diff --git a/src/land/engine/ArcanistMercurialLandEngine.php b/src/land/engine/ArcanistMercurialLandEngine.php --- a/src/land/engine/ArcanistMercurialLandEngine.php +++ b/src/land/engine/ArcanistMercurialLandEngine.php @@ -116,7 +116,7 @@ throw new PhutilArgumentUsageException( pht( 'Symbol "%s" is ambiguous.', - $symbol)); + $raw_symbol)); } $marker = head($named_markers); @@ -493,6 +493,7 @@ } protected function selectIntoCommit() { + $api = $this->getRepositoryAPI(); $log = $this->getLogEngine(); if ($this->getIntoEmpty()) { @@ -508,7 +509,6 @@ if ($this->getIntoLocal()) { // If we're running under "--into-local", just make sure that the // target identifies some actual commit. - $api = $this->getRepositoryAPI(); $local_ref = $this->getIntoRef(); // TODO: This error handling could probably be cleaner, it will just @@ -834,7 +834,7 @@ try { foreach ($body as $command) { - $this->newPasthru('%Ls', $command); + $this->newPassthru('%Ls', $command); } } finally { foreach ($tail as $command) { diff --git a/support/hg/arc-hg.py b/support/hg/arc-hg.py --- a/support/hg/arc-hg.py +++ b/support/hg/arc-hg.py @@ -31,9 +31,9 @@ @command( b'arc-ls-markers', [(b'', b'output', b'', - _('file to output refs to'), _('FILE')), + _(b'file to output refs to'), _(b'FILE')), ] + cmdutil.remoteopts, - _('[--output FILENAME] [SOURCE]')) + _(b'[--output FILENAME] [SOURCE]')) def lsmarkers(ui, repo, source=None, **opts): """list markers @@ -166,7 +166,7 @@ 'isClosed': False, 'isTip': False, 'isCurrent': True, - 'description': repo['.'].description(), + 'description': repo[b'.'].description(), }) return markers @@ -181,7 +181,7 @@ remote = hg.peer(repo, opts, source) with remote.commandexecutor() as e: - branchmap = e.callcommand('branchmap', {}).result() + branchmap = e.callcommand(b'branchmap', {}).result() for branch_name in branchmap: for branch_node in branchmap[branch_name]: @@ -189,11 +189,12 @@ 'type': 'branch', 'name': branch_name, 'node': node.hex(branch_node), + 'description': None, }) with remote.commandexecutor() as e: - remotemarks = bookmarks.unhexlifybookmarks(e.callcommand('listkeys', { - 'namespace': 'bookmarks', + remotemarks = bookmarks.unhexlifybookmarks(e.callcommand(b'listkeys', { + b'namespace': b'bookmarks', }).result()) for mark in remotemarks: @@ -201,6 +202,7 @@ 'type': 'bookmark', 'name': mark, 'node': node.hex(remotemarks[mark]), + 'description': None, }) return markers