evolve: comparison hgext3rd/evolve/evolvecmd.py

equal deleted inserted replaced

-:09337aae08d4
+:699e25687cc5
 returns a tuple (bool, newnode) where,
 bool: a boolean value indicating whether the instability was solved
 newnode: if bool is True, then the newnode of the resultant commit
 formed. newnode can be node, when resolution led to no new
-commit. If bool is False, this is ''.
+commit. If bool is False, this is ".".
 """
 displayer = None
 if stacktmplt:
 displayer = compat.changesetdisplayer(ui, repo,
 {'template': stacktemplate})
 returns a tuple (bool, newnode) where,
 bool: a boolean value indicating whether the instability was solved
 newnode: if bool is True, then the newnode of the resultant commit
 formed. newnode can be node, when resolution led to no new
-commit. If bool is False, this is ''.
+commit. If bool is False, this is ".".
 """
 pctx = orig.p1()
 keepbranch = orig.p1().branch() != orig.branch()
 if len(orig.parents()) == 2:
 p1obs = orig.p1().obsolete()
 pctx = orig.p2()
 keepbranch = orig.p2().branch() != orig.branch()
 if not pctx.obsolete():
 ui.warn(_("cannot solve instability of %s, skipping\n") % orig)
-return (False, '')
+return (False, ".")
 obs = pctx
 newer = obsutil.successorssets(repo, obs.node())
 # search of a parent which is not killed
 while not newer or newer == [()]:
 ui.debug("stabilize target %s is plain dead,"
 newer = obsutil.successorssets(repo, obs.node())
 if len(newer) > 1:
 msg = _("skipping %s: divergent rewriting. can't choose "
 "destination\n") % obs
 ui.write_err(msg)
-return (False, '')
+return (False, ".")
 targets = newer[0]
 assert targets
 if len(targets) > 1:
 # split target, figure out which one to pick, are they all in line?
 targetrevs = [repo[r].rev() for r in targets]
 if selectedrev is None:
 msg = _("could not solve instability, "
 "ambiguous destination: "
 "parent split across two branches\n")
 ui.write_err(msg)
-return (False, '')
+return (False, ".")
 target = repo[selectedrev]
 else:
 target = repo[heads.first()]
 else:
 target = targets[0]
 if progresscb:
 progresscb()
 todo = 'hg rebase -r %s -d %s\n' % (orig, target)
 if dryrun:
 repo.ui.write(todo)
-return (False, '')
+return (False, ".")
 else:
 repo.ui.note(todo)
 if progresscb:
 progresscb()
 try:
 returns a tuple (bool, newnode) where,
 bool: a boolean value indicating whether the instability was solved
 newnode: if bool is True, then the newnode of the resultant commit
 formed. newnode can be node, when resolution led to no new
-commit. If bool is False, this is ''.
+commit. If bool is False, this is ".".
 """
 repo = repo.unfiltered()
 bumped = repo[bumped.rev()]
 # For now we deny bumped merge
 if len(bumped.parents()) > 1:
 msg = _('skipping %s : we do not handle merge yet\n') % bumped
 ui.write_err(msg)
-return (False, '')
+return (False, ".")
 prec = repo.set('last(allprecursors(%d) and public())', bumped.rev()).next()
 # For now we deny target merge
 if len(prec.parents()) > 1:
 msg = _('skipping: %s: public version is a merge, '
 'this is not handled yet\n') % prec
 ui.write_err(msg)
-return (False, '')
+return (False, ".")
 if not ui.quiet or confirm:
 repo.ui.write(_('recreate:'), label='evolve.operation')
 displayer.show(bumped)
 repo.ui.write(_('atop:'))
 repo.ui.write(todo)
 repo.ui.write(('hg update %s;\n' % prec))
 repo.ui.write(('hg revert --all --rev %s;\n' % bumped))
 repo.ui.write(('hg commit --msg "%s update to %s"\n' %
 (TROUBLES['PHASEDIVERGENT'], bumped)))
-return (False, '')
+return (False, ".")
 if progresscb:
 progresscb()
 tmpctx = bumped
 # Checking for whether the phase-divergent changeset has common parents as
 returns a tuple (bool, newnode) where,
 bool: a boolean value indicating whether the instability was solved
 newnode: if bool is True, then the newnode of the resultant commit
 formed. newnode can be node, when resolution led to no new
-commit. If bool is False, this is ''.
+commit. If bool is False, this is ".".
 """
 repo = repo.unfiltered()
 divergent = repo[divergent.rev()]
 evolvestate['divergent'] = divergent.node()
 # sometimes we will relocate a node in case of different parents and we can
 "| - hg prune\n"
 "| \n"
 "| You should contact your local evolution Guru for help.\n"
 ) % (divergent, TROUBLES['CONTENTDIVERGENT'], othersstr)
 ui.write_err(msg)
-return (False, '')
+return (False, ".")
 other = others[0]
 evolvestate['other-divergent'] = other.node()
 evolvestate['base'] = base.node()
 # we don't handle merge content-divergent changesets yet
 ui.write_err(msg)
 hint = _("You have to fallback to solving this by hand...\n"
 "| This probably means redoing the merge and using \n"
 "| `hg prune` to kill older version.\n")
 ui.write_err(hint)
-return (False, '')
+return (False, ".")
 otherp1 = other.p1().rev()
 divp1 = divergent.p1().rev()
 # finding single successors of otherp1 and divp1
 "| - either: hg rebase --dest 'p1(%(d)s)' -r %(o)s\n"
 "| - or:     hg rebase --dest 'p1(%(o)s)' -r %(d)s\n"
 ) % {'d': divergent, 'o': other}
 ui.write_err(msg)
 ui.write_err(hint)
-return (False, '')
+return (False, ".")
 if not ui.quiet or confirm:
 ui.write(_('merge:'), label='evolve.operation')
 displayer.show(divergent)
 ui.write(_('with: '))
 '%s and %s"&&\n' % (divergent, other)))
 ui.write(('hg up -C %s &&\n' % base))
 ui.write(('hg revert --all --rev tip &&\n'))
 ui.write(('hg commit -m "`hg log -r %s --template={desc}`";\n'
 % divergent))
-return (False, '')
+return (False, ".")
 evolvestate['resolutionparent'] = resolutionparent
 # relocate the other divergent if required
 if relocatereq:
 # relocating will help us understand during the time of conflicts that

branch	stable
changeset 4297	699e25687cc5
parent 4269	d2599da04bb5
child 4301	5cbaf5d25443
child 4311	8aa28e68ac44