Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 20095:1c46b18b0e1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Nov 2013 17:26:58 -0600
parents 79d3b6a45351 1dee888b22f7
children 85d9200ba9f0
comparison
equal deleted inserted replaced
20091:abfe6a8e619b 20095:1c46b18b0e1c
4511 changes = sum(o != newdata[i] for i, o in enumerate(olddata)) 4511 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4512 cl = unfi.changelog 4512 cl = unfi.changelog
4513 rejected = [n for n in nodes 4513 rejected = [n for n in nodes
4514 if newdata[cl.rev(n)] < targetphase] 4514 if newdata[cl.rev(n)] < targetphase]
4515 if rejected: 4515 if rejected:
4516 ui.warn(_('cannot move %i changesets to a more permissive ' 4516 ui.warn(_('cannot move %i changesets to a higher '
4517 'phase, use --force\n') % len(rejected)) 4517 'phase, use --force\n') % len(rejected))
4518 ret = 1 4518 ret = 1
4519 if changes: 4519 if changes:
4520 msg = _('phase changed for %i changesets\n') % changes 4520 msg = _('phase changed for %i changesets\n') % changes
4521 if ret: 4521 if ret: