# HG changeset patch # User Patrick Mezard # Date 1336834416 -7200 # Node ID 1e24da6fcd6719b9ea92b98a454575e21ac98027 # Parent 0a176990243c9b4753039867164cfed560806fb7 phase: remove useless test, olddata is never None diff -r 0a176990243c -r 1e24da6fcd67 mercurial/commands.py --- a/mercurial/commands.py Sun May 13 14:29:05 2012 +0200 +++ b/mercurial/commands.py Sat May 12 16:53:36 2012 +0200 @@ -4443,25 +4443,23 @@ phases.retractboundary(repo, targetphase, nodes) finally: lock.release() - if olddata is not None: - changes = 0 - newdata = repo._phasecache.getphaserevs(repo) - changes = sum(o != newdata[i] for i, o in enumerate(olddata)) - rejected = [n for n in nodes - if newdata[repo[n].rev()] < targetphase] - if rejected: - ui.warn(_('cannot move %i changesets to a more permissive ' - 'phase, use --force\n') % len(rejected)) - ret = 1 - if changes: - msg = _('phase changed for %i changesets\n') % changes - if ret: - ui.status(msg) - else: - ui.note(msg) + newdata = repo._phasecache.getphaserevs(repo) + changes = sum(o != newdata[i] for i, o in enumerate(olddata)) + rejected = [n for n in nodes + if newdata[repo[n].rev()] < targetphase] + if rejected: + ui.warn(_('cannot move %i changesets to a more permissive ' + 'phase, use --force\n') % len(rejected)) + ret = 1 + if changes: + msg = _('phase changed for %i changesets\n') % changes + if ret: + ui.status(msg) else: - ui.warn(_('no phases changed\n')) - ret = 1 + ui.note(msg) + else: + ui.warn(_('no phases changed\n')) + ret = 1 return ret def postincoming(ui, repo, modheads, optupdate, checkout):