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>
This commit is contained in:
parent
31f9ec129e
commit
14594f4b57
@ -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")
|
||||
|
Loading…
Reference in New Issue
Block a user