mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 11:36:08 +02:00
Code

Fixes for rollback, delete branches that did not exist at the specified p4 change 

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-05-21 23:44:24 +02:00
parent af8da89cb7
commit 52102d4784
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,8 +136,10 @@ class P4RollBack(Command):
def __init__(self):
Command.__init__(self)
self.options = [
optparse.make_option("--verbose", dest="verbose", action="store_true")
]
self.description = "A tool to debug the multi-branch import. Don't use :)"
self.verbose = False
def run(self, args):
if len(args) != 1:
@ -149,15 +151,22 @@ class P4RollBack(Command):
log = extractLogMessageFromGitCommit(ref)
depotPath, change = extractDepotPathAndChangeFromGitLog(log)
changed = False
if len(p4Cmd("changes -m 1 %s...@%s" % (depotPath, maxChange))) == 0:
print "Branch %s did not exist at change %s, deleting." % (ref, maxChange)
system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
continue
while len(change) > 0 and int(change) > maxChange:
changed = True
print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
if self.verbose:
print "%s is at %s ; rewinding towards %s" % (ref, change, maxChange)
system("git update-ref %s \"%s^\"" % (ref, ref))
log = extractLogMessageFromGitCommit(ref)
depotPath, change = extractDepotPathAndChangeFromGitLog(log)
if changed:
print "%s is at %s" % (ref, change)
print "%s rewound to %s" % (ref, change)
return True