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

annotate hgext/largefiles/reposetup.py @ 22290:dcb95aadf850

largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" After previous patches, largefiles in the working directory are ensured to be updated before "repo.commit" invocation for automated committing below: - by "overrides.mergeupdate" via "merge.update" for rebase - by "overrides.scmutilmarktouched" via "patch.patch" for transplant This patch removes redundant "lfcommands.updatelfiles" invocation in "Case 0" code path of "lfilesrepo.commit" for automated committing, and revises detailed comment.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Sun, 24 Aug 2014 23:47:26 +0900
parents	2fb3c1c0b4ef
children	48e4e47774bf

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
21044 52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	13 from mercurial import error, manifest, match as match_, util
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	14 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	15 from mercurial import localrepo
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	16
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	17 import lfcommands
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	18 import lfutil
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	19
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	20 def reposetup(ui, repo):
20858 bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20177 diff changeset	21 # wire repositories should be given new wireproto functions
bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20177 diff changeset	22 # by "proto.wirereposetup()" via "hg.wirepeersetupfuncs"
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	23 if not repo.local():
20858 bc56ec9e64df hg: introduce "wirepeersetupfuncs" to setup wire peer by extensions (issue4109) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20177 diff changeset	24 return
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	25
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	26 class lfilesrepo(repo.__class__):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	27 lfstatus = False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	28 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	29 return super(lfilesrepo, self).status(args, *kwargs)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	30
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	31 # 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	32 # of largefiles instead of their corresponding standins and
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	33 # identifies the largefiles as always binary, regardless of
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	34 # their actual contents.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	35 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	36 ctx = super(lfilesrepo, self).__getitem__(changeid)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	37 if self.lfstatus:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	38 class lfilesmanifestdict(manifest.manifestdict):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	39 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	40 if super(lfilesmanifestdict,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	41 self).__contains__(filename):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	42 return True
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	43 return super(lfilesmanifestdict,
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	44 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	45 class lfilesctx(ctx.__class__):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	46 def files(self):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	47 filenames = super(lfilesctx, self).files()
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	48 return [lfutil.splitstandin(f) or f for f in filenames]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	49 def manifest(self):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	50 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	51 man1.__class__ = lfilesmanifestdict
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	52 return man1
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	53 def filectx(self, path, fileid=None, filelog=None):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	54 try:
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	55 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	56 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	57 path, fileid, filelog)
f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	58 else:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	59 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	60 path, fileid)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	61 except error.LookupError:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	62 # Adding a null character will cause Mercurial to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	63 # identify this as a binary file.
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	64 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	65 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	66 lfutil.standin(path), fileid, filelog)
f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	67 else:
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	68 result = super(lfilesctx, self).filectx(
16141 f346de4dff57 largefiles: don't break filesets Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 16110 diff changeset	69 lfutil.standin(path), fileid)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	70 olddata = result.data
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	71 result.data = lambda: olddata() + '\0'
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	72 return result
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	73 ctx.__class__ = lfilesctx
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	74 return ctx
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	75
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	76 # 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	77 # appropriate list in the result. Also removes standin files
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	78 # from the listing. Revert to the original status if
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	79 # 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	80 # 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	81 # 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	82 @localrepo.unfilteredmethod
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	83 def status(self, node1='.', node2=None, match=None, ignored=False,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	84 clean=False, unknown=False, listsubrepos=False):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	85 listignored, listclean, listunknown = ignored, clean, unknown
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	86 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	87 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	88 listignored, listclean, listunknown, listsubrepos)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	89 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	90 # some calls in this function rely on the old version of status
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	91 self.lfstatus = False
19570 f69ebcb06ce2 largefiles: remove unnecessary check of instance Sean Farley <sean.michael.farley@gmail.com> parents: 19088 diff changeset	92 ctx1 = self[node1]
f69ebcb06ce2 largefiles: remove unnecessary check of instance Sean Farley <sean.michael.farley@gmail.com> parents: 19088 diff changeset	93 ctx2 = self[node2]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	94 working = ctx2.rev() is None
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	95 parentworking = working and ctx1 == self['.']
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	96
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	97 def inctx(file, ctx):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	98 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	99 if ctx.rev() is None:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	100 return file in ctx.manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	101 ctx[file]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	102 return True
15171 547da6115d1d largefiles: eliminate naked exceptions Matt Mackall <mpm@selenic.com> parents: 15170 diff changeset	103 except KeyError:
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	104 return False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	105
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	106 if match is None:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	107 match = match_.always(self.root, self.getcwd())
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	108
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	109 wlock = None
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	110 try:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	111 try:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	112 # updating the dirstate is optional
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	113 # 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	114 wlock = self.wlock(False)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	115 except error.LockError:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	116 pass
15653 93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	117
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	118 # 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	119 # 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	120 # 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	121 # 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	122 lfdirstate = lfutil.openlfdirstate(ui, self)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	123 if match.files() and not match.anypats():
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	124 for f in lfdirstate:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	125 if match(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	126 break
16586 ebd2ead59f1c largefiles: fix "hg status dir" missing regular files (issue3421) Patrick Mezard <patrick@mezard.eu> parents: 16571 diff changeset	127 else:
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	128 return super(lfilesrepo, self).status(node1, node2,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	129 match, listignored, listclean,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	130 listunknown, listsubrepos)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	131
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	132 # 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	133 # of largefiles.
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	134 def tostandins(files):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	135 if not working:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	136 return files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	137 newfiles = []
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	138 dirstate = self.dirstate
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	139 for f in files:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	140 sf = lfutil.standin(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	141 if sf in dirstate:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	142 newfiles.append(sf)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	143 elif sf in dirstate.dirs():
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	144 # Directory entries could be regular or
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	145 # standin, check both
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	146 newfiles.extend((f, sf))
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	147 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	148 newfiles.append(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	149 return newfiles
18149 2dcc3653b361 largefiles: unindent code Mads Kiilerich <madski@unity3d.com> parents: 18148 diff changeset	150
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	151 m = copy.copy(match)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	152 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	153
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	154 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	155 ignored, clean, unknown, listsubrepos)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	156 if working:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	157
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	158 def sfindirstate(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	159 sf = lfutil.standin(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	160 dirstate = self.dirstate
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	161 return sf in dirstate or sf in dirstate.dirs()
18149 2dcc3653b361 largefiles: unindent code Mads Kiilerich <madski@unity3d.com> parents: 18148 diff changeset	162
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	163 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	164 if sfindirstate(f)]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	165 # 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	166 # files from lfdirstate
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	167 s = lfdirstate.status(match, [], False,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	168 listclean, False)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	169 (unsure, modified, added, removed, missing, _unknown,
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	170 _ignored, clean) = s
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	171 if parentworking:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	172 for lfile in unsure:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	173 standin = lfutil.standin(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	174 if standin not in ctx1:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	175 # from second parent
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	176 modified.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	177 elif ctx1[standin].data().strip() \
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	178 != lfutil.hashfile(self.wjoin(lfile)):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	179 modified.append(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	180 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	181 clean.append(lfile)
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	182 lfdirstate.normal(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	183 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	184 tocheck = unsure + modified + added + clean
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	185 modified, added, clean = [], [], []
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	186
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	187 for lfile in tocheck:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	188 standin = lfutil.standin(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	189 if inctx(standin, ctx1):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	190 if ctx1[standin].data().strip() != \
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	191 lfutil.hashfile(self.wjoin(lfile)):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	192 modified.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	193 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	194 clean.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 added.append(lfile)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	197
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	198 # 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	199 # removed
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	200 for standin in ctx1.manifest():
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	201 if not lfutil.isstandin(standin):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	202 continue
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	203 lfile = lfutil.splitstandin(standin)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	204 if not match(lfile):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	205 continue
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	206 if lfile not in lfdirstate:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	207 removed.append(lfile)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	208
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	209 # Filter result lists
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	210 result = list(result)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	211
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	212 # 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	213 # still in the normal dirstate. Likewise, normal
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	214 # 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	215 # lfdirstate. This happens in merges where files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	216 # change type.
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	217 removed = [f for f in removed
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	218 if f not in self.dirstate]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	219 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	220 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	221
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	222 lfiles = set(lfdirstate._map)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	223 # Unknown files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	224 result[4] = set(result[4]).difference(lfiles)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	225 # Ignored files
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	226 result[5] = set(result[5]).difference(lfiles)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	227 # combine normal files and largefiles
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	228 normals = [[fn for fn in filelist
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	229 if not lfutil.isstandin(fn)]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	230 for filelist in result]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	231 lfiles = (modified, added, removed, missing, [], [],
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	232 clean)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	233 result = [sorted(list1 + list2)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	234 for (list1, list2) in zip(normals, lfiles)]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	235 else:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	236 def toname(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	237 if lfutil.isstandin(f):
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	238 return lfutil.splitstandin(f)
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	239 return f
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	240 result = [[toname(f) for f in items]
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	241 for items in result]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	242
19056 ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	243 if wlock:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	244 lfdirstate.write()
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	245
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	246 finally:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	247 if wlock:
ac41bb76c737 largefiles: wlock in status before lfdirstate.write() Mads Kiilerich <madski@unity3d.com> parents: 18969 diff changeset	248 wlock.release()
18139 03faf12fbee7 largefiles status: update lfdirstate with result from cleanliness check Mads Kiilerich <madski@unity3d.com> parents: 18064 diff changeset	249
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	250 if not listunknown:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	251 result[4] = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	252 if not listignored:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	253 result[5] = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	254 if not listclean:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	255 result[6] = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	256 self.lfstatus = True
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	257 return result
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	258
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	259 # 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	260 # cache.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	261 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	262 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	263 lfutil.copyalltostore(self, node)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	264 return node
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	265
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	266 # 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	267 # 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	268 # Do that here.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	269 def commit(self, text="", user=None, date=None, match=None,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	270 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	271 orig = super(lfilesrepo, self).commit
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	272
17803 1479572db256 largefile: use `self` in repo method instead of `repo` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17424 diff changeset	273 wlock = self.wlock()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	274 try:
22290 dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	275 # Case 0: Automated committing
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	276 #
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	277 # While automated committing (like rebase, transplant
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	278 # and so on), this code path is used to avoid:
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	279 # (1) updating standins, because standins should
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	280 # be already updated at this point
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	281 # (2) aborting when stadnins are matched by "match",
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	282 # because automated committing may specify them directly
dcb95aadf850 largefiles: remove redundant "updatelfiles" invocation in "lfilesrepo.commit" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22098 diff changeset	283 #
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):
15793 3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	286 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	287 force=force, editor=editor, extra=extra)
22098 2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	288
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	289 if result:
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	290 lfdirstate = lfutil.openlfdirstate(ui, self)
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	291 for f in self[result].files():
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	292 if lfutil.isstandin(f):
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	293 lfile = lfutil.splitstandin(f)
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	294 lfutil.synclfdirstate(self, lfdirstate, lfile,
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	295 False)
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	296 lfdirstate.write()
2fb3c1c0b4ef largefiles: synchronize lfdirstate with dirstate after automated committing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21044 diff changeset	297
15793 3ef07ecdb0d5 largefiles: correctly handle dirstate status when rebasing Na'Tosha Bard <natosha@unity3d.com> parents: 15789 diff changeset	298 return result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	299 # 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	300 # 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	301 # are "dirty".
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	302 if ((match is None) or
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	303 (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	304 # 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	305 # 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	306 # 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	307 # 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	308 # large.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	309 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	310 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	311 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	312 (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	313 _ignored, _clean) = s
431b246cfb12 largefiles: missing largefiles should not be committed as removed Mads Kiilerich <madski@unity3d.com> parents: 18182 diff changeset	314 modifiedfiles = unsure + modified + added + removed
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	315 lfiles = lfutil.listlfiles(self)
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	316 # this only loops through largefiles that exist (not
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	317 # removed/renamed)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	318 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	319 if lfile in modifiedfiles:
16248 51e6f318bdf1 largefiles: fix check-code errors. Na'Tosha Bard <natosha@unity3d.com> parents: 16247 diff changeset	320 if os.path.exists(
51e6f318bdf1 largefiles: fix check-code errors. Na'Tosha Bard <natosha@unity3d.com> parents: 16247 diff changeset	321 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	322 # 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	323 # 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	324 # yet.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	325 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	326 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	327 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	328 lfdirstate.normal(lfile)
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	329
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	330 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	331 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	332
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	333 if result is not None:
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	334 for lfile in lfdirstate:
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	335 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	336 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	337 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	338 (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	339 lfdirstate.drop(lfile)
fc4c155658b7 largefiles: defer lfdirstate.drop() until after commit (issue3364) Matt Harbison <matt_harbison@yahoo.com> parents: 16731 diff changeset	340
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	341 # This needs to be after commit; otherwise precommit hooks
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	342 # get the wrong status
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	343 lfdirstate.write()
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	344 return result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	345
18064 7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	346 lfiles = lfutil.listlfiles(self)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	347 match._files = self._subdirlfs(match.files(), lfiles)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	348
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	349 # Case 2: user calls commit with specified patterns: refresh
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	350 # any matching big files.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	351 smatcher = lfutil.composestandinmatcher(self, match)
18154 93c697d9c158 largefiles: remove trivial portability wrappers Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	352 standins = self.dirstate.walk(smatcher, [], False, False)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	353
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	354 # No matching big files: get out of the way and pass control to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	355 # the usual commit() method.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	356 if not standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	357 return orig(text=text, user=user, date=date, match=match,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	358 force=force, editor=editor, extra=extra)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	359
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	360 # Refresh all matching big files. It's possible that the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	361 # commit will end up failing, in which case the big files will
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	362 # stay refreshed. No harm done: the user modified them and
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	363 # asked to commit them, so sooner or later we're going to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	364 # refresh the standins. Might as well leave them refreshed.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	365 lfdirstate = lfutil.openlfdirstate(ui, self)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	366 for standin in standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	367 lfile = lfutil.splitstandin(standin)
18182 e6db64abfa87 largefiles: stop using <> operator in favor of != Augie Fackler <raf@durin42.com> parents: 18154 diff changeset	368 if lfdirstate[lfile] != 'r':
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	369 lfutil.updatestandin(self, standin)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	370 lfdirstate.normal(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	371 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	372 lfdirstate.drop(lfile)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	373
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	374 # Cook up a new matcher that only matches regular files or
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	375 # standins corresponding to the big files requested by the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	376 # user. Have to modify _files to prevent commit() from
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	377 # complaining "not tracked" for big files.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	378 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	379 origmatchfn = match.matchfn
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	380
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	381 # 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	382 # 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	383 # won't be in the list of largefiles at this point
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	384 match._files += sorted(standins)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	385
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	386 actualfiles = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	387 for f in match._files:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	388 fstandin = lfutil.standin(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	389
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	390 # ignore known largefiles and standins
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	391 if f in lfiles or fstandin in standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	392 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	393
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	394 # append directory separator to avoid collisions
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	395 if not fstandin.endswith(os.sep):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	396 fstandin += os.sep
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	397
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	398 actualfiles.append(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	399 match._files = actualfiles
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	400
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	401 def matchfn(f):
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	402 if origmatchfn(f):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	403 return f not in lfiles
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	404 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	405 return f in standins
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	406
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	407 match.matchfn = matchfn
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	408 result = orig(text=text, user=user, date=date, match=match,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	409 force=force, editor=editor, extra=extra)
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	410 # This needs to be after commit; otherwise precommit hooks
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	411 # get the wrong status
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	412 lfdirstate.write()
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15793 diff changeset	413 return result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	414 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	415 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	416
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	417 def push(self, remote, force=False, revs=None, newbranch=False):
19779 fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	418 if remote.local():
fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	419 missing = set(self.requirements) - remote.local().supported
fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	420 if missing:
fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	421 msg = _("required features are not"
fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	422 " supported in the destination:"
fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	423 " %s") % (', '.join(sorted(missing)))
fb6e87d93948 largefiles: setup "largefiles" feature in each repositories individually FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19570 diff changeset	424 raise util.Abort(msg)
20177 c5f0574034ef largefiles: call super class method with proper kwargs to respect API Long Vu <long@tlvu.ca> parents: 19779 diff changeset	425 return super(lfilesrepo, self).push(remote, force=force, revs=revs,
c5f0574034ef largefiles: call super class method with proper kwargs to respect API Long Vu <long@tlvu.ca> parents: 19779 diff changeset	426 newbranch=newbranch)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	427
18064 7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	428 def _subdirlfs(self, files, lfiles):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	429 '''
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	430 Adjust matched file list
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	431 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	432 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	433 the largefiles.
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	434 So we do the following:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	435 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	436 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	437 the directory.
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	438 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	439 '''
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	440 actualfiles = []
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	441 dirs = []
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	442 regulars = []
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	443
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	444 for f in files:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	445 if lfutil.isstandin(f + '/'):
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	446 raise util.Abort(
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	447 _('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	448 hint=('commit the largefile itself instead'))
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	449 # Scan directories
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	450 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	451 dirs.append(f)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	452 else:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	453 regulars.append(f)
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 for f in dirs:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	456 matcheddir = False
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	457 d = self.dirstate.normalize(f) + '/'
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	458 # Check for matched normal files
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	459 for mf in regulars:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	460 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	461 actualfiles.append(f)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	462 matcheddir = True
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	463 break
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	464 if not matcheddir:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	465 # If no normal match, manually append
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	466 # any matching largefiles
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	467 for lf in lfiles:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	468 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	469 actualfiles.append(lf)
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	470 if not matcheddir:
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	471 actualfiles.append(lfutil.standin(f))
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	472 matcheddir = True
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	473 # Nothing in dir, so readd it
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	474 # and let commit reject it
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	475 if not matcheddir:
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
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	478 # Always add normal files
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	479 actualfiles += regulars
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	480 return actualfiles
7e2b9f6a2cd0 largefiles: commit directories that only contain largefiles (issue3548) Levi Bard <levi@unity3d.com> parents: 17803 diff changeset	481
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16141 diff changeset	482 repo.__class__ = lfilesrepo
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	483
21044 52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	484 def prepushoutgoinghook(local, remote, outgoing):
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	485 if outgoing.missing:
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	486 toupload = set()
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	487 addfunc = lambda fn, lfhash: toupload.add(lfhash)
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	488 lfutil.getlfilestoupload(local, outgoing.missing, addfunc)
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	489 lfcommands.uploadlfiles(ui, local, remote, toupload)
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	490 repo.prepushoutgoinghooks.add("largefiles", prepushoutgoinghook)
52a5eabf1f2f largefiles: reuse "findcommonoutgoing()" result at "hg push" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	491
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	492 def checkrequireslfiles(ui, repo, **kwargs):
15319 9da7e96cd5c2 largefiles: remove redundant any_ function Benjamin Pollack <benjamin@bitquabit.com> parents: 15316 diff changeset	493 if 'largefiles' not in repo.requirements and util.any(
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	494 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	495 repo.requirements.add('largefiles')
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	496 repo._writerequirements()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	497
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20177 diff changeset	498 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles,
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20177 diff changeset	499 'largefiles')
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20177 diff changeset	500 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles')

Mercurial > public > mercurial-scm > hg

annotate hgext/largefiles/reposetup.py @ 22290:dcb95aadf850