[PATCH] phase: remove useless test, olddata is never None
Patrick Mezard
patrick at mezard.eu
Sat May 12 10:13:37 CDT 2012
# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1336834416 -7200
# Node ID fc3be2993a9b5ffe76d55079022ef23d4b7898d2
# Parent 76c744e0c5bbd0900beba49787b7e04ba862939b
phase: remove useless test, olddata is never None
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4393,25 +4393,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):
More information about the Mercurial-devel
mailing list