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

annotate hgext/largefiles/reposetup.py @ 15783:927712d9853b

largefiles: remove a chunk of commented out code

author	Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date	Sat, 07 Jan 2012 15:27:34 +0100
parents	7b7f03502b5a
children	2c10ea43c801

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 types
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	12 import os
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	13
15305 683f417fa538 largefiles: tidy imports Greg Ward <greg@gerg.ca> parents: 15255 diff changeset	14 from mercurial import context, error, manifest, match as match_, node, util
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	15 from mercurial.i18n import _
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 proto
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	19 import lfutil
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	20
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	21 def reposetup(ui, repo):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	22 # wire repositories should be given new wireproto functions but not the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	23 # other largefiles modifications
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	24 if not repo.local():
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	25 return proto.wirereposetup(ui, repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	26
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	27 for name in ('status', 'commitctx', 'commit', 'push'):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	28 method = getattr(repo, name)
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	29 if (isinstance(method, types.FunctionType) and
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	30 method.func_name == 'wrap'):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	31 ui.warn(_('largefiles: repo method %r appears to have already been'
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	32 ' wrapped by another extension: '
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	33 'largefiles may behave incorrectly\n')
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	34 % name)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	35
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	36 class lfiles_repo(repo.__class__):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	37 lfstatus = False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	38 def status_nolfiles(self, args, *kwargs):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	39 return super(lfiles_repo, self).status(args, *kwargs)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	40
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	41 # 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	42 # of largefiles instead of their corresponding standins and
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	43 # identifies the largefiles as always binary, regardless of
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	44 # their actual contents.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	45 def __getitem__(self, changeid):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	46 ctx = super(lfiles_repo, self).__getitem__(changeid)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	47 if self.lfstatus:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	48 class lfiles_manifestdict(manifest.manifestdict):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	49 def __contains__(self, filename):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	50 if super(lfiles_manifestdict,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	51 self).__contains__(filename):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	52 return True
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	53 return super(lfiles_manifestdict,
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	54 self).__contains__(lfutil.standin(filename))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	55 class lfiles_ctx(ctx.__class__):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	56 def files(self):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	57 filenames = super(lfiles_ctx, self).files()
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	58 return [lfutil.splitstandin(f) or f for f in filenames]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	59 def manifest(self):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	60 man1 = super(lfiles_ctx, self).manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	61 man1.__class__ = lfiles_manifestdict
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	62 return man1
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	63 def filectx(self, path, fileid=None, filelog=None):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	64 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	65 result = super(lfiles_ctx, self).filectx(path,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	66 fileid, filelog)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	67 except error.LookupError:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	68 # Adding a null character will cause Mercurial to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	69 # identify this as a binary file.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	70 result = super(lfiles_ctx, self).filectx(
15628 2b40513384ca largefiles: use lfutil functions Martin Geisler <mg@aragost.com> parents: 15626 diff changeset	71 lfutil.standin(path), fileid, filelog)
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
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	75 ctx.__class__ = lfiles_ctx
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.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	82 def status(self, node1='.', node2=None, match=None, ignored=False,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	83 clean=False, unknown=False, listsubrepos=False):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	84 listignored, listclean, listunknown = ignored, clean, unknown
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	85 if not self.lfstatus:
15626 931dc4af0d95 largefiles: remove pre-1.7 compatibility code Martin Geisler <mg@aragost.com> parents: 15617 diff changeset	86 return super(lfiles_repo, self).status(node1, node2, match,
931dc4af0d95 largefiles: remove pre-1.7 compatibility code Martin Geisler <mg@aragost.com> parents: 15617 diff changeset	87 listignored, listclean, listunknown, listsubrepos)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	88 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	89 # some calls in this function rely on the old version of status
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	90 self.lfstatus = False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	91 if isinstance(node1, context.changectx):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	92 ctx1 = node1
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	93 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	94 ctx1 = repo[node1]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	95 if isinstance(node2, context.changectx):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	96 ctx2 = node2
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	97 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	98 ctx2 = repo[node2]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	99 working = ctx2.rev() is None
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	100 parentworking = working and ctx1 == self['.']
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	101
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	102 def inctx(file, ctx):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	103 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	104 if ctx.rev() is None:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	105 return file in ctx.manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	106 ctx[file]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	107 return True
15171 547da6115d1d largefiles: eliminate naked exceptions Matt Mackall <mpm@selenic.com> parents: 15170 diff changeset	108 except KeyError:
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	109 return False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	110
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	111 if match is None:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	112 match = match_.always(self.root, self.getcwd())
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	113
15653 93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	114 # First check if there were files specified on the
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	115 # command line. If there were, and none of them were
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	116 # largefiles, we should just bail here and let super
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	117 # handle it -- thus gaining a big performance boost.
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	118 lfdirstate = lfutil.openlfdirstate(ui, self)
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	119 if match.files() and not match.anypats():
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	120 matchedfiles = [f for f in match.files() if f in lfdirstate]
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	121 if not matchedfiles:
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	122 return super(lfiles_repo, self).status(node1, node2,
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	123 match, listignored, listclean,
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	124 listunknown, listsubrepos)
93c77d5b9752 largefiles: optimize status when files are specified (issue3144) Na'Tosha Bard <natosha@unity3d.com> parents: 15630 diff changeset	125
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	126 # Create a copy of match that matches standins instead
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	127 # of largefiles.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	128 def tostandin(file):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	129 if inctx(lfutil.standin(file), ctx2):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	130 return lfutil.standin(file)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	131 return file
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	132
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	133 # Create a function that we can use to override what is
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	134 # normally the ignore matcher. We've already checked
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	135 # for ignored files on the first dirstate walk, and
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	136 # unecessarily re-checking here causes a huge performance
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	137 # hit because lfdirstate only knows about largefiles
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	138 def _ignoreoverride(self):
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	139 return False
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	140
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	141 m = copy.copy(match)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	142 m._files = [tostandin(f) for f in m._files]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	143
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	144 # Get ignored files here even if we weren't asked for them; we
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	145 # must use the result here for filtering later
15626 931dc4af0d95 largefiles: remove pre-1.7 compatibility code Martin Geisler <mg@aragost.com> parents: 15617 diff changeset	146 result = super(lfiles_repo, self).status(node1, node2, m,
931dc4af0d95 largefiles: remove pre-1.7 compatibility code Martin Geisler <mg@aragost.com> parents: 15617 diff changeset	147 True, clean, unknown, listsubrepos)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	148 if working:
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	149 # hold the wlock while we read largefiles and
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	150 # update the lfdirstate
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	151 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	152 try:
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	153 # Any non-largefiles that were explicitly listed must be
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	154 # taken out or lfdirstate.status will report an error.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	155 # The status of these files was already computed using
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	156 # super's status.
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	157 # Override lfdirstate's ignore matcher to not do
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	158 # anything
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	159 orig_ignore = lfdirstate._ignore
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	160 lfdirstate._ignore = _ignoreoverride
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	161
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	162 match._files = [f for f in match._files if f in
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	163 lfdirstate]
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	164 # Don't waste time getting the ignored and unknown
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	165 # files again; we already have them
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	166 s = lfdirstate.status(match, [], False,
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	167 listclean, False)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	168 (unsure, modified, added, removed, missing, unknown,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	169 ignored, clean) = s
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	170 # Replace the list of ignored and unknown files with
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	171 # the previously caclulated lists, and strip out the
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	172 # largefiles
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	173 lfiles = set(lfdirstate._map)
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	174 ignored = set(result[5]).difference(lfiles)
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	175 unknown = set(result[4]).difference(lfiles)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	176 if parentworking:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	177 for lfile in unsure:
15629 5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15385 diff changeset	178 standin = lfutil.standin(lfile)
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15385 diff changeset	179 if standin not in ctx1:
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15385 diff changeset	180 # from second parent
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15385 diff changeset	181 modified.append(lfile)
5b66e55c0d93 largefiles: fix 'hg status' abort after merge Martin Geisler <mg@aragost.com> parents: 15385 diff changeset	182 elif ctx1[standin].data().strip() \
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	183 != lfutil.hashfile(self.wjoin(lfile)):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	184 modified.append(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	185 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	186 clean.append(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	187 lfdirstate.normal(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	188 lfdirstate.write()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	189 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	190 tocheck = unsure + modified + added + clean
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	191 modified, added, clean = [], [], []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	192
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	193 for lfile in tocheck:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	194 standin = lfutil.standin(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	195 if inctx(standin, ctx1):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	196 if ctx1[standin].data().strip() != \
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	197 lfutil.hashfile(self.wjoin(lfile)):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	198 modified.append(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	199 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	200 clean.append(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	201 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	202 added.append(lfile)
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	203 # Replace the original ignore function
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	204 lfdirstate._ignore = orig_ignore
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	205 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	206 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	207
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	208 for standin in ctx1.manifest():
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	209 if not lfutil.isstandin(standin):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	210 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	211 lfile = lfutil.splitstandin(standin)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	212 if not match(lfile):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	213 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	214 if lfile not in lfdirstate:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	215 removed.append(lfile)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	216
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	217 # Filter result lists
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	218 result = list(result)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	219
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	220 # Largefiles are not really removed when they're
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	221 # still in the normal dirstate. Likewise, normal
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	222 # files are not really removed if it's still in
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	223 # lfdirstate. This happens in merges where files
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	224 # change type.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	225 removed = [f for f in removed if f not in repo.dirstate]
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	226 result[2] = [f for f in result[2] if f not in lfdirstate]
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	227
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	228 # Unknown files
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	229 unknown = set(unknown).difference(ignored)
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	230 result[4] = [f for f in unknown
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	231 if (repo.dirstate[f] == '?' and
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	232 not lfutil.isstandin(f))]
15617 74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	233 # Ignored files were calculated earlier by the dirstate,
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	234 # and we already stripped out the largefiles from the list
74e691b141c4 largefiles: optimize performance of status on largefiles repos (issue3136) Na'Tosha Bard <natosha@unity3d.com> parents: 15385 diff changeset	235 result[5] = ignored
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	236 # combine normal files and largefiles
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	237 normals = [[fn for fn in filelist
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	238 if not lfutil.isstandin(fn)]
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	239 for filelist in result]
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15629 diff changeset	240 lfiles = (modified, added, removed, missing, [], [], clean)
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	241 result = [sorted(list1 + list2)
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	242 for (list1, list2) in zip(normals, lfiles)]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	243 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	244 def toname(f):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	245 if lfutil.isstandin(f):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	246 return lfutil.splitstandin(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	247 return f
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	248 result = [[toname(f) for f in items] for items in result]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	249
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):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	262 node = super(lfiles_repo, self).commitctx(args, *kwargs)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	263 ctx = self[node]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	264 for filename in ctx.files():
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	265 if lfutil.isstandin(filename) and filename in ctx.manifest():
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	266 realfile = lfutil.splitstandin(filename)
15316 c65f5b6e26d4 largefiles: rename functions and methods to match desired behavior Benjamin Pollack <benjamin@bitquabit.com> parents: 15312 diff changeset	267 lfutil.copytostore(self, ctx.node(), realfile)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	268
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	269 return node
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	270
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	271 # 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	272 # 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	273 # Do that here.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	274 def commit(self, text="", user=None, date=None, match=None,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	275 force=False, editor=False, extra={}):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	276 orig = super(lfiles_repo, self).commit
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	277
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	278 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	279 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	280 if getattr(repo, "_isrebasing", False):
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	281 # We have to take the time to pull down the new
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	282 # largefiles now. Otherwise if we are rebasing,
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	283 # any largefiles that were modified in the
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	284 # destination changesets get overwritten, either
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	285 # by the rebase or in the first commit after the
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	286 # rebase.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	287 lfcommands.updatelfiles(repo.ui, repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	288 # 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	289 # 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	290 # are "dirty".
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	291 if ((match is None) or
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	292 (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	293 # 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	294 # 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	295 # 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	296 # 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	297 # large.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	298 lfdirstate = lfutil.openlfdirstate(ui, self)
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	299 dirtymatch = match_.always(repo.root, repo.getcwd())
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	300 s = lfdirstate.status(dirtymatch, [], False, False, False)
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	301 modifiedfiles = []
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	302 for i in s:
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	303 modifiedfiles.extend(i)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	304 lfiles = lfutil.listlfiles(self)
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	305 # this only loops through largefiles that exist (not
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	306 # removed/renamed)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	307 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	308 if lfile in modifiedfiles:
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	309 if os.path.exists(self.wjoin(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	310 # 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	311 # 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	312 # yet.
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	313 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	314 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	315 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	316 lfdirstate.normal(lfile)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	317 for lfile in lfdirstate:
15250 f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	318 if lfile in modifiedfiles:
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	319 if not os.path.exists(
f172292cd416 largefiles: speed up commit by only rewriting standins for modified largefiles Na'Tosha Bard <natosha@unity3d.com> parents: 15224 diff changeset	320 repo.wjoin(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	321 lfdirstate.drop(lfile)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	322 lfdirstate.write()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	323
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	324 return orig(text=text, user=user, date=date, match=match,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	325 force=force, editor=editor, extra=extra)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	326
15253 67d010779907 largefiles: improve error reporting Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	327 for f in match.files():
67d010779907 largefiles: improve error reporting Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	328 if lfutil.isstandin(f):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	329 raise util.Abort(
15253 67d010779907 largefiles: improve error reporting Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	330 _('file "%s" is a largefile standin') % f,
67d010779907 largefiles: improve error reporting Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	331 hint=('commit the largefile itself instead'))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	332
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	333 # Case 2: user calls commit with specified patterns: refresh
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	334 # any matching big files.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	335 smatcher = lfutil.composestandinmatcher(self, match)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	336 standins = lfutil.dirstate_walk(self.dirstate, smatcher)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	337
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	338 # No matching big files: get out of the way and pass control to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	339 # the usual commit() method.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	340 if not standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	341 return orig(text=text, user=user, date=date, match=match,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	342 force=force, editor=editor, extra=extra)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	343
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	344 # Refresh all matching big files. It's possible that the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	345 # commit will end up failing, in which case the big files will
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	346 # stay refreshed. No harm done: the user modified them and
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	347 # asked to commit them, so sooner or later we're going to
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	348 # refresh the standins. Might as well leave them refreshed.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	349 lfdirstate = lfutil.openlfdirstate(ui, self)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	350 for standin in standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	351 lfile = lfutil.splitstandin(standin)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	352 if lfdirstate[lfile] <> 'r':
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	353 lfutil.updatestandin(self, standin)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	354 lfdirstate.normal(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	355 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	356 lfdirstate.drop(lfile)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	357 lfdirstate.write()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	358
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	359 # Cook up a new matcher that only matches regular files or
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	360 # standins corresponding to the big files requested by the
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	361 # user. Have to modify _files to prevent commit() from
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	362 # complaining "not tracked" for big files.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	363 lfiles = lfutil.listlfiles(repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	364 match = copy.copy(match)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	365 orig_matchfn = match.matchfn
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	366
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15253 diff changeset	367 # 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	368 # 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	369 # won't be in the list of largefiles at this point
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	370 match._files += sorted(standins)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	371
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	372 actualfiles = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	373 for f in match._files:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	374 fstandin = lfutil.standin(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	375
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	376 # ignore known largefiles and standins
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	377 if f in lfiles or fstandin in standins:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	378 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	379
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	380 # append directory separator to avoid collisions
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	381 if not fstandin.endswith(os.sep):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	382 fstandin += os.sep
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	383
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15250 diff changeset	384 # prevalidate matching standin directories
15319 9da7e96cd5c2 largefiles: remove redundant any_ function Benjamin Pollack <benjamin@bitquabit.com> parents: 15316 diff changeset	385 if util.any(st for st in match._files
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	386 if st.startswith(fstandin)):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	387 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	388 actualfiles.append(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	389 match._files = actualfiles
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	390
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	391 def matchfn(f):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	392 if orig_matchfn(f):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	393 return f not in lfiles
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	394 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	395 return f in standins
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	396
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	397 match.matchfn = matchfn
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	398 return orig(text=text, user=user, date=date, match=match,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	399 force=force, editor=editor, extra=extra)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	400 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	401 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	402
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	403 def push(self, remote, force=False, revs=None, newbranch=False):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	404 o = lfutil.findoutgoing(repo, remote, force)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	405 if o:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	406 toupload = set()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	407 o = repo.changelog.nodesbetween(o, revs)[0]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	408 for n in o:
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	409 parents = [p for p in repo.changelog.parents(n)
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	410 if p != node.nullid]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	411 ctx = repo[n]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	412 files = set(ctx.files())
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	413 if len(parents) == 2:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	414 mc = ctx.manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	415 mp1 = ctx.parents()[0].manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	416 mp2 = ctx.parents()[1].manifest()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	417 for f in mp1:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	418 if f not in mc:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	419 files.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	420 for f in mp2:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	421 if f not in mc:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	422 files.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	423 for f in mc:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	424 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	425 None):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	426 files.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	427
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	428 toupload = toupload.union(
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	429 set([ctx[f].data().strip()
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	430 for f in files
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	431 if lfutil.isstandin(f) and f in ctx]))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	432 lfcommands.uploadlfiles(ui, self, remote, toupload)
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	433 return super(lfiles_repo, self).push(remote, force, revs,
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15171 diff changeset	434 newbranch)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	435
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	436 repo.__class__ = lfiles_repo
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	437
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	438 def checkrequireslfiles(ui, repo, **kwargs):
15319 9da7e96cd5c2 largefiles: remove redundant any_ function Benjamin Pollack <benjamin@bitquabit.com> parents: 15316 diff changeset	439 if 'largefiles' not in repo.requirements and util.any(
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	440 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	441 repo.requirements.add('largefiles')
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	442 repo._writerequirements()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	443
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	444 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	445 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles)

Mercurial > public > mercurial-scm > hg

annotate hgext/largefiles/reposetup.py @ 15783:927712d9853b