Mercurial > hg
changeset 16169:c12d4aceba79
copies: remove checkdirs options
This removes the undocumented merge.followdirs option, which has
always been true.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 25 Feb 2012 14:22:58 -0600 |
| parents | 7bbabfe25321 |
| children | ef2373ea3d24 |
| files | mercurial/copies.py mercurial/merge.py |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Fri Feb 24 18:21:06 2012 -0600 +++ b/mercurial/copies.py Sat Feb 25 14:22:58 2012 -0600 @@ -174,7 +174,7 @@ return _backwardcopies(x, y) return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y)) -def mergecopies(repo, c1, c2, ca, checkdirs=True): +def mergecopies(repo, c1, c2, ca): """ Find moves and copies between context c1 and c2 that are relevant for merging. @@ -310,7 +310,7 @@ repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) del diverge2 - if not fullcopy or not checkdirs: + if not fullcopy: return copy, diverge repo.ui.debug(" checking for directory renames\n")
--- a/mercurial/merge.py Fri Feb 24 18:21:06 2012 -0600 +++ b/mercurial/merge.py Sat Feb 25 14:22:58 2012 -0600 @@ -188,8 +188,7 @@ elif pa == p2: # backwards pa = p1.p1() elif pa and repo.ui.configbool("merge", "followcopies", True): - dirs = repo.ui.configbool("merge", "followdirs", True) - copy, diverge = copies.mergecopies(repo, p1, p2, pa, dirs) + copy, diverge = copies.mergecopies(repo, p1, p2, pa) for of, fl in diverge.iteritems(): act("divergent renames", "dr", of, fl)