Tools/git-repo
1
0
Fork 0
Code Activity

Add a --rebase option to sync command

Browse source 
Previously repo would abort a sync if there were published changes not
merged upstream. The --rebase option allows the modification of
published commits.

This is a copy of http://go/grev/369694 with the merge conflicts
resolved.

Bug: 40014610
Change-Id: Idac8199400346327b530abea33f1ed794e5bb4c2
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/435838
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Tested-by: Jeroen Dhollander <jeroendh@google.com>
Commit-Queue: Jeroen Dhollander <jeroendh@google.com>
This commit is contained in:
Jeroen Dhollander 2024-08-20 10:28:41 +02:00 • committed by LUCI
parent 4592a63de5
commit c44ad09309
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
project.py
View file

@ -1535,6 +1535,7 @@ class Project:
syncbuf,
force_sync=False,
force_checkout=False,
force_rebase=False,
submodules=False,
errors=None,
verbose=False,
@ -1680,14 +1681,15 @@ class Project:
if pub:
not_merged = self._revlist(not_rev(revid), pub)
if not_merged:
if upstream_gain:
if upstream_gain and not force_rebase:
# The user has published this branch and some of those
# commits are not yet merged upstream. We do not want
# to rewrite the published commits so we punt.
fail(
LocalSyncFail(
"branch %s is published (but not merged) and is "
"now %d commits behind"
"now %d commits behind. Fix this manually or rerun "
"with the --rebase option to force a rebase."
% (branch.name, len(upstream_gain)),
project=self.name,
)