Mercurial > hg-stable
diff relnotes/next @ 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 | edc8504bc26b |
children | 6a34e438461b |
line wrap: on
line diff
--- a/relnotes/next Fri Jan 17 21:22:23 2020 +0300 +++ b/relnotes/next Fri Jan 24 15:28:37 2020 -0800 @@ -67,6 +67,9 @@ * The deprecated `ui.progress()` has now been deleted. Please use `ui.makeprogress()` instead. + * `hg.merge()` now takes a `ctx` instead of the previous `repo` and + `node` arguments. + * `hg.merge()` has lost its `abort` argument. Please call `hg.abortmerge()` directly instead.