summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-08-22 07:07:15 (GMT)
committerSimon Hausmann <simon@lst.de>2007-09-03 18:27:02 (GMT)
commit14594f4b5747e51b051f647f6430089e6664e77d (patch)
tree2db51e570a6f731ac766b010bbcaf23bf6fb29b5 /contrib/fast-import
parent31f9ec129ef37e50b5cacf26a2ebcb5420fcdc5e (diff)
downloadgit-14594f4b5747e51b051f647f6430089e6664e77d.zip
git-14594f4b5747e51b051f647f6430089e6664e77d.tar.gz
git-14594f4b5747e51b051f647f6430089e6664e77d.tar.bz2
git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p411
1 files changed, 9 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3728cbf..16e0a7b 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -704,10 +704,14 @@ class P4Submit(Command):
else:
print "All changes applied!"
os.chdir(self.oldWorkingDirectory)
- response = raw_input("Do you want to sync from Perforce now using git-p4 rebase? [y]es/[n]o ")
+
+ sync = P4Sync()
+ sync.run([])
+
+ response = raw_input("Do you want to rebase current HEAD from Perforce now using git-p4 rebase? [y]es/[n]o ")
if response == "y" or response == "yes":
rebase = P4Rebase()
- rebase.run([])
+ rebase.rebase()
os.remove(self.configFile)
return True
@@ -1439,6 +1443,9 @@ class P4Rebase(Command):
sync = P4Sync()
sync.run([])
+ return self.rebase()
+
+ def rebase(self):
[upstream, settings] = findUpstreamBranchPoint()
if len(upstream) == 0:
die("Cannot find upstream branchpoint for rebase")