comparison hgext/histedit.py @ 29876:034d38b5f6fb

histedit: drop the 'nodetoverify' local variable We can just use 'action.node'.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 26 Aug 2016 20:38:37 +0200
parents 478e4a2a9952
children 1c19d3efe15d
comparison
equal deleted inserted replaced
29875:478e4a2a9952 29876:034d38b5f6fb
1383 for constraint in constraints: 1383 for constraint in constraints:
1384 if constraint not in _constraints.known(): 1384 if constraint not in _constraints.known():
1385 raise error.ParseError(_('unknown constraint "%s"') % 1385 raise error.ParseError(_('unknown constraint "%s"') %
1386 constraint) 1386 constraint)
1387 1387
1388 nodetoverify = action.node 1388 if action.node is not None:
1389 if nodetoverify is not None: 1389 ha = node.hex(action.node)
1390 ha = node.hex(nodetoverify)
1391 if _constraints.noother in constraints and ha not in expected: 1390 if _constraints.noother in constraints and ha not in expected:
1392 raise error.ParseError( 1391 raise error.ParseError(
1393 _('%s "%s" changeset was not a candidate') 1392 _('%s "%s" changeset was not a candidate')
1394 % (action.verb, ha[:12]), 1393 % (action.verb, ha[:12]),
1395 hint=_('only use listed changesets')) 1394 hint=_('only use listed changesets'))