| hg-reviewers |
This is a slightly less forceful incarnation of D7384, where pytype can be
appeased with some assertions rather than disabling warnings.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (15 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| vfs as vfsmod, | vfs as vfsmod, | ||||
| wireprotoserver, | wireprotoserver, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| dateutil, | dateutil, | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| if pycompat.TYPE_CHECKING: | |||||
| from typing import ( | |||||
| List, | |||||
| ) | |||||
| table = {} | table = {} | ||||
| table.update(debugcommandsmod.command._table) | table.update(debugcommandsmod.command._table) | ||||
| command = registrar.command(table) | command = registrar.command(table) | ||||
| INTENT_READONLY = registrar.INTENT_READONLY | INTENT_READONLY = registrar.INTENT_READONLY | ||||
| # common command options | # common command options | ||||
| ) | ) | ||||
| if node is None: | if node is None: | ||||
| ui.warn( | ui.warn( | ||||
| _(b'note: graft of %d:%s created no changes to commit\n') | _(b'note: graft of %d:%s created no changes to commit\n') | ||||
| % (ctx.rev(), ctx) | % (ctx.rev(), ctx) | ||||
| ) | ) | ||||
| # checking that newnodes exist because old state files won't have it | # checking that newnodes exist because old state files won't have it | ||||
| elif statedata.get(b'newnodes') is not None: | elif statedata.get(b'newnodes') is not None: | ||||
| statedata[b'newnodes'].append(node) | nn = statedata[b'newnodes'] # type: List[bytes] | ||||
| nn.append(node) | |||||
| # remove state when we complete successfully | # remove state when we complete successfully | ||||
| if not opts.get(b'dry_run'): | if not opts.get(b'dry_run'): | ||||
| graftstate.delete() | graftstate.delete() | ||||
| return 0 | return 0 | ||||
| return dest, dbranch, dother, outgoing | return dest, dbranch, dother, outgoing | ||||
| if needsoutgoing: | if needsoutgoing: | ||||
| dest, dbranch, dother, outgoing = getoutgoing() | dest, dbranch, dother, outgoing = getoutgoing() | ||||
| else: | else: | ||||
| dest = dbranch = dother = outgoing = None | dest = dbranch = dother = outgoing = None | ||||
| if opts.get(b'remote'): | if opts.get(b'remote'): | ||||
| # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`. | |||||
| # The former always sets `sother` (or raises an exception if it can't); | |||||
| # the latter always sets `outgoing`. | |||||
| assert sother is not None | |||||
| assert outgoing is not None | |||||
| t = [] | t = [] | ||||
| if incoming: | if incoming: | ||||
| t.append(_(b'1 or more incoming')) | t.append(_(b'1 or more incoming')) | ||||
| o = outgoing.missing | o = outgoing.missing | ||||
| if o: | if o: | ||||
| t.append(_(b'%d outgoing') % len(o)) | t.append(_(b'%d outgoing') % len(o)) | ||||
| other = dother or sother | other = dother or sother | ||||
| if b'bookmarks' in other.listkeys(b'namespaces'): | if b'bookmarks' in other.listkeys(b'namespaces'): | ||||