hgext/histedit.py
changeset 27712 bb810c8b3eca
parent 27675 d073f4c70575
child 27713 fb2c77ba577a
equal deleted inserted replaced
27711:7a678a12a5cf 27712:bb810c8b3eca
  1300         nodetoverify = action.nodetoverify()
  1300         nodetoverify = action.nodetoverify()
  1301         if nodetoverify is not None:
  1301         if nodetoverify is not None:
  1302             ha = node.hex(nodetoverify)
  1302             ha = node.hex(nodetoverify)
  1303             if _constraints.noother in constraints and ha not in expected:
  1303             if _constraints.noother in constraints and ha not in expected:
  1304                 raise error.ParseError(
  1304                 raise error.ParseError(
  1305                     _('may not use "%s" with changesets '
  1305                     _('%s "%s" changeset was not a candidate')
  1306                       'other than the ones listed') % action.verb)
  1306                      % (action.verb, node.short(ha)),
       
  1307                     hint=_('only use listed changesets'))
  1307             if _constraints.forceother in constraints and ha in expected:
  1308             if _constraints.forceother in constraints and ha in expected:
  1308                 raise error.ParseError(
  1309                 raise error.ParseError(
  1309                     _('may not use "%s" with changesets '
  1310                     _('%s "%s" changeset was not an edited list candidate')
  1310                       'within the edited list') % action.verb)
  1311                      % (action.verb, node.short(ha)),
       
  1312                     hint=_('only use listed changesets'))
  1311             if _constraints.noduplicates in constraints and ha in seen:
  1313             if _constraints.noduplicates in constraints and ha in seen:
  1312                 raise error.ParseError(_(
  1314                 raise error.ParseError(_(
  1313                         'duplicated command for changeset %s') %
  1315                         'duplicated command for changeset %s') %
  1314                         ha[:12])
  1316                         ha[:12])
  1315             seen.add(ha)
  1317             seen.add(ha)