comparison mercurial/commands.py @ 20093:1dee888b22f7 stable

phase: better error message when --force is needed When trying to turn a draft changeset into a secret changeset, I was told: % hg phase -s . cannot move 1 changesets to a more permissive phase, use --force no phases changed That message struck me as being backwards -- the secret phase feels less permissive to me since it restricts the changesets from being pushed. We don't use the word "permissive" elsewhere, 'hg help phase' talks about "lower phases" and "higher phases". I therefore reformulated the error message to be cannot move 1 changesets to a higher phase, use --force That is not perfect either, but more in line with the help text. An alternative could be cannot move phase backwards for 1 changesets, use --force which fits better with the help text for --force.
author Martin Geisler <martin@geisler.net>
date Fri, 08 Nov 2013 11:49:13 +0100
parents de16c673455b
children 1c46b18b0e1c 2ca325ea57fa
comparison
equal deleted inserted replaced
20092:77acd8ce01ce 20093:1dee888b22f7
4510 changes = sum(o != newdata[i] for i, o in enumerate(olddata)) 4510 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4511 cl = unfi.changelog 4511 cl = unfi.changelog
4512 rejected = [n for n in nodes 4512 rejected = [n for n in nodes
4513 if newdata[cl.rev(n)] < targetphase] 4513 if newdata[cl.rev(n)] < targetphase]
4514 if rejected: 4514 if rejected:
4515 ui.warn(_('cannot move %i changesets to a more permissive ' 4515 ui.warn(_('cannot move %i changesets to a higher '
4516 'phase, use --force\n') % len(rejected)) 4516 'phase, use --force\n') % len(rejected))
4517 ret = 1 4517 ret = 1
4518 if changes: 4518 if changes:
4519 msg = _('phase changed for %i changesets\n') % changes 4519 msg = _('phase changed for %i changesets\n') % changes
4520 if ret: 4520 if ret: