Show More
@@ -1379,25 +1379,25 b' def verifyactions(actions, state, ctxs):' | |||
|
1379 | 1379 | for action in actions: |
|
1380 | 1380 | action.verify(prev) |
|
1381 | 1381 | prev = action |
|
1382 |
constr |
|
|
1383 |
for constraint in constr |
|
|
1382 | constrs = action.constraints | |
|
1383 | for constraint in constrs: | |
|
1384 | 1384 | if constraint not in _constraints.known(): |
|
1385 | 1385 | raise error.ParseError(_('unknown constraint "%s"') % |
|
1386 | 1386 | constraint) |
|
1387 | 1387 | |
|
1388 | 1388 | if action.node is not None: |
|
1389 | 1389 | ha = node.hex(action.node) |
|
1390 |
if _constraints.noother in constr |
|
|
1390 | if _constraints.noother in constrs and ha not in expected: | |
|
1391 | 1391 | raise error.ParseError( |
|
1392 | 1392 | _('%s "%s" changeset was not a candidate') |
|
1393 | 1393 | % (action.verb, ha[:12]), |
|
1394 | 1394 | hint=_('only use listed changesets')) |
|
1395 |
if _constraints.forceother in constr |
|
|
1395 | if _constraints.forceother in constrs and ha in expected: | |
|
1396 | 1396 | raise error.ParseError( |
|
1397 | 1397 | _('%s "%s" changeset was not an edited list candidate') |
|
1398 | 1398 | % (action.verb, ha[:12]), |
|
1399 | 1399 | hint=_('only use listed changesets')) |
|
1400 |
if _constraints.noduplicates in constr |
|
|
1400 | if _constraints.noduplicates in constrs and ha in seen: | |
|
1401 | 1401 | raise error.ParseError(_( |
|
1402 | 1402 | 'duplicated command for changeset %s') % |
|
1403 | 1403 | ha[:12]) |
General Comments 0
You need to be logged in to leave comments.
Login now