Mercurial > public > mercurial-scm > hg

comparison mercurial/copies.py @ 16169:c12d4aceba79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b8c1a8a57540
comparison
equal deleted inserted replaced
16168:7bbabfe25321 16169:c12d4aceba79
172 return _forwardcopies(x, y) 172 return _forwardcopies(x, y)
173 if a == y: 173 if a == y:
174 return _backwardcopies(x, y) 174 return _backwardcopies(x, y)
175 return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y)) 175 return _chain(x, y, _backwardcopies(x, a), _forwardcopies(a, y))
176 176
177 def mergecopies(repo, c1, c2, ca, checkdirs=True): 177 def mergecopies(repo, c1, c2, ca):
178 """ 178 """
179 Find moves and copies between context c1 and c2 that are relevant 179 Find moves and copies between context c1 and c2 that are relevant
180 for merging. 180 for merging.
181 181
182 Returns two dicts, "copy" and "diverge". 182 Returns two dicts, "copy" and "diverge".
308 if f in diverge2: 308 if f in diverge2:
309 note += "!" 309 note += "!"
310 repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note)) 310 repo.ui.debug(" %s -> %s %s\n" % (f, fullcopy[f], note))
311 del diverge2 311 del diverge2
312 312
313 if not fullcopy or not checkdirs: 313 if not fullcopy:
314 return copy, diverge 314 return copy, diverge
315 315
316 repo.ui.debug(" checking for directory renames\n") 316 repo.ui.debug(" checking for directory renames\n")
317 317
318 # generate a directory move map 318 # generate a directory move map