##// END OF EJS Templates
compression: introduce a `storage.revlog.zstd.level` configuration...
compression: introduce a `storage.revlog.zstd.level` configuration This option control the zstd compression level used when compressing revlog chunk. The usage of zstd for revlog compression has not graduated from experimental yet, but we intend to fix that soon. The option name for the compression level is more straight forward to pick, so this changesets comes first. Having a dedicated option for each compression engine is useful because they don't support the same range of values. I ran the same measurement as for the zlib compression level (in the parent changesets). The variation in repository size is stay mostly in the same (small) range. The "read/write" performance see smallish variation, but are overall much better than zlib. Write performance show the same tend of having better write performance for when reaching high-end compression. Again, we don't intend to change the default zstd compression level (currently: 3) in this series. However this is worth investigating in the future. The Performance comparison of zlib vs zstd is quite impressive. The repository size stay in the same range, but the performance are much better in all situations. Comparison summary ================== We are looking at: - performance range for zlib - performance range for zstd - comparison of default zstd (level-3) to default zlib (level 6) - comparison of the slowest zstd time to the fastest zlib time Read performance: ----------------- | zlib | zstd | cmp | f2s mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88% pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63% netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73% mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71% Write performance: ------------------ | zlib | zstd | cmp | f2s mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86% pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65% netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82% mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80% Raw data -------- repo alg lvl .hg/store size 00manifest.d read write mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304 mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320 mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612 mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025 mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142 mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875 mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489 mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286 mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407 mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460 pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984 pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158 pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918 pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409 pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509 pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219 pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239 pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332 pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827 pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218 netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316 netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400 netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064 netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311 netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087 netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626 netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602 netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652 netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349 netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655 mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721 mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093 mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002 mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751 mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805 mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906 mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202 mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683 mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389 mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537

File last commit:

