equal
deleted
inserted
replaced
4628 if opts['force']: |
4628 if opts['force']: |
4629 phases.retractboundary(repo, targetphase, nodes) |
4629 phases.retractboundary(repo, targetphase, nodes) |
4630 finally: |
4630 finally: |
4631 lock.release() |
4631 lock.release() |
4632 newdata = repo._phasecache.getphaserevs(repo) |
4632 newdata = repo._phasecache.getphaserevs(repo) |
|
4633 cl = repo.changelog |
4633 changes = sum(o != newdata[i] for i, o in enumerate(olddata)) |
4634 changes = sum(o != newdata[i] for i, o in enumerate(olddata)) |
4634 rejected = [n for n in nodes |
4635 rejected = [n for n in nodes |
4635 if newdata[repo[n].rev()] < targetphase] |
4636 if newdata[cl.rev(n)] < targetphase] |
4636 if rejected: |
4637 if rejected: |
4637 ui.warn(_('cannot move %i changesets to a more permissive ' |
4638 ui.warn(_('cannot move %i changesets to a more permissive ' |
4638 'phase, use --force\n') % len(rejected)) |
4639 'phase, use --force\n') % len(rejected)) |
4639 ret = 1 |
4640 ret = 1 |
4640 if changes: |
4641 if changes: |