This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9116

copies: no longer change the sidedata flag
ClosedPublic

Authored by marmoute on Sep 28 2020, 12:32 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7a757e893532: copies: no longer change the sidedata flag
Summary

With the new sidedata storage that include data about all file changes, every
revision has one, so the sidedata flag is not longer a good way to spot
changeset with copy information. So we drop this check to simplify the code

We optimisation itself provided an interesting speedup, so we will likely
reintroduce something similar, with a dedicated flag, in the future.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Sep 28 2020, 12:32 PM
Alphare accepted this revision.Oct 2 2020, 4:38 AM
pulkit accepted this revision.Oct 6 2020, 4:23 AM
This revision is now accepted and ready to land.Oct 6 2020, 4:23 AM
marmoute added a commit: rHG7a757e893532: copies: no longer change the sidedata flag.Oct 6 2020, 5:03 AM
Closed by commit rHG7a757e893532: copies: no longer change the sidedata flag (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (42 lines)

Diff 22905

mercurial/copies.py

# copies.py - copy detection for Mercurial # copies.py - copy detection for Mercurial
# #
# Copyright 2008 Matt Mackall <mpm@selenic.com> # Copyright 2008 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import os import os
from .i18n import _ from .i18n import _
from .revlogutils.flagutil import REVIDX_SIDEDATA
from . import ( from . import (
match as matchmod, match as matchmod,
node, node,
pathutil, pathutil,
pycompat, pycompat,
util, util,
) )
for n in parents: for n in parents:
if n != node.nullid: if n != node.nullid:
nb_parents += 1 nb_parents += 1
return nb_parents >= 2 return nb_parents >= 2
return ismerged return ismerged
changelogrevision = cl.changelogrevision changelogrevision = cl.changelogrevision
flags = cl.flags
# A small cache to avoid doing the work twice for merges # A small cache to avoid doing the work twice for merges
# #
# In the vast majority of cases, if we ask information for a revision # In the vast majority of cases, if we ask information for a revision
# about 1 parent, we'll later ask it for the other. So it make sense to # about 1 parent, we'll later ask it for the other. So it make sense to
# keep the information around when reaching the first parent of a merge # keep the information around when reaching the first parent of a merge
# and dropping it after it was provided for the second parents. # and dropping it after it was provided for the second parents.
# #
# that case the cache could grow. If this even become an issue one can # that case the cache could grow. If this even become an issue one can
# safely introduce a maximum cache size. This would trade extra CPU/IO # safely introduce a maximum cache size. This would trade extra CPU/IO
# time to save memory. # time to save memory.
merge_caches = {} merge_caches = {}
def revinfo(rev): def revinfo(rev):
p1, p2 = parents(rev) p1, p2 = parents(rev)
value = None value = None
if flags(rev) & REVIDX_SIDEDATA:
e = merge_caches.pop(rev, None) e = merge_caches.pop(rev, None)
if e is not None: if e is not None:
return e return e
c = changelogrevision(rev) c = changelogrevision(rev)
p1copies = c.p1copies p1copies = c.p1copies
p2copies = c.p2copies p2copies = c.p2copies
removed = c.filesremoved removed = c.filesremoved
if p1 != node.nullrev and p2 != node.nullrev: if p1 != node.nullrev and p2 != node.nullrev:
# XXX some case we over cache, IGNORE # XXX some case we over cache, IGNORE
value = merge_caches[rev] = ( value = merge_caches[rev] = (
p1, p1,
p2, p2,
p1copies, p1copies,
p2copies, p2copies,
removed, removed,
get_ismerged(rev), get_ismerged(rev),
) )
else:
p1copies = {}
p2copies = {}
removed = []
if value is None: if value is None:
value = (p1, p2, p1copies, p2copies, removed, get_ismerged(rev)) value = (p1, p2, p1copies, p2copies, removed, get_ismerged(rev))
return value return value
return revinfo return revinfo