Cross Forests
/
projects
/
python
/
fast-export.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17360fd
)
Provide a tree summary after git-p4 rebase
author
Simon Hausmann
<simon@luria.(none)>
Sat, 7 Apr 2007 22:07:02 +0000
(
00:07
+0200)
committer
Simon Hausmann
<simon@luria.(none)>
Sat, 7 Apr 2007 22:07:02 +0000
(
00:07
+0200)
git-p4
patch
|
blob
|
history
diff --git
a/git-p4
b/git-p4
index
aa85800
..
170af90
100755
(executable)
--- a/
git-p4
+++ b/
git-p4
@@
-974,7
+974,7
@@
class P4Sync(Command):
if len(changes) == 0:
if not self.silent:
print "no changes to import!"
- sys.exit(1)
+ return True
cnt = 1
for change in changes:
@@
-1053,7
+1053,9
@@
class P4Rebase(Command):
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):