##// END OF EJS Templates
histedit: add forceother constraint...
Mateusz Kwapich -
r27083:6d5d7ac4 default
parent child Browse files
Show More
@@ -340,6 +340,7 b' class histeditaction(object):'
340 340 Available constraints:
341 341 noduplicates - aborts if there are multiple rules for one node
342 342 noother - abort if the node doesn't belong to edited stack
343 forceother - abort if the node does belong to edited stack
343 344 """
344 345
345 346 return set(['noduplicates', 'noother'])
@@ -1087,6 +1088,10 b' def verifyrules(rules, state, ctxs):'
1087 1088 raise error.Abort(
1088 1089 _('may not use "%s" with changesets '
1089 1090 'other than the ones listed') % verb)
1091 if 'forceother' in constraints and ha in expected:
1092 raise error.Abort(
1093 _('may not use "%s" with changesets '
1094 'within the edited list') % verb)
1090 1095 if 'noduplicates' in constraints and ha in seen:
1091 1096 raise error.Abort(_('duplicated command for changeset %s') %
1092 1097 ha[:12])
General Comments 0
You need to be logged in to leave comments. Login now