Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 44454:2f290136b7d6
merge: make hg.merge() take a context instead of a node
Many callers already have a repo, so we might as well pass
that. `merge.update()` will look up the context object later. This
patch is part of making it so we pass around the context object all
the way down instead.
I also removed the `repo` argument since it can be retrieved from the
context.
Differential Revision: https://phab.mercurial-scm.org/D7999
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 15:28:37 -0800 |
| parents | a45ffad9ae98 |
| children | 6a8738dc4a01 |
line wrap: on
line diff
--- a/mercurial/hg.py Fri Jan 17 21:22:23 2020 +0300 +++ b/mercurial/hg.py Fri Jan 24 15:28:37 2020 -0800 @@ -1137,11 +1137,12 @@ def merge( - repo, node, force=False, remind=True, labels=None, + ctx, force=False, remind=True, labels=None, ): """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" - stats = mergemod.merge(repo[node], force=force, labels=labels) + repo = ctx.repo() + stats = mergemod.merge(ctx, force=force, labels=labels) _showstats(repo, stats) if stats.unresolvedcount: repo.ui.status(