mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 01:56:15 +02:00
Code

Clean up code duplication for revision parsing and fix previous commit to not 

import into remotes/p4 (yet!).

Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-05-17 09:13:54 +02:00
parent f9162f6a4c
commit 463e8af655
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/fast-import/git-p4
View File

@ -69,6 +69,9 @@ def isValidGitDir(path):
return True; return True;
return False return False
def parseRevision(ref):
return mypopen("git rev-parse %s" % ref).read()[:-1]
def system(cmd): def system(cmd):
if os.system(cmd) != 0: if os.system(cmd) != 0:
die("command failed: %s" % cmd) die("command failed: %s" % cmd)
@ -865,7 +868,7 @@ class P4Sync(Command):
self.previousDepotPath = "" self.previousDepotPath = ""
if len(self.branch) == 0: if len(self.branch) == 0:
self.branch = "refs/remotes/p4" self.branch = "p4"
if len(args) == 0: if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin"): if not gitBranchExists(self.branch) and gitBranchExists("origin"):
@ -878,7 +881,7 @@ class P4Sync(Command):
p4Change = int(p4Change) + 1 p4Change = int(p4Change) + 1
self.depotPath = self.previousDepotPath self.depotPath = self.previousDepotPath
self.changeRange = "@%s,#head" % p4Change self.changeRange = "@%s,#head" % p4Change
self.initialParent = mypopen("git rev-parse %s" % self.branch).read()[:-1] self.initialParent = parseRevision(self.branch)
if not self.silent: if not self.silent:
print "Performing incremental import into %s git branch" % self.branch print "Performing incremental import into %s git branch" % self.branch
@ -943,7 +946,7 @@ class P4Sync(Command):
endPos = caretIdx endPos = caretIdx
self.rev = int(output[tagIdx + 9 : endPos]) + 1 self.rev = int(output[tagIdx + 9 : endPos]) + 1
self.changeRange = "@%s,#head" % self.rev self.changeRange = "@%s,#head" % self.rev
self.initialParent = mypopen("git rev-parse %s" % self.branch).read()[:-1] self.initialParent = parseRevision(self.branch)
except: except:
pass pass