| durham |
| Restricted Project |
One config option is left as that will be dropped in an upcoming patch.
| Lint Skipped |
| Unit Tests Skipped |
| cmdutil, | cmdutil, | ||||
| commands, | commands, | ||||
| copies as copiesmod, | copies as copiesmod, | ||||
| dispatch, | dispatch, | ||||
| extensions, | extensions, | ||||
| filemerge, | filemerge, | ||||
| node, | node, | ||||
| phases, | phases, | ||||
| registrar, | |||||
| scmutil, | scmutil, | ||||
| util, | util, | ||||
| ) | ) | ||||
| configtable = {} | |||||
| configitem = registrar.configitem(configtable) | |||||
| configitem('copytrace', 'maxmovescandidatestocheck', default=5) | |||||
| configitem('copytrace', 'sourcecommitlimit', default=100) | |||||
| configitem('copytrace', 'fastcopytrace', default=False) | |||||
| configitem('copytrace', 'enableamendcopytrace', default=True) | |||||
| configitem('copytrace', 'amendcopytracecommitlimit', default=100) | |||||
| defaultdict = collections.defaultdict | defaultdict = collections.defaultdict | ||||
| _copytracinghint = ("hint: if this message is due to a moved file, you can " + | _copytracinghint = ("hint: if this message is due to a moved file, you can " + | ||||
| "ask mercurial to attempt to automatically resolve this " + | "ask mercurial to attempt to automatically resolve this " + | ||||
| "change by re-running with the --tracecopies flag, but " + | "change by re-running with the --tracecopies flag, but " + | ||||
| "this will significantly slow down the operation, so you " + | "this will significantly slow down the operation, so you " + | ||||
| "will need to be patient.\n" + | "will need to be patient.\n" + | ||||
| "Source control team is working on fixing this problem.\n") | "Source control team is working on fixing this problem.\n") | ||||
| This function collects the copytrace information from the working copy and | This function collects the copytrace information from the working copy and | ||||
| stores it against the amended commit in a separate dbm file. Later, | stores it against the amended commit in a separate dbm file. Later, | ||||
| in _domergecopies, this information will be merged with the rebase | in _domergecopies, this information will be merged with the rebase | ||||
| copytrace data to incorporate renames and copies made during the amend. | copytrace data to incorporate renames and copies made during the amend. | ||||
| """ | """ | ||||
| # Check if amend copytracing has been disabled. | # Check if amend copytracing has been disabled. | ||||
| if not ui.configbool("copytrace", "enableamendcopytrace", True): | if not ui.configbool("copytrace", "enableamendcopytrace"): | ||||
| return orig(ui, repo, old, extra, pats, opts) | return orig(ui, repo, old, extra, pats, opts) | ||||
| # Need to get the amend-copies before calling the command because files from | # Need to get the amend-copies before calling the command because files from | ||||
| # the working copy will be used during the amend. | # the working copy will be used during the amend. | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| # Find the amend-copies. | # Find the amend-copies. | ||||
| matcher = scmutil.match(wctx, pats, opts) | matcher = scmutil.match(wctx, pats, opts) | ||||
| path = repo.vfs.join('amendcopytrace') | path = repo.vfs.join('amendcopytrace') | ||||
| try: | try: | ||||
| db = anydbm.open(path, 'r') | db = anydbm.open(path, 'r') | ||||
| except anydbm.error: | except anydbm.error: | ||||
| return {} | return {} | ||||
| try: | try: | ||||
| ctx = dest | ctx = dest | ||||
| count = 0 | count = 0 | ||||
| limit = repo.ui.configint('copytrace', 'amendcopytracecommitlimit', 100) | limit = repo.ui.configint('copytrace', 'amendcopytracecommitlimit') | ||||
| # Search for the ancestor commit that has amend copytrace data. This | # Search for the ancestor commit that has amend copytrace data. This | ||||
| # will be the most recent amend commit if we are rebasing onto an | # will be the most recent amend commit if we are rebasing onto an | ||||
| # amend commit. If we reach the common ancestor or a public commit, | # amend commit. If we reach the common ancestor or a public commit, | ||||
| # then there is no amend copytrace data to be found. | # then there is no amend copytrace data to be found. | ||||
| while ctx.node() not in db: | while ctx.node() not in db: | ||||
| ctx = ctx.p1() | ctx = ctx.p1() | ||||
| count += 1 | count += 1 | ||||
| return orig(repo, cdst, csrc, base) | return orig(repo, cdst, csrc, base) | ||||
| # If base, source and destination are all draft branches, let's use full | # If base, source and destination are all draft branches, let's use full | ||||
| # copytrace for increased capabilities since it will work fast enough | # copytrace for increased capabilities since it will work fast enough | ||||
| if _isfullcopytraceable(repo.ui, cdst, base): | if _isfullcopytraceable(repo.ui, cdst, base): | ||||
| configoverrides = {('experimental', 'copytrace'): 'on'} | configoverrides = {('experimental', 'copytrace'): 'on'} | ||||
| with repo.ui.configoverride(configoverrides, 'mergecopies'): | with repo.ui.configoverride(configoverrides, 'mergecopies'): | ||||
| result = orig(repo, cdst, csrc, base) | result = orig(repo, cdst, csrc, base) | ||||
| if repo.ui.configbool("copytrace", "enableamendcopytrace", True): | if repo.ui.configbool("copytrace", "enableamendcopytrace"): | ||||
| # Look for additional amend-copies | # Look for additional amend-copies | ||||
| amend_copies = _getamendcopies(repo, cdst, base.p1()) | amend_copies = _getamendcopies(repo, cdst, base.p1()) | ||||
| # update result[0] dict w/ amend_copies | # update result[0] dict w/ amend_copies | ||||
| result[0].update(amend_copies) | result[0].update(amend_copies) | ||||
| return result | return result | ||||
| # avoid silly behavior for parent -> working dir | # avoid silly behavior for parent -> working dir | ||||
| if csrc.node() is None and cdst.node() == repo.dirstate.p1(): | if csrc.node() is None and cdst.node() == repo.dirstate.p1(): | ||||
| return repo.dirstate.copies(), {}, {}, {}, {} | return repo.dirstate.copies(), {}, {}, {}, {} | ||||
| if cdst.rev() is None: | if cdst.rev() is None: | ||||
| cdst = cdst.p1() | cdst = cdst.p1() | ||||
| if csrc.rev() is None: | if csrc.rev() is None: | ||||
| csrc = csrc.p1() | csrc = csrc.p1() | ||||
| copies = {} | copies = {} | ||||
| ctx = csrc | ctx = csrc | ||||
| changedfiles = set() | changedfiles = set() | ||||
| sourcecommitnum = 0 | sourcecommitnum = 0 | ||||
| sourcecommitlimit = repo.ui.configint('copytrace', 'sourcecommitlimit', 100) | sourcecommitlimit = repo.ui.configint('copytrace', 'sourcecommitlimit') | ||||
| mdst = cdst.manifest() | mdst = cdst.manifest() | ||||
| while ctx != base: | while ctx != base: | ||||
| if len(ctx.parents()) == 2: | if len(ctx.parents()) == 2: | ||||
| # To keep things simple let's not handle merges | # To keep things simple let's not handle merges | ||||
| return orig(repo, cdst, csrc, base) | return orig(repo, cdst, csrc, base) | ||||
| changedfiles.update(ctx.files()) | changedfiles.update(ctx.files()) | ||||
| ctx = ctx.p1() | ctx = ctx.p1() | ||||
| sourcecommitnum += 1 | sourcecommitnum += 1 | ||||
| dirnametofilename = defaultdict(list) | dirnametofilename = defaultdict(list) | ||||
| for f in mdst.filesnotin(base.manifest()): | for f in mdst.filesnotin(base.manifest()): | ||||
| basename = os.path.basename(f) | basename = os.path.basename(f) | ||||
| dirname = os.path.dirname(f) | dirname = os.path.dirname(f) | ||||
| basenametofilename[basename].append(f) | basenametofilename[basename].append(f) | ||||
| dirnametofilename[dirname].append(f) | dirnametofilename[dirname].append(f) | ||||
| maxmovecandidatestocheck = repo.ui.configint( | maxmovecandidatestocheck = repo.ui.configint( | ||||
| 'copytrace', 'maxmovescandidatestocheck', 5) | 'copytrace', 'maxmovescandidatestocheck') | ||||
| # in case of a rebase/graft, base may not be a common ancestor | # in case of a rebase/graft, base may not be a common ancestor | ||||
| anc = cdst.ancestor(csrc) | anc = cdst.ancestor(csrc) | ||||
| for f in missingfiles: | for f in missingfiles: | ||||
| basename = os.path.basename(f) | basename = os.path.basename(f) | ||||
| dirname = os.path.dirname(f) | dirname = os.path.dirname(f) | ||||
| samebasename = basenametofilename[basename] | samebasename = basenametofilename[basename] | ||||
| samedirname = dirnametofilename[dirname] | samedirname = dirnametofilename[dirname] | ||||
| movecandidates = samebasename + samedirname | movecandidates = samebasename + samedirname | ||||
| # f is guaranteed to be present in csrc, that's why | # f is guaranteed to be present in csrc, that's why | ||||
| # csrc.filectx(f) won't fail | # csrc.filectx(f) won't fail | ||||
| f2 = csrc.filectx(f) | f2 = csrc.filectx(f) | ||||
| for candidate in movecandidates[:maxmovecandidatestocheck]: | for candidate in movecandidates[:maxmovecandidatestocheck]: | ||||
| f1 = cdst.filectx(candidate) | f1 = cdst.filectx(candidate) | ||||
| if copiesmod._related(f1, f2, anc.rev()): | if copiesmod._related(f1, f2, anc.rev()): | ||||
| # if there are a few related copies then we'll merge | # if there are a few related copies then we'll merge | ||||
| # changes into all of them. This matches the behaviour | # changes into all of them. This matches the behaviour | ||||
| # of upstream copytracing | # of upstream copytracing | ||||
| copies[candidate] = f | copies[candidate] = f | ||||
| if len(movecandidates) > maxmovecandidatestocheck: | if len(movecandidates) > maxmovecandidatestocheck: | ||||
| msg = "too many moves candidates: %d" % len(movecandidates) | msg = "too many moves candidates: %d" % len(movecandidates) | ||||
| repo.ui.log("copytrace", msg=msg, | repo.ui.log("copytrace", msg=msg, | ||||
| reponame=_getreponame(repo, repo.ui)) | reponame=_getreponame(repo, repo.ui)) | ||||
| if repo.ui.configbool("copytrace", "enableamendcopytrace", True): | if repo.ui.configbool("copytrace", "enableamendcopytrace"): | ||||
| # Look for additional amend-copies. | # Look for additional amend-copies. | ||||
| amend_copies = _getamendcopies(repo, cdst, base.p1()) | amend_copies = _getamendcopies(repo, cdst, base.p1()) | ||||
| if amend_copies: | if amend_copies: | ||||
| repo.ui.debug('Loaded amend copytrace for %s' % cdst) | repo.ui.debug('Loaded amend copytrace for %s' % cdst) | ||||
| for dst, src in amend_copies.iteritems(): | for dst, src in amend_copies.iteritems(): | ||||
| if dst not in copies: | if dst not in copies: | ||||
| copies[dst] = src | copies[dst] = src | ||||
| return copies, {}, {}, {}, {} | return copies, {}, {}, {}, {} | ||||
| def _fastcopytraceenabled(ui): | def _fastcopytraceenabled(ui): | ||||
| return ui.configbool("copytrace", "fastcopytrace", False) | return ui.configbool("copytrace", "fastcopytrace") | ||||
| def _getreponame(repo, ui): | def _getreponame(repo, ui): | ||||
| reporoot = repo.origroot if util.safehasattr(repo, 'origroot') else '' | reporoot = repo.origroot if util.safehasattr(repo, 'origroot') else '' | ||||
| reponame = ui.config('paths', 'default') or reporoot | reponame = ui.config('paths', 'default') or reporoot | ||||
| if reponame: | if reponame: | ||||
| reponame = os.path.basename(reponame) | reponame = os.path.basename(reponame) | ||||
| return reponame | return reponame | ||||
| def _isfullcopytraceable(ui, cdst, base): | def _isfullcopytraceable(ui, cdst, base): | ||||
| if not ui.configbool("copytrace", "draftusefullcopytrace", False): | if not ui.configbool("copytrace", "draftusefullcopytrace", False): | ||||
| return False | return False | ||||
| if cdst.phase() == phases.draft and base.phase() == phases.draft: | if cdst.phase() == phases.draft and base.phase() == phases.draft: | ||||
| # draft branch: Use traditional copytracing if < 100 commits | # draft branch: Use traditional copytracing if < 100 commits | ||||
| ctx = cdst | ctx = cdst | ||||
| commits = 0 | commits = 0 | ||||
| sourcecommitlimit = ui.configint('copytrace', 'sourcecommitlimit', 100) | sourcecommitlimit = ui.configint('copytrace', 'sourcecommitlimit') | ||||
| while ctx != base and commits != sourcecommitlimit: | while ctx != base and commits != sourcecommitlimit: | ||||
| ctx = ctx.p1() | ctx = ctx.p1() | ||||
| commits += 1 | commits += 1 | ||||
| return commits < sourcecommitlimit | return commits < sourcecommitlimit | ||||