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:
Simon Hausmann 2007-08-22 09:07:15 +02:00
Родитель 31f9ec129e
Коммит 14594f4b57
1 изменённых файлов: 9 добавлений и 2 удалений

Просмотреть файл

@ -704,10 +704,14 @@ class P4Submit(Command):
else: else:
print "All changes applied!" print "All changes applied!"
os.chdir(self.oldWorkingDirectory) 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": if response == "y" or response == "yes":
rebase = P4Rebase() rebase = P4Rebase()
rebase.run([]) rebase.rebase()
os.remove(self.configFile) os.remove(self.configFile)
return True return True
@ -1439,6 +1443,9 @@ class P4Rebase(Command):
sync = P4Sync() sync = P4Sync()
sync.run([]) sync.run([])
return self.rebase()
def rebase(self):
[upstream, settings] = findUpstreamBranchPoint() [upstream, settings] = findUpstreamBranchPoint()
if len(upstream) == 0: if len(upstream) == 0:
die("Cannot find upstream branchpoint for rebase") die("Cannot find upstream branchpoint for rebase")