mercurial-scm/hg: hgext/largefiles/reposetup.py annotate

annotate hgext/largefiles/reposetup.py @ 19570:f69ebcb06ce2

largefiles: remove unnecessary check of instance The refactoring of all the context objects allows us to simply pass a basectx to the __new__ constructor and have it return the same object without allocating new memory. This also removes the need to import the context module.

author	Sean Farley <sean.michael.farley@gmail.com>
date	Tue, 06 Aug 2013 15:10:09 -0500
parents	ce4472b2edb2
children	fb6e87d93948

rev	line source
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1 # Copyright 2009-2010 Gregory P. Ward
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	3 # Copyright 2010-2011 Fog Creek Software
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	4 # Copyright 2010-2011 Unity Technologies
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	5 #
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	6 # This software may be used and distributed according to the terms of the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	7 # GNU General Public License version 2 or any later version.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	8
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	9 '''setup for largefiles repositories: reposetup'''
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	10 import copy
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	11 import os
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	12
19570 f69ebcb06ce2 largefiles: remove unnecessary check of instance Sean Farley <sean.michael.farley@gmail.com> parents: 19088 diff changeset	13 from mercurial import error, manifest, match as match_, util, discovery
15789 2c10ea43c801 largefiles: Fix parser warning: redefinition of unused 'node' from line 14 Levi Bard <levi@unity3d.com> parents: 15783 diff changeset	14 from mercurial import node as node_
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	15 from mercurial.i18n import _
18012 848c428bb5ee largefile: status is buggy on repoproxy, so run unfiltered Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17803 diff changeset	16 from mercurial import localrepo
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	17
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	18 import lfcommands
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	19 import proto
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	20 import lfutil
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	21
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	22 def reposetup(ui, repo):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	23 # wire repositories should be given new wireproto functions but not the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	24 # other largefiles modifications
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	25 if not repo.local():
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	26 return proto.wirereposetup(ui, repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	27
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	28 class lfilesrepo(repo.__class__):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	29 lfstatus = False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	30 def status_nolfiles(self, args, *kwargs):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	31 return super(lfilesrepo, self).status(args, *kwargs)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	32
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	33 # When lfstatus is set, return a context that gives the names
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	34 # of largefiles instead of their corresponding standins and
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	35 # identifies the largefiles as always binary, regardless of
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	36 # their actual contents.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	37 def __getitem__(self, changeid):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	38 ctx = super(lfilesrepo, self).__getitem__(changeid)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	39 if self.lfstatus:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	40 class lfilesmanifestdict(manifest.manifestdict):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	41 def __contains__(self, filename):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	42 if super(lfilesmanifestdict,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	43 self).__contains__(filename):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	44 return True
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	45 return super(lfilesmanifestdict,
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	46 self).__contains__(lfutil.standin(filename))
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	47 class lfilesctx(ctx.__class__):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	48 def files(self):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	49 filenames = super(lfilesctx, self).files()
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	50 return [lfutil.splitstandin(f) or f for f in filenames]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	51 def manifest(self):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	52 man1 = super(lfilesctx, self).manifest()
d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	53 man1.__class__ = lfilesmanifestdict
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	54 return man1
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	55 def filectx(self, path, fileid=None, filelog=None):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	56 try:
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	57 if filelog is not None:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	58 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	59 path, fileid, filelog)
f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	60 else:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	61 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	62 path, fileid)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	63 except error.LookupError:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	64 # Adding a null character will cause Mercurial to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	65 # identify this as a binary file.
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	66 if filelog is not None:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	67 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	68 lfutil.standin(path), fileid, filelog)
f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	69 else:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	70 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	71 lfutil.standin(path), fileid)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	72 olddata = result.data
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	73 result.data = lambda: olddata() + '\0'
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	74 return result
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	75 ctx.__class__ = lfilesctx
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	76 return ctx
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	77
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	78 # Figure out the status of big files and insert them into the
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	79 # appropriate list in the result. Also removes standin files
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	80 # from the listing. Revert to the original status if
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	81 # self.lfstatus is False.
18012 848c428bb5ee largefile: status is buggy on repoproxy, so run unfiltered Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17803 diff changeset	82 # XXX large file status is buggy when used on repo proxy.
848c428bb5ee largefile: status is buggy on repoproxy, so run unfiltered Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17803 diff changeset	83 # XXX this needs to be investigated.
18016 2a393df0f5cc clfilter: rename `unfilteredmeth` to `unfilteredmethod` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18012 diff changeset	84 @localrepo.unfilteredmethod
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	85 def status(self, node1='.', node2=None, match=None, ignored=False,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	86 clean=False, unknown=False, listsubrepos=False):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	87 listignored, listclean, listunknown = ignored, clean, unknown
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	88 if not self.lfstatus:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	89 return super(lfilesrepo, self).status(node1, node2, match,
15626 931dc4af0d95 largefiles: remove pre-1.7 compatibility code Martin Geisler <mg@aragost.com> parents: 15617 diff changeset	90 listignored, listclean, listunknown, listsubrepos)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	91 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	92 # some calls in this function rely on the old version of status
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	93 self.lfstatus = False
19570 f69ebcb06ce2 largefiles: remove unnecessary check of instance Sean Farley <sean.michael.farley@gmail.com> parents: 19088 diff changeset	94 ctx1 = self[node1]
f69ebcb06ce2 largefiles: remove unnecessary check of instance Sean Farley <sean.michael.farley@gmail.com> parents: 19088 diff changeset	95 ctx2 = self[node2]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	96 working = ctx2.rev() is None
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	97 parentworking = working and ctx1 == self['.']
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	98
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	99 def inctx(file, ctx):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	100 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	101 if ctx.rev() is None:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	102 return file in ctx.manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	103 ctx[file]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	104 return True
15171 547da6115d1d largefiles: eliminate naked exceptions Matt Mackall <mpm@selenic.com> parents: 15170 diff changeset	105 except KeyError:
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	106 return False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	107
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	108 if match is None:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	109 match = match_.always(self.root, self.getcwd())
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	110
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	111 wlock = None
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	112 try:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	113 try:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	114 # updating the dirstate is optional
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	115 # so we don't wait on the lock
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	116 wlock = self.wlock(False)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	117 except error.LockError:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	118 pass
15653 93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	119
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	120 # First check if there were files specified on the
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	121 # command line. If there were, and none of them were
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	122 # largefiles, we should just bail here and let super
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	123 # handle it -- thus gaining a big performance boost.
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	124 lfdirstate = lfutil.openlfdirstate(ui, self)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	125 if match.files() and not match.anypats():
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	126 for f in lfdirstate:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	127 if match(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	128 break
16586 ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421) Patrick Mezard <patrick@mezard.eu> parents: 16571 diff changeset	129 else:
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	130 return super(lfilesrepo, self).status(node1, node2,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	131 match, listignored, listclean,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	132 listunknown, listsubrepos)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	133
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	134 # Create a copy of match that matches standins instead
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	135 # of largefiles.
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	136 def tostandins(files):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	137 if not working:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	138 return files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	139 newfiles = []
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	140 dirstate = self.dirstate
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	141 for f in files:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	142 sf = lfutil.standin(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	143 if sf in dirstate:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	144 newfiles.append(sf)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	145 elif sf in dirstate.dirs():
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	146 # Directory entries could be regular or
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	147 # standin, check both
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	148 newfiles.extend((f, sf))
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	149 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	150 newfiles.append(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	151 return newfiles
18149 2dcc3653b361 largefiles: unindent code Mads Kiilerich <madski@unity3d.com> parents: 18148 diff changeset	152
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	153 m = copy.copy(match)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	154 m._files = tostandins(m._files)
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	155
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	156 result = super(lfilesrepo, self).status(node1, node2, m,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	157 ignored, clean, unknown, listsubrepos)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	158 if working:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	159
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	160 def sfindirstate(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	161 sf = lfutil.standin(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	162 dirstate = self.dirstate
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	163 return sf in dirstate or sf in dirstate.dirs()
18149 2dcc3653b361 largefiles: unindent code Mads Kiilerich <madski@unity3d.com> parents: 18148 diff changeset	164
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	165 match._files = [f for f in match._files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	166 if sfindirstate(f)]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	167 # Don't waste time getting the ignored and unknown
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	168 # files from lfdirstate
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	169 s = lfdirstate.status(match, [], False,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	170 listclean, False)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	171 (unsure, modified, added, removed, missing, _unknown,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	172 _ignored, clean) = s
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	173 if parentworking:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	174 for lfile in unsure:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	175 standin = lfutil.standin(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	176 if standin not in ctx1:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	177 # from second parent
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	178 modified.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	179 elif ctx1[standin].data().strip() \
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	180 != lfutil.hashfile(self.wjoin(lfile)):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	181 modified.append(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	182 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	183 clean.append(lfile)
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	184 lfdirstate.normal(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	185 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	186 tocheck = unsure + modified + added + clean
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	187 modified, added, clean = [], [], []
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	188
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	189 for lfile in tocheck:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	190 standin = lfutil.standin(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	191 if inctx(standin, ctx1):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	192 if ctx1[standin].data().strip() != \
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	193 lfutil.hashfile(self.wjoin(lfile)):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	194 modified.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	195 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	196 clean.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	197 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	198 added.append(lfile)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	199
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	200 # Standins no longer found in lfdirstate has been
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	201 # removed
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	202 for standin in ctx1.manifest():
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	203 if not lfutil.isstandin(standin):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	204 continue
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	205 lfile = lfutil.splitstandin(standin)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	206 if not match(lfile):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	207 continue
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	208 if lfile not in lfdirstate:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	209 removed.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	210
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	211 # Filter result lists
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	212 result = list(result)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	213
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	214 # Largefiles are not really removed when they're
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	215 # still in the normal dirstate. Likewise, normal
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	216 # files are not really removed if they are still in
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	217 # lfdirstate. This happens in merges where files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	218 # change type.
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	219 removed = [f for f in removed
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	220 if f not in self.dirstate]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	221 result[2] = [f for f in result[2]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	222 if f not in lfdirstate]
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	223
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	224 lfiles = set(lfdirstate._map)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	225 # Unknown files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	226 result[4] = set(result[4]).difference(lfiles)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	227 # Ignored files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	228 result[5] = set(result[5]).difference(lfiles)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	229 # combine normal files and largefiles
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	230 normals = [[fn for fn in filelist
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	231 if not lfutil.isstandin(fn)]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	232 for filelist in result]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	233 lfiles = (modified, added, removed, missing, [], [],
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	234 clean)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	235 result = [sorted(list1 + list2)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	236 for (list1, list2) in zip(normals, lfiles)]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	237 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	238 def toname(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	239 if lfutil.isstandin(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	240 return lfutil.splitstandin(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	241 return f
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	242 result = [[toname(f) for f in items]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	243 for items in result]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	244
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	245 if wlock:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	246 lfdirstate.write()
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	247
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	248 finally:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	249 if wlock:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	250 wlock.release()
18139 03faf12fbee7 largefiles status: update lfdirstate with result from cleanliness check Mads Kiilerich <madski@unity3d.com> parents: 18064 diff changeset	251
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	252 if not listunknown:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	253 result[4] = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	254 if not listignored:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	255 result[5] = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	256 if not listclean:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	257 result[6] = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	258 self.lfstatus = True
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	259 return result
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	260
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	261 # As part of committing, copy all of the largefiles into the
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	262 # cache.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	263 def commitctx(self, args, *kwargs):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	264 node = super(lfilesrepo, self).commitctx(args, *kwargs)
15796 3e5b6045ccfc largefiles: factor out a copyalltostore() function Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 15794 diff changeset	265 lfutil.copyalltostore(self, node)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	266 return node
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	267
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	268 # Before commit, largefile standins have not had their
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	269 # contents updated to reflect the hash of their largefile.
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	270 # Do that here.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	271 def commit(self, text="", user=None, date=None, match=None,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	272 force=False, editor=False, extra={}):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	273 orig = super(lfilesrepo, self).commit
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	274
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	275 wlock = self.wlock()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	276 try:
15982 bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15796 diff changeset	277 # Case 0: Rebase or Transplant
15793 3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	278 # We have to take the time to pull down the new largefiles now.
15982 bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15796 diff changeset	279 # Otherwise, any largefiles that were modified in the
bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15796 diff changeset	280 # destination changesets get overwritten, either by the rebase
bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15796 diff changeset	281 # or in the first commit after the rebase or transplant.
15793 3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	282 # updatelfiles will update the dirstate to mark any pulled
3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	283 # largefiles as modified
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	284 if getattr(self, "_isrebasing", False) or \
1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	285 getattr(self, "_istransplanting", False):
1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	286 lfcommands.updatelfiles(self.ui, self, filelist=None,
15982 bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15796 diff changeset	287 printmessage=False)
15793 3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	288 result = orig(text=text, user=user, date=date, match=match,
3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	289 force=force, editor=editor, extra=extra)
3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	290 return result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	291 # Case 1: user calls commit with no specific files or
15250 f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	292 # include/exclude patterns: refresh and commit all files that
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	293 # are "dirty".
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	294 if ((match is None) or
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	295 (not match.anypats() and not match.files())):
15250 f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	296 # Spend a bit of time here to get a list of files we know
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	297 # are modified so we can compare only against those.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	298 # It can cost a lot of time (several seconds)
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	299 # otherwise to update all standins if the largefiles are
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	300 # large.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	301 lfdirstate = lfutil.openlfdirstate(ui, self)
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	302 dirtymatch = match_.always(self.root, self.getcwd())
15250 f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	303 s = lfdirstate.status(dirtymatch, [], False, False, False)
18726 431b246cfb12 largefiles: missing largefiles should not be committed as removed Mads Kiilerich <madski@unity3d.com> parents: 18182 diff changeset	304 (unsure, modified, added, removed, _missing, _unknown,
431b246cfb12 largefiles: missing largefiles should not be committed as removed Mads Kiilerich <madski@unity3d.com> parents: 18182 diff changeset	305 _ignored, _clean) = s
431b246cfb12 largefiles: missing largefiles should not be committed as removed Mads Kiilerich <madski@unity3d.com> parents: 18182 diff changeset	306 modifiedfiles = unsure + modified + added + removed
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	307 lfiles = lfutil.listlfiles(self)
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	308 # this only loops through largefiles that exist (not
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	309 # removed/renamed)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	310 for lfile in lfiles:
15250 f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	311 if lfile in modifiedfiles:
16248 51e6f318bdf1 largefiles: fix check-code errors. Na'Tosha Bard <natosha@unity3d.com> parents: 16247 diff changeset	312 if os.path.exists(
51e6f318bdf1 largefiles: fix check-code errors. Na'Tosha Bard <natosha@unity3d.com> parents: 16247 diff changeset	313 self.wjoin(lfutil.standin(lfile))):
15250 f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	314 # this handles the case where a rebase is being
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	315 # performed and the working copy is not updated
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	316 # yet.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	317 if os.path.exists(self.wjoin(lfile)):
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	318 lfutil.updatestandin(self,
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	319 lfutil.standin(lfile))
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	320 lfdirstate.normal(lfile)
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	321
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	322 result = orig(text=text, user=user, date=date, match=match,
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	323 force=force, editor=editor, extra=extra)
17230 fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	324
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	325 if result is not None:
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	326 for lfile in lfdirstate:
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	327 if lfile in modifiedfiles:
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	328 if (not os.path.exists(self.wjoin(
17230 fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	329 lfutil.standin(lfile)))) or \
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	330 (not os.path.exists(self.wjoin(lfile))):
17230 fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	331 lfdirstate.drop(lfile)
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	332
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	333 # This needs to be after commit; otherwise precommit hooks
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	334 # get the wrong status
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	335 lfdirstate.write()
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	336 return result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	337
18064 7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	338 lfiles = lfutil.listlfiles(self)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	339 match._files = self._subdirlfs(match.files(), lfiles)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	340
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	341 # Case 2: user calls commit with specified patterns: refresh
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	342 # any matching big files.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	343 smatcher = lfutil.composestandinmatcher(self, match)
18154 93c697d9c158 largefiles: remove trivial portability wrappers Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	344 standins = self.dirstate.walk(smatcher, [], False, False)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	345
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	346 # No matching big files: get out of the way and pass control to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	347 # the usual commit() method.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	348 if not standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	349 return orig(text=text, user=user, date=date, match=match,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	350 force=force, editor=editor, extra=extra)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	351
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	352 # Refresh all matching big files. It's possible that the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	353 # commit will end up failing, in which case the big files will
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	354 # stay refreshed. No harm done: the user modified them and
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	355 # asked to commit them, so sooner or later we're going to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	356 # refresh the standins. Might as well leave them refreshed.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	357 lfdirstate = lfutil.openlfdirstate(ui, self)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	358 for standin in standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	359 lfile = lfutil.splitstandin(standin)
18182 e6db64abfa87 largefiles: stop using <> operator in favor of != Augie Fackler <raf@durin42.com> parents: 18154 diff changeset	360 if lfdirstate[lfile] != 'r':
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	361 lfutil.updatestandin(self, standin)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	362 lfdirstate.normal(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	363 else:
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15171 diff changeset	364 lfdirstate.drop(lfile)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	365
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	366 # Cook up a new matcher that only matches regular files or
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	367 # standins corresponding to the big files requested by the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	368 # user. Have to modify _files to prevent commit() from
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	369 # complaining "not tracked" for big files.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	370 match = copy.copy(match)
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	371 origmatchfn = match.matchfn
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	372
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	373 # Check both the list of largefiles and the list of
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	374 # standins because if a largefile was removed, it
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	375 # won't be in the list of largefiles at this point
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	376 match._files += sorted(standins)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	377
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	378 actualfiles = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	379 for f in match._files:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	380 fstandin = lfutil.standin(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	381
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	382 # ignore known largefiles and standins
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	383 if f in lfiles or fstandin in standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	384 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	385
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	386 # append directory separator to avoid collisions
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	387 if not fstandin.endswith(os.sep):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	388 fstandin += os.sep
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	389
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	390 actualfiles.append(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	391 match._files = actualfiles
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	392
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	393 def matchfn(f):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	394 if origmatchfn(f):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	395 return f not in lfiles
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	396 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	397 return f in standins
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	398
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	399 match.matchfn = matchfn
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	400 result = orig(text=text, user=user, date=date, match=match,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	401 force=force, editor=editor, extra=extra)
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	402 # This needs to be after commit; otherwise precommit hooks
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	403 # get the wrong status
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	404 lfdirstate.write()
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	405 return result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	406 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	407 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	408
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	409 def push(self, remote, force=False, revs=None, newbranch=False):
18152 4454607b5d25 largefiles: remove findoutgoing portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18149 diff changeset	410 outgoing = discovery.findcommonoutgoing(repo, remote.peer(),
4454607b5d25 largefiles: remove findoutgoing portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18149 diff changeset	411 force=force)
4454607b5d25 largefiles: remove findoutgoing portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18149 diff changeset	412 if outgoing.missing:
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	413 toupload = set()
18152 4454607b5d25 largefiles: remove findoutgoing portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18149 diff changeset	414 o = self.changelog.nodesbetween(outgoing.missing, revs)[0]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	415 for n in o:
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	416 parents = [p for p in self.changelog.parents(n)
15789 2c10ea43c801 largefiles: Fix parser warning: redefinition of unused 'node' from line 14 Levi Bard <levi@unity3d.com> parents: 15783 diff changeset	417 if p != node_.nullid]
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	418 ctx = self[n]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	419 files = set(ctx.files())
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	420 if len(parents) == 2:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	421 mc = ctx.manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	422 mp1 = ctx.parents()[0].manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	423 mp2 = ctx.parents()[1].manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	424 for f in mp1:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	425 if f not in mc:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	426 files.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	427 for f in mp2:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	428 if f not in mc:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	429 files.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	430 for f in mc:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	431 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	432 None):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	433 files.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	434
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	435 toupload = toupload.union(
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	436 set([ctx[f].data().strip()
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	437 for f in files
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	438 if lfutil.isstandin(f) and f in ctx]))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	439 lfcommands.uploadlfiles(ui, self, remote, toupload)
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	440 return super(lfilesrepo, self).push(remote, force, revs,
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15171 diff changeset	441 newbranch)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	442
18064 7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	443 def _subdirlfs(self, files, lfiles):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	444 '''
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	445 Adjust matched file list
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	446 If we pass a directory to commit whose only commitable files
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	447 are largefiles, the core commit code aborts before finding
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	448 the largefiles.
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	449 So we do the following:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	450 For directories that only have largefiles as matches,
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18182 diff changeset	451 we explicitly add the largefiles to the match list and remove
18064 7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	452 the directory.
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	453 In other cases, we leave the match list unmodified.
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	454 '''
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	455 actualfiles = []
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	456 dirs = []
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	457 regulars = []
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	458
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	459 for f in files:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	460 if lfutil.isstandin(f + '/'):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	461 raise util.Abort(
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	462 _('file "%s" is a largefile standin') % f,
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	463 hint=('commit the largefile itself instead'))
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	464 # Scan directories
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	465 if os.path.isdir(self.wjoin(f)):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	466 dirs.append(f)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	467 else:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	468 regulars.append(f)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	469
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	470 for f in dirs:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	471 matcheddir = False
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	472 d = self.dirstate.normalize(f) + '/'
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	473 # Check for matched normal files
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	474 for mf in regulars:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	475 if self.dirstate.normalize(mf).startswith(d):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	476 actualfiles.append(f)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	477 matcheddir = True
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	478 break
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	479 if not matcheddir:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	480 # If no normal match, manually append
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	481 # any matching largefiles
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	482 for lf in lfiles:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	483 if self.dirstate.normalize(lf).startswith(d):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	484 actualfiles.append(lf)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	485 if not matcheddir:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	486 actualfiles.append(lfutil.standin(f))
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	487 matcheddir = True
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	488 # Nothing in dir, so readd it
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	489 # and let commit reject it
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	490 if not matcheddir:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	491 actualfiles.append(f)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	492
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	493 # Always add normal files
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	494 actualfiles += regulars
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	495 return actualfiles
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	496
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	497 repo.__class__ = lfilesrepo
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	498
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	499 def checkrequireslfiles(ui, repo, **kwargs):
15319 9da7e96cd5c2 largefiles: remove redundant any_ function Benjamin Pollack <benjamin@bitquabit.com> parents: 15316 diff changeset	500 if 'largefiles' not in repo.requirements and util.any(
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	501 lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()):
15312 8d862e7b96d4 largefiles: remove 1.9 compat code Eli Carter <eli.carter@tektronix.com> parents: 15305 diff changeset	502 repo.requirements.add('largefiles')
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	503 repo._writerequirements()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	504
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	505 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	506 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles)

Mercurial > public > mercurial-scm > hg

annotate hgext/largefiles/reposetup.py @ 19570:f69ebcb06ce2