stabilize: rename "node" variable to "orig"
It's a not a node at all. this is a context.
--- a/hgext/evolve.py Mon Aug 20 12:25:08 2012 +0200
+++ b/hgext/evolve.py Mon Aug 20 12:31:43 2012 +0200
@@ -242,10 +242,10 @@
obsolete = extensions.find('obsolete')
- node = None
+ orig = None
if not opts['any']:
- node = stabilizableunstable(repo, repo['.'])
- if node is None:
+ orig = stabilizableunstable(repo, repo['.'])
+ if orig is None:
unstables = list(repo.set('unstable()'))
if unstables and not opts['any']:
ui.write_err(_('nothing to stabilize here\n'))
@@ -255,11 +255,11 @@
elif not unstables:
ui.write_err(_('no unstable changeset\n'))
return 1
- node = unstables[0]
+ orig = unstables[0]
- obs = node.parents()[0]
+ obs = orig.parents()[0]
if not obs.obsolete():
- obs = node.parents()[1]
+ obs = orig.parents()[1]
assert obs.obsolete()
newer = obsolete.newerversion(repo, obs.node())
if len(newer) > 1:
@@ -277,18 +277,18 @@
target = repo[target]
repo.ui.status(_('move:'))
if not ui.quiet:
- displayer.show(node)
+ displayer.show(orig)
repo.ui.status(_('atop:'))
if not ui.quiet:
displayer.show(target)
- todo= 'hg rebase -Dr %s -d %s\n' % (node, target)
+ todo= 'hg rebase -Dr %s -d %s\n' % (orig, target)
if opts['dry_run']:
repo.ui.write(todo)
else:
repo.ui.note(todo)
lock = repo.lock()
try:
- relocate(repo, node, target)
+ relocate(repo, orig, target)
except MergeFailure:
repo.ui.write_err(_('/!\\ stabilize failed /!\\\n'))
repo.ui.write_err(_('/!\\ Their is no "hg stabilize --continue" /!\\\n'))