Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 40366:b14fdf1fb615
update: clarify update() call sites by specifying argument names
merge.update() takes a lot of parameters and I get confused all the
time which is which.
Differential Revision: https://phab.mercurial-scm.org/D5153
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 09 Feb 2017 09:17:40 -0800 |
| parents | c303d65d2e34 |
| children | f07d4f94f098 ea84c2b286a2 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Oct 18 10:11:08 2018 -0700 +++ b/hgext/rebase.py Thu Feb 09 09:17:40 2017 -0800 @@ -1188,7 +1188,7 @@ else: if repo['.'].rev() != p1: repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) - mergemod.update(repo, p1, False, True) + mergemod.update(repo, p1, branchmerge=False, force=True) else: repo.ui.debug(" already in destination\n") # This is, alas, necessary to invalidate workingctx's manifest cache, @@ -1200,7 +1200,8 @@ repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) # When collapsing in-place, the parent is the common ancestor, we # have to allow merging with it. - stats = mergemod.update(repo, rev, True, True, base, collapse, + stats = mergemod.update(repo, rev, branchmerge=True, force=True, + ancestor=base, mergeancestor=collapse, labels=['dest', 'source'], wc=wctx) if collapse: copies.duplicatecopies(repo, wctx, rev, dest) @@ -1643,7 +1644,7 @@ # Update away from the rebase if necessary if shouldupdate or needupdate(repo, state): - mergemod.update(repo, originalwd, False, True) + mergemod.update(repo, originalwd, branchmerge=False, force=True) # Strip from the first rebased revision if rebased: