Mercurial > evolve

comparison hgext/evolve.py @ 1566:25254b2f8116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: apply API change to 'merge.update' Mercurial core43c00ca887d1 (future 3.7) changed the signature of the 'mercurial.merge.update', this impact our code so we update it. This
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 17 Dec 2015 16:00:32 +0000
parents 42c30774e63d
children 536fdfa3c48b
comparison
equal deleted inserted replaced
1565:9590332b26c8 1566:25254b2f8116
2002 if divergent not in repo[None].parents(): 2002 if divergent not in repo[None].parents():
2003 repo.ui.status(_('updating to "local" conflict\n')) 2003 repo.ui.status(_('updating to "local" conflict\n'))
2004 hg.update(repo, divergent.rev()) 2004 hg.update(repo, divergent.rev())
2005 repo.ui.note(_('merging divergent changeset\n')) 2005 repo.ui.note(_('merging divergent changeset\n'))
2006 if progresscb: progresscb() 2006 if progresscb: progresscb()
2007 stats = merge.update(repo, 2007 if 'partial' in merge.update.__doc__:
2008 other.node(), 2008 # Mercurial < 43c00ca887d1 (3.7)
2009 branchmerge=True, 2009 stats = merge.update(repo,
2010 force=False, 2010 other.node(),
2011 partial=None, 2011 branchmerge=True,
2012 ancestor=base.node(), 2012 force=False,
2013 mergeancestor=True) 2013 partial=None,
2014 ancestor=base.node(),
2015 mergeancestor=True)
2016 else:
2017 stats = merge.update(repo,
2018 other.node(),
2019 branchmerge=True,
2020 force=False,
2021 ancestor=base.node(),
2022 mergeancestor=True)
2023
2014 hg._showstats(repo, stats) 2024 hg._showstats(repo, stats)
2015 if stats[3]: 2025 if stats[3]:
2016 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " 2026 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
2017 "or 'hg update -C .' to abandon\n")) 2027 "or 'hg update -C .' to abandon\n"))
2018 if stats[3] > 0: 2028 if stats[3] > 0: