From: "Robert Blum" <rob.blum@gmail.com>
To: simon@lst.de, shausman@trolltech.com, marius@trolltech.com,
hanwen@google.com, gitster@pobox.com
Cc: git@vger.kernel.org
Subject: [PATCH] git-p4: chdir now properly sets PWD environment variable in msysGit
Date: Fri, 1 Aug 2008 12:50:03 -0700 [thread overview]
Message-ID: <bad7471c0808011250v569ffaaby9e20a5ba1f971927@mail.gmail.com> (raw)
P4 on Windows expects the PWD environment variable to be set to the
current working dir, but os.chdir in python doesn't do that by default
Signed-off-by: Robert Blum <rob.blum@gmail.com>
---
Pushing it out to the list since I'm not entirely sure who the git-p4 owner
even is. CC'ed likely suspects for ownership ;)
contrib/fast-import/git-p4 | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6ae0429..b4d0c65 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -16,6 +16,13 @@ from sets import Set;
verbose = False
+if os.name == 'nt':
+ def os_chdir(dir):
+ os.environ['PWD']=dir
+ os.chdir(dir)
+else:
+ os_chdir = os.chdir
+
def die(msg):
if verbose:
raise Exception(msg)
@@ -712,7 +719,7 @@ class P4Submit(Command):
print "Perforce checkout for depot path %s located at %s" % (self.depot
Path, self.clientPath)
self.oldWorkingDirectory = os.getcwd()
- os.chdir(self.clientPath)
+ os_chdir(self.clientPath)
print "Syncronizing p4 checkout..."
system("p4 sync ...")
@@ -732,7 +739,7 @@ class P4Submit(Command):
if len(commits) == 0:
print "All changes applied!"
- os.chdir(self.oldWorkingDirectory)
+ os_chdir(self.oldWorkingDirectory)
sync = P4Sync()
sync.run([])
@@ -1670,7 +1677,7 @@ class P4Clone(P4Sync):
print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneD
estination)
if not os.path.exists(self.cloneDestination):
os.makedirs(self.cloneDestination)
- os.chdir(self.cloneDestination)
+ os_chdir(self.cloneDestination)
system("git init")
self.gitdir = os.getcwd() + "/.git"
if not P4Sync.run(self, depotPaths):
@@ -1782,7 +1789,7 @@ def main():
if os.path.exists(cmd.gitdir):
cdup = read_pipe("git rev-parse --show-cdup").strip()
if len(cdup) > 0:
- os.chdir(cdup);
+ os_chdir(cdup);
if not isValidGitDir(cmd.gitdir):
if isValidGitDir(cmd.gitdir + "/.git"):
--
1.5.5.1015.g9d258
next reply other threads:[~2008-08-01 19:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 19:50 Robert Blum [this message]
2008-08-03 21:13 ` [PATCH] git-p4: chdir now properly sets PWD environment variable in msysGit Junio C Hamano
[not found] ` <bad7471c0808040601y10cceb44idcde5a4a8f415769@mail.gmail.com>
2008-08-04 13:04 ` Fwd: " Robert Blum
2008-08-16 5:44 ` Junio C Hamano
2008-08-16 5:56 ` Junio C Hamano
2008-08-05 8:24 ` Simon Hausmann
2008-08-04 3:06 ` Han-Wen Nienhuys
2008-08-05 22:23 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bad7471c0808011250v569ffaaby9e20a5ba1f971927@mail.gmail.com \
--to=rob.blum@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hanwen@google.com \
--cc=marius@trolltech.com \
--cc=shausman@trolltech.com \
--cc=simon@lst.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).