D7904: rebase: clarify a little by calculating a set in Python instead of in revset
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 24 18:27:14 EST 2020
Closed by commit rHG4263aaab651d: rebase: clarify a little by calculating a set in Python instead of in revset (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7904?vs=19340&id=19578
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7904/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7904
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1767,8 +1767,9 @@
continue
# Revisions in the side (not chosen as merge base) branch that
# might contain "surprising" contents
+ other_bases = set(bases) - {base}
siderevs = list(
- repo.revs(b'((%ld-%d) %% (%d+%d))', bases, base, base, dest)
+ repo.revs(b'(%ld %% (%d+%d))', other_bases, base, dest)
)
# If those revisions are covered by rebaseset, the result is good.
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list