| hg-reviewers |
This makes a difference when a branch name is passed via the extra argument,
which will be used as the branch name for the created changeset. The empty
commit check should use that branch name instead of whatever was set on the
working directory.
Besides fixing the bug for which a test case was extended, it enables to remove
a workaround in the rebase extension, which will be done in a follow-up patch
(D8725).
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (2 lines) | |||
| M | tests/test-rebase-emptycommit.t (12 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| f47043dd2784 | b6afe1c52964 | Manuel Jacob | Jul 9 2020, 6:44 PM |
| self, status, text, user, date, extra | self, status, text, user, date, extra | ||||
| ) | ) | ||||
| ms = mergestatemod.mergestate.read(self) | ms = mergestatemod.mergestate.read(self) | ||||
| mergeutil.checkunresolved(ms) | mergeutil.checkunresolved(ms) | ||||
| # internal config: ui.allowemptycommit | # internal config: ui.allowemptycommit | ||||
| allowemptycommit = ( | allowemptycommit = ( | ||||
| wctx.branch() != wctx.p1().branch() | cctx.branch() != cctx.p1().branch() | ||||
| or extra.get(b'close') | or extra.get(b'close') | ||||
| or merge | or merge | ||||
| or cctx.files() | or cctx.files() | ||||
| or self.ui.configbool(b'ui', b'allowemptycommit') | or self.ui.configbool(b'ui', b'allowemptycommit') | ||||
| ) | ) | ||||
| if not allowemptycommit: | if not allowemptycommit: | ||||
| self.ui.debug(b'nothing to commit, clearing merge state\n') | self.ui.debug(b'nothing to commit, clearing merge state\n') | ||||
| ms.reset() | ms.reset() | ||||
| > | | > | | ||||
| > D | > D | ||||
| > | | > | | ||||
| > C | > C | ||||
| > | | > | | ||||
| > B | > B | ||||
| > EOS | > EOS | ||||
| $ hg rebase -r '(A::)-(B::)-A' -d H | Previously, there was a bug where the empty commit check compared the parent | ||||
| branch name with the wdir branch name instead of the actual branch name (which | |||||
| should stay unchanged if --keepbranches is passed), and erroneously assumed | |||||
| that an otherwise empty changeset should be created because of the incorrectly | |||||
| assumed branch name change. | |||||
| $ hg update H -q | |||||
| $ hg branch foo -q | |||||
| $ hg rebase -r '(A::)-(B::)-A' -d H --keepbranches | |||||
| rebasing 2:dc0947a82db8 "C" (BOOK-C) | rebasing 2:dc0947a82db8 "C" (BOOK-C) | ||||
| note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes | note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes | ||||
| rebasing 3:b18e25de2cf5 "D" (BOOK-D) | rebasing 3:b18e25de2cf5 "D" (BOOK-D) | ||||
| note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes | note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes | ||||
| rebasing 4:86a1f6686812 "E" (BOOK-E E) | rebasing 4:86a1f6686812 "E" (BOOK-E E) | ||||
| note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes | note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes | ||||
| saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg | saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg | ||||
| $ hg update null -q | |||||
| $ hg log -G -T '{rev} {desc} {bookmarks}' | $ hg log -G -T '{rev} {desc} {bookmarks}' | ||||
| o 4 H BOOK-C BOOK-D BOOK-E | o 4 H BOOK-C BOOK-D BOOK-E | ||||
| | | | | ||||
| o 3 D | o 3 D | ||||
| | | | | ||||
| o 2 C | o 2 C | ||||
| | | | | ||||