This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3423

firefoxtree: use error.Abort (bug 1456213); r?sheehan
AbandonedPublic

Authored by indygreg on Apr 23 2018, 2:28 PM.

Details

Reviewers
sheehan
Group Reviewers
hg-reviewers
Summary

util.Abort was removed in Mercurial 4.6 it appears.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 8421

hgext/firefoxtree/__init__.py

remote = args[0].remote remote = args[0].remote
outgoing = args[0].outgoing outgoing = args[0].outgoing
tree = resolve_uri_to_tree(remote.url()) tree = resolve_uri_to_tree(remote.url())
if not tree or tree == 'try': if not tree or tree == 'try':
return return
if len(outgoing.missingheads) > 1: if len(outgoing.missingheads) > 1:
raise util.Abort(_('cannot push multiple heads to a Firefox tree; ' raise error.Abort(_('cannot push multiple heads to a Firefox tree; '
'limit pushed revisions using the -r argument')) 'limit pushed revisions using the -r argument'))
def wrappedpullobsolete(orig, pullop): def wrappedpullobsolete(orig, pullop):
res = orig(pullop) res = orig(pullop)
repo = pullop.repo repo = pullop.repo
remote = pullop.remote remote = pullop.remote
], _('show Firefox tree heads')) ], _('show Firefox tree heads'))
def fxheads(ui, repo, **opts): def fxheads(ui, repo, **opts):
"""Show last known head commits for pulled Firefox trees. """Show last known head commits for pulled Firefox trees.
The displayed list may be out of date. Pull before running to ensure The displayed list may be out of date. Pull before running to ensure
data is current. data is current.
""" """
if not isfirefoxrepo(repo): if not isfirefoxrepo(repo):
raise util.Abort(_('fxheads is only available on Firefox repos')) raise error.Abort(_('fxheads is only available on Firefox repos'))
if logcmdutil: if logcmdutil:
displayer = logcmdutil.changesetdisplayer(ui, repo, opts) displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
else: else:
displayer = cmdutil.show_changeset(ui, repo, opts) displayer = cmdutil.show_changeset(ui, repo, opts)
seen = set() seen = set()
for tag, node, tree, uri in get_firefoxtrees(repo): for tag, node, tree, uri in get_firefoxtrees(repo):