Mercurial > hg > mercurial-crew

comparison hgext/rebase.py @ 19956:78ab0f85e249 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: improve error message for more than one external parent
author Mads Kiilerich <madski@unity3d.com>
date Wed, 23 Oct 2013 23:42:13 +0800
parents 2160c2e0d7d1
children ad9db007656f
comparison
equal deleted inserted replaced
19955:2160c2e0d7d1 19956:78ab0f85e249
404 parents.add(p.rev()) 404 parents.add(p.rev())
405 if not parents: 405 if not parents:
406 return nullrev 406 return nullrev
407 if len(parents) == 1: 407 if len(parents) == 1:
408 return parents.pop() 408 return parents.pop()
409 raise util.Abort(_('unable to collapse, there is more ' 409 raise util.Abort(_('unable to collapse on top of %s, there is more '
410 'than one external parent')) 410 'than one external parent: %s') %
411 (max(targetancestors),
412 ', '.join(str(p) for p in sorted(parents))))
411 413
412 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None): 414 def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None):
413 'Commit the changes and store useful information in extra' 415 'Commit the changes and store useful information in extra'
414 try: 416 try:
415 repo.setparents(repo[p1].node(), repo[p2].node()) 417 repo.setparents(repo[p1].node(), repo[p2].node())