| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (6 lines) | |||
| M | tests/test-update-branches.t (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # make sure all explicit patterns are matched | # make sure all explicit patterns are matched | ||||
| if not force: | if not force: | ||||
| self.checkcommitpatterns(wctx, match, status, fail) | self.checkcommitpatterns(wctx, match, status, fail) | ||||
| cctx = context.workingcommitctx( | cctx = context.workingcommitctx( | ||||
| self, status, text, user, date, extra | self, status, text, user, date, extra | ||||
| ) | ) | ||||
| ms = mergemod.mergestate.read(self) | |||||
| mergeutil.checkunresolved(ms) | |||||
| # internal config: ui.allowemptycommit | # internal config: ui.allowemptycommit | ||||
| allowemptycommit = ( | allowemptycommit = ( | ||||
| wctx.branch() != wctx.p1().branch() | wctx.branch() != wctx.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: | ||||
| return None | return None | ||||
| if merge and cctx.deleted(): | if merge and cctx.deleted(): | ||||
| raise error.Abort(_(b"cannot commit merge with missing files")) | raise error.Abort(_(b"cannot commit merge with missing files")) | ||||
| ms = mergemod.mergestate.read(self) | |||||
| mergeutil.checkunresolved(ms) | |||||
| if editor: | if editor: | ||||
| cctx._text = editor(self, cctx, subs) | cctx._text = editor(self, cctx, subs) | ||||
| edited = text != cctx._text | edited = text != cctx._text | ||||
| # Save commit message in case this transaction gets rolled back | # Save commit message in case this transaction gets rolled back | ||||
| # (e.g. by a pretxncommit hook). Leave the content alone on | # (e.g. by a pretxncommit hook). Leave the content alone on | ||||
| # the assumption that the user will use the same editor again. | # the assumption that the user will use the same editor again. | ||||
| msgfn = self.savecommitmessage(cctx._text) | msgfn = self.savecommitmessage(cctx._text) | ||||
| $ hg resolve -l | $ hg resolve -l | ||||
| U a | U a | ||||
| Try to make empty commit while there are conflicts | Try to make empty commit while there are conflicts | ||||
| $ hg revert -r . a | $ hg revert -r . a | ||||
| $ rm a.orig | $ rm a.orig | ||||
| $ hg ci -m empty | $ hg ci -m empty | ||||
| nothing changed | abort: unresolved merge conflicts (see 'hg help resolve') | ||||
| [1] | [255] | ||||
| $ hg resolve -m a | $ hg resolve -m a | ||||
| (no more unresolved files) | (no more unresolved files) | ||||
| $ hg resolve -l | $ hg resolve -l | ||||
| R a | R a | ||||
| $ hg ci -m empty | $ hg ci -m empty | ||||
| nothing changed | nothing changed | ||||
| [1] | [1] | ||||
| $ hg resolve -l | $ hg resolve -l | ||||