| hg-reviewers |
This enables reuse in other places, e.g. those dealing with memctx.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (8 lines) | |||
| M | mercurial/localrepo.py (11 lines) |
| return r | return r | ||||
| def mergestate(self, clean=False): | def mergestate(self, clean=False): | ||||
| """Get a mergestate object for this context.""" | """Get a mergestate object for this context.""" | ||||
| raise NotImplementedError( | raise NotImplementedError( | ||||
| '%s does not implement mergestate()' % self.__class__ | '%s does not implement mergestate()' % self.__class__ | ||||
| ) | ) | ||||
| def isempty(self): | |||||
| return not ( | |||||
| len(self.parents()) > 1 | |||||
| or self.branch() != self.p1().branch() | |||||
| or self.closesbranch() | |||||
| or self.files() | |||||
| ) | |||||
| class changectx(basectx): | class changectx(basectx): | ||||
| """A changecontext object makes access to data related to a particular | """A changecontext object makes access to data related to a particular | ||||
| changeset convenient. It represents a read-only context already present in | changeset convenient. It represents a read-only context already present in | ||||
| the repo.""" | the repo.""" | ||||
| def __init__(self, repo, rev, node, maybe_filtered=True): | def __init__(self, repo, rev, node, maybe_filtered=True): | ||||
| super(changectx, self).__init__(repo) | super(changectx, self).__init__(repo) | ||||
| 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: | ||||