##// END OF EJS Templates
merge: remove workaround for issue5020...
merge: remove workaround for issue5020 As I explained in the previous commit, I think the filtering added there is a better fix for the issue, so the workaround from 41f6af50c0d8 (merge: fix crash on criss cross merge with dir move and delete (issue5020), 2017-01-31) should no longer be needed. Differential Revision: https://phab.mercurial-scm.org/D6245

File last commit:

r42338:31abb9d7 default
r42339:beec7fc6 default
Show More
copies.py
1017 lines | 37.8 KiB | text/x-python | PythonLexer
Matt Mackall
copies: move findcopies code to its own module...
r6274 # copies.py - copy detection for Mercurial
#
# Copyright 2008 Matt Mackall <mpm@selenic.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
copies: move findcopies code to its own module...
r6274
Gregory Szorc
copies: use absolute_import
r25924 from __future__ import absolute_import
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 import collections
Simon Heimberg
separate import lines from mercurial and general python modules
r8312 import heapq
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 import os
Matt Mackall
copies: move findcopies code to its own module...
r6274
Pulkit Goyal
copies: add a config to limit the number of candidates to check in heuristics...
r34847 from .i18n import _
Gregory Szorc
copies: use absolute_import
r25924 from . import (
Yuya Nishihara
copies: use intersectmatchers() in non-merge p1 optimization...
r33869 match as matchmod,
Durham Goode
copies: optimize forward copy detection logic for rebases...
r28000 node,
Gregory Szorc
copies: use absolute_import
r25924 pathutil,
util,
)
Pulkit Goyal
copies: improve logic of deciding copytracing on based of config options...
r39402 from .utils import (
stringutil,
)
Gregory Szorc
copies: use absolute_import
r25924
Martin von Zweigbergk
copies: pass contexts into _findlimit()...
r41438 def _findlimit(repo, ctxa, ctxb):
Ryan McElroy
amend: fix amending rename commit with diverged topologies (issue4405)...
r23071 """
Find the last revision that needs to be checked to ensure that a full
transitive closure for file copies can be properly calculated.
Generally, this means finding the earliest revision number that's an
ancestor of a or b but not both, except when a or b is a direct descendent
of the other, in which case we can return the minimum revnum of a and b.
Patrick Mezard
copies: don't report copies with unrelated branch
r10179 """
Ryan McElroy
amend: fix amending rename commit with diverged topologies (issue4405)...
r23071
Matt Mackall
symmetricdifference: move back to copies...
r6429 # basic idea:
# - mark a and b with different sides
# - if a parent's children are all on the same side, the parent is
# on that side, otherwise it is on no side
# - walk the graph in topological order with the help of a heap;
# - add unseen parents to side map
# - clear side of any parent that has children on different sides
Matt Mackall
copies: refactor symmetricdifference as _findlimit...
r6431 # - track number of interesting revs that might still be on a side
# - track the lowest interesting rev seen
# - quit when interesting revs is zero
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430
cl = repo.changelog
Martin von Zweigbergk
copies: get working copy parents from wctx, not dirstate, to make in-mem work...
r41439 wdirparents = None
Martin von Zweigbergk
copies: pass contexts into _findlimit()...
r41438 a = ctxa.rev()
b = ctxb.rev()
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 if a is None:
Martin von Zweigbergk
copies: get working copy parents from wctx, not dirstate, to make in-mem work...
r41439 wdirparents = (ctxa.p1(), ctxa.p2())
Martin von Zweigbergk
copies: use node.wdirrev instead of inventing another constant for it...
r41267 a = node.wdirrev
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 if b is None:
Martin von Zweigbergk
copies: get working copy parents from wctx, not dirstate, to make in-mem work...
r41439 assert not wdirparents
wdirparents = (ctxb.p1(), ctxb.p2())
Martin von Zweigbergk
copies: use node.wdirrev instead of inventing another constant for it...
r41267 b = node.wdirrev
Matt Mackall
symmetricdifference: move back to copies...
r6429
side = {a: -1, b: 1}
visit = [-a, -b]
heapq.heapify(visit)
interesting = len(visit)
Martin von Zweigbergk
copies: use node.wdirrev instead of inventing another constant for it...
r41267 limit = node.wdirrev
Matt Mackall
symmetricdifference: move back to copies...
r6429
while interesting:
r = -heapq.heappop(visit)
Martin von Zweigbergk
copies: use node.wdirrev instead of inventing another constant for it...
r41267 if r == node.wdirrev:
Martin von Zweigbergk
copies: get working copy parents from wctx, not dirstate, to make in-mem work...
r41439 parents = [pctx.rev() for pctx in wdirparents]
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 else:
parents = cl.parentrevs(r)
Martin von Zweigbergk
copies: consider nullrev a common ancestor...
r41437 if parents[1] == node.nullrev:
parents = parents[:1]
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 for p in parents:
Matt Mackall
symmetricdifference: move back to copies...
r6429 if p not in side:
# first time we see p; add it to visit
side[p] = side[r]
if side[p]:
interesting += 1
heapq.heappush(visit, -p)
elif side[p] and side[p] != side[r]:
# p was interesting but now we know better
side[p] = 0
interesting -= 1
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 if side[r]:
Matt Mackall
copies: refactor symmetricdifference as _findlimit...
r6431 limit = r # lowest rev visited
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 interesting -= 1
Patrick Mezard
copies: don't report copies with unrelated branch
r10179
Ryan McElroy
amend: fix amending rename commit with diverged topologies (issue4405)...
r23071 # Consider the following flow (see test-commit-amend.t under issue4405):
# 1/ File 'a0' committed
# 2/ File renamed from 'a0' to 'a1' in a new commit (call it 'a1')
# 3/ Move back to first commit
# 4/ Create a new commit via revert to contents of 'a1' (call it 'a1-amend')
# 5/ Rename file from 'a1' to 'a2' and commit --amend 'a1-msg'
#
# During the amend in step five, we will be in this state:
#
# @ 3 temporary amend commit for a1-amend
# |
# o 2 a1-amend
# |
# | o 1 a1
# |/
# o 0 a0
#
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23139 # When _findlimit is called, a and b are revs 3 and 0, so limit will be 2,
Ryan McElroy
amend: fix amending rename commit with diverged topologies (issue4405)...
r23071 # yet the filelog has the copy information in rev 1 and we will not look
# back far enough unless we also look at the a and b as candidates.
# This only occurs when a is a descendent of b or visa-versa.
return min(limit, a, b)
Matt Mackall
symmetricdifference: move back to copies...
r6429
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 def _chain(src, dst, a, b):
Martin von Zweigbergk
copies: consistently use """ for docstrings...
r35422 """chain two sets of copies a->b"""
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 t = a.copy()
for k, v in b.iteritems():
if v in t:
# found a chain
if t[v] != k:
# file wasn't renamed back to itself
t[k] = t[v]
if v not in dst:
# chain was a rename, not a copy
del t[v]
if v in src:
# file is a copy of an existing file
t[k] = v
Matt Mackall
copies: eliminate criss-crosses when chaining...
r15976
Gregory Szorc
py3: avoid changing dictionary during iteration...
r36134 for k, v in list(t.items()):
Martin von Zweigbergk
copies: filter out copies when target is not in destination manifest...
r41920 # remove criss-crossed copies
Matt Mackall
copies: eliminate criss-crosses when chaining...
r15976 if k in src and v in dst:
del t[k]
Martin von Zweigbergk
copies: filter out copies when target is not in destination manifest...
r41920 # remove copies to files that were then removed
elif k not in dst:
del t[k]
Matt Mackall
copies: eliminate criss-crosses when chaining...
r15976
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 return t
Martin von Zweigbergk
copies: use node.nullrev instead of literal -1...
r41268 def _tracefile(fctx, am, limit=node.nullrev):
Martin von Zweigbergk
copies: consistently use """ for docstrings...
r35422 """return file context that is the ancestor of fctx present in ancestor
manifest am, stopping after the first ancestor lower than limit"""
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775
for f in fctx.ancestors():
if am.get(f.path(), None) == f.filenode():
return f
Boris Feld
context: introduce an `isintroducedafter` method and use it in copies...
r40730 if limit >= 0 and not f.isintroducedafter(limit):
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 return None
Martin von Zweigbergk
copies: respect narrowmatcher in "parent -> working dir" case...
r41918 def _dirstatecopies(repo, match=None):
ds = repo.dirstate
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 c = ds.copies().copy()
Pulkit Goyal
py3: explicitly convert dict.keys() and dict.items() into a list...
r34350 for k in list(c):
Martin von Zweigbergk
copies: always respect matcher arg to _forwardcopies()...
r35421 if ds[k] not in 'anm' or (match and not match(k)):
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 del c[k]
return c
Durham Goode
copies: add matcher parameter to copy logic...
r24782 def _computeforwardmissing(a, b, match=None):
Durham Goode
copy: move _forwardcopies file logic to a function...
r24011 """Computes which files are in b but not a.
This is its own function so extensions can easily wrap this call to see what
files _forwardcopies is about to process.
"""
Durham Goode
copies: add matcher parameter to copy logic...
r24782 ma = a.manifest()
mb = b.manifest()
Durham Goode
copies: remove use of manifest.matches...
r31256 return mb.filesnotin(ma, match=match)
Durham Goode
copy: move _forwardcopies file logic to a function...
r24011
Martin von Zweigbergk
copies: extract function for deciding whether to use changeset-centric algos...
r42284 def usechangesetcentricalgo(repo):
"""Checks if we should use changeset-centric copy algorithms"""
Martin von Zweigbergk
changelog: parse copy metadata if available in extras...
r42318 return (repo.ui.config('experimental', 'copies.read-from') in
('changeset-only', 'compatibility'))
Martin von Zweigbergk
copies: extract function for deciding whether to use changeset-centric algos...
r42284
Martin von Zweigbergk
copies: extract method for getting non-wdir forward copies...
r35423 def _committedforwardcopies(a, b, match):
"""Like _forwardcopies(), but b.rev() cannot be None (working copy)"""
Mads Kiilerich
diff: search beyond ancestor when detecting renames...
r20294 # files might have to be traced back to the fctx parent of the last
# one-side-only changeset, but not further back than that
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 repo = a._repo
Martin von Zweigbergk
copies: do copy tracing based on ctx.p[12]copies() if configured...
r41922
Martin von Zweigbergk
copies: extract function for deciding whether to use changeset-centric algos...
r42284 if usechangesetcentricalgo(repo):
Martin von Zweigbergk
copies: do copy tracing based on ctx.p[12]copies() if configured...
r41922 return _changesetforwardcopies(a, b, match)
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 debug = repo.ui.debugflag and repo.ui.configbool('devel', 'debug.copies')
dbg = repo.ui.debug
if debug:
dbg('debug.copies: looking into rename from %s to %s\n'
% (a, b))
Martin von Zweigbergk
copies: pass contexts into _findlimit()...
r41438 limit = _findlimit(repo, a, b)
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 if debug:
dbg('debug.copies: search limit: %d\n' % limit)
Mads Kiilerich
diff: search beyond ancestor when detecting renames...
r20294 am = a.manifest()
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 # find where new files came from
# we currently don't try to find where old files went, too expensive
# this means we can miss a case like 'hg rm b; hg cp a b'
cm = {}
Durham Goode
copies: optimize forward copy detection logic for rebases...
r28000
# Computing the forward missing is quite expensive on large manifests, since
# it compares the entire manifests. We can optimize it in the common use
# case of computing what copies are in a commit versus its parent (like
# during a rebase or histedit). Note, we exclude merge commits from this
# optimization, since the ctx.files() for a merge commit is not correct for
# this comparison.
forwardmissingmatch = match
Yuya Nishihara
copies: use intersectmatchers() in non-merge p1 optimization...
r33869 if b.p1() == a and b.p2().node() == node.nullid:
Martin von Zweigbergk
copies: remove dependency on scmutil by directly using match.exact()...
r42102 filesmatcher = matchmod.exact(b.files())
Yuya Nishihara
copies: use intersectmatchers() in non-merge p1 optimization...
r33869 forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher)
Durham Goode
copies: optimize forward copy detection logic for rebases...
r28000 missing = _computeforwardmissing(a, b, match=forwardmissingmatch)
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True)
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093
if debug:
dbg('debug.copies: missing file to search: %d\n' % len(missing))
Siddharth Agarwal
copies._forwardcopies: use set operations to find missing files...
r18878 for f in missing:
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 if debug:
dbg('debug.copies: tracing file: %s\n' % f)
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 fctx = b[f]
fctx._ancestrycontext = ancestrycontext
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093
Boris Feld
copies: add time information to the debug information
r40094 if debug:
start = util.timer()
Pierre-Yves David
_adjustlinkrev: reuse ancestors set during rename detection (issue4514)...
r23980 ofctx = _tracefile(fctx, am, limit)
Siddharth Agarwal
copies._forwardcopies: use set operations to find missing files...
r18878 if ofctx:
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 if debug:
dbg('debug.copies: rename of: %s\n' % ofctx._path)
Siddharth Agarwal
copies._forwardcopies: use set operations to find missing files...
r18878 cm[f] = ofctx.path()
Boris Feld
copies: add time information to the debug information
r40094 if debug:
Pulkit Goyal
py3: use '%f' for floats instead of '%s'...
r40112 dbg('debug.copies: time: %f seconds\n'
Boris Feld
copies: add time information to the debug information
r40094 % (util.timer() - start))
Martin von Zweigbergk
copies: extract method for getting non-wdir forward copies...
r35423 return cm
Martin von Zweigbergk
copies: do copy tracing based on ctx.p[12]copies() if configured...
r41922 def _changesetforwardcopies(a, b, match):
if a.rev() == node.nullrev:
return {}
repo = a.repo()
children = {}
cl = repo.changelog
missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])
for r in missingrevs:
for p in cl.parentrevs(r):
if p == node.nullrev:
continue
if p not in children:
children[p] = [r]
else:
children[p].append(r)
roots = set(children) - set(missingrevs)
# 'work' contains 3-tuples of a (revision number, parent number, copies).
# The parent number is only used for knowing which parent the copies dict
# came from.
work = [(r, 1, {}) for r in roots]
heapq.heapify(work)
while work:
r, i1, copies1 = heapq.heappop(work)
if work and work[0][0] == r:
# We are tracing copies from both parents
r, i2, copies2 = heapq.heappop(work)
copies = {}
ctx = repo[r]
p1man, p2man = ctx.p1().manifest(), ctx.p2().manifest()
allcopies = set(copies1) | set(copies2)
# TODO: perhaps this filtering should be done as long as ctx
# is merge, whether or not we're tracing from both parent.
for dst in allcopies:
if not match(dst):
continue
if dst not in copies2:
# Copied on p1 side: mark as copy from p1 side if it didn't
# already exist on p2 side
if dst not in p2man:
copies[dst] = copies1[dst]
elif dst not in copies1:
# Copied on p2 side: mark as copy from p2 side if it didn't
# already exist on p1 side
if dst not in p1man:
copies[dst] = copies2[dst]
else:
# Copied on both sides: mark as copy from p1 side
copies[dst] = copies1[dst]
else:
copies = copies1
if r == b.rev():
return copies
for c in children[r]:
childctx = repo[c]
if r == childctx.p1().rev():
parent = 1
childcopies = childctx.p1copies()
else:
assert r == childctx.p2().rev()
parent = 2
childcopies = childctx.p2copies()
if not match.always():
childcopies = {dst: src for dst, src in childcopies.items()
if match(dst)}
childcopies = _chain(a, childctx, copies, childcopies)
heapq.heappush(work, (c, parent, childcopies))
assert False
Martin von Zweigbergk
copies: extract method for getting non-wdir forward copies...
r35423 def _forwardcopies(a, b, match=None):
"""find {dst@b: src@a} copy mapping where a is an ancestor of b"""
Martin von Zweigbergk
narrow: make copies.pathcopies() filter with narrowspec again...
r40487 match = a.repo().narrowmatch(match)
Martin von Zweigbergk
copies: extract method for getting non-wdir forward copies...
r35423 # check for working copy
if b.rev() is None:
Martin von Zweigbergk
copies: group wdir-handling in one place...
r35424 if a == b.p1():
Martin von Zweigbergk
copies: extract method for getting non-wdir forward copies...
r35423 # short-circuit to avoid issues with merge states
Martin von Zweigbergk
copies: respect narrowmatcher in "parent -> working dir" case...
r41918 return _dirstatecopies(b._repo, match)
Martin von Zweigbergk
copies: extract method for getting non-wdir forward copies...
r35423
Martin von Zweigbergk
copies: group wdir-handling in one place...
r35424 cm = _committedforwardcopies(a, b.p1(), match)
# combine copies from dirstate if necessary
Martin von Zweigbergk
copies: respect narrowmatcher in "parent -> working dir" case...
r41918 return _chain(a, b, cm, _dirstatecopies(b._repo, match))
Martin von Zweigbergk
copies: group wdir-handling in one place...
r35424 return _committedforwardcopies(a, b, match)
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775
Martin von Zweigbergk
copies: make _backwardrenames() filter out copies by destination...
r41919 def _backwardrenames(a, b, match):
Pulkit Goyal
copytrace: replace experimental.disablecopytrace config with copytrace (BC)...
r34079 if a._repo.ui.config('experimental', 'copytrace') == 'off':
Durham Goode
copy: add flag for disabling copy tracing...
r26013 return {}
Siddharth Agarwal
copies: do not track backward copies, only renames (issue3739)...
r18136 # Even though we're not taking copies into account, 1:n rename situations
# can still exist (e.g. hg cp a b; hg mv a c). In those cases we
# arbitrarily pick one of the renames.
Martin von Zweigbergk
copies: make _backwardrenames() filter out copies by destination...
r41919 # We don't want to pass in "match" here, since that would filter
# the destination by it. Since we're reversing the copies, we want
# to filter the source instead.
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 f = _forwardcopies(b, a)
r = {}
Mads Kiilerich
copies: make the loss in _backwardcopies more stable...
r18355 for k, v in sorted(f.iteritems()):
Martin von Zweigbergk
copies: make _backwardrenames() filter out copies by destination...
r41919 if match and not match(v):
continue
Siddharth Agarwal
copies: do not track backward copies, only renames (issue3739)...
r18136 # remove copies
if v in a:
continue
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 r[v] = k
return r
Durham Goode
copies: add matcher parameter to copy logic...
r24782 def pathcopies(x, y, match=None):
Martin von Zweigbergk
copies: consistently use """ for docstrings...
r35422 """find {dst@y: src@x} copy mapping for directed compare"""
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 repo = x._repo
debug = repo.ui.debugflag and repo.ui.configbool('devel', 'debug.copies')
if debug:
repo.ui.debug('debug.copies: searching copies from %s to %s\n'
% (x, y))
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 if x == y or not x or not y:
return {}
a = y.ancestor(x)
if a == x:
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 if debug:
repo.ui.debug('debug.copies: search mode: forward\n')
Durham Goode
copies: add matcher parameter to copy logic...
r24782 return _forwardcopies(x, y, match=match)
Matt Mackall
copies: rewrite copy detection for non-merge users...
r15775 if a == y:
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 if debug:
repo.ui.debug('debug.copies: search mode: backward\n')
Martin von Zweigbergk
copies: make _backwardrenames() filter out copies by destination...
r41919 return _backwardrenames(x, y, match=match)
Boris Feld
copies: add a devel debug mode to trace what copy tracing does...
r40093 if debug:
repo.ui.debug('debug.copies: search mode: combined\n')
Martin von Zweigbergk
copies: make _backwardrenames() filter out copies by destination...
r41919 return _chain(x, y, _backwardrenames(x, a, match=match),
Durham Goode
copies: add matcher parameter to copy logic...
r24782 _forwardcopies(a, y, match=match))
Matt Mackall
copies: split the copies api for "normal" and merge cases (API)
r15774
Pierre-Yves David
copies: make it possible to distinguish betwen _computenonoverlap invocations...
r30196 def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, baselabel=''):
Durham Goode
copies: pass changectx instead of manifest to _computenonoverlap...
r24625 """Computes, based on addedinm1 and addedinm2, the files exclusive to c1
and c2. This is its own function so extensions can easily wrap this call
Martin von Zweigbergk
copies: only calculate 'addedinm[12]' sets once...
r24187 to see what files mergecopies is about to process.
Durham Goode
copies: added manifests to computenonoverlap...
r24273
Durham Goode
copies: pass changectx instead of manifest to _computenonoverlap...
r24625 Even though c1 and c2 are not used in this function, they are useful in
Durham Goode
copies: added manifests to computenonoverlap...
r24273 other extensions for being able to read the file nodes of the changed files.
Pierre-Yves David
copies: make it possible to distinguish betwen _computenonoverlap invocations...
r30196
"baselabel" can be passed to help distinguish the multiple computations
done in the graft case.
Durham Goode
copy: move mergecopies file logic to a function...
r24010 """
Martin von Zweigbergk
copies: replace _nonoverlap() by calls to manifestdict.filesnotin()...
r24185 u1 = sorted(addedinm1 - addedinm2)
u2 = sorted(addedinm2 - addedinm1)
Durham Goode
copy: move mergecopies file logic to a function...
r24010
Pierre-Yves David
copies: make it possible to distinguish betwen _computenonoverlap invocations...
r30196 header = " unmatched files in %s"
if baselabel:
header += ' (from %s)' % baselabel
Durham Goode
copy: move mergecopies file logic to a function...
r24010 if u1:
Pierre-Yves David
copies: make it possible to distinguish betwen _computenonoverlap invocations...
r30196 repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1)))
Durham Goode
copy: move mergecopies file logic to a function...
r24010 if u2:
Pierre-Yves David
copies: make it possible to distinguish betwen _computenonoverlap invocations...
r30196 repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2)))
Martin von Zweigbergk
narrow: filter copies in core...
r38057
Durham Goode
copy: move mergecopies file logic to a function...
r24010 return u1, u2
Matt Mackall
copies: factor out setupctx into _makegetfctx...
r26656 def _makegetfctx(ctx):
Gábor Stefanik
copies: mark checkcopies as internal with the _ prefix
r30048 """return a 'getfctx' function suitable for _checkcopies usage
Matt Mackall
copies: factor out setupctx into _makegetfctx...
r26656
We have to re-setup the function building 'filectx' for each
Gábor Stefanik
copies: mark checkcopies as internal with the _ prefix
r30048 '_checkcopies' to ensure the linkrev adjustment is properly setup for
Matt Mackall
copies: factor out setupctx into _makegetfctx...
r26656 each. Linkrev adjustment is important to avoid bug in rename
detection. Moreover, having a proper '_ancestrycontext' setup ensures
the performance impact of this adjustment is kept limited. Without it,
each file could do a full dag traversal making the time complexity of
the operation explode (see issue4537).
This function exists here mostly to limit the impact on stable. Feel
free to refactor on default.
"""
rev = ctx.rev()
repo = ctx._repo
ac = getattr(ctx, '_ancestrycontext', None)
if ac is None:
revs = [rev]
if rev is None:
revs = [p.rev() for p in ctx.parents()]
ac = repo.changelog.ancestors(revs, inclusive=True)
ctx._ancestrycontext = ac
def makectx(f, n):
Yuya Nishihara
node: rename wdirnodes to clarify they are for manifest/filelogs...
r37466 if n in node.wdirfilenodeids: # in a working context?
Matt Mackall
copies: factor out setupctx into _makegetfctx...
r26656 if ctx.rev() is None:
return ctx.filectx(f)
return repo[None][f]
fctx = repo.filectx(f, fileid=n)
# setup only needed for filectx not create from a changectx
fctx._ancestrycontext = ac
fctx._descendantrev = rev
return fctx
return util.lrucachefunc(makectx)
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 def _combinecopies(copyfrom, copyto, finalcopy, diverge, incompletediverge):
"""combine partial copy paths"""
remainder = {}
for f in copyfrom:
if f in copyto:
finalcopy[copyto[f]] = copyfrom[f]
del copyto[f]
for f in incompletediverge:
assert f not in diverge
ic = incompletediverge[f]
if ic[0] in copyto:
diverge[f] = [copyto[ic[0]], ic[1]]
else:
remainder[f] = ic
return remainder
Pierre-Yves David
mergecopies: rename 'ca' to 'base'...
r30186 def mergecopies(repo, c1, c2, base):
Matt Mackall
copies: move findcopies code to its own module...
r6274 """
Martin von Zweigbergk
copies: move comment about implementation of mergecopies() to end...
r42287 Finds moves and copies between context c1 and c2 that are relevant for
Pulkit Goyal
copytrace: move the default copytracing algorithm in a new function...
r34080 merging. 'base' will be used as the merge base.
Copytracing is used in commands like rebase, merge, unshelve, etc to merge
files that were moved/ copied in one merge parent and modified in another.
For example:
Pulkit Goyal
copies: add more details to the documentation of mergecopies()...
r33821
o ---> 4 another commit
|
| o ---> 3 commit that modifies a.txt
| /
o / ---> 2 commit that moves a.txt to b.txt
|/
o ---> 1 merge base
If we try to rebase revision 3 on revision 4, since there is no a.txt in
revision 4, and if user have copytrace disabled, we prints the following
message:
```other changed <file> which local deleted```
Gábor Stefanik
graft: support grafting changes to new file in renamed directory (issue5436)
r30581 Returns five dicts: "copy", "movewithdir", "diverge", "renamedelete" and
"dirmove".
Matt Mackall
copies: add docstring for mergecopies
r16168
Matt Mackall
copies: fix mergecopies doc mapping direction
r16177 "copy" is a mapping from destination name -> source name,
Matt Mackall
copies: add docstring for mergecopies
r16168 where source is in c1 and destination is in c2 or vice-versa.
Siddharth Agarwal
copies: separate moves via directory renames from explicit copies...
r18134 "movewithdir" is a mapping from source name -> destination name,
where the file at source present in one context but not the other
needs to be moved to destination by the merge process, because the
other context moved the directory it is in.
Matt Mackall
copies: add docstring for mergecopies
r16168 "diverge" is a mapping of source name -> list of destination names
for divergent renames.
Thomas Arendsen Hein
merge: warn about file deleted in one branch and renamed in other (issue3074)...
r16794
"renamedelete" is a mapping of source name -> list of destination
names for files deleted in c1 that were renamed in c2 or vice-versa.
Gábor Stefanik
graft: support grafting changes to new file in renamed directory (issue5436)
r30581
"dirmove" is a mapping of detected source dir -> destination dir renames.
This is needed for handling changes to new files previously grafted into
renamed directories.
Martin von Zweigbergk
copies: move comment about implementation of mergecopies() to end...
r42287
This function calls different copytracing algorithms based on config.
Matt Mackall
copies: move findcopies code to its own module...
r6274 """
# avoid silly behavior for update from empty dir
Matt Mackall
copies: teach symmetric difference about working revisions...
r6430 if not c1 or not c2 or c1 == c2:
Gábor Stefanik
graft: support grafting changes to new file in renamed directory (issue5436)
r30581 return {}, {}, {}, {}, {}
Matt Mackall
copies: move findcopies code to its own module...
r6274
Martin von Zweigbergk
copies: respect narrowmatcher in "parent -> working dir" case...
r41918 narrowmatch = c1.repo().narrowmatch()
Matt Mackall
copies: teach copies about dirstate.copies...
r6646 # avoid silly behavior for parent -> working dir
Matt Mackall
misc: replace .parents()[0] with p1()
r13878 if c2.node() is None and c1.node() == repo.dirstate.p1():
Martin von Zweigbergk
copies: respect narrowmatcher in "parent -> working dir" case...
r41918 return _dirstatecopies(repo, narrowmatch), {}, {}, {}, {}
Matt Mackall
copies: teach copies about dirstate.copies...
r6646
Pulkit Goyal
copytrace: move the default copytracing algorithm in a new function...
r34080 copytracing = repo.ui.config('experimental', 'copytrace')
Pulkit Goyal
copies: improve logic of deciding copytracing on based of config options...
r39402 boolctrace = stringutil.parsebool(copytracing)
Pulkit Goyal
copytrace: move the default copytracing algorithm in a new function...
r34080
Durham Goode
copy: add flag for disabling copy tracing...
r26013 # Copy trace disabling is explicitly below the node == p1 logic above
# because the logic above is required for a simple copy to be kept across a
# rebase.
Pulkit Goyal
copies: improve logic of deciding copytracing on based of config options...
r39402 if copytracing == 'heuristics':
Yuya Nishihara
copytrace: use ctx.mutable() instead of adhoc constant of non-public phases
r34365 # Do full copytracing if only non-public revisions are involved as
# that will be fast enough and will also cover the copies which could
# be missed by heuristics
Pulkit Goyal
copytrace: add a a new config to limit the number of drafts in heuristics...
r34312 if _isfullcopytraceable(repo, c1, base):
Pulkit Goyal
copytrace: use the full copytracing method if only drafts are involved...
r34289 return _fullcopytracing(repo, c1, c2, base)
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 return _heuristicscopytracing(repo, c1, c2, base)
Pulkit Goyal
copies: improve logic of deciding copytracing on based of config options...
r39402 elif boolctrace is False:
# stringutil.parsebool() returns None when it is unable to parse the
# value, so we should rely on making sure copytracing is on such cases
return {}, {}, {}, {}, {}
Pulkit Goyal
copytrace: move the default copytracing algorithm in a new function...
r34080 else:
return _fullcopytracing(repo, c1, c2, base)
Durham Goode
copy: add flag for disabling copy tracing...
r26013
Pulkit Goyal
copytrace: add a a new config to limit the number of drafts in heuristics...
r34312 def _isfullcopytraceable(repo, c1, base):
Yuya Nishihara
copytrace: use ctx.mutable() instead of adhoc constant of non-public phases
r34365 """ Checks that if base, source and destination are all no-public branches,
if yes let's use the full copytrace algorithm for increased capabilities
since it will be fast enough.
Pulkit Goyal
copies: add docs for config `experimental.copytrace.sourcecommitlimit`...
r34517
`experimental.copytrace.sourcecommitlimit` can be used to set a limit for
number of changesets from c1 to base such that if number of changesets are
more than the limit, full copytracing algorithm won't be used.
Pulkit Goyal
copytrace: use the full copytracing method if only drafts are involved...
r34289 """
Pulkit Goyal
copytrace: add a a new config to limit the number of drafts in heuristics...
r34312 if c1.rev() is None:
c1 = c1.p1()
Yuya Nishihara
copytrace: use ctx.mutable() instead of adhoc constant of non-public phases
r34365 if c1.mutable() and base.mutable():
Pulkit Goyal
copytrace: add a a new config to limit the number of drafts in heuristics...
r34312 sourcecommitlimit = repo.ui.configint('experimental',
'copytrace.sourcecommitlimit')
commits = len(repo.revs('%d::%d', base.rev(), c1.rev()))
return commits < sourcecommitlimit
Pulkit Goyal
copytrace: use the full copytracing method if only drafts are involved...
r34289 return False
Pulkit Goyal
copytrace: move the default copytracing algorithm in a new function...
r34080 def _fullcopytracing(repo, c1, c2, base):
""" The full copytracing algorithm which finds all the new files that were
added from merge base up to the top commit and for each file it checks if
this file was copied from another file.
This is pretty slow when a lot of changesets are involved but will track all
the copies.
"""
Gábor Stefanik
copies: detect graft-like merges...
r30193 # In certain scenarios (e.g. graft, update or rebase), base can be
# overridden We still need to know a real common ancestor in this case We
# can't just compute _c1.ancestor(_c2) and compare it to ca, because there
# can be multiple common ancestors, e.g. in case of bidmerge. Because our
# caller may not know if the revision passed in lieu of the CA is a genuine
# common ancestor or not without explicitly checking it, it's better to
# determine that here.
#
Martin von Zweigbergk
context: rename descendant() to isancestorof()...
r38692 # base.isancestorof(wc) is False, work around that
Gábor Stefanik
copies: detect graft-like merges...
r30193 _c1 = c1.p1() if c1.rev() is None else c1
_c2 = c2.p1() if c2.rev() is None else c2
# an endpoint is "dirty" if it isn't a descendant of the merge base
# if we have a dirty endpoint, we need to trigger graft logic, and also
# keep track of which endpoint is dirty
Martin von Zweigbergk
context: rename descendant() to isancestorof()...
r38692 dirtyc1 = not base.isancestorof(_c1)
dirtyc2 = not base.isancestorof(_c2)
Gábor Stefanik
copies: detect graft-like merges...
r30193 graft = dirtyc1 or dirtyc2
Gábor Stefanik
copies: compute a suitable TCA if base turns out to be unsuitable...
r30194 tca = base
if graft:
tca = _c1.ancestor(_c2)
Martin von Zweigbergk
copies: pass contexts into _findlimit()...
r41438 limit = _findlimit(repo, c1, c2)
Matt Mackall
copies: move debug statement to appropriate place
r26319 repo.ui.debug(" searching for copies back to rev %d\n" % limit)
Matt Mackall
copies: move findcopies code to its own module...
r6274 m1 = c1.manifest()
m2 = c2.manifest()
Pierre-Yves David
mergecopies: rename 'ca' to 'base'...
r30186 mb = base.manifest()
Matt Mackall
copies: move findcopies code to its own module...
r6274
Pierre-Yves David
copies: move variable document from checkcopies to mergecopies...
r30185 # gather data from _checkcopies:
# - diverge = record all diverges in this dict
# - copy = record all non-divergent copies in this dict
# - fullcopy = record all copies in this dict
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 # - incomplete = record non-divergent partial copies here
# - incompletediverge = record divergent partial copies here
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 diverge = {} # divergence data is shared
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 incompletediverge = {}
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 data1 = {'copy': {},
'fullcopy': {},
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 'incomplete': {},
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 'diverge': diverge,
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 'incompletediverge': incompletediverge,
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 }
data2 = {'copy': {},
'fullcopy': {},
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 'incomplete': {},
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 'diverge': diverge,
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 'incompletediverge': incompletediverge,
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 }
Matt Mackall
copies: move findcopies code to its own module...
r6274
Matt Mackall
copies: group bothnew with other sets
r26659 # find interesting file sets from manifests
Martin von Zweigbergk
narrow: move copies overrides to core...
r40002 addedinm1 = m1.filesnotin(mb, repo.narrowmatch())
addedinm2 = m2.filesnotin(mb, repo.narrowmatch())
Matt Mackall
copies: group bothnew with other sets
r26659 bothnew = sorted(addedinm1 & addedinm2)
Gábor Stefanik
mergecopies: invoke _computenonoverlap for both base and tca during merges...
r30197 if tca == base:
# unmatched file from base
u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
u1u, u2u = u1r, u2r
else:
# unmatched file from base (DAG rotation in the graft case)
u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2,
baselabel='base')
# unmatched file from topological common ancestors (no DAG rotation)
# need to recompute this for directory move handling when grafting
mta = tca.manifest()
Martin von Zweigbergk
narrow: fix copies._fullcopytracing() narrowspec filtering in graft case...
r40489 u1u, u2u = _computenonoverlap(repo, c1, c2,
m1.filesnotin(mta, repo.narrowmatch()),
m2.filesnotin(mta, repo.narrowmatch()),
Gábor Stefanik
mergecopies: invoke _computenonoverlap for both base and tca during merges...
r30197 baselabel='topological common ancestor')
Matt Mackall
copies: move findcopies code to its own module...
r6274
Gábor Stefanik
copies: split u1/u2 to u1u/u2u and u1r/u2r...
r30047 for f in u1u:
Stanislau Hlebik
copies: remove msrc and mdst parameters...
r32563 _checkcopies(c1, c2, f, base, tca, dirtyc1, limit, data1)
Mads Kiilerich
copies: remove _checkcopies wrapper - it does no good...
r20989
Gábor Stefanik
copies: split u1/u2 to u1u/u2u and u1r/u2r...
r30047 for f in u2u:
Stanislau Hlebik
copies: remove msrc and mdst parameters...
r32563 _checkcopies(c2, c1, f, base, tca, dirtyc2, limit, data2)
Matt Mackall
copies: begin separating mergecopies sides
r26316
Pulkit Goyal
py3: use dict.update() instead of constructing lists and adding them...
r32640 copy = dict(data1['copy'])
copy.update(data2['copy'])
fullcopy = dict(data1['fullcopy'])
fullcopy.update(data2['fullcopy'])
Matt Mackall
copies: move findcopies code to its own module...
r6274
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 if dirtyc1:
_combinecopies(data2['incomplete'], data1['incomplete'], copy, diverge,
incompletediverge)
Sushil khanchi
copies: handle a case when both merging csets are not descendant of merge base...
r42098 if dirtyc2:
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 _combinecopies(data1['incomplete'], data2['incomplete'], copy, diverge,
incompletediverge)
Thomas Arendsen Hein
merge: warn about file deleted in one branch and renamed in other (issue3074)...
r16794 renamedelete = {}
Matt Mackall
copies: rename renamedelete to renamedeleteset for clarity
r26658 renamedeleteset = set()
Matt Mackall
copies: rename diverge2 to divergeset for clarity
r26317 divergeset = set()
Pulkit Goyal
py3: explicitly convert dict.keys() and dict.items() into a list...
r34350 for of, fl in list(diverge.items()):
Thomas Arendsen Hein
merge: do not warn about copy and rename in the same transaction (issue2113)
r16792 if len(fl) == 1 or of in c1 or of in c2:
Dan Villiom Podlaski Christiansen
copies: don't detect copies as "divergent renames"...
r12683 del diverge[of] # not actually divergent, or not a rename
Thomas Arendsen Hein
merge: warn about file deleted in one branch and renamed in other (issue3074)...
r16794 if of not in c1 and of not in c2:
# renamed on one side, deleted on the other side, but filter
# out files that have been renamed and then deleted
renamedelete[of] = [f for f in fl if f in c1 or f in c2]
Matt Mackall
copies: rename renamedelete to renamedeleteset for clarity
r26658 renamedeleteset.update(fl) # reverse map for below
Matt Mackall
copies: move findcopies code to its own module...
r6274 else:
Matt Mackall
copies: rename diverge2 to divergeset for clarity
r26317 divergeset.update(fl) # reverse map for below
Matt Mackall
copies: move findcopies code to its own module...
r6274
Mads Kiilerich
copies: when both sides made the same copy, report it as a copy...
r20641 if bothnew:
repo.ui.debug(" unmatched files new in both:\n %s\n"
% "\n ".join(bothnew))
Pierre-Yves David
checkcopies: pass data as a dictionary of dictionaries...
r30184 bothdiverge = {}
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 bothincompletediverge = {}
Gábor Stefanik
copies: improve assertions during copy recombination...
r30208 remainder = {}
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 both1 = {'copy': {},
'fullcopy': {},
'incomplete': {},
'diverge': bothdiverge,
'incompletediverge': bothincompletediverge
}
both2 = {'copy': {},
'fullcopy': {},
'incomplete': {},
'diverge': bothdiverge,
'incompletediverge': bothincompletediverge
}
Mads Kiilerich
copies: when both sides made the same copy, report it as a copy...
r20641 for f in bothnew:
Stanislau Hlebik
copies: remove msrc and mdst parameters...
r32563 _checkcopies(c1, c2, f, base, tca, dirtyc1, limit, both1)
_checkcopies(c2, c1, f, base, tca, dirtyc2, limit, both2)
Sushil khanchi
copies: handle a case when both merging csets are not descendant of merge base...
r42098 if dirtyc1 and dirtyc2:
remainder = _combinecopies(both2['incomplete'], both1['incomplete'],
copy, bothdiverge, bothincompletediverge)
remainder1 = _combinecopies(both1['incomplete'], both2['incomplete'],
copy, bothdiverge, bothincompletediverge)
remainder.update(remainder1)
elif dirtyc1:
Gábor Stefanik
copies: improve assertions during copy recombination...
r30208 # incomplete copies may only be found on the "dirty" side for bothnew
assert not both2['incomplete']
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 remainder = _combinecopies({}, both1['incomplete'], copy, bothdiverge,
bothincompletediverge)
Gábor Stefanik
copies: improve assertions during copy recombination...
r30208 elif dirtyc2:
assert not both1['incomplete']
remainder = _combinecopies({}, both2['incomplete'], copy, bothdiverge,
bothincompletediverge)
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 else:
Gábor Stefanik
copies: improve assertions during copy recombination...
r30208 # incomplete copies and divergences can't happen outside grafts
assert not both1['incomplete']
assert not both2['incomplete']
assert not bothincompletediverge
Gábor Stefanik
mergecopies: add logic to process incomplete data...
r30202 for f in remainder:
assert f not in bothdiverge
ic = remainder[f]
if ic[0] in (m1 if dirtyc1 else m2):
# backed-out rename on one side, but watch out for deleted files
bothdiverge[f] = ic
Mads Kiilerich
copies: when both sides made the same copy, report it as a copy...
r20641 for of, fl in bothdiverge.items():
if len(fl) == 2 and fl[0] == fl[1]:
copy[fl[0]] = of # not actually divergent, just matching renames
Martin von Zweigbergk
copies: don't include copies that are not in source in directory move...
r42338 # Sometimes we get invalid copies here (the "and not remotebase" in
# _checkcopies() seems suspicious). Filter them out.
for dst, src in fullcopy.copy().items():
if src not in mb:
del fullcopy[dst]
Mads Kiilerich
copies: guard debug section with ui.debugflag
r20990 if fullcopy and repo.ui.debugflag:
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
r16795 repo.ui.debug(" all copies found (* = to merge, ! = divergent, "
"% = renamed and deleted):\n")
Mads Kiilerich
copies: report found copies sorted
r18362 for f in sorted(fullcopy):
Matt Mackall
copies: move findcopies code to its own module...
r6274 note = ""
Matt Mackall
many, many trivial check-code fixups
r10282 if f in copy:
note += "*"
Matt Mackall
copies: rename diverge2 to divergeset for clarity
r26317 if f in divergeset:
Matt Mackall
many, many trivial check-code fixups
r10282 note += "!"
Matt Mackall
copies: rename renamedelete to renamedeleteset for clarity
r26658 if f in renamedeleteset:
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
r16795 note += "%"
Siddharth Agarwal
copies: make debug messages more sensible...
r18135 repo.ui.debug(" src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f,
note))
Matt Mackall
copies: rename diverge2 to divergeset for clarity
r26317 del divergeset
Matt Mackall
copies: move findcopies code to its own module...
r6274
Matt Mackall
copies: remove checkdirs options...
r16169 if not fullcopy:
Gábor Stefanik
graft: support grafting changes to new file in renamed directory (issue5436)
r30581 return copy, {}, diverge, renamedelete, {}
Matt Mackall
copies: move findcopies code to its own module...
r6274
Martin Geisler
do not attempt to translate ui.debug output
r9467 repo.ui.debug(" checking for directory renames\n")
Matt Mackall
copies: move findcopies code to its own module...
r6274
# generate a directory move map
Matt Mackall
copies: use ctx.dirs() for directory rename detection
r16178 d1, d2 = c1.dirs(), c2.dirs()
Martin von Zweigbergk
copies: document hack for adding '' to set of dirs...
r25288 # Hack for adding '', which is not otherwise added, to d1 and d2
Bryan O'Sullivan
scmutil: use new dirs class in dirstate and context...
r18899 d1.addpath('/')
d2.addpath('/')
Matt Mackall
copies: re-include root directory in directory rename detection (issue3511)
r17055 invalid = set()
Matt Mackall
copies: move findcopies code to its own module...
r6274 dirmove = {}
# examine each file copy for a potential directory move, which is
# when all the files in a directory are moved to a new directory
Dirkjan Ochtman
use dict.iteritems() rather than dict.items()...
r7622 for dst, src in fullcopy.iteritems():
Durham Goode
copies: switch to using pathutil.dirname...
r25282 dsrc, ddst = pathutil.dirname(src), pathutil.dirname(dst)
Matt Mackall
copies: move findcopies code to its own module...
r6274 if dsrc in invalid:
# already seen to be uninteresting
continue
elif dsrc in d1 and ddst in d1:
# directory wasn't entirely moved locally
Kyle Lippincott
copies: correctly skip directories that have already been considered...
r39299 invalid.add(dsrc)
Matt Mackall
copies: move findcopies code to its own module...
r6274 elif dsrc in d2 and ddst in d2:
# directory wasn't entirely moved remotely
Kyle Lippincott
copies: correctly skip directories that have already been considered...
r39299 invalid.add(dsrc)
elif dsrc in dirmove and dirmove[dsrc] != ddst:
Matt Mackall
copies: move findcopies code to its own module...
r6274 # files from the same directory moved to two different places
Kyle Lippincott
copies: correctly skip directories that have already been considered...
r39299 invalid.add(dsrc)
Matt Mackall
copies: move findcopies code to its own module...
r6274 else:
# looks good so far
Kyle Lippincott
copies: correctly skip directories that have already been considered...
r39299 dirmove[dsrc] = ddst
Matt Mackall
copies: move findcopies code to its own module...
r6274
for i in invalid:
if i in dirmove:
del dirmove[i]
del d1, d2, invalid
if not dirmove:
Gábor Stefanik
graft: support grafting changes to new file in renamed directory (issue5436)
r30581 return copy, {}, diverge, renamedelete, {}
Matt Mackall
copies: move findcopies code to its own module...
r6274
Kyle Lippincott
copies: correctly skip directories that have already been considered...
r39299 dirmove = {k + "/": v + "/" for k, v in dirmove.iteritems()}
Matt Mackall
copies: move findcopies code to its own module...
r6274 for d in dirmove:
Siddharth Agarwal
copies: make debug messages more sensible...
r18135 repo.ui.debug(" discovered dir src: '%s' -> dst: '%s'\n" %
(d, dirmove[d]))
Matt Mackall
copies: move findcopies code to its own module...
r6274
Pierre-Yves David
checkcopies: move 'movewithdir' initialisation right before its usage...
r30183 movewithdir = {}
Matt Mackall
copies: move findcopies code to its own module...
r6274 # check unaccounted nonoverlapping files against directory moves
Gábor Stefanik
copies: split u1/u2 to u1u/u2u and u1r/u2r...
r30047 for f in u1r + u2r:
Matt Mackall
copies: move findcopies code to its own module...
r6274 if f not in fullcopy:
for d in dirmove:
if f.startswith(d):
# new file added in a directory that was moved, move it
Matt Mackall
copies: skip directory rename checks when not merging...
r6425 df = dirmove[d] + f[len(d):]
Matt Mackall
copies: don't double-detect items in the directory copy check
r6426 if df not in copy:
Siddharth Agarwal
copies: separate moves via directory renames from explicit copies...
r18134 movewithdir[f] = df
Siddharth Agarwal
copies: make debug messages more sensible...
r18135 repo.ui.debug((" pending file src: '%s' -> "
"dst: '%s'\n") % (f, df))
Matt Mackall
copies: move findcopies code to its own module...
r6274 break
Gábor Stefanik
graft: support grafting changes to new file in renamed directory (issue5436)
r30581 return copy, movewithdir, diverge, renamedelete, dirmove
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 def _heuristicscopytracing(repo, c1, c2, base):
""" Fast copytracing using filename heuristics
Assumes that moves or renames are of following two types:
1) Inside a directory only (same directory name but different filenames)
2) Move from one directory to another
(same filenames but different directory names)
Works only when there are no merge commits in the "source branch".
Source branch is commits from base up to c2 not including base.
If merge is involved it fallbacks to _fullcopytracing().
Can be used by setting the following config:
[experimental]
copytrace = heuristics
Pulkit Goyal
copies: add a config to limit the number of candidates to check in heuristics...
r34847
In some cases the copy/move candidates found by heuristics can be very large
in number and that will make the algorithm slow. The number of possible
candidates to check can be limited by using the config
`experimental.copytrace.movecandidateslimit` which defaults to 100.
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 """
if c1.rev() is None:
c1 = c1.p1()
if c2.rev() is None:
c2 = c2.p1()
copies = {}
changedfiles = set()
m1 = c1.manifest()
if not repo.revs('%d::%d', base.rev(), c2.rev()):
# If base is not in c2 branch, we switch to fullcopytracing
repo.ui.debug("switching to full copytracing as base is not "
"an ancestor of c2\n")
return _fullcopytracing(repo, c1, c2, base)
ctx = c2
while ctx != base:
if len(ctx.parents()) == 2:
# To keep things simple let's not handle merges
repo.ui.debug("switching to full copytracing because of merges\n")
return _fullcopytracing(repo, c1, c2, base)
changedfiles.update(ctx.files())
ctx = ctx.p1()
cp = _forwardcopies(base, c2)
for dst, src in cp.iteritems():
if src in m1:
copies[dst] = src
# file is missing if it isn't present in the destination, but is present in
# the base and present in the source.
# Presence in the base is important to exclude added files, presence in the
# source is important to exclude removed files.
Augie Fackler
py3: use list comprehensions instead of filter where we need to eagerly filter...
r36364 filt = lambda f: f not in m1 and f in base and f in c2
missingfiles = [f for f in changedfiles if filt(f)]
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180
if missingfiles:
basenametofilename = collections.defaultdict(list)
dirnametofilename = collections.defaultdict(list)
for f in m1.filesnotin(base.manifest()):
basename = os.path.basename(f)
dirname = os.path.dirname(f)
basenametofilename[basename].append(f)
dirnametofilename[dirname].append(f)
for f in missingfiles:
basename = os.path.basename(f)
dirname = os.path.dirname(f)
samebasename = basenametofilename[basename]
samedirname = dirnametofilename[dirname]
movecandidates = samebasename + samedirname
# f is guaranteed to be present in c2, that's why
# c2.filectx(f) won't fail
f2 = c2.filectx(f)
Pulkit Goyal
copies: add a config to limit the number of candidates to check in heuristics...
r34847 # we can have a lot of candidates which can slow down the heuristics
# config value to limit the number of candidates moves to check
maxcandidates = repo.ui.configint('experimental',
'copytrace.movecandidateslimit')
if len(movecandidates) > maxcandidates:
repo.ui.status(_("skipping copytracing for '%s', more "
"candidates than the limit: %d\n")
% (f, len(movecandidates)))
continue
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 for candidate in movecandidates:
f1 = c1.filectx(candidate)
Gábor Stefanik
copies: clean up _related logic...
r37410 if _related(f1, f2):
Pulkit Goyal
copytrace: move fast heuristic copytracing algorithm to core...
r34180 # if there are a few related copies then we'll merge
# changes into all of them. This matches the behaviour
# of upstream copytracing
copies[candidate] = f
return copies, {}, {}, {}, {}
Gábor Stefanik
copies: clean up _related logic...
r37410 def _related(f1, f2):
Pierre-Yves David
checkcopies: extract the '_related' closure...
r30138 """return True if f1 and f2 filectx have a common ancestor
Walk back to common ancestor to see if the two files originate
from the same file. Since workingfilectx's rev() is None it messes
up the integer comparison logic, hence the pre-step check for
None (f1 and f2 can only be workingfilectx's initially).
"""
if f1 == f2:
Sushil khanchi
copies: return True instead of filename as it is expected to return boolean...
r41873 return True # a match
Pierre-Yves David
checkcopies: extract the '_related' closure...
r30138
g1, g2 = f1.ancestors(), f2.ancestors()
try:
f1r, f2r = f1.linkrev(), f2.linkrev()
if f1r is None:
f1 = next(g1)
if f2r is None:
f2 = next(g2)
while True:
f1r, f2r = f1.linkrev(), f2.linkrev()
if f1r > f2r:
f1 = next(g1)
elif f2r > f1r:
f2 = next(g2)
Gábor Stefanik
copies: clean up _related logic...
r37410 else: # f1 and f2 point to files in the same linkrev
return f1 == f2 # true if they point to the same file
Pierre-Yves David
checkcopies: extract the '_related' closure...
r30138 except StopIteration:
return False
Stanislau Hlebik
copies: remove msrc and mdst parameters...
r32563 def _checkcopies(srcctx, dstctx, f, base, tca, remotebase, limit, data):
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 """
Stanislau Hlebik
copies: rename m2 to mdst...
r32560 check possible copies of f from msrc to mdst
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178
Stanislau Hlebik
copies: rename ctx to srcctx...
r32561 srcctx = starting context for f in msrc
Stanislau Hlebik
copies: add dstctx parameter...
r32562 dstctx = destination context for f in mdst
Stanislau Hlebik
copies: rename m1 to msrc...
r32559 f = the filename to check (as in msrc)
Pierre-Yves David
checkcopies: rename 'ca' to 'base'...
r30135 base = the changectx used as a merge base
Gábor Stefanik
copies: make _checkcopies handle simple renames in a rotated DAG...
r30195 tca = topological common ancestor for graft-like scenarios
Stanislau Hlebik
copies: rename ctx to srcctx...
r32561 remotebase = True if base is outside tca::srcctx, False otherwise
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 limit = the rev number to not search beyond
Pierre-Yves David
copies: move variable document from checkcopies to mergecopies...
r30185 data = dictionary of dictionary to store copy data. (see mergecopies)
Gábor Stefanik
copies: limit is an optimization, and doesn't provide guarantees
r30045
Gábor Stefanik
copies: fix typo in comment...
r33881 note: limit is only an optimization, and provides no guarantee that
irrelevant revisions will not be visited
Gábor Stefanik
copies: limit is an optimization, and doesn't provide guarantees
r30045 there is no easy way to make this algorithm stop in a guaranteed way
once it "goes behind a certain revision".
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 """
Stanislau Hlebik
copies: remove msrc and mdst parameters...
r32563 msrc = srcctx.manifest()
mdst = dstctx.manifest()
Pierre-Yves David
checkcopies: rename 'ca' to 'base'...
r30135 mb = base.manifest()
Gábor Stefanik
copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)...
r30204 mta = tca.manifest()
Gábor Stefanik
copies: make _checkcopies handle simple renames in a rotated DAG...
r30195 # Might be true if this call is about finding backward renames,
# This happens in the case of grafts because the DAG is then rotated.
# If the file exists in both the base and the source, we are not looking
# for a rename on the source side, but on the part of the DAG that is
# traversed backwards.
#
# In the case there is both backward and forward renames (before and after
Gábor Stefanik
checkcopies: handle divergences contained entirely in tca::ctx...
r30201 # the base) this is more complicated as we must detect a divergence.
# We use 'backwards = False' in that case.
Gábor Stefanik
checkcopies: add logic to handle remotebase...
r30203 backwards = not remotebase and base != tca and f in mb
Stanislau Hlebik
copies: rename getfctx to getsrcfctx...
r32564 getsrcfctx = _makegetfctx(srcctx)
Stanislau Hlebik
copies: introduce getdstfctx...
r32565 getdstfctx = _makegetfctx(dstctx)
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178
Stanislau Hlebik
copies: rename m1 to msrc...
r32559 if msrc[f] == mb.get(f) and not remotebase:
Gábor Stefanik
merge: avoid superfluous filemerges when grafting through renames (issue5407)...
r30229 # Nothing to merge
return
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 of = None
Martin von Zweigbergk
cleanup: use set literals...
r32291 seen = {f}
Stanislau Hlebik
copies: rename getfctx to getsrcfctx...
r32564 for oc in getsrcfctx(f, msrc[f]).ancestors():
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 of = oc.path()
if of in seen:
# check limit late - grab last rename before
Martin von Zweigbergk
copies: inline a variable that's used only once...
r39981 if oc.linkrev() < limit:
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 break
continue
seen.add(of)
Gábor Stefanik
copies: make _checkcopies handle simple renames in a rotated DAG...
r30195 # remember for dir rename detection
if backwards:
data['fullcopy'][of] = f # grafting backwards through renames
else:
data['fullcopy'][f] = of
Stanislau Hlebik
copies: rename m2 to mdst...
r32560 if of not in mdst:
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 continue # no match, keep looking
Stanislau Hlebik
copies: rename m2 to mdst...
r32560 if mdst[of] == mb.get(of):
Gábor Stefanik
copies: don't record divergence for files needing no merge...
r30075 return # no merge needed, quit early
Stanislau Hlebik
copies: introduce getdstfctx...
r32565 c2 = getdstfctx(of, mdst[of])
Pierre-Yves David
checkcopies: add an inline comment about the '_related' call...
r30137 # c2 might be a plain new file on added on destination side that is
# unrelated to the droids we are looking for.
Gábor Stefanik
copies: clean up _related logic...
r37410 cr = _related(oc, c2)
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178 if cr and (of == f or of == c2.path()): # non-divergent
Gábor Stefanik
copies: make _checkcopies handle simple renames in a rotated DAG...
r30195 if backwards:
data['copy'][of] = f
elif of in mb:
Gábor Stefanik
checkcopies: add a sanity check against false-positive copies...
r30188 data['copy'][f] = of
Gábor Stefanik
checkcopies: add logic to handle remotebase...
r30203 elif remotebase: # special case: a <- b <- a -> b "ping-pong" rename
data['copy'][of] = f
del data['fullcopy'][f]
data['fullcopy'][of] = f
Gábor Stefanik
checkcopies: handle divergences contained entirely in tca::ctx...
r30201 else: # divergence w.r.t. graft CA on one side of topological CA
for sf in seen:
if sf in mb:
assert sf not in data['diverge']
data['diverge'][sf] = [f, of]
break
Gábor Stefanik
copies: don't record divergence for files needing no merge...
r30075 return
Durham Goode
copies: refactor checkcopies() into a top level method...
r19178
Gábor Stefanik
copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)...
r30204 if of in mta:
if backwards or remotebase:
data['incomplete'][of] = f
else:
for sf in seen:
if sf in mb:
if tca == base:
data['diverge'].setdefault(sf, []).append(f)
else:
data['incompletediverge'][sf] = [of, f]
return
Matt Mackall
duplicatecopies: move from cmdutil to copies...
r22901
Phil Cohen
context: add workingfilectx.markcopied...
r34788 def duplicatecopies(repo, wctx, rev, fromrev, skiprev=None):
Martin von Zweigbergk
copies: consistently use """ for docstrings...
r35422 """reproduce copies from fromrev to rev in the dirstate
Matt Mackall
duplicatecopies: move from cmdutil to copies...
r22901
If skiprev is specified, it's a revision that should be used to
filter copy records. Any copies that occur between fromrev and
skiprev will not be duplicated, even if they appear in the set of
copies between fromrev and rev.
Martin von Zweigbergk
copies: consistently use """ for docstrings...
r35422 """
Matt Mackall
duplicatecopies: move from cmdutil to copies...
r22901 exclude = {}
Pulkit Goyal
copies: improve logic of deciding copytracing on based of config options...
r39402 ctraceconfig = repo.ui.config('experimental', 'copytrace')
bctrace = stringutil.parsebool(ctraceconfig)
Durham Goode
copy: add flag for disabling copy tracing...
r26013 if (skiprev is not None and
Pulkit Goyal
copies: improve logic of deciding copytracing on based of config options...
r39402 (ctraceconfig == 'heuristics' or bctrace or bctrace is None)):
Pulkit Goyal
copytrace: replace experimental.disablecopytrace config with copytrace (BC)...
r34079 # copytrace='off' skips this line, but not the entire function because
Durham Goode
copy: add flag for disabling copy tracing...
r26013 # the line below is O(size of the repo) during a rebase, while the rest
# of the function is much faster (and is required for carrying copy
# metadata across the rebase anyway).
Matt Mackall
duplicatecopies: move from cmdutil to copies...
r22901 exclude = pathcopies(repo[fromrev], repo[skiprev])
for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems():
# copies.pathcopies returns backward renames, so dst might not
# actually be in the dirstate
if dst in exclude:
continue
Phil Cohen
context: add workingfilectx.markcopied...
r34788 wctx[dst].markcopied(src)