##// 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:

r41925:aaad36b8 default
r42211:bb271ec2 default
Show More
reposetup.py
393 lines | 17.3 KiB | text/x-python | PythonLexer
various
hgext: add largefiles extension...
r15168 # Copyright 2009-2010 Gregory P. Ward
# Copyright 2009-2010 Intelerad Medical Systems Incorporated
# Copyright 2010-2011 Fog Creek Software
# Copyright 2010-2011 Unity Technologies
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
'''setup for largefiles repositories: reposetup'''
liscju
py3: make largefiles/reposetup.py use absolute_import
r29314 from __future__ import absolute_import
various
hgext: add largefiles extension...
r15168 import copy
from mercurial.i18n import _
liscju
py3: make largefiles/reposetup.py use absolute_import
r29314 from mercurial import (
error,
localrepo,
liscju
largefiles: rename match_ to matchmod import in reposetup
r29319 match as matchmod,
liscju
py3: make largefiles/reposetup.py use absolute_import
r29314 scmutil,
)
from . import (
lfcommands,
lfutil,
)
various
hgext: add largefiles extension...
r15168
def reposetup(ui, repo):
FUJIWARA Katsunori
hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109)...
r20858 # wire repositories should be given new wireproto functions
# by "proto.wirereposetup()" via "hg.wirepeersetupfuncs"
various
hgext: add largefiles extension...
r15168 if not repo.local():
FUJIWARA Katsunori
hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109)...
r20858 return
various
hgext: add largefiles extension...
r15168
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 class lfilesrepo(repo.__class__):
FUJIWARA Katsunori
largefiles: access to specific fields only if largefiles enabled (issue4547)...
r24158 # the mark to examine whether "repo" object enables largefiles or not
_largefilesenabled = True
various
hgext: add largefiles extension...
r15168 lfstatus = False
def status_nolfiles(self, *args, **kwargs):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return super(lfilesrepo, self).status(*args, **kwargs)
various
hgext: add largefiles extension...
r15168
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # When lfstatus is set, return a context that gives the names
# of largefiles instead of their corresponding standins and
# identifies the largefiles as always binary, regardless of
# their actual contents.
various
hgext: add largefiles extension...
r15168 def __getitem__(self, changeid):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 ctx = super(lfilesrepo, self).__getitem__(changeid)
Matt Harbison
largefiles: revert to lfilesrepo.status() being an unfiltered method...
r23958 if self.lfstatus:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 class lfilesctx(ctx.__class__):
various
hgext: add largefiles extension...
r15168 def files(self):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 filenames = super(lfilesctx, self).files()
Martin Geisler
largefiles: use lfutil functions...
r15628 return [lfutil.splitstandin(f) or f for f in filenames]
various
hgext: add largefiles extension...
r15168 def manifest(self):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 man1 = super(lfilesctx, self).manifest()
Martin von Zweigbergk
largefiles: fix typo with s/__class/__class__/...
r24428 class lfilesmanifest(man1.__class__):
Martin von Zweigbergk
largefiles: don't create chain of __contains__ calls...
r24287 def __contains__(self, filename):
orig = super(lfilesmanifest, self).__contains__
return (orig(filename) or
orig(lfutil.standin(filename)))
man1.__class__ = lfilesmanifest
various
hgext: add largefiles extension...
r15168 return man1
def filectx(self, path, fileid=None, filelog=None):
Martin von Zweigbergk
largefiles: extract 'orig' method in lfilesctx.filectx
r22517 orig = super(lfilesctx, self).filectx
various
hgext: add largefiles extension...
r15168 try:
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 if filelog is not None:
Martin von Zweigbergk
largefiles: extract 'orig' method in lfilesctx.filectx
r22517 result = orig(path, fileid, filelog)
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 else:
Martin von Zweigbergk
largefiles: extract 'orig' method in lfilesctx.filectx
r22517 result = orig(path, fileid)
various
hgext: add largefiles extension...
r15168 except error.LookupError:
# Adding a null character will cause Mercurial to
# identify this as a binary file.
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 if filelog is not None:
Martin von Zweigbergk
largefiles: extract 'orig' method in lfilesctx.filectx
r22517 result = orig(lfutil.standin(path), fileid,
filelog)
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 else:
Martin von Zweigbergk
largefiles: extract 'orig' method in lfilesctx.filectx
r22517 result = orig(lfutil.standin(path), fileid)
various
hgext: add largefiles extension...
r15168 olddata = result.data
result.data = lambda: olddata() + '\0'
return result
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 ctx.__class__ = lfilesctx
various
hgext: add largefiles extension...
r15168 return ctx
# Figure out the status of big files and insert them into the
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # appropriate list in the result. Also removes standin files
# from the listing. Revert to the original status if
# self.lfstatus is False.
Matt Harbison
largefiles: revert to lfilesrepo.status() being an unfiltered method...
r23958 # XXX large file status is buggy when used on repo proxy.
# XXX this needs to be investigated.
@localrepo.unfilteredmethod
various
hgext: add largefiles extension...
r15168 def status(self, node1='.', node2=None, match=None, ignored=False,
clean=False, unknown=False, listsubrepos=False):
listignored, listclean, listunknown = ignored, clean, unknown
Martin von Zweigbergk
largefiles: extract 'orig' method in reposetup.status
r22518 orig = super(lfilesrepo, self).status
Matt Harbison
largefiles: revert to lfilesrepo.status() being an unfiltered method...
r23958 if not self.lfstatus:
Martin von Zweigbergk
largefiles: extract 'orig' method in reposetup.status
r22518 return orig(node1, node2, match, listignored, listclean,
listunknown, listsubrepos)
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515
# some calls in this function rely on the old version of status
Matt Harbison
largefiles: revert to lfilesrepo.status() being an unfiltered method...
r23958 self.lfstatus = False
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 ctx1 = self[node1]
ctx2 = self[node2]
working = ctx2.rev() is None
parentworking = working and ctx1 == self['.']
various
hgext: add largefiles extension...
r15168
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 if match is None:
Martin von Zweigbergk
match: delete unused root and cwd arguments from {always,never,exact}() (API)...
r41825 match = matchmod.always()
various
hgext: add largefiles extension...
r15168
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 wlock = None
try:
Mads Kiilerich
largefiles: wlock in status before lfdirstate.write()
r19056 try:
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 # updating the dirstate is optional
# so we don't wait on the lock
wlock = self.wlock(False)
except error.LockError:
pass
Na'Tosha Bard
largefiles: optimize status when files are specified (issue3144)...
r15653
Martin von Zweigbergk
largefiles: shortcircuit status code also for non-matching patterns...
r23146 # First check if paths or patterns were specified on the
# command line. If there were, and they don't match any
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 # largefiles, we should just bail here and let super
# handle it -- thus gaining a big performance boost.
lfdirstate = lfutil.openlfdirstate(ui, self)
Martin von Zweigbergk
largefiles: shortcircuit status code also for non-matching patterns...
r23146 if not match.always():
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 for f in lfdirstate:
if match(f):
break
else:
Martin von Zweigbergk
largefiles: extract 'orig' method in reposetup.status
r22518 return orig(node1, node2, match, listignored, listclean,
listunknown, listsubrepos)
various
hgext: add largefiles extension...
r15168
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 # Create a copy of match that matches standins instead
# of largefiles.
def tostandins(files):
if not working:
return files
newfiles = []
dirstate = self.dirstate
for f in files:
sf = lfutil.standin(f)
if sf in dirstate:
newfiles.append(sf)
Mark Thomas
dirstate: add explicit methods for querying directories (API)...
r35083 elif dirstate.hasdir(sf):
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 # Directory entries could be regular or
# standin, check both
newfiles.extend((f, sf))
else:
newfiles.append(f)
return newfiles
Mads Kiilerich
largefiles: unindent code
r18149
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 m = copy.copy(match)
m._files = tostandins(m._files)
Martin von Zweigbergk
largefiles: extract 'orig' method in reposetup.status
r22518 result = orig(node1, node2, m, ignored, clean, unknown,
listsubrepos)
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 if working:
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 def sfindirstate(f):
sf = lfutil.standin(f)
dirstate = self.dirstate
Mark Thomas
dirstate: add explicit methods for querying directories (API)...
r35083 return sf in dirstate or dirstate.hasdir(sf)
Mads Kiilerich
largefiles: unindent code
r18149
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 match._files = [f for f in match._files
if sfindirstate(f)]
# Don't waste time getting the ignored and unknown
# files from lfdirstate
Martin von Zweigbergk
dirstate: use keyword arguments to clarify status()'s callers...
r34345 unsure, s = lfdirstate.status(match, subrepos=[],
ignored=False,
clean=listclean,
unknown=False)
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 (modified, added, removed, deleted, clean) = (
s.modified, s.added, s.removed, s.deleted, s.clean)
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 if parentworking:
for lfile in unsure:
standin = lfutil.standin(lfile)
if standin not in ctx1:
# from second parent
modified.append(lfile)
Augie Fackler
cleanup: use () to wrap long lines instead of \...
r41925 elif (lfutil.readasstandin(ctx1[standin])
!= lfutil.hashfile(self.wjoin(lfile))):
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 modified.append(lfile)
else:
Martin von Zweigbergk
largefiles: remove unnecessary clearing of status fields...
r22523 if listclean:
clean.append(lfile)
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 lfdirstate.normal(lfile)
else:
tocheck = unsure + modified + added + clean
modified, added, clean = [], [], []
FUJIWARA Katsunori
largefiles: avoid exec-bit examination on the platform being unaware of it...
r23383 checkexec = self.dirstate._checkexec
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515
for lfile in tocheck:
standin = lfutil.standin(lfile)
Mads Kiilerich
largefiles: inline redundant inctx function in status
r23043 if standin in ctx1:
FUJIWARA Katsunori
largefiles: add examination of exec bit in "hg status --rev REV" case...
r23090 abslfile = self.wjoin(lfile)
FUJIWARA Katsunori
largefiles: use readasstandin() to read hex hash directly from filectx...
r31740 if ((lfutil.readasstandin(ctx1[standin]) !=
FUJIWARA Katsunori
largefiles: add examination of exec bit in "hg status --rev REV" case...
r23090 lfutil.hashfile(abslfile)) or
FUJIWARA Katsunori
largefiles: avoid exec-bit examination on the platform being unaware of it...
r23383 (checkexec and
('x' in ctx1.flags(standin)) !=
FUJIWARA Katsunori
largefiles: add examination of exec bit in "hg status --rev REV" case...
r23090 bool(lfutil.getexecutable(abslfile)))):
various
hgext: add largefiles extension...
r15168 modified.append(lfile)
Martin von Zweigbergk
largefiles: remove unnecessary clearing of status fields...
r22523 elif listclean:
various
hgext: add largefiles extension...
r15168 clean.append(lfile)
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 else:
added.append(lfile)
various
hgext: add largefiles extension...
r15168
FUJIWARA Katsunori
largefiles: ignore removal status of files not managed in the target context...
r23089 # at this point, 'removed' contains largefiles
# marked as 'R' in the working context.
# then, largefiles not managed also in the target
# context should be excluded from 'removed'.
removed = [lfile for lfile in removed
if lfutil.standin(lfile) in ctx1]
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 # Standins no longer found in lfdirstate have been deleted
Martin von Zweigbergk
largefiles: simplify iteration over standins...
r22525 for standin in ctx1.walk(lfutil.getstandinmatcher(self)):
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 lfile = lfutil.splitstandin(standin)
if not match(lfile):
continue
if lfile not in lfdirstate:
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 deleted.append(lfile)
# Sync "largefile has been removed" back to the
# standin. Removing a file as a side effect of
# running status is gross, but the alternatives (if
# any) are worse.
Mads Kiilerich
largefiles: handle that a found standin file doesn't exist when removing it...
r30233 self.wvfs.unlinkpath(standin, ignoremissing=True)
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 # Filter result lists
result = list(result)
Mads Kiilerich
largefiles: wlock in status before lfdirstate.write()
r19056
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 # Largefiles are not really removed when they're
# still in the normal dirstate. Likewise, normal
# files are not really removed if they are still in
# lfdirstate. This happens in merges where files
# change type.
removed = [f for f in removed
if f not in self.dirstate]
result[2] = [f for f in result[2]
if f not in lfdirstate]
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 lfiles = set(lfdirstate._map)
# Unknown files
result[4] = set(result[4]).difference(lfiles)
# Ignored files
result[5] = set(result[5]).difference(lfiles)
# combine normal files and largefiles
normals = [[fn for fn in filelist
if not lfutil.isstandin(fn)]
for filelist in result]
Mads Kiilerich
largefiles: fix 'deleted' files sometimes persistently appearing with R status...
r30191 lfstatus = (modified, added, removed, deleted, [], [],
Martin von Zweigbergk
largefiles: avoid using 'lfiles' variable for two purposes...
r22524 clean)
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 result = [sorted(list1 + list2)
Martin von Zweigbergk
largefiles: avoid using 'lfiles' variable for two purposes...
r22524 for (list1, list2) in zip(normals, lfstatus)]
Mads Kiilerich
largefiles: inline redundant toname function in status...
r23044 else: # not against working directory
result = [[lfutil.splitstandin(f) or f for f in items]
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 for items in result]
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663
Martin von Zweigbergk
largefiles: reduce indentation by dropping 'else' block after 'return'
r22515 if wlock:
lfdirstate.write()
finally:
if wlock:
wlock.release()
various
hgext: add largefiles extension...
r15168
Matt Harbison
largefiles: revert to lfilesrepo.status() being an unfiltered method...
r23958 self.lfstatus = True
Martin von Zweigbergk
status: update various other methods to return new class
r22914 return scmutil.status(*result)
various
hgext: add largefiles extension...
r15168
FUJIWARA Katsunori
largefiles: factor out procedures to update lfdirstate for post-committing...
r23184 def commitctx(self, ctx, *args, **kwargs):
node = super(lfilesrepo, self).commitctx(ctx, *args, **kwargs)
class lfilesctx(ctx.__class__):
def markcommitted(self, node):
orig = super(lfilesctx, self).markcommitted
return lfutil.markcommitted(orig, self, node)
ctx.__class__ = lfilesctx
various
hgext: add largefiles extension...
r15168 return node
Greg Ward
largefiles: more work on cleaning up comments...
r15254 # Before commit, largefile standins have not had their
# contents updated to reflect the hash of their largefile.
# Do that here.
various
hgext: add largefiles extension...
r15168 def commit(self, text="", user=None, date=None, match=None,
Pierre-Yves David
largefiles: don't use mutable default argument value...
r31410 force=False, editor=False, extra=None):
if extra is None:
extra = {}
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 orig = super(lfilesrepo, self).commit
various
hgext: add largefiles extension...
r15168
Bryan O'Sullivan
with: use context manager in largefiles commit
r27842 with self.wlock():
FUJIWARA Katsunori
largefiles: introduce "_lfcommithooks" to abstract pre-committing procedures...
r23186 lfcommithook = self._lfcommithooks[-1]
match = lfcommithook(self, match)
Levi Bard
largefiles: fix inappropriate locking (issue3182)...
r15794 result = orig(text=text, user=user, date=date, match=match,
various
hgext: add largefiles extension...
r15168 force=force, editor=editor, extra=extra)
Levi Bard
largefiles: fix inappropriate locking (issue3182)...
r15794 return result
various
hgext: add largefiles extension...
r15168
def push(self, remote, force=False, revs=None, newbranch=False):
FUJIWARA Katsunori
largefiles: setup "largefiles" feature in each repositories individually...
r19779 if remote.local():
missing = set(self.requirements) - remote.local().supported
if missing:
msg = _("required features are not"
" supported in the destination:"
" %s") % (', '.join(sorted(missing)))
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(msg)
Long Vu
largefiles: call super class method with proper kwargs to respect API...
r20177 return super(lfilesrepo, self).push(remote, force=force, revs=revs,
newbranch=newbranch)
various
hgext: add largefiles extension...
r15168
FUJIWARA Katsunori
largefiles: factor out procedures to update standins for pre-committing...
r23185 # TODO: _subdirlfs should be moved into "lfutil.py", because
# it is referred only from "lfutil.updatestandinsbymatch"
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 def _subdirlfs(self, files, lfiles):
'''
Adjust matched file list
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23543 If we pass a directory to commit whose only committable files
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 are largefiles, the core commit code aborts before finding
the largefiles.
So we do the following:
For directories that only have largefiles as matches,
Mads Kiilerich
spelling: fix some minor issues found by spell checker
r18644 we explicitly add the largefiles to the match list and remove
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 the directory.
In other cases, we leave the match list unmodified.
'''
actualfiles = []
dirs = []
regulars = []
for f in files:
if lfutil.isstandin(f + '/'):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 _('file "%s" is a largefile standin') % f,
hint=('commit the largefile itself instead'))
# Scan directories
liscju
largefiles: replace invocation of os.path module by vfs in reposetup.py...
r28716 if self.wvfs.isdir(f):
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 dirs.append(f)
else:
regulars.append(f)
for f in dirs:
matcheddir = False
d = self.dirstate.normalize(f) + '/'
# Check for matched normal files
for mf in regulars:
if self.dirstate.normalize(mf).startswith(d):
actualfiles.append(f)
matcheddir = True
break
if not matcheddir:
# If no normal match, manually append
# any matching largefiles
for lf in lfiles:
if self.dirstate.normalize(lf).startswith(d):
actualfiles.append(lf)
if not matcheddir:
Matt Harbison
largefiles: fix commit of a directory with no largefile changes (issue4330)...
r23923 # There may still be normal files in the dir, so
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r24180 # add a directory to the list, which
Matt Harbison
largefiles: update _subdirlfs() comment...
r24007 # forces status/dirstate to walk all files and
# call the match function on the matcher, even
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r24180 # on case sensitive filesystems.
Matt Harbison
largefiles: fix commit of a directory with no largefile changes (issue4330)...
r23923 actualfiles.append('.')
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 matcheddir = True
# Nothing in dir, so readd it
# and let commit reject it
if not matcheddir:
actualfiles.append(f)
# Always add normal files
actualfiles += regulars
return actualfiles
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 repo.__class__ = lfilesrepo
various
hgext: add largefiles extension...
r15168
FUJIWARA Katsunori
largefiles: introduce "_lfcommithooks" to abstract pre-committing procedures...
r23186 # stack of hooks being executed before committing.
# only last element ("_lfcommithooks[-1]") is used for each committing.
repo._lfcommithooks = [lfutil.updatestandinsbymatch]
FUJIWARA Katsunori
largefiles: introduce "_lfstatuswriters" to customize status reporting...
r23188 # Stack of status writer functions taking "*msg, **opts" arguments
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r23543 # like "ui.status()". Only last element ("_lfstatuswriters[-1]")
FUJIWARA Katsunori
largefiles: introduce "_lfstatuswriters" to customize status reporting...
r23188 # is used to write status out.
repo._lfstatuswriters = [ui.status]
Mads Kiilerich
localrepo: refactor prepushoutgoinghook to take a pushop...
r28876 def prepushoutgoinghook(pushop):
Mads Kiilerich
largefiles: introduce push --lfrev to control which revisions are pushed...
r28878 """Push largefiles for pushop before pushing revisions."""
lfrevs = pushop.lfrevs
if lfrevs is None:
lfrevs = pushop.outgoing.missing
if lfrevs:
FUJIWARA Katsunori
largefiles: reuse "findcommonoutgoing()" result at "hg push"...
r21044 toupload = set()
addfunc = lambda fn, lfhash: toupload.add(lfhash)
Mads Kiilerich
largefiles: introduce push --lfrev to control which revisions are pushed...
r28878 lfutil.getlfilestoupload(pushop.repo, lfrevs,
Mads Kiilerich
localrepo: refactor prepushoutgoinghook to take a pushop...
r28876 addfunc)
lfcommands.uploadlfiles(ui, pushop.repo, pushop.remote, toupload)
FUJIWARA Katsunori
largefiles: reuse "findcommonoutgoing()" result at "hg push"...
r21044 repo.prepushoutgoinghooks.add("largefiles", prepushoutgoinghook)
various
hgext: add largefiles extension...
r15168 def checkrequireslfiles(ui, repo, **kwargs):
Augie Fackler
cleanup: use __builtins__.any instead of util.any...
r25149 if 'largefiles' not in repo.requirements and any(
various
hgext: add largefiles extension...
r15168 lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()):
Eli Carter
largefiles: remove 1.9 compat code
r15312 repo.requirements.add('largefiles')
various
hgext: add largefiles extension...
r15168 repo._writerequirements()
Mads Kiilerich
config: set a 'source' in most cases where config don't come from file but code...
r20790 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles,
'largefiles')
ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles')