Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.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 | a61287a95dc3 |
| children | 3b7aabd02e11 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Fri Jan 17 21:22:23 2020 +0300 +++ b/mercurial/subrepo.py Fri Jan 24 15:28:37 2020 -0800 @@ -806,7 +806,7 @@ self.ui.debug( b'merging subrepository "%s"\n' % subrelpath(self) ) - hg.merge(self._repo, state[1], remind=False) + hg.merge(dst, remind=False) wctx = self._repo[None] if self.dirty():