| hg-reviewers |
While the nullid lookup is a special case, it is still more complicated.
The common pattern is to lookup via nullrev so be consistent here.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cmdutil.py (9 lines) | |||
| M | mercurial/context.py (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger | ||
| Closed | joerg.sonnenberger |
| import errno | import errno | ||||
| import os | import os | ||||
| import re | import re | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| hex, | hex, | ||||
| nullid, | nullid, | ||||
| nullrev, | |||||
| short, | short, | ||||
| ) | ) | ||||
| from .pycompat import ( | from .pycompat import ( | ||||
| getattr, | getattr, | ||||
| open, | open, | ||||
| setattr, | setattr, | ||||
| ) | ) | ||||
| from .thirdparty import attr | from .thirdparty import attr | ||||
| # pickup the patch msg | # pickup the patch msg | ||||
| message = message.strip() | message = message.strip() | ||||
| else: | else: | ||||
| # launch the editor | # launch the editor | ||||
| message = None | message = None | ||||
| ui.debug(b'message:\n%s\n' % (message or b'')) | ui.debug(b'message:\n%s\n' % (message or b'')) | ||||
| if len(parents) == 1: | if len(parents) == 1: | ||||
| parents.append(repo[nullid]) | parents.append(repo[nullrev]) | ||||
| if opts.get(b'exact'): | if opts.get(b'exact'): | ||||
| if not nodeid or not p1: | if not nodeid or not p1: | ||||
| raise error.InputError(_(b'not a Mercurial patch')) | raise error.InputError(_(b'not a Mercurial patch')) | ||||
| p1 = repo[p1] | p1 = repo[p1] | ||||
| p2 = repo[p2 or nullid] | p2 = repo[p2 or nullrev] | ||||
| elif p2: | elif p2: | ||||
| try: | try: | ||||
| p1 = repo[p1] | p1 = repo[p1] | ||||
| p2 = repo[p2] | p2 = repo[p2] | ||||
| # Without any options, consider p2 only if the | # Without any options, consider p2 only if the | ||||
| # patch is being applied on top of the recorded | # patch is being applied on top of the recorded | ||||
| # first parent. | # first parent. | ||||
| if p1 != parents[0]: | if p1 != parents[0]: | ||||
| p1 = parents[0] | p1 = parents[0] | ||||
| p2 = repo[nullid] | p2 = repo[nullrev] | ||||
| except error.RepoError: | except error.RepoError: | ||||
| p1, p2 = parents | p1, p2 = parents | ||||
| if p2.node() == nullid: | if p2.rev() == nullrev: | ||||
| ui.warn( | ui.warn( | ||||
| _( | _( | ||||
| b"warning: import the patch as a normal revision\n" | b"warning: import the patch as a normal revision\n" | ||||
| b"(use --exact to import the patch as a merge)\n" | b"(use --exact to import the patch as a merge)\n" | ||||
| ) | ) | ||||
| ) | ) | ||||
| else: | else: | ||||
| p1, p2 = parents | p1, p2 = parents | ||||
| self._originalctx = originalctx | self._originalctx = originalctx | ||||
| self._manifestnode = originalctx.manifestnode() | self._manifestnode = originalctx.manifestnode() | ||||
| if parents is None: | if parents is None: | ||||
| parents = originalctx.parents() | parents = originalctx.parents() | ||||
| else: | else: | ||||
| parents = [repo[p] for p in parents if p is not None] | parents = [repo[p] for p in parents if p is not None] | ||||
| parents = parents[:] | parents = parents[:] | ||||
| while len(parents) < 2: | while len(parents) < 2: | ||||
| parents.append(repo[nullid]) | parents.append(repo[nullrev]) | ||||
| p1, p2 = self._parents = parents | p1, p2 = self._parents = parents | ||||
| # sanity check to ensure that the reused manifest parents are | # sanity check to ensure that the reused manifest parents are | ||||
| # manifests of our commit parents | # manifests of our commit parents | ||||
| mp1, mp2 = self.manifestctx().parents | mp1, mp2 = self.manifestctx().parents | ||||
| if p1 != nullid and p1.manifestnode() != mp1: | if p1 != nullid and p1.manifestnode() != mp1: | ||||
| raise RuntimeError( | raise RuntimeError( | ||||
| r"can't reuse the manifest: its p1 " | r"can't reuse the manifest: its p1 " | ||||