r41216:69804c04 default
r42211:bb271ec2 default
Show More
filemap.py
479 lines | 17.6 KiB | text/x-python | PythonLexer
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 # Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 # Copyright 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 #
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.
Yuya Nishihara
doctest: use print_function and convert bytes to unicode where needed
r34139
from __future__ import absolute_import, print_function
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 import posixpath
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205
from mercurial.i18n import _
timeless
convert: filemap use absolute_import
r28367 from mercurial import (
error,
Augie Fackler
convert: fix two %r output formats with pycompat.bytestr() wrapping...
r36578 pycompat,
timeless
convert: filemap use absolute_import
r28367 )
from . import common
SKIPREV = common.SKIPREV
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376
Mads Kiilerich
convert: readability and test of rpairs function
r20048 def rpairs(path):
'''Yield tuples with path split at '/', starting with the full path.
No leading, trailing or double '/', please.
Yuya Nishihara
doctest: use print_function and convert bytes to unicode where needed
r34139 >>> for x in rpairs(b'foo/bar/baz'): print(x)
Mads Kiilerich
convert: readability and test of rpairs function
r20048 ('foo/bar/baz', '')
('foo/bar', 'baz')
('foo', 'bar/baz')
('.', 'foo/bar/baz')
'''
i = len(path)
while i != -1:
yield path[:i], path[i + 1:]
i = path.rfind('/', 0, i)
yield '.', path
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 def normalize(path):
''' We use posixpath.normpath to support cross-platform path format.
However, it doesn't handle None input. So we wrap it up. '''
if path is None:
return None
return posixpath.normpath(path)
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 class filemapper(object):
'''Map and filter filenames when importing.
A name can be mapped to itself, a new name, or None (omit from new
repository).'''
def __init__(self, ui, path=None):
self.ui = ui
self.include = {}
self.exclude = {}
self.rename = {}
Durham Goode
convert: implements targetfilebelongstosource for filemap source...
r26036 self.targetprefixes = None
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 if path:
if self.parse(path):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('errors in filemap'))
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376
def parse(self, path):
errs = 0
def check(name, mapping, listname):
Mads Kiilerich
convert: warn on superfluous / in paths...
r11680 if not name:
self.ui.warn(_('%s:%d: path to %s is missing\n') %
(lex.infile, lex.lineno, listname))
return 1
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 if name in mapping:
self.ui.warn(_('%s:%d: %r already in %s list\n') %
(lex.infile, lex.lineno, name, listname))
return 1
Mads Kiilerich
convert: warn on superfluous / in paths...
r11680 if (name.startswith('/') or
name.endswith('/') or
'//' in name):
self.ui.warn(_('%s:%d: superfluous / in %s %r\n') %
Augie Fackler
convert: fix two %r output formats with pycompat.bytestr() wrapping...
r36578 (lex.infile, lex.lineno, listname,
pycompat.bytestr(name)))
Mads Kiilerich
convert: warn on superfluous / in paths...
r11680 return 1
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 return 0
Augie Fackler
convert: use our shlex wrapper in filemap to avoid Python 3 tracebacks...
r36577 lex = common.shlexer(
filepath=path, wordchars='!@#$%^&*()-=+[]{}|;:,./<>?')
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 cmd = lex.get_token()
while cmd:
if cmd == 'include':
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 name = normalize(lex.get_token())
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 errs += check(name, self.exclude, 'exclude')
self.include[name] = name
elif cmd == 'exclude':
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 name = normalize(lex.get_token())
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 errs += check(name, self.include, 'include')
errs += check(name, self.rename, 'rename')
self.exclude[name] = name
elif cmd == 'rename':
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 src = normalize(lex.get_token())
dest = normalize(lex.get_token())
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 errs += check(src, self.exclude, 'exclude')
self.rename[src] = dest
elif cmd == 'source':
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 errs += self.parse(normalize(lex.get_token()))
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 else:
self.ui.warn(_('%s:%d: unknown directive %r\n') %
Augie Fackler
convert: fix two %r output formats with pycompat.bytestr() wrapping...
r36578 (lex.infile, lex.lineno, pycompat.bytestr(cmd)))
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 errs += 1
cmd = lex.get_token()
return errs
def lookup(self, name, mapping):
Huayang
convert: normalize paths in filemaps (issue3612)...
r17797 name = normalize(name)
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 for pre, suf in rpairs(name):
try:
return mapping[pre], pre, suf
Peter Arrenbrecht
cleanup: drop unused assignments
r7875 except KeyError:
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 pass
return '', name, ''
Durham Goode
convert: implements targetfilebelongstosource for filemap source...
r26036 def istargetfile(self, filename):
"""Return true if the given target filename is covered as a destination
of the filemap. This is useful for identifying what parts of the target
repo belong to the source repo and what parts don't."""
if self.targetprefixes is None:
self.targetprefixes = set()
for before, after in self.rename.iteritems():
self.targetprefixes.add(after)
# If "." is a target, then all target files are considered from the
# source.
if not self.targetprefixes or '.' in self.targetprefixes:
return True
filename = normalize(filename)
for pre, suf in rpairs(filename):
# This check is imperfect since it doesn't account for the
# include/exclude list, but it should work in filemaps that don't
# apply include/exclude to the same source directories they are
# renaming.
if pre in self.targetprefixes:
return True
return False
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 def __call__(self, name):
if self.include:
inc = self.lookup(name, self.include)[0]
else:
inc = name
if self.exclude:
exc = self.lookup(name, self.exclude)[0]
else:
exc = ''
Stefan Simek
convert: make filemap favor most specific filtering rule...
r9884 if (not self.include and exc) or (len(inc) <= len(exc)):
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 return None
newpre, pre, suf = self.lookup(name, self.rename)
if newpre:
if newpre == '.':
return suf
if suf:
Matt Mackall
convert: handle trailing slashes in filemap better (issue3124)
r15565 if newpre.endswith('/'):
return newpre + suf
Alexis S. L. Carvalho
convert: move filemapper class to a separate file
r5376 return newpre + '/' + suf
return newpre
return name
def active(self):
return bool(self.include or self.exclude or self.rename)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
# This class does two additional things compared to a regular source:
#
# - Filter and rename files. This is mostly wrapped by the filemapper
# class above. We hide the original filename in the revision that is
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 # returned by getchanges to be able to find things later in getfile.
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 #
# - Return only revisions that matter for the files we're interested in.
# This involves rewriting the parents of the original revision to
# create a graph that is restricted to those revisions.
#
# This set of revisions includes not only revisions that directly
# touch files we're interested in, but also merges that merge two
# or more interesting revisions.
timeless
convert: filemap use absolute_import
r28367 class filemap_source(common.converter_source):
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 def __init__(self, ui, baseconverter, filemap):
Matt Harbison
convert: save an indicator of the repo type for sources and sinks...
r35168 super(filemap_source, self).__init__(ui, baseconverter.repotype)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 self.base = baseconverter
self.filemapper = filemapper(ui, filemap)
self.commits = {}
# if a revision rev has parent p in the original revision graph, then
# rev will have parent self.parentmap[p] in the restricted graph.
self.parentmap = {}
# self.wantedancestors[rev] is the set of all ancestors of rev that
# are in the restricted graph.
self.wantedancestors = {}
self.convertedorder = None
self._rebuilt = False
self.origparents = {}
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 self.children = {}
self.seenchildren = {}
Durham Goode
convert: add config option for disabling ancestor parent checks...
r25742 # experimental config: convert.ignoreancestorcheck
self.ignoreancestorcheck = self.ui.configbool('convert',
'ignoreancestorcheck')
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
Patrick Mezard
convert: filemap must call base converter before()/after() actions
r5799 def before(self):
self.base.before()
def after(self):
self.base.after()
Bryan O'Sullivan
convert: abstract map files into a class
r5510 def setrevmap(self, revmap):
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 # rebuild our state to make things restartable
#
# To avoid calling getcommit for every revision that has already
# been converted, we rebuild only the parentmap, delaying the
# rebuild of wantedancestors until we need it (i.e. until a
# merge).
#
# We assume the order argument lists the revisions in
# topological order, so that we can infer which revisions were
# wanted by previous runs.
self._rebuilt = not revmap
seen = {SKIPREV: SKIPREV}
Martin Geisler
util: use built-in set and frozenset...
r8150 dummyset = set()
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 converted = []
Bryan O'Sullivan
convert: abstract map files into a class
r5510 for rev in revmap.order:
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 mapped = revmap[rev]
wanted = mapped not in seen
if wanted:
seen[mapped] = rev
self.parentmap[rev] = rev
else:
self.parentmap[rev] = seen[mapped]
self.wantedancestors[rev] = dummyset
arg = seen[mapped]
if arg == SKIPREV:
arg = None
converted.append((rev, wanted, arg))
self.convertedorder = converted
Bryan O'Sullivan
convert: abstract map files into a class
r5510 return self.base.setrevmap(revmap)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
def rebuild(self):
if self._rebuilt:
return True
self._rebuilt = True
self.parentmap.clear()
self.wantedancestors.clear()
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 self.seenchildren.clear()
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 for rev, wanted, arg in self.convertedorder:
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 if rev not in self.origparents:
Mads Kiilerich
convert: fix crash when existing converted revision didn't come from source...
r19863 try:
self.origparents[rev] = self.getcommit(rev).parents
except error.RepoLookupError:
self.ui.debug("unknown revmap source: %s\n" % rev)
continue
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 if arg is not None:
self.children[arg] = self.children.get(arg, 0) + 1
for rev, wanted, arg in self.convertedorder:
Mads Kiilerich
convert: fix crash when existing converted revision didn't come from source...
r19863 try:
parents = self.origparents[rev]
except KeyError:
continue # unknown revmap source
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 if wanted:
self.mark_wanted(rev, parents)
else:
self.mark_not_wanted(rev, arg)
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 self._discard(arg, *parents)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
return True
def getheads(self):
return self.base.getheads()
def getcommit(self, rev):
# We want to save a reference to the commit objects to be able
# to rewrite their parents later on.
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 c = self.commits[rev] = self.base.getcommit(rev)
for p in c.parents:
self.children[p] = self.children.get(p, 0) + 1
return c
Matt Harbison
convert: add missing numcommits() override to hg sources...
r41215 def numcommits(self):
return self.base.numcommits()
Patrick Mezard
convert: make filemap prune useless branch closing revs (issue2774)...
r13968 def _cachedcommit(self, rev):
if rev in self.commits:
return self.commits[rev]
return self.base.getcommit(rev)
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 def _discard(self, *revs):
for r in revs:
if r is None:
continue
self.seenchildren[r] = self.seenchildren.get(r, 0) + 1
if self.seenchildren[r] == self.children[r]:
Mads Kiilerich
convert: fix crash when filemap filtering is changed
r19862 self.wantedancestors.pop(r, None)
self.parentmap.pop(r, None)
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 del self.seenchildren[r]
if self._rebuilt:
del self.children[r]
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
def wanted(self, rev, i):
# Return True if we're directly interested in rev.
#
# i is an index selecting one of the parents of rev (if rev
# has no parents, i is None). getchangedfiles will give us
# the list of files that are different in rev and in the parent
# indicated by i. If we're interested in any of these files,
# we're interested in rev.
try:
files = self.base.getchangedfiles(rev, i)
except NotImplementedError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("source repository doesn't support --filemap"))
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 for f in files:
if self.filemapper(f):
return True
Matt Harbison
convert: don't drop commits that are empty in the source when using --filemap...
r41216
# The include directive is documented to include nothing else (though
# valid branch closes are included).
if self.filemapper.include:
return False
# Allow empty commits in the source revision through. The getchanges()
# method doesn't even bother calling this if it determines that the
# close marker is significant (i.e. all of the branch ancestors weren't
# eliminated). Therefore if there *is* a close marker, getchanges()
# doesn't consider it significant, and this revision should be dropped.
return not files and 'close' not in self.commits[rev].extra
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
def mark_not_wanted(self, rev, p):
# Mark rev as not interesting and update data structures.
if p is None:
# A root revision. Use SKIPREV to indicate that it doesn't
# map to any revision in the restricted graph. Put SKIPREV
# in the set of wanted ancestors to simplify code elsewhere
self.parentmap[rev] = SKIPREV
Martin von Zweigbergk
cleanup: use set literals...
r32291 self.wantedancestors[rev] = {SKIPREV}
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 return
# Reuse the data from our parent.
self.parentmap[rev] = self.parentmap[p]
self.wantedancestors[rev] = self.wantedancestors[p]
def mark_wanted(self, rev, parents):
# Mark rev ss wanted and update data structures.
# rev will be in the restricted graph, so children of rev in
# the original graph should still have rev as a parent in the
# restricted graph.
self.parentmap[rev] = rev
# The set of wanted ancestors of rev is the union of the sets
# of wanted ancestors of its parents. Plus rev itself.
Martin Geisler
util: use built-in set and frozenset...
r8150 wrev = set()
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 for p in parents:
Mads Kiilerich
convert: fix crash when filemap filtering is changed
r19862 if p in self.wantedancestors:
wrev.update(self.wantedancestors[p])
else:
self.ui.warn(_('warning: %s parent %s is missing\n') %
(rev, p))
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 wrev.add(rev)
self.wantedancestors[rev] = wrev
Mads Kiilerich
convert: introduce --full for converting all files...
r22300 def getchanges(self, rev, full):
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 parents = self.commits[rev].parents
Durham Goode
convert: add config option for disabling ancestor parent checks...
r25742 if len(parents) > 1 and not self.ignoreancestorcheck:
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 self.rebuild()
# To decide whether we're interested in rev we:
#
# - calculate what parents rev will have if it turns out we're
# interested in it. If it's going to have more than 1 parent,
# we're interested in it.
#
# - otherwise, we'll compare it with the single parent we found.
# If any of the files we're interested in is different in the
# the two revisions, we're interested in rev.
# A parent p is interesting if its mapped version (self.parentmap[p]):
# - is not SKIPREV
# - is still not in the list of parents (we don't want duplicates)
Patrick Mezard
convert: keep branch switching merges with ancestors (issue3340)...
r17103 # - is not an ancestor of the mapped versions of the other parents or
# there is no parent in the same branch than the current revision.
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 mparents = []
Patrick Mezard
convert: keep branch switching merges with ancestors (issue3340)...
r17103 knownparents = set()
branch = self.commits[rev].branch
hasbranchparent = False
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 for i, p1 in enumerate(parents):
mp1 = self.parentmap[p1]
Patrick Mezard
convert: keep branch switching merges with ancestors (issue3340)...
r17103 if mp1 == SKIPREV or mp1 in knownparents:
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 continue
Durham Goode
convert: add config option for disabling ancestor parent checks...
r25742
isancestor = (not self.ignoreancestorcheck and
any(p2 for p2 in parents
if p1 != p2 and mp1 != self.parentmap[p2]
and mp1 in self.wantedancestors[p2]))
Patrick Mezard
convert: keep branch switching merges with ancestors (issue3340)...
r17103 if not isancestor and not hasbranchparent and len(parents) > 1:
# This could be expensive, avoid unnecessary calls.
if self._cachedcommit(p1).branch == branch:
hasbranchparent = True
mparents.append((p1, mp1, i, isancestor))
knownparents.add(mp1)
# Discard parents ancestors of other parents if there is a
# non-ancestor one on the same branch than current revision.
if hasbranchparent:
mparents = [p for p in mparents if not p[3]]
wp = None
if mparents:
wp = max(p[2] for p in mparents)
mparents = [p[1] for p in mparents]
elif parents:
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 wp = 0
self.origparents[rev] = parents
Patrick Mezard
convert: make filemap prune useless branch closing revs (issue2774)...
r13968 closed = False
if 'close' in self.commits[rev].extra:
# A branch closing revision is only useful if one of its
# parents belong to the branch being closed
pbranches = [self._cachedcommit(p).branch for p in mparents]
if branch in pbranches:
closed = True
Matt Mackall
convert: handle closed branch heads in hg-hg conversion (issue2185)
r11673
if len(mparents) < 2 and not closed and not self.wanted(rev, wp):
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 # We don't want this revision.
# Update our state and tell the convert process to map this
# revision to the same revision its parent as mapped to.
p = None
if parents:
p = parents[wp]
self.mark_not_wanted(rev, p)
self.convertedorder.append((rev, False, p))
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 self._discard(*parents)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 return self.parentmap[rev]
# We want this revision.
# Rewrite the parents of the commit object
self.commits[rev].parents = mparents
self.mark_wanted(rev, parents)
self.convertedorder.append((rev, True, None))
Alexis S. L. Carvalho
convert --filemap: reduce memory usage
r5401 self._discard(*parents)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
Patrick Mezard
convert: merge sources getmode() into getfile()
r11134 # Get the real changes and do the filtering/mapping. To be
# able to get the files later on in getfile, we hide the
# original filename in the rev part of the return value.
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 changes, copies, cleanp2 = self.base.getchanges(rev, full)
Wagner Bruna
convert: make filemap renames consistently override revision renames...
r17174 files = {}
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 ncleanp2 = set(cleanp2)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 for f, r in changes:
newf = self.filemapper(f)
Wagner Bruna
convert: make filemap renames consistently override revision renames...
r17174 if newf and (newf != f or newf not in files):
files[newf] = (f, r)
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 if newf != f:
ncleanp2.discard(f)
Wagner Bruna
convert: make filemap renames consistently override revision renames...
r17174 files = sorted(files.items())
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
ncopies = {}
for c in copies:
newc = self.filemapper(c)
if newc:
newsource = self.filemapper(copies[c])
if newsource:
ncopies[newc] = newsource
Mads Kiilerich
convert: optimize convert of files that are unmodified from p2 in merges...
r24395 return files, ncopies, ncleanp2
Alexis S. L. Carvalho
convert: readd --filemap...
r5377
Durham Goode
convert: implements targetfilebelongstosource for filemap source...
r26036 def targetfilebelongstosource(self, targetfilename):
return self.filemapper.istargetfile(targetfilename)
Alexis S. L. Carvalho
convert: readd --filemap...
r5377 def getfile(self, name, rev):
realname, realrev = rev
return self.base.getfile(realname, realrev)
def gettags(self):
return self.base.gettags()
Patrick Mezard
convert: fail fast if source does not support --sourcesort
r8691
def hasnativeorder(self):
return self.base.hasnativeorder()
Patrick Mezard
convert: rewrite tags when converting from hg to hg
r8693
def lookuprev(self, rev):
return self.base.lookuprev(rev)
etienne
convert: added bookmarks support in filemap...
r15107
def getbookmarks(self):
return self.base.getbookmarks()
Mads Kiilerich
convert: update source shamap when using filemap, just as when not using filemap...
r19892
def converted(self, rev, sinkrev):
self.base.converted(rev, sinkrev)