This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3157

histedit: drop unnecessary check for "self.node is not None"
ClosedPublic

Authored by martinvonz on Apr 6 2018, 12:54 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG966061b8826d: histedit: drop unnecessary check for "self.node is not None"
Summary

We are doing hex(self.node) just a few lines up, so it shouldn't be
None. The only way it could be none is if it was reassigned in
between. The only way that can happen is if the user had put a
"ffff..." wdirhex revision in the histedit script. This code is much
older than the "ffff..." identifier, so I'm confident it's not there
to handle that case. I'll let someone else add proper checks for
"ffff..." if they care enough.

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 6 2018, 12:54 PM
indygreg accepted this revision.Apr 6 2018, 2:54 PM
This revision is now accepted and ready to land.Apr 6 2018, 2:54 PM
Closed by commit rHG966061b8826d: histedit: drop unnecessary check for "self.node is not None" (authored by martinvonz). · Explain WhyApr 10 2018, 12:03 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (3 lines)

Diff 7935

hgext/histedit.py

""" Verifies semantic correctness of the rule""" """ Verifies semantic correctness of the rule"""
repo = self.repo repo = self.repo
ha = node.hex(self.node) ha = node.hex(self.node)
try: try:
self.node = repo[ha].node() self.node = repo[ha].node()
except error.RepoError: except error.RepoError:
raise error.ParseError(_('unknown changeset %s listed') raise error.ParseError(_('unknown changeset %s listed')
% ha[:12]) % ha[:12])
if self.node is not None:
self._verifynodeconstraints(prev, expected, seen) self._verifynodeconstraints(prev, expected, seen)
def _verifynodeconstraints(self, prev, expected, seen): def _verifynodeconstraints(self, prev, expected, seen):
# by default command need a node in the edited list # by default command need a node in the edited list
if self.node not in expected: if self.node not in expected:
raise error.ParseError(_('%s "%s" changeset was not a candidate') raise error.ParseError(_('%s "%s" changeset was not a candidate')
% (self.verb, node.short(self.node)), % (self.verb, node.short(self.node)),
hint=_('only use listed changesets')) hint=_('only use listed changesets'))
# and only one command per node # and only one command per node