This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3054

histedit: avoid repo.lookup() for converting revnum to nodeid
ClosedPublic

Authored by martinvonz on Apr 3 2018, 6:08 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG8474005fcfe2: histedit: avoid repo.lookup() for converting revnum to nodeid
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 3 2018, 6:08 PM
indygreg accepted this revision.Apr 3 2018, 7:14 PM
This revision is now accepted and ready to land.Apr 3 2018, 7:14 PM
Closed by commit rHG8474005fcfe2: histedit: avoid repo.lookup() for converting revnum to nodeid (authored by martinvonz). · Explain WhyApr 3 2018, 7:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)

Diff 7594

hgext/histedit.py

outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force) outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
if not outgoing.missing: if not outgoing.missing:
raise error.Abort(_('no outgoing ancestors')) raise error.Abort(_('no outgoing ancestors'))
roots = list(repo.revs("roots(%ln)", outgoing.missing)) roots = list(repo.revs("roots(%ln)", outgoing.missing))
if 1 < len(roots): if 1 < len(roots):
msg = _('there are ambiguous outgoing revisions') msg = _('there are ambiguous outgoing revisions')
hint = _("see 'hg help histedit' for more detail") hint = _("see 'hg help histedit' for more detail")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
return repo.lookup(roots[0]) return repo[roots[0]].node()
@command('histedit', @command('histedit',
[('', 'commands', '', [('', 'commands', '',
_('read history edits from the specified file'), _('FILE')), _('read history edits from the specified file'), _('FILE')),
('c', 'continue', False, _('continue an edit already in progress')), ('c', 'continue', False, _('continue an edit already in progress')),
('', 'edit-plan', False, _('edit remaining actions list')), ('', 'edit-plan', False, _('edit remaining actions list')),
('k', 'keep', False, ('k', 'keep', False,
_("don't strip old nodes after edit is complete")), _("don't strip old nodes after edit is complete")),