| hg-reviewers |
This enables reuse in other places, e.g. those dealing with memctx.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (8 lines) | |||
| M | mercurial/localrepo.py (11 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 7c68a9414e7d | 81c2dc9633f3 | Manuel Jacob | Jul 10 2020, 7:14 PM |
| workingctx have been committed. For example, it marks | workingctx have been committed. For example, it marks | ||||
| modified and added files as normal in the dirstate. | modified and added files as normal in the dirstate. | ||||
| """ | """ | ||||
| def dirty(self, missing=False, merge=True, branch=True): | def dirty(self, missing=False, merge=True, branch=True): | ||||
| return False | return False | ||||
| def isempty(self): | |||||
| return not ( | |||||
| len(self.parents()) > 1 | |||||
| or self.branch() != self.p1().branch() | |||||
| or self.closesbranch() | |||||
| or self.files() | |||||
| ) | |||||
| class workingctx(committablectx): | class workingctx(committablectx): | ||||
| """A workingctx object makes access to data related to | """A workingctx object makes access to data related to | ||||
| the current working directory convenient. | the current working directory convenient. | ||||
| date - any valid date string or (unixtime, offset), or None. | date - any valid date string or (unixtime, offset), or None. | ||||
| user - username string, or None. | user - username string, or None. | ||||
| extra - a dictionary of extra values, or None. | extra - a dictionary of extra values, or None. | ||||
| changes - a list of file lists as returned by localrepo.status() | changes - a list of file lists as returned by localrepo.status() | ||||
| cctx = context.workingcommitctx( | cctx = context.workingcommitctx( | ||||
| 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 = ( | if cctx.isempty() and not self.ui.configbool( | ||||
| cctx.branch() != cctx.p1().branch() | b'ui', b'allowemptycommit' | ||||
| or extra.get(b'close') | ): | ||||
| or merge | |||||
| or cctx.files() | |||||
| or self.ui.configbool(b'ui', b'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() | ||||
| 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")) | ||||
| if editor: | if editor: | ||||