summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 01ce1fe)
raw | patch | inline | side by side (parent: 01ce1fe)
author | Simon Hausmann <simon@lst.de> | |
Sat, 7 Apr 2007 22:07:02 +0000 (00:07 +0200) | ||
committer | Simon Hausmann <simon@lst.de> | |
Sat, 7 Apr 2007 22:07:02 +0000 (00:07 +0200) |
Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4 | patch | blob | history |
index aa85800d697f25518886dcd5d1826eb1eef91958..170af90abc963a1fb5b1f679a9d4ee4acf14de4e 100755 (executable)
if len(changes) == 0:
if not self.silent:
print "no changes to import!"
- sys.exit(1)
+ return True
cnt = 1
for change in changes:
sync = P4Sync()
sync.run([])
print "Rebasing the current branch"
+ oldHead = os.popen("git rev-parse HEAD").read()[:-1]
system("git rebase p4")
+ system("git diff-tree --stat --summary -M %s HEAD" % oldHead)
return True
class HelpFormatter(optparse.IndentedHelpFormatter):