##// END OF EJS Templates
histedit: correct the number of added revisions in online help...
histedit: correct the number of added revisions in online help In the context of help document on which this patch focuses, the example repository, which is source of cloning, should be already histedit-ed, and contain only 3 revisions (rev # 0 to 2). So, not 3, but 4 revisions should be added to the destination repository of cloning, if it contains 7 revisions (rev # 0 to 6). This patch also adds modifier "histedit-ed" to "example repository", to make context clear.

File last commit:

r18182:e6db64ab default
r18323:7648b87e stable
Show More
reposetup.py
525 lines | 24.2 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'''
import copy
import types
import os
Levi Bard
largefiles: Fix parser warning: redefinition of unused 'node' from line 14
r15789 from mercurial import context, error, manifest, match as match_, util
from mercurial import node as node_
various
hgext: add largefiles extension...
r15168 from mercurial.i18n import _
import lfcommands
import proto
import lfutil
def reposetup(ui, repo):
# wire repositories should be given new wireproto functions but not the
# other largefiles modifications
if not repo.local():
return proto.wirereposetup(ui, repo)
for name in ('status', 'commitctx', 'commit', 'push'):
method = getattr(repo, name)
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 if (isinstance(method, types.FunctionType) and
method.func_name == 'wrap'):
various
hgext: add largefiles extension...
r15168 ui.warn(_('largefiles: repo method %r appears to have already been'
' wrapped by another extension: '
'largefiles may behave incorrectly\n')
% name)
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 class lfilesrepo(repo.__class__):
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)
various
hgext: add largefiles extension...
r15168 if self.lfstatus:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 class lfilesmanifestdict(manifest.manifestdict):
various
hgext: add largefiles extension...
r15168 def __contains__(self, filename):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 if super(lfilesmanifestdict,
various
hgext: add largefiles extension...
r15168 self).__contains__(filename):
return True
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return super(lfilesmanifestdict,
Martin Geisler
largefiles: use lfutil functions...
r15628 self).__contains__(lfutil.standin(filename))
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()
man1.__class__ = lfilesmanifestdict
various
hgext: add largefiles extension...
r15168 return man1
def filectx(self, path, fileid=None, filelog=None):
try:
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 if filelog is not None:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 result = super(lfilesctx, self).filectx(
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 path, fileid, filelog)
else:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 result = super(lfilesctx, self).filectx(
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 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:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 result = super(lfilesctx, self).filectx(
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 lfutil.standin(path), fileid, filelog)
else:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 result = super(lfilesctx, self).filectx(
Dan Villiom Podlaski Christiansen
largefiles: don't break filesets
r16141 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.
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
if not self.lfstatus:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return super(lfilesrepo, self).status(node1, node2, match,
Martin Geisler
largefiles: remove pre-1.7 compatibility code...
r15626 listignored, listclean, listunknown, listsubrepos)
various
hgext: add largefiles extension...
r15168 else:
# some calls in this function rely on the old version of status
self.lfstatus = False
if isinstance(node1, context.changectx):
ctx1 = node1
else:
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 ctx1 = self[node1]
various
hgext: add largefiles extension...
r15168 if isinstance(node2, context.changectx):
ctx2 = node2
else:
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 ctx2 = self[node2]
various
hgext: add largefiles extension...
r15168 working = ctx2.rev() is None
parentworking = working and ctx1 == self['.']
def inctx(file, ctx):
try:
if ctx.rev() is None:
return file in ctx.manifest()
ctx[file]
return True
Matt Mackall
largefiles: eliminate naked exceptions
r15171 except KeyError:
various
hgext: add largefiles extension...
r15168 return False
if match is None:
match = match_.always(self.root, self.getcwd())
Na'Tosha Bard
largefiles: optimize status when files are specified (issue3144)...
r15653 # First check if there were files specified on the
# command line. If there were, and none of them were
# largefiles, we should just bail here and let super
# handle it -- thus gaining a big performance boost.
lfdirstate = lfutil.openlfdirstate(ui, self)
if match.files() and not match.anypats():
FUJIWARA Katsunori
largefiles: check whether specified patterns are related to largefiles strictly...
r16110 for f in lfdirstate:
if match(f):
break
else:
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return super(lfilesrepo, self).status(node1, node2,
Na'Tosha Bard
largefiles: optimize status when files are specified (issue3144)...
r15653 match, listignored, listclean,
listunknown, listsubrepos)
Greg Ward
largefiles: more work on cleaning up comments...
r15254 # Create a copy of match that matches standins instead
# of largefiles.
Patrick Mezard
largefiles: fix "hg status dir" missing regular files (issue3421)...
r16586 def tostandins(files):
if not working:
return files
newfiles = []
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 dirstate = self.dirstate
Patrick Mezard
largefiles: fix "hg status dir" missing regular files (issue3421)...
r16586 for f in files:
sf = lfutil.standin(f)
if sf in dirstate:
newfiles.append(sf)
elif sf in dirstate.dirs():
# Directory entries could be regular or
# standin, check both
newfiles.extend((f, sf))
else:
newfiles.append(f)
return newfiles
various
hgext: add largefiles extension...
r15168
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # Create a function that we can use to override what is
# normally the ignore matcher. We've already checked
# for ignored files on the first dirstate walk, and
Mads Kiilerich
fix trivial spelling errors
r17424 # unnecessarily re-checking here causes a huge performance
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # hit because lfdirstate only knows about largefiles
def _ignoreoverride(self):
return False
various
hgext: add largefiles extension...
r15168 m = copy.copy(match)
Patrick Mezard
largefiles: fix "hg status dir" missing regular files (issue3421)...
r16586 m._files = tostandins(m._files)
various
hgext: add largefiles extension...
r15168
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 result = super(lfilesrepo, self).status(node1, node2, m,
Mads Kiilerich
largefiles: don't walk through all ignored files...
r18141 ignored, clean, unknown, listsubrepos)
various
hgext: add largefiles extension...
r15168 if working:
try:
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # Any non-largefiles that were explicitly listed must be
various
hgext: add largefiles extension...
r15168 # taken out or lfdirstate.status will report an error.
# The status of these files was already computed using
# super's status.
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # Override lfdirstate's ignore matcher to not do
# anything
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 origignore = lfdirstate._ignore
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 lfdirstate._ignore = _ignoreoverride
FUJIWARA Katsunori
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check...
r16282 def sfindirstate(f):
sf = lfutil.standin(f)
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 dirstate = self.dirstate
FUJIWARA Katsunori
largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check...
r16282 return sf in dirstate or sf in dirstate.dirs()
match._files = [f for f in match._files
if sfindirstate(f)]
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # Don't waste time getting the ignored and unknown
# files again; we already have them
s = lfdirstate.status(match, [], False,
listclean, False)
various
hgext: add largefiles extension...
r15168 (unsure, modified, added, removed, missing, unknown,
ignored, clean) = s
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # Replace the list of ignored and unknown files with
Mads Kiilerich
fix trivial spelling errors
r17424 # the previously calculated lists, and strip out the
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # largefiles
lfiles = set(lfdirstate._map)
ignored = set(result[5]).difference(lfiles)
unknown = set(result[4]).difference(lfiles)
various
hgext: add largefiles extension...
r15168 if parentworking:
for lfile in unsure:
Martin Geisler
largefiles: fix 'hg status' abort after merge...
r15629 standin = lfutil.standin(lfile)
if standin not in ctx1:
# from second parent
modified.append(lfile)
elif ctx1[standin].data().strip() \
various
hgext: add largefiles extension...
r15168 != lfutil.hashfile(self.wjoin(lfile)):
modified.append(lfile)
else:
clean.append(lfile)
lfdirstate.normal(lfile)
else:
tocheck = unsure + modified + added + clean
modified, added, clean = [], [], []
for lfile in tocheck:
standin = lfutil.standin(lfile)
if inctx(standin, ctx1):
if ctx1[standin].data().strip() != \
lfutil.hashfile(self.wjoin(lfile)):
modified.append(lfile)
else:
clean.append(lfile)
else:
added.append(lfile)
Levi Bard
largefiles: fix inappropriate locking (issue3182)...
r15794 finally:
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # Replace the original ignore function
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 lfdirstate._ignore = origignore
various
hgext: add largefiles extension...
r15168
for standin in ctx1.manifest():
if not lfutil.isstandin(standin):
continue
lfile = lfutil.splitstandin(standin)
if not match(lfile):
continue
if lfile not in lfdirstate:
removed.append(lfile)
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663
# Filter result lists
various
hgext: add largefiles extension...
r15168 result = list(result)
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663
# Largefiles are not really removed when they're
# still in the normal dirstate. Likewise, normal
# files are not really removed if it's still in
# lfdirstate. This happens in merges where files
# change type.
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 removed = [f for f in removed if f not in self.dirstate]
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663 result[2] = [f for f in result[2] if f not in lfdirstate]
various
hgext: add largefiles extension...
r15168 # Unknown files
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 unknown = set(unknown).difference(ignored)
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 result[4] = [f for f in unknown
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 if (self.dirstate[f] == '?' and
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 not lfutil.isstandin(f))]
Na'Tosha Bard
largefiles: optimize performance of status on largefiles repos (issue3136)
r15617 # Ignored files were calculated earlier by the dirstate,
# and we already stripped out the largefiles from the list
result[5] = ignored
Greg Ward
largefiles: more work on cleaning up comments...
r15254 # combine normal files and largefiles
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 normals = [[fn for fn in filelist
if not lfutil.isstandin(fn)]
for filelist in result]
Martin Geisler
largefiles: handle merges between normal files and largefiles (issue3084)...
r15663 lfiles = (modified, added, removed, missing, [], [], clean)
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 result = [sorted(list1 + list2)
for (list1, list2) in zip(normals, lfiles)]
various
hgext: add largefiles extension...
r15168 else:
def toname(f):
if lfutil.isstandin(f):
return lfutil.splitstandin(f)
return f
result = [[toname(f) for f in items] for items in result]
Mads Kiilerich
largefiles status: update lfdirstate with result from cleanliness check...
r18139 lfdirstate.write()
various
hgext: add largefiles extension...
r15168 if not listunknown:
result[4] = []
if not listignored:
result[5] = []
if not listclean:
result[6] = []
self.lfstatus = True
return result
Greg Ward
largefiles: more work on cleaning up comments...
r15254 # As part of committing, copy all of the largefiles into the
# cache.
various
hgext: add largefiles extension...
r15168 def commitctx(self, *args, **kwargs):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 node = super(lfilesrepo, self).commitctx(*args, **kwargs)
Dan Villiom Podlaski Christiansen
largefiles: factor out a copyalltostore() function
r15796 lfutil.copyalltostore(self, node)
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,
force=False, editor=False, 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
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 wlock = self.wlock()
various
hgext: add largefiles extension...
r15168 try:
Na'Tosha Bard
largefiles: fix transplant for all cases (issue3192)
r15982 # Case 0: Rebase or Transplant
Na'Tosha Bard
largefiles: correctly handle dirstate status when rebasing...
r15793 # We have to take the time to pull down the new largefiles now.
Na'Tosha Bard
largefiles: fix transplant for all cases (issue3192)
r15982 # Otherwise, any largefiles that were modified in the
# destination changesets get overwritten, either by the rebase
# or in the first commit after the rebase or transplant.
Na'Tosha Bard
largefiles: correctly handle dirstate status when rebasing...
r15793 # updatelfiles will update the dirstate to mark any pulled
# largefiles as modified
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 if getattr(self, "_isrebasing", False) or \
getattr(self, "_istransplanting", False):
lfcommands.updatelfiles(self.ui, self, filelist=None,
Na'Tosha Bard
largefiles: fix transplant for all cases (issue3192)
r15982 printmessage=False)
Na'Tosha Bard
largefiles: correctly handle dirstate status when rebasing...
r15793 result = orig(text=text, user=user, date=date, match=match,
force=force, editor=editor, extra=extra)
return result
various
hgext: add largefiles extension...
r15168 # Case 1: user calls commit with no specific files or
Na'Tosha Bard
largefiles: speed up commit by only rewriting standins for modified largefiles
r15250 # include/exclude patterns: refresh and commit all files that
# are "dirty".
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 if ((match is None) or
(not match.anypats() and not match.files())):
Na'Tosha Bard
largefiles: speed up commit by only rewriting standins for modified largefiles
r15250 # Spend a bit of time here to get a list of files we know
# are modified so we can compare only against those.
# It can cost a lot of time (several seconds)
# otherwise to update all standins if the largefiles are
# large.
lfdirstate = lfutil.openlfdirstate(ui, self)
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 dirtymatch = match_.always(self.root, self.getcwd())
Na'Tosha Bard
largefiles: speed up commit by only rewriting standins for modified largefiles
r15250 s = lfdirstate.status(dirtymatch, [], False, False, False)
modifiedfiles = []
for i in s:
modifiedfiles.extend(i)
various
hgext: add largefiles extension...
r15168 lfiles = lfutil.listlfiles(self)
Greg Ward
largefiles: more work on cleaning up comments...
r15254 # this only loops through largefiles that exist (not
various
hgext: add largefiles extension...
r15168 # removed/renamed)
for lfile in lfiles:
Na'Tosha Bard
largefiles: speed up commit by only rewriting standins for modified largefiles
r15250 if lfile in modifiedfiles:
Na'Tosha Bard
largefiles: fix check-code errors.
r16248 if os.path.exists(
self.wjoin(lfutil.standin(lfile))):
Na'Tosha Bard
largefiles: speed up commit by only rewriting standins for modified largefiles
r15250 # this handles the case where a rebase is being
# performed and the working copy is not updated
# yet.
if os.path.exists(self.wjoin(lfile)):
lfutil.updatestandin(self,
lfutil.standin(lfile))
lfdirstate.normal(lfile)
Levi Bard
largefiles: fix inappropriate locking (issue3182)...
r15794
result = orig(text=text, user=user, date=date, match=match,
force=force, editor=editor, extra=extra)
Matt Harbison
largefiles: defer lfdirstate.drop() until after commit (issue3364)...
r17230
if result is not None:
for lfile in lfdirstate:
if lfile in modifiedfiles:
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 if (not os.path.exists(self.wjoin(
Matt Harbison
largefiles: defer lfdirstate.drop() until after commit (issue3364)...
r17230 lfutil.standin(lfile)))) or \
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 (not os.path.exists(self.wjoin(lfile))):
Matt Harbison
largefiles: defer lfdirstate.drop() until after commit (issue3364)...
r17230 lfdirstate.drop(lfile)
Levi Bard
largefiles: fix inappropriate locking (issue3182)...
r15794 # This needs to be after commit; otherwise precommit hooks
# get the wrong status
various
hgext: add largefiles extension...
r15168 lfdirstate.write()
Levi Bard
largefiles: fix inappropriate locking (issue3182)...
r15794 return result
various
hgext: add largefiles extension...
r15168
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 lfiles = lfutil.listlfiles(self)
match._files = self._subdirlfs(match.files(), lfiles)
various
hgext: add largefiles extension...
r15168
# Case 2: user calls commit with specified patterns: refresh
# any matching big files.
smatcher = lfutil.composestandinmatcher(self, match)
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 standins = lfutil.dirstatewalk(self.dirstate, smatcher)
various
hgext: add largefiles extension...
r15168
# No matching big files: get out of the way and pass control to
# the usual commit() method.
if not standins:
return orig(text=text, user=user, date=date, match=match,
force=force, editor=editor, extra=extra)
# Refresh all matching big files. It's possible that the
# commit will end up failing, in which case the big files will
# stay refreshed. No harm done: the user modified them and
# asked to commit them, so sooner or later we're going to
# refresh the standins. Might as well leave them refreshed.
lfdirstate = lfutil.openlfdirstate(ui, self)
for standin in standins:
lfile = lfutil.splitstandin(standin)
if lfdirstate[lfile] <> 'r':
lfutil.updatestandin(self, standin)
lfdirstate.normal(lfile)
else:
Na'Tosha Bard
largefiles: remove pre-1.9 code from extension first bundled with 1.9
r15224 lfdirstate.drop(lfile)
various
hgext: add largefiles extension...
r15168
# Cook up a new matcher that only matches regular files or
# standins corresponding to the big files requested by the
# user. Have to modify _files to prevent commit() from
# complaining "not tracked" for big files.
match = copy.copy(match)
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 origmatchfn = match.matchfn
various
hgext: add largefiles extension...
r15168
Greg Ward
largefiles: more work on cleaning up comments...
r15254 # Check both the list of largefiles and the list of
# standins because if a largefile was removed, it
# won't be in the list of largefiles at this point
various
hgext: add largefiles extension...
r15168 match._files += sorted(standins)
actualfiles = []
for f in match._files:
fstandin = lfutil.standin(f)
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # ignore known largefiles and standins
various
hgext: add largefiles extension...
r15168 if f in lfiles or fstandin in standins:
continue
Greg Ward
largefiles: improve comments, internal docstrings...
r15252 # append directory separator to avoid collisions
various
hgext: add largefiles extension...
r15168 if not fstandin.endswith(os.sep):
fstandin += os.sep
actualfiles.append(f)
match._files = actualfiles
def matchfn(f):
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 if origmatchfn(f):
various
hgext: add largefiles extension...
r15168 return f not in lfiles
else:
return f in standins
match.matchfn = matchfn
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 # This needs to be after commit; otherwise precommit hooks
# get the wrong status
lfdirstate.write()
return result
various
hgext: add largefiles extension...
r15168 finally:
wlock.release()
def push(self, remote, force=False, revs=None, newbranch=False):
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 o = lfutil.findoutgoing(self, remote, force)
various
hgext: add largefiles extension...
r15168 if o:
toupload = set()
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 o = self.changelog.nodesbetween(o, revs)[0]
various
hgext: add largefiles extension...
r15168 for n in o:
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 parents = [p for p in self.changelog.parents(n)
Levi Bard
largefiles: Fix parser warning: redefinition of unused 'node' from line 14
r15789 if p != node_.nullid]
Pierre-Yves David
largefile: use `self` in repo method instead of `repo`...
r17803 ctx = self[n]
various
hgext: add largefiles extension...
r15168 files = set(ctx.files())
if len(parents) == 2:
mc = ctx.manifest()
mp1 = ctx.parents()[0].manifest()
mp2 = ctx.parents()[1].manifest()
for f in mp1:
if f not in mc:
files.add(f)
for f in mp2:
if f not in mc:
files.add(f)
for f in mc:
if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f,
None):
files.add(f)
Greg Ward
largefiles: cosmetics, whitespace, code style...
r15255 toupload = toupload.union(
set([ctx[f].data().strip()
for f in files
if lfutil.isstandin(f) and f in ctx]))
various
hgext: add largefiles extension...
r15168 lfcommands.uploadlfiles(ui, self, remote, toupload)
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
r16247 return super(lfilesrepo, self).push(remote, force, revs,
Na'Tosha Bard
largefiles: remove pre-1.9 code from extension first bundled with 1.9
r15224 newbranch)
various
hgext: add largefiles extension...
r15168
Levi Bard
largefiles: commit directories that only contain largefiles (issue3548)...
r18064 def _subdirlfs(self, files, lfiles):
'''
Adjust matched file list
If we pass a directory to commit whose only commitable files
are largefiles, the core commit code aborts before finding
the largefiles.
So we do the following:
For directories that only have largefiles as matches,
we explicitly add the largefiles to the matchlist and remove
the directory.
In other cases, we leave the match list unmodified.
'''
actualfiles = []
dirs = []
regulars = []
for f in files:
if lfutil.isstandin(f + '/'):
raise util.Abort(
_('file "%s" is a largefile standin') % f,
hint=('commit the largefile itself instead'))
# Scan directories
if os.path.isdir(self.wjoin(f)):
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:
actualfiles.append(lfutil.standin(f))
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
def checkrequireslfiles(ui, repo, **kwargs):
Benjamin Pollack
largefiles: remove redundant any_ function
r15319 if 'largefiles' not in repo.requirements and util.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()
ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles)
ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles)