facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

phase: remove useless test, olddata is never None

Browse Source
This commit is contained in:
Patrick Mezard 2012-05-12 16:53:36 +02:00
parent de32ec835b
commit abc8f672ec
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mercurial/commands.py
View File

@ -4443,25 +4443,23 @@ def phase(ui, repo, *revs, **opts):
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):