mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-04 00:46:12 +02:00
Code

Moved the code from git-p4 submit to figure out the upstream branch point 

into a separate helper method.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-06-12 14:31:59 +02:00
parent e6b711f00e
commit 27d2d8119b
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,28 @@ def gitBranchExists(branch):
def gitConfig(key):
return read_pipe("git config %s" % key, ignore_error=True).strip()
def findUpstreamBranchPoint():
settings = None
branchPoint = ""
parent = 0
while parent < 65535:
commit = "HEAD~%s" % parent
log = extractLogMessageFromGitCommit(commit)
settings = extractSettingsGitLog(log)
if not settings.has_key("depot-paths"):
parent = parent + 1
continue
names = read_pipe_lines("git name-rev '--refs=refs/remotes/p4/*' '%s'" % commit)
if len(names) <= 0:
continue
# strip away the beginning of 'HEAD~42 refs/remotes/p4/foo'
branchPoint = names[0].strip()[len(commit) + 1:]
break
return [branchPoint, settings]
class Command:
def __init__(self):
self.usage = "usage: %prog [options]"
@ -494,25 +516,10 @@ class P4Submit(Command):
else:
return False
depotPath = ""
parent = 0
while parent < 65535:
commit = "HEAD~%s" % parent
log = extractLogMessageFromGitCommit(commit)
settings = extractSettingsGitLog(log)
if not settings.has_key("depot-paths"):
parent = parent + 1
continue
depotPath = settings['depot-paths'][0]
if len(self.origin) == 0:
names = read_pipe_lines("git name-rev '--refs=refs/remotes/p4/*' '%s'" % commit)
if len(names) > 0:
# strip away the beginning of 'HEAD~42 refs/remotes/p4/foo'
self.origin = names[0].strip()[len(commit) + 1:]
break
[upstream, settings] = findUpstreamBranchPoint()
depotPath = settings['depot-paths'][0]
if len(self.origin) == 0:
self.origin = upstream
if self.verbose:
print "Origin branch is " + self.origin