mercurial-source: hgext/largefiles/overrides.py annotate

annotate hgext/largefiles/overrides.py @ 23898:5ce8dcd05dc4

largefiles: enable subrepo support for add The --large, --normal and --lfsize args couldn't be passed to a subrepo before, and files in the subrepos would be added silently (if -v wasn't specified) as normal files. As an added bonus, 'hg add --dry-run' no longer prints that largefiles would also be added as normal files as well.

author	Matt Harbison <matt_harbison@yahoo.com>
date	Mon, 12 Jan 2015 21:44:43 -0500
parents	ec2c2e1400f0
children	054cfb7c33ae

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 '''Overridden Mercurial commands and functions for the largefiles extension'''
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	10
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	11 import os
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	12 import copy
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	13
23183 51c9196a6bd0 largefiles: remove meaningless code path for "hg pull --rebase" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23145 diff changeset	14 from mercurial import hg, util, cmdutil, scmutil, match as match_, \
22285 85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	15 archival, pathutil, revset
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	16 from mercurial.i18n import _
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	17 from mercurial.node import hex
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	18
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	19 import lfutil
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	20 import lfcommands
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	21 import basestore
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	22
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	23 # -- Utility functions: commonly/repeatedly needed functionality ---------------
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	24
23629 f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	25 def composelargefilematcher(match, manifest):
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	26 '''create a matcher that matches only the largefiles in the original
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	27 matcher'''
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	28 m = copy.copy(match)
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	29 lfile = lambda f: lfutil.standin(f) in manifest
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	30 m._files = filter(lfile, m._files)
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	31 m._fmap = set(m._files)
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	32 m._always = False
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	33 origmatchfn = m.matchfn
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	34 m.matchfn = lambda f: lfile(f) and origmatchfn(f)
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	35 return m
f1e6b86da4c0 largefiles: introduce the 'composelargefilematcher()' method Matt Harbison <matt_harbison@yahoo.com> parents: 23604 diff changeset	36
23781 bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	37 def composenormalfilematcher(match, manifest, exclude=None):
bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	38 excluded = set()
bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	39 if exclude is not None:
bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	40 excluded.update(exclude)
bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	41
23428 b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	42 m = copy.copy(match)
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	43 notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in
23781 bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	44 manifest or f in excluded)
23428 b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	45 m._files = filter(notlfile, m._files)
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	46 m._fmap = set(m._files)
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	47 m._always = False
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	48 origmatchfn = m.matchfn
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	49 m.matchfn = lambda f: notlfile(f) and origmatchfn(f)
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	50 return m
b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	51
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	52 def installnormalfilesmatchfn(manifest):
21090 aa3d652ba1d5 largefiles: clarify installmatchfn documentation Mads Kiilerich <madski@unity3d.com> parents: 21089 diff changeset	53 '''installmatchfn with a matchfn that ignores all largefiles'''
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	54 def overridematch(ctx, pats=[], opts={}, globbed=False,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	55 default='relpath'):
15306 94527d67f3da largefiles: fix some badly named function parameters Greg Ward <greg@gerg.ca> parents: 15305 diff changeset	56 match = oldmatch(ctx, pats, opts, globbed, default)
23428 b5e3f3d25395 largefiles: split the creation of a normal matcher out of its install method Matt Harbison <matt_harbison@yahoo.com> parents: 23426 diff changeset	57 return composenormalfilematcher(match, manifest)
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	58 oldmatch = installmatchfn(overridematch)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	59
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	60 def installmatchfn(f):
21090 aa3d652ba1d5 largefiles: clarify installmatchfn documentation Mads Kiilerich <madski@unity3d.com> parents: 21089 diff changeset	61 '''monkey patch the scmutil module with a custom match function.
aa3d652ba1d5 largefiles: clarify installmatchfn documentation Mads Kiilerich <madski@unity3d.com> parents: 21089 diff changeset	62 Warning: it is monkey patching the _module_ on runtime! Not thread safe!'''
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	63 oldmatch = scmutil.match
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	64 setattr(f, 'oldmatch', oldmatch)
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	65 scmutil.match = f
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	66 return oldmatch
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	67
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	68 def restorematchfn():
21090 aa3d652ba1d5 largefiles: clarify installmatchfn documentation Mads Kiilerich <madski@unity3d.com> parents: 21089 diff changeset	69 '''restores scmutil.match to what it was before installmatchfn
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	70 was called. no-op if scmutil.match is its original function.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	71
21090 aa3d652ba1d5 largefiles: clarify installmatchfn documentation Mads Kiilerich <madski@unity3d.com> parents: 21089 diff changeset	72 Note that n calls to installmatchfn will require n calls to
23551 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23549 diff changeset	73 restore the original matchfn.'''
21092 56fda512db9f largefiles: remove silent handling of incorrect invocation of restorematchfn Mads Kiilerich <madski@unity3d.com> parents: 21091 diff changeset	74 scmutil.match = getattr(scmutil.match, 'oldmatch')
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	75
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	76 def installmatchandpatsfn(f):
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	77 oldmatchandpats = scmutil.matchandpats
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	78 setattr(f, 'oldmatchandpats', oldmatchandpats)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	79 scmutil.matchandpats = f
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	80 return oldmatchandpats
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	81
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	82 def restorematchandpatsfn():
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	83 '''restores scmutil.matchandpats to what it was before
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23041 diff changeset	84 installmatchandpatsfn was called. No-op if scmutil.matchandpats
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	85 is its original function.
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	86
23139 e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23041 diff changeset	87 Note that n calls to installmatchandpatsfn will require n calls
23551 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23549 diff changeset	88 to restore the original matchfn.'''
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	89 scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats',
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	90 scmutil.matchandpats)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	91
23779 749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	92 def addlargefiles(ui, repo, isaddremove, matcher, **opts):
23896 ec2c2e1400f0 largefiles: don't pop largefile-specific arguments to the add command Matt Harbison <matt_harbison@yahoo.com> parents: 23853 diff changeset	93 large = opts.get('large')
15227 a7686abf73a6 largefiles: factor out lfutil.getminsize() Greg Ward <greg@gerg.ca> parents: 15224 diff changeset	94 lfsize = lfutil.getminsize(
23896 ec2c2e1400f0 largefiles: don't pop largefile-specific arguments to the add command Matt Harbison <matt_harbison@yahoo.com> parents: 23853 diff changeset	95 ui, lfutil.islfilesrepo(repo), opts.get('lfsize'))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	96
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	97 lfmatcher = None
15739 be55285470cf largefiles: tiny code clean up Michal Sznajder <michalsznajder@gmail.com> parents: 15674 diff changeset	98 if lfutil.islfilesrepo(repo):
15229 89e19ca2a90e largefiles: use ui.configlist() to split largefiles.patterns Greg Ward <greg@gerg.ca> parents: 15227 diff changeset	99 lfpats = ui.configlist(lfutil.longname, 'patterns', default=[])
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	100 if lfpats:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	101 lfmatcher = match_.match(repo.root, '', list(lfpats))
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	102
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	103 lfnames = []
23541 891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	104 m = copy.copy(matcher)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	105 m.bad = lambda x, y: None
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	106 wctx = repo[None]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	107 for f in repo.walk(m):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	108 exact = m.exact(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	109 lfile = lfutil.standin(f) in wctx
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	110 nfile = f in wctx
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	111 exists = lfile or nfile
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	112
23779 749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	113 # addremove in core gets fancy with the name, add doesn't
749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	114 if isaddremove:
749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	115 name = m.uipath(f)
749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	116 else:
749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	117 name = m.rel(f)
749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	118
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	119 # Don't warn the user when they attempt to add a normal tracked file.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	120 # The normal add code will do that for us.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	121 if exact and exists:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	122 if lfile:
23779 749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	123 ui.warn(_('%s already a largefile\n') % name)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	124 continue
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	125
17232 25248e2ebaee largefiles: ensure addlargefiles() doesn't add a standin as a largefile Matt Harbison <matt_harbison@yahoo.com> parents: 17231 diff changeset	126 if (exact or not exists) and not lfutil.isstandin(f):
17231 2446b63c89ec largefiles: fix a traceback when addremove follows a remove (issue3507) Matt Harbison <matt_harbison@yahoo.com> parents: 17229 diff changeset	127 # In case the file was removed previously, but not committed
2446b63c89ec largefiles: fix a traceback when addremove follows a remove (issue3507) Matt Harbison <matt_harbison@yahoo.com> parents: 17229 diff changeset	128 # (issue3507)
23745 86810cd85eb8 largefiles: convert addlargefiles() to vfs Matt Harbison <matt_harbison@yahoo.com> parents: 23738 diff changeset	129 if not repo.wvfs.exists(f):
17231 2446b63c89ec largefiles: fix a traceback when addremove follows a remove (issue3507) Matt Harbison <matt_harbison@yahoo.com> parents: 17229 diff changeset	130 continue
2446b63c89ec largefiles: fix a traceback when addremove follows a remove (issue3507) Matt Harbison <matt_harbison@yahoo.com> parents: 17229 diff changeset	131
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	132 abovemin = (lfsize and
23745 86810cd85eb8 largefiles: convert addlargefiles() to vfs Matt Harbison <matt_harbison@yahoo.com> parents: 23738 diff changeset	133 repo.wvfs.lstat(f).st_size >= lfsize * 1024 * 1024)
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	134 if large or abovemin or (lfmatcher and lfmatcher(f)):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	135 lfnames.append(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	136 if ui.verbose or not exact:
23779 749dc66e9329 largefiles: align the output messages for an added file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23778 diff changeset	137 ui.status(_('adding %s as a largefile\n') % name)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	138
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	139 bad = []
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	140
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	141 # Need to lock, otherwise there could be a race condition between
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	142 # when standins are created and added to the repo.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	143 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	144 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	145 if not opts.get('dry_run'):
23041 a36625ef1f35 largefiles: move initialization of standins variable to clarify its "scope" Mads Kiilerich <madski@unity3d.com> parents: 23040 diff changeset	146 standins = []
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	147 lfdirstate = lfutil.openlfdirstate(ui, repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	148 for f in lfnames:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	149 standinname = lfutil.standin(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	150 lfutil.writestandin(repo, standinname, hash='',
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	151 executable=lfutil.getexecutable(repo.wjoin(f)))
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	152 standins.append(standinname)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	153 if lfdirstate[f] == 'r':
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	154 lfdirstate.normallookup(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	155 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	156 lfdirstate.add(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	157 lfdirstate.write()
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	158 bad += [lfutil.splitstandin(f)
18154 93c697d9c158 largefiles: remove trivial portability wrappers Mads Kiilerich <madski@unity3d.com> parents: 18153 diff changeset	159 for f in repo[None].add(standins)
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	160 if f in m.files()]
23780 6b1428e55728 largefiles: return the list of added files from addlargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23779 diff changeset	161
6b1428e55728 largefiles: return the list of added files from addlargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23779 diff changeset	162 added = [f for f in lfnames if f not in bad]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	163 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	164 wlock.release()
23780 6b1428e55728 largefiles: return the list of added files from addlargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23779 diff changeset	165 return added, bad
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	166
23753 f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	167 def removelargefiles(ui, repo, isaddremove, matcher, **opts):
15786 aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15663 diff changeset	168 after = opts.get('after')
23753 f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	169 m = composelargefilematcher(matcher, repo[None].manifest())
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	170 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	171 repo.lfstatus = True
23753 f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	172 s = repo.status(match=m, clean=not isaddremove)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	173 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	174 repo.lfstatus = False
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	175 manifest = repo[None].manifest()
15255 7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	176 modified, added, deleted, clean = [[f for f in list
7ab05d752405 largefiles: cosmetics, whitespace, code style Greg Ward <greg@gerg.ca> parents: 15254 diff changeset	177 if lfutil.standin(f) in manifest]
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	178 for list in (s.modified, s.added,
1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	179 s.deleted, s.clean)]
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	180
18066 abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	181 def warn(files, msg):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	182 for f in files:
18066 abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	183 ui.warn(msg % m.rel(f))
17588 e0081bb5450e largefiles: exit from remove with 1 on warnings Matt Harbison <matt_harbison@yahoo.com> parents: 17587 diff changeset	184 return int(len(files) > 0)
e0081bb5450e largefiles: exit from remove with 1 on warnings Matt Harbison <matt_harbison@yahoo.com> parents: 17587 diff changeset	185
e0081bb5450e largefiles: exit from remove with 1 on warnings Matt Harbison <matt_harbison@yahoo.com> parents: 17587 diff changeset	186 result = 0
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	187
15786 aca0f2b3c7e3 largefiles: fix confusion upon removal of added largefile (issue3176) Na'Tosha Bard <natosha@unity3d.com> parents: 15663 diff changeset	188 if after:
22630 0290982e5ac7 largefiles: remove 'forget' list that's always empty Martin von Zweigbergk <martinvonz@gmail.com> parents: 22289 diff changeset	189 remove = deleted
18066 abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	190 result = warn(modified + added + clean,
abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	191 _('not removing %s: file still exists\n'))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	192 else:
22630 0290982e5ac7 largefiles: remove 'forget' list that's always empty Martin von Zweigbergk <martinvonz@gmail.com> parents: 22289 diff changeset	193 remove = deleted + clean
18066 abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	194 result = warn(modified, _('not removing %s: file is modified (use -f'
abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	195 ' to force removal)\n'))
abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	196 result = warn(added, _('not removing %s: file has been marked for add'
abe9799a86d6 largefiles: align rm warnings with warnings used in core Mads Kiilerich <madski@unity3d.com> parents: 18011 diff changeset	197 ' (use forget to undo)\n')) or result
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	198
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	199 # Need to lock because standin files are deleted then removed from the
17407 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17299 diff changeset	200 # repository and we could race in-between.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	201 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	202 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	203 lfdirstate = lfutil.openlfdirstate(ui, repo)
23670 55c92618fdd4 largefiles: eliminate a duplicate message when removing files in verbose mode Matt Harbison <matt_harbison@yahoo.com> parents: 23665 diff changeset	204 for f in sorted(remove):
23778 ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	205 if ui.verbose or not m.exact(f):
ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	206 # addremove in core gets fancy with the name, remove doesn't
ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	207 if isaddremove:
ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	208 name = m.uipath(f)
ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	209 else:
ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	210 name = m.rel(f)
ce0731e58ac9 largefiles: align the output messages for a removed file with core methods Matt Harbison <matt_harbison@yahoo.com> parents: 23753 diff changeset	211 ui.status(_('removing %s\n') % name)
23604 96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	212
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	213 if not opts.get('dry_run'):
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	214 if not after:
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	215 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	216
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	217 if opts.get('dry_run'):
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	218 return result
96d335e4eacb largefiles: don't actually remove largefiles in an addremove dry run Matt Harbison <matt_harbison@yahoo.com> parents: 23419 diff changeset	219
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	220 remove = [lfutil.standin(f) for f in remove]
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	221 # If this is being called by addremove, let the original addremove
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	222 # function handle this.
23038 3f581bfbb268 largefiles: replace repo._isaddremove hack with a simple function parameter Mads Kiilerich <madski@unity3d.com> parents: 22919 diff changeset	223 if not isaddremove:
18153 51837a31b425 largefiles: remove reporemove portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	224 for f in remove:
51837a31b425 largefiles: remove reporemove portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	225 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
51837a31b425 largefiles: remove reporemove portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	226 repo[None].forget(remove)
23733 1b3df5ef5949 largefiles: properly sync lfdirstate after removing largefiles Matt Harbison <matt_harbison@yahoo.com> parents: 23707 diff changeset	227
1b3df5ef5949 largefiles: properly sync lfdirstate after removing largefiles Matt Harbison <matt_harbison@yahoo.com> parents: 23707 diff changeset	228 for f in remove:
1b3df5ef5949 largefiles: properly sync lfdirstate after removing largefiles Matt Harbison <matt_harbison@yahoo.com> parents: 23707 diff changeset	229 lfutil.synclfdirstate(repo, lfdirstate, lfutil.splitstandin(f),
1b3df5ef5949 largefiles: properly sync lfdirstate after removing largefiles Matt Harbison <matt_harbison@yahoo.com> parents: 23707 diff changeset	230 False)
1b3df5ef5949 largefiles: properly sync lfdirstate after removing largefiles Matt Harbison <matt_harbison@yahoo.com> parents: 23707 diff changeset	231
1b3df5ef5949 largefiles: properly sync lfdirstate after removing largefiles Matt Harbison <matt_harbison@yahoo.com> parents: 23707 diff changeset	232 lfdirstate.write()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	233 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	234 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	235
17588 e0081bb5450e largefiles: exit from remove with 1 on warnings Matt Harbison <matt_harbison@yahoo.com> parents: 17587 diff changeset	236 return result
e0081bb5450e largefiles: exit from remove with 1 on warnings Matt Harbison <matt_harbison@yahoo.com> parents: 17587 diff changeset	237
16449 874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb Martin Geisler <mg@lazybytes.net> parents: 16439 diff changeset	238 # For overriding mercurial.hgweb.webcommands so that largefiles will
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb Martin Geisler <mg@lazybytes.net> parents: 16439 diff changeset	239 # appear at their right place in the manifests.
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb Martin Geisler <mg@lazybytes.net> parents: 16439 diff changeset	240 def decodepath(orig, path):
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb Martin Geisler <mg@lazybytes.net> parents: 16439 diff changeset	241 return lfutil.splitstandin(path) or path
874a680a3e23 largefiles: hide .hglf/ prefix for largefiles in hgweb Martin Geisler <mg@lazybytes.net> parents: 16439 diff changeset	242
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	243 # -- Wrappers: modify existing commands --------------------------------
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	244
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	245 def overrideadd(orig, ui, repo, pats, *opts):
23896 ec2c2e1400f0 largefiles: don't pop largefile-specific arguments to the add command Matt Harbison <matt_harbison@yahoo.com> parents: 23853 diff changeset	246 normal = opts.get('normal')
15944 f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	247 if normal:
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	248 if opts.get('large'):
f19d5c852f9b largefiles: add --normal option to hg add (issue3061) Na'Tosha Bard <natosha@unity3d.com> parents: 15930 diff changeset	249 raise util.Abort(_('--normal cannot be used with --large'))
23898 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	250 return orig(ui, repo, pats, *opts)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	251
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	252 def cmdutiladd(orig, ui, repo, matcher, prefix, explicitonly, **opts):
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	253 # The --normal flag short circuits this override
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	254 if opts.get('normal'):
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	255 return orig(ui, repo, matcher, prefix, explicitonly, **opts)
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	256
23898 5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	257 ladded, lbad = addlargefiles(ui, repo, False, matcher, **opts)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	258 normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(),
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	259 ladded)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	260 bad = orig(ui, repo, normalmatcher, prefix, explicitonly, **opts)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	261
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	262 bad.extend(f for f in lbad)
5ce8dcd05dc4 largefiles: enable subrepo support for add Matt Harbison <matt_harbison@yahoo.com> parents: 23896 diff changeset	263 return bad
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	264
23794 304e69cb1ee9 largefiles: enable subrepo support for remove Matt Harbison <matt_harbison@yahoo.com> parents: 23781 diff changeset	265 def cmdutilremove(orig, ui, repo, matcher, prefix, after, force, subrepos):
304e69cb1ee9 largefiles: enable subrepo support for remove Matt Harbison <matt_harbison@yahoo.com> parents: 23781 diff changeset	266 normalmatcher = composenormalfilematcher(matcher, repo[None].manifest())
304e69cb1ee9 largefiles: enable subrepo support for remove Matt Harbison <matt_harbison@yahoo.com> parents: 23781 diff changeset	267 result = orig(ui, repo, normalmatcher, prefix, after, force, subrepos)
304e69cb1ee9 largefiles: enable subrepo support for remove Matt Harbison <matt_harbison@yahoo.com> parents: 23781 diff changeset	268 return removelargefiles(ui, repo, False, matcher, after=after,
304e69cb1ee9 largefiles: enable subrepo support for remove Matt Harbison <matt_harbison@yahoo.com> parents: 23781 diff changeset	269 force=force) or result
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	270
16515 12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	271 def overridestatusfn(orig, repo, rev2, **opts):
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	272 try:
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	273 repo._repo.lfstatus = True
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	274 return orig(repo, rev2, **opts)
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	275 finally:
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	276 repo._repo.lfstatus = False
12dabc22de77 largefiles: fix status -S reporting of subrepos (issue3231) Matt Harbison <matt_harbison@yahoo.com> parents: 16449 diff changeset	277
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	278 def overridestatus(orig, ui, repo, pats, *opts):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	279 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	280 repo.lfstatus = True
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	281 return orig(ui, repo, pats, *opts)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	282 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	283 repo.lfstatus = False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	284
16516 597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	285 def overridedirty(orig, repo, ignoreupdate=False):
597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	286 try:
597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	287 repo._repo.lfstatus = True
597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	288 return orig(repo, ignoreupdate)
597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	289 finally:
597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	290 repo._repo.lfstatus = False
597ddcb41b32 largefiles: notice dirty large files in a subrepo Matt Harbison <matt_harbison@yahoo.com> parents: 16515 diff changeset	291
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	292 def overridelog(orig, ui, repo, pats, *opts):
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	293 def overridematchandpats(ctx, pats=[], opts={}, globbed=False,
18341 ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	294 default='relpath'):
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	295 """Matcher that merges root directory with .hglf, suitable for log.
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	296 It is still possible to match .hglf directly.
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	297 For any listed files run log on the standin too.
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	298 matchfn tries both the given filename and with .hglf stripped.
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	299 """
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	300 matchandpats = oldmatchandpats(ctx, pats, opts, globbed, default)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	301 m, p = copy.copy(matchandpats)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	302
22170 0e1b02f984c7 largefiles: don't override matchandpats for always matchers (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22169 diff changeset	303 if m.always():
0e1b02f984c7 largefiles: don't override matchandpats for always matchers (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22169 diff changeset	304 # We want to match everything anyway, so there's no benefit trying
0e1b02f984c7 largefiles: don't override matchandpats for always matchers (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22169 diff changeset	305 # to add standins.
0e1b02f984c7 largefiles: don't override matchandpats for always matchers (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22169 diff changeset	306 return matchandpats
0e1b02f984c7 largefiles: don't override matchandpats for always matchers (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22169 diff changeset	307
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	308 pats = set(p)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	309 # TODO: handling of patterns in both cases below
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	310 if m._cwd:
21209 c5d35995d192 largefiles: better handling of log from other working directory (issue4236) Mads Kiilerich <madski@unity3d.com> parents: 21196 diff changeset	311 if os.path.isabs(m._cwd):
c5d35995d192 largefiles: better handling of log from other working directory (issue4236) Mads Kiilerich <madski@unity3d.com> parents: 21196 diff changeset	312 # TODO: handle largefile magic when invoked from other cwd
c5d35995d192 largefiles: better handling of log from other working directory (issue4236) Mads Kiilerich <madski@unity3d.com> parents: 21196 diff changeset	313 return matchandpats
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	314 back = (m._cwd.count('/') + 1) * '../'
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	315 pats.update(back + lfutil.standin(m._cwd + '/' + f) for f in p)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	316 else:
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	317 pats.update(lfutil.standin(f) for f in p)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	318
19472 32e502b26983 largefiles: overridematch() should replace the file path instead of extending (issue3934) Wei, Elson <elson.wei@gmail.com> parents: 19226 diff changeset	319 for i in range(0, len(m._files)):
32e502b26983 largefiles: overridematch() should replace the file path instead of extending (issue3934) Wei, Elson <elson.wei@gmail.com> parents: 19226 diff changeset	320 standin = lfutil.standin(m._files[i])
32e502b26983 largefiles: overridematch() should replace the file path instead of extending (issue3934) Wei, Elson <elson.wei@gmail.com> parents: 19226 diff changeset	321 if standin in repo[ctx.node()]:
32e502b26983 largefiles: overridematch() should replace the file path instead of extending (issue3934) Wei, Elson <elson.wei@gmail.com> parents: 19226 diff changeset	322 m._files[i] = standin
21275 c7e9fb881a5a largefiles: include largefiles when doing log on a directory (issue4241) Mads Kiilerich <madski@unity3d.com> parents: 21209 diff changeset	323 elif m._files[i] not in repo[ctx.node()]:
c7e9fb881a5a largefiles: include largefiles when doing log on a directory (issue4241) Mads Kiilerich <madski@unity3d.com> parents: 21209 diff changeset	324 m._files.append(standin)
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	325 pats.add(standin)
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	326
18341 ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	327 m._fmap = set(m._files)
18813 d780c472463c largefiles: fix _always for match overrides Siddharth Agarwal <sid0@fb.com> parents: 18782 diff changeset	328 m._always = False
18341 ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	329 origmatchfn = m.matchfn
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	330 def lfmatchfn(f):
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	331 lf = lfutil.splitstandin(f)
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	332 if lf is not None and origmatchfn(lf):
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	333 return True
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	334 r = origmatchfn(f)
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	335 return r
ed23d6100dd3 largefiles: make log match largefiles in the non-standin location too Mads Kiilerich <mads@kiilerich.com> parents: 18154 diff changeset	336 m.matchfn = lfmatchfn
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	337
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	338 return m, pats
49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	339
22169 35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	340 # For hg log --patch, the match object is used in two different senses:
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	341 # (1) to determine what revisions should be printed out, and
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	342 # (2) to determine what files to print out diffs for.
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	343 # The magic matchandpats override should be used for case (1) but not for
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	344 # case (2).
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	345 def overridemakelogfilematcher(repo, pats, opts):
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	346 pctx = repo[None]
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	347 match, pats = oldmatchandpats(pctx, pats, opts)
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	348 return lambda rev: match
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	349
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	350 oldmatchandpats = installmatchandpatsfn(overridematchandpats)
22169 35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	351 oldmakelogfilematcher = cmdutil._makenofollowlogfilematcher
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	352 setattr(cmdutil, '_makenofollowlogfilematcher', overridemakelogfilematcher)
35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	353
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	354 try:
17589 0f39e9355d3c largefiles: preserve the exit status of the log command Matt Harbison <matt_harbison@yahoo.com> parents: 17588 diff changeset	355 return orig(ui, repo, pats, *opts)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	356 finally:
21110 49e13e76ec5a largefiles: changed overridelog to work with graphlog Lucas Moscovicz <lmoscovicz@fb.com> parents: 21096 diff changeset	357 restorematchandpatsfn()
22169 35cc5b07b3fc largefiles: in overridelog, use non-lf matcher for patch generation (issue4334) Siddharth Agarwal <sid0@fb.com> parents: 22168 diff changeset	358 setattr(cmdutil, '_makenofollowlogfilematcher', oldmakelogfilematcher)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	359
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	360 def overrideverify(orig, ui, repo, pats, *opts):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	361 large = opts.pop('large', False)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	362 all = opts.pop('lfa', False)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	363 contents = opts.pop('lfc', False)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	364
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	365 result = orig(ui, repo, pats, *opts)
18547 2e3ec9e6ee6e largefiles: make verify --lfa and --lfc work without --large Mads Kiilerich <madski@unity3d.com> parents: 18541 diff changeset	366 if large or all or contents:
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	367 result = result or lfcommands.verifylfiles(ui, repo, all, contents)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	368 return result
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	369
18144 e16982a74bf7 largefiles: introduce basic debugstate --large functionality Mads Kiilerich <madski@unity3d.com> parents: 18142 diff changeset	370 def overridedebugstate(orig, ui, repo, pats, *opts):
e16982a74bf7 largefiles: introduce basic debugstate --large functionality Mads Kiilerich <madski@unity3d.com> parents: 18142 diff changeset	371 large = opts.pop('large', False)
e16982a74bf7 largefiles: introduce basic debugstate --large functionality Mads Kiilerich <madski@unity3d.com> parents: 18142 diff changeset	372 if large:
21088 e095626e8676 largefiles: full debugdirstate functionality for largefiles Mads Kiilerich <madski@unity3d.com> parents: 21087 diff changeset	373 class fakerepo(object):
e095626e8676 largefiles: full debugdirstate functionality for largefiles Mads Kiilerich <madski@unity3d.com> parents: 21087 diff changeset	374 dirstate = lfutil.openlfdirstate(ui, repo)
e095626e8676 largefiles: full debugdirstate functionality for largefiles Mads Kiilerich <madski@unity3d.com> parents: 21087 diff changeset	375 orig(ui, fakerepo, pats, *opts)
18144 e16982a74bf7 largefiles: introduce basic debugstate --large functionality Mads Kiilerich <madski@unity3d.com> parents: 18142 diff changeset	376 else:
e16982a74bf7 largefiles: introduce basic debugstate --large functionality Mads Kiilerich <madski@unity3d.com> parents: 18142 diff changeset	377 orig(ui, repo, pats, *opts)
e16982a74bf7 largefiles: introduce basic debugstate --large functionality Mads Kiilerich <madski@unity3d.com> parents: 18142 diff changeset	378
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	379 # Override needs to refresh standins so that update's normal merge
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	380 # will go through properly. Then the other update hook (overriding repo.update)
17407 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17299 diff changeset	381 # will get the new files. Filemerge is also overridden so that the merge
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	382 # will merge standins correctly.
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	383 def overrideupdate(orig, ui, repo, pats, *opts):
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	384 # Need to lock between the standins getting updated and their
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	385 # largefiles getting updated
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	386 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	387 try:
23040 46c5983ce48f largefiles: the update override only needs lfdirstate and status for --check Mads Kiilerich <madski@unity3d.com> parents: 23039 diff changeset	388 if opts['check']:
46c5983ce48f largefiles: the update override only needs lfdirstate and status for --check Mads Kiilerich <madski@unity3d.com> parents: 23039 diff changeset	389 lfdirstate = lfutil.openlfdirstate(ui, repo)
46c5983ce48f largefiles: the update override only needs lfdirstate and status for --check Mads Kiilerich <madski@unity3d.com> parents: 23039 diff changeset	390 unsure, s = lfdirstate.status(
46c5983ce48f largefiles: the update override only needs lfdirstate and status for --check Mads Kiilerich <madski@unity3d.com> parents: 23039 diff changeset	391 match_.always(repo.root, repo.getcwd()),
46c5983ce48f largefiles: the update override only needs lfdirstate and status for --check Mads Kiilerich <madski@unity3d.com> parents: 23039 diff changeset	392 [], False, False, False)
21089 278bd08a2902 largefiles: use more reasonable locking for update Mads Kiilerich <madski@unity3d.com> parents: 21088 diff changeset	393
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	394 mod = len(s.modified) > 0
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	395 for lfile in unsure:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	396 standin = lfutil.standin(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	397 if repo['.'][standin].data().strip() != \
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	398 lfutil.hashfile(repo.wjoin(lfile)):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	399 mod = True
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	400 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	401 lfdirstate.normal(lfile)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	402 lfdirstate.write()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	403 if mod:
19805 9b088e9c2690 largefiles: standardize error message for dirty working dir Siddharth Agarwal <sid0@fb.com> parents: 19775 diff changeset	404 raise util.Abort(_('uncommitted changes'))
21089 278bd08a2902 largefiles: use more reasonable locking for update Mads Kiilerich <madski@unity3d.com> parents: 21088 diff changeset	405 return orig(ui, repo, pats, *opts)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	406 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	407 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	408
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	409 # Before starting the manifest merge, merge.updates will call
23551 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23549 diff changeset	410 # _checkunknownfile to check if there are any files in the merged-in
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	411 # changeset that collide with unknown files in the working copy.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	412 #
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	413 # The largefiles are seen as unknown, so this prevents us from merging
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	414 # in a file 'foo' if we already have a largefile with the same name.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	415 #
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	416 # The overridden function filters the unknown files by removing any
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	417 # largefiles. This makes the merge proceed and we can then handle this
23307 9dd0d0d61a24 largefiles: update comments to refer to the right overridden method Martin von Zweigbergk <martinvonz@google.com> parents: 23276 diff changeset	418 # case further in the overridden calculateupdates function below.
23665 0297d8469350 merge: don't overwrite untracked file at directory rename target Martin von Zweigbergk <martinvonz@google.com> parents: 23656 diff changeset	419 def overridecheckunknownfile(origfn, repo, wctx, mctx, f, f2=None):
19161 24877c50aada largefiles: check unknown files with case awareness of the filesystem FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19001 diff changeset	420 if lfutil.standin(repo.dirstate.normalize(f)) in wctx:
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16075 diff changeset	421 return False
23665 0297d8469350 merge: don't overwrite untracked file at directory rename target Martin von Zweigbergk <martinvonz@google.com> parents: 23656 diff changeset	422 return origfn(repo, wctx, mctx, f, f2)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	423
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	424 # The manifest merge handles conflicts on the manifest level. We want
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	425 # to handle changes in largefile-ness of files at this level too.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	426 #
23307 9dd0d0d61a24 largefiles: update comments to refer to the right overridden method Martin von Zweigbergk <martinvonz@google.com> parents: 23276 diff changeset	427 # The strategy is to run the original calculateupdates and then process
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	428 # the action list it outputs. There are two cases we need to deal with:
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	429 #
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	430 # 1. Normal file in p1, largefile in p2. Here the largefile is
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	431 # detected via its standin file, which will enter the working copy
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	432 # with a "get" action. It is not "merge" since the standin is all
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	433 # Mercurial is concerned with at this level -- the link to the
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	434 # existing normal file is not relevant here.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	435 #
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	436 # 2. Largefile in p1, normal file in p2. Here we get a "merge" action
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	437 # since the largefile will be present in the working copy and
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	438 # different from the normal file in p2. Mercurial therefore
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	439 # triggers a merge action.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	440 #
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	441 # In both cases, we prompt the user and emit new actions to either
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	442 # remove the standin (if the normal file was kept) or to remove the
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	443 # normal file and get the standin (if the largefile was kept). The
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	444 # default prompt answer is to use the largefile version since it was
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	445 # presumably changed on purpose.
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	446 #
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	447 # Finally, the merge.applyupdates function will then take care of
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	448 # writing the files into the working copy and lfcommands.updatelfiles
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	449 # will update the largefiles.
21081 ffd7b6ce46ff merge: pass merge ancestor to calculateupdates as a list Mads Kiilerich <madski@unity3d.com> parents: 21080 diff changeset	450 def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force,
21080 04540a8499a3 merge: move ancestor selection tweaking from manifestmerge to update function Mads Kiilerich <madski@unity3d.com> parents: 21053 diff changeset	451 partial, acceptremote, followcopies):
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18600 diff changeset	452 overwrite = force and not branchmerge
23534 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23511 diff changeset	453 actions, diverge, renamedelete = origfn(
a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23511 diff changeset	454 repo, p1, p2, pas, branchmerge, force, partial, acceptremote,
a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23511 diff changeset	455 followcopies)
19952 8eb99e5cec4a largefiles: don't process merge actions at all when overwriting Mads Kiilerich <madski@unity3d.com> parents: 19805 diff changeset	456
8eb99e5cec4a largefiles: don't process merge actions at all when overwriting Mads Kiilerich <madski@unity3d.com> parents: 19805 diff changeset	457 if overwrite:
23534 a5887f2da5e6 merge: don't treat 'diverge' and 'renamedelete' like actions Martin von Zweigbergk <martinvonz@google.com> parents: 23511 diff changeset	458 return actions, diverge, renamedelete
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	459
23537 38e55e55ae4d largefiles: rewrite merge code using dictionary with entry per file Martin von Zweigbergk <martinvonz@google.com> parents: 23536 diff changeset	460 # Convert to dictionary with filename as key and action as value.
23538 42ae1b1f048f largefiles: start by finding files of interest Martin von Zweigbergk <martinvonz@google.com> parents: 23537 diff changeset	461 lfiles = set()
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	462 for f in actions:
20148 7ac03bfa1369 largefiles: don't crash on 'local renamed directory' actions Mads Kiilerich <madski@unity3d.com> parents: 19967 diff changeset	463 splitstandin = f and lfutil.splitstandin(f)
23653 a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23647 diff changeset	464 if splitstandin in p1:
a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23647 diff changeset	465 lfiles.add(splitstandin)
a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23647 diff changeset	466 elif lfutil.standin(f) in p1:
a7a0f32a383f merge: make calculateupdates() return file->action dict Martin von Zweigbergk <martinvonz@google.com> parents: 23647 diff changeset	467 lfiles.add(f)
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	468
23538 42ae1b1f048f largefiles: start by finding files of interest Martin von Zweigbergk <martinvonz@google.com> parents: 23537 diff changeset	469 for lfile in lfiles:
42ae1b1f048f largefiles: start by finding files of interest Martin von Zweigbergk <martinvonz@google.com> parents: 23537 diff changeset	470 standin = lfutil.standin(lfile)
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	471 (lm, largs, lmsg) = actions.get(lfile, (None, None, None))
7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	472 (sm, sargs, smsg) = actions.get(standin, (None, None, None))
23549 495bc1b65d25 merge: move cd/dc prompts after largefiles prompts Martin von Zweigbergk <martinvonz@google.com> parents: 23545 diff changeset	473 if sm in ('g', 'dc') and lm != 'r':
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	474 # Case 1: normal file in the working copy, largefile in
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	475 # the second parent
23470 2b23a25f06fd largefiles: don't clobber merge action message with user message Martin von Zweigbergk <martinvonz@google.com> parents: 23441 diff changeset	476 usermsg = _('remote turned local normal file %s into a largefile\n'
2b23a25f06fd largefiles: don't clobber merge action message with user message Martin von Zweigbergk <martinvonz@google.com> parents: 23441 diff changeset	477 'use (l)argefile or keep (n)ormal file?'
2b23a25f06fd largefiles: don't clobber merge action message with user message Martin von Zweigbergk <martinvonz@google.com> parents: 23441 diff changeset	478 '$$ &Largefile $$ &Normal file') % lfile
23491 3805f4b0f5a9 largefiles: remove redundant checks for false modify/delete conflicts Martin von Zweigbergk <martinvonz@google.com> parents: 23471 diff changeset	479 if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	480 actions[lfile] = ('r', None, 'replaced by standin')
7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	481 actions[standin] = ('g', sargs, 'replaces standin')
23419 a34a99181f36 largefiles: don't show largefile/normal prompts if one side is unchanged Mads Kiilerich <madski@unity3d.com> parents: 23041 diff changeset	482 else: # keep local normal file
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	483 actions[lfile] = ('k', None, 'replaces standin')
23501 28f01c318c05 largefiles: don't use 'r' action for standin that doesn't exist Martin von Zweigbergk <martinvonz@google.com> parents: 23500 diff changeset	484 if branchmerge:
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	485 actions[standin] = ('k', None, 'replaced by non-standin')
23501 28f01c318c05 largefiles: don't use 'r' action for standin that doesn't exist Martin von Zweigbergk <martinvonz@google.com> parents: 23500 diff changeset	486 else:
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	487 actions[standin] = ('r', None, 'replaced by non-standin')
23549 495bc1b65d25 merge: move cd/dc prompts after largefiles prompts Martin von Zweigbergk <martinvonz@google.com> parents: 23545 diff changeset	488 elif lm in ('g', 'dc') and sm != 'r':
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	489 # Case 2: largefile in the working copy, normal file in
9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	490 # the second parent
23470 2b23a25f06fd largefiles: don't clobber merge action message with user message Martin von Zweigbergk <martinvonz@google.com> parents: 23441 diff changeset	491 usermsg = _('remote turned local largefile %s into a normal file\n'
19967 e92c6524a76d largefiles: use 'remote'/'local' in merge prompts like in other merge prompts Mads Kiilerich <madski@unity3d.com> parents: 19954 diff changeset	492 'keep (l)argefile or use (n)ormal file?'
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19161 diff changeset	493 '$$ &Largefile $$ &Normal file') % lfile
23491 3805f4b0f5a9 largefiles: remove redundant checks for false modify/delete conflicts Martin von Zweigbergk <martinvonz@google.com> parents: 23471 diff changeset	494 if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	495 if branchmerge:
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	496 # largefile can be restored from standin safely
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	497 actions[lfile] = ('k', None, 'replaced by standin')
7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	498 actions[standin] = ('k', None, 'replaces standin')
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	499 else:
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	500 # "lfile" should be marked as "removed" without
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	501 # removal of itself
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	502 actions[lfile] = ('lfmr', None,
7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	503 'forget non-standin largefile')
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	504
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	505 # linear-merge should treat this largefile as 're-added'
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	506 actions[standin] = ('a', None, 'keep standin')
23419 a34a99181f36 largefiles: don't show largefile/normal prompts if one side is unchanged Mads Kiilerich <madski@unity3d.com> parents: 23041 diff changeset	507 else: # pick remote normal file
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	508 actions[lfile] = ('g', largs, 'replaces standin')
7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	509 actions[standin] = ('r', None, 'replaced by non-standin')
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	510
23654 7fd1a6c27e60 largefiles: don't duplicate 'actions' into 'actionbyfile' Martin von Zweigbergk <martinvonz@google.com> parents: 23653 diff changeset	511 return actions, diverge, renamedelete
15663 9036c7d106bf largefiles: handle merges between normal files and largefiles (issue3084) Martin Geisler <mg@aragost.com> parents: 15598 diff changeset	512
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	513 def mergerecordupdates(orig, repo, actions, branchmerge):
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	514 if 'lfmr' in actions:
23707 997a96cf6344 largefiles: mark lfile as added in lfdirstate when the standin is added Mads Kiilerich <madski@unity3d.com> parents: 23631 diff changeset	515 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	516 for lfile, args, msg in actions['lfmr']:
23707 997a96cf6344 largefiles: mark lfile as added in lfdirstate when the standin is added Mads Kiilerich <madski@unity3d.com> parents: 23631 diff changeset	517 # this should be executed before 'orig', to execute 'remove'
997a96cf6344 largefiles: mark lfile as added in lfdirstate when the standin is added Mads Kiilerich <madski@unity3d.com> parents: 23631 diff changeset	518 # before all other actions
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	519 repo.dirstate.remove(lfile)
23707 997a96cf6344 largefiles: mark lfile as added in lfdirstate when the standin is added Mads Kiilerich <madski@unity3d.com> parents: 23631 diff changeset	520 # make sure lfile doesn't get synclfdirstate'd as normal
997a96cf6344 largefiles: mark lfile as added in lfdirstate when the standin is added Mads Kiilerich <madski@unity3d.com> parents: 23631 diff changeset	521 lfdirstate.add(lfile)
997a96cf6344 largefiles: mark lfile as added in lfdirstate when the standin is added Mads Kiilerich <madski@unity3d.com> parents: 23631 diff changeset	522 lfdirstate.write()
22196 23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	523
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	524 return orig(repo, actions, branchmerge)
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	525
23fe278bde43 largefiles: keep largefiles from colliding with normal one during linear merge FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22194 diff changeset	526
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	527 # Override filemerge to prompt the user about how they wish to merge
20295 36333ff8c54d largefiles: drop redundant special handling of merges of renames Mads Kiilerich <madski@unity3d.com> parents: 20156 diff changeset	528 # largefiles. This will handle identical edits without prompting the user.
21524 47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21275 diff changeset	529 def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca, labels=None):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	530 if not lfutil.isstandin(orig):
21524 47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21275 diff changeset	531 return origfn(repo, mynode, orig, fcd, fco, fca, labels=labels)
20298 9d350fa0708e largefiles: stylistic cleanup of filemerge Mads Kiilerich <madski@unity3d.com> parents: 20297 diff changeset	532
20994 40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	533 ahash = fca.data().strip().lower()
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	534 dhash = fcd.data().strip().lower()
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	535 ohash = fco.data().strip().lower()
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	536 if (ohash != ahash and
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	537 ohash != dhash and
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	538 (dhash == ahash or
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	539 repo.ui.promptchoice(
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	540 _('largefile %s has a merge conflict\nancestor was %s\n'
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	541 'keep (l)ocal %s or\ntake (o)ther %s?'
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	542 '$$ &Local $$ &Other') %
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	543 (lfutil.splitstandin(orig), ahash, dhash, ohash),
40800668e019 largefiles: don't prompt when one side of merge was changed but didn't change Mads Kiilerich <madski@unity3d.com> parents: 20638 diff changeset	544 0) == 1)):
20298 9d350fa0708e largefiles: stylistic cleanup of filemerge Mads Kiilerich <madski@unity3d.com> parents: 20297 diff changeset	545 repo.wwrite(fcd.path(), fco.data(), fco.flags())
9d350fa0708e largefiles: stylistic cleanup of filemerge Mads Kiilerich <madski@unity3d.com> parents: 20297 diff changeset	546 return 0
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	547
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	548 # Copy first changes the matchers to match standins instead of
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	549 # largefiles. Then it overrides util.copyfile in that function it
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	550 # checks if the destination largefile already exists. It also keeps a
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	551 # list of copied files so that the largefiles can be copied and the
6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	552 # dirstate updated.
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	553 def overridecopy(orig, ui, repo, pats, opts, rename=False):
15252 6e809bb4f969 largefiles: improve comments, internal docstrings Greg Ward <greg@gerg.ca> parents: 15229 diff changeset	554 # doesn't remove largefile on rename
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	555 if len(pats) < 2:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	556 # this isn't legal, let the original function deal with it
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	557 return orig(ui, repo, pats, opts, rename)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	558
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	559 def makestandin(relpath):
20033 f962870712da pathutil: tease out a new library to break an import cycle from canonpath use Augie Fackler <raf@durin42.com> parents: 19967 diff changeset	560 path = pathutil.canonpath(repo.root, repo.getcwd(), relpath)
15323 19368c54a774 largefiles: remove all uses of os.path.relpath for 2.4 compatibility Benjamin Pollack <benjamin@bitquabit.com> parents: 15306 diff changeset	561 return os.path.join(repo.wjoin(lfutil.standin(path)))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	562
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	563 fullpats = scmutil.expandpats(pats)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	564 dest = fullpats[-1]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	565
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	566 if os.path.isdir(dest):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	567 if not os.path.isdir(makestandin(dest)):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	568 os.makedirs(makestandin(dest))
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	569 # This could copy both lfiles and normal files in one command,
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	570 # but we don't want to do that. First replace their matcher to
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	571 # only match normal files and run it, then replace it to just
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	572 # match largefiles and run it again.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	573 nonormalfiles = False
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	574 nolfiles = False
21091 dd584d1a75e7 largefiles: copy override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21090 diff changeset	575 installnormalfilesmatchfn(repo[None].manifest())
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	576 try:
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	577 try:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	578 result = orig(ui, repo, pats, opts, rename)
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	579 except util.Abort, e:
17263 c4ebdc36c17e largefiles: fix exception hack for i18n (issue3197) Matt Mackall <mpm@selenic.com> parents: 17245 diff changeset	580 if str(e) != _('no files to copy'):
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	581 raise e
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	582 else:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	583 nonormalfiles = True
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	584 result = 0
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	585 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	586 restorematchfn()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	587
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	588 # The first rename can cause our current working directory to be removed.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	589 # In that case there is nothing left to copy/rename so just quit.
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	590 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	591 repo.getcwd()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	592 except OSError:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	593 return result
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	594
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	595 try:
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	596 try:
16248 51e6f318bdf1 largefiles: fix check-code errors. Na'Tosha Bard <natosha@unity3d.com> parents: 16247 diff changeset	597 # When we call orig below it creates the standins but we don't add
51e6f318bdf1 largefiles: fix check-code errors. Na'Tosha Bard <natosha@unity3d.com> parents: 16247 diff changeset	598 # them to the dir state until later so lock during that time.
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	599 wlock = repo.wlock()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	600
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	601 manifest = repo[None].manifest()
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	602 def overridematch(ctx, pats=[], opts={}, globbed=False,
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	603 default='relpath'):
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	604 newpats = []
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	605 # The patterns were previously mangled to add the standin
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	606 # directory; we need to remove that now
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	607 for pat in pats:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	608 if match_.patkind(pat) is None and lfutil.shortname in pat:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	609 newpats.append(pat.replace(lfutil.shortname, ''))
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	610 else:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	611 newpats.append(pat)
15306 94527d67f3da largefiles: fix some badly named function parameters Greg Ward <greg@gerg.ca> parents: 15305 diff changeset	612 match = oldmatch(ctx, newpats, opts, globbed, default)
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	613 m = copy.copy(match)
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	614 lfile = lambda f: lfutil.standin(f) in manifest
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	615 m._files = [lfutil.standin(f) for f in m._files if lfile(f)]
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	616 m._fmap = set(m._files)
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	617 origmatchfn = m.matchfn
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	618 m.matchfn = lambda f: (lfutil.isstandin(f) and
16075 d2e8e79a6361 largefiles: reduce redundant splitstandin/standin combination FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16074 diff changeset	619 (f in manifest) and
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	620 origmatchfn(lfutil.splitstandin(f)) or
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	621 None)
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	622 return m
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	623 oldmatch = installmatchfn(overridematch)
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	624 listpats = []
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	625 for pat in pats:
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	626 if match_.patkind(pat) is not None:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	627 listpats.append(pat)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	628 else:
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	629 listpats.append(makestandin(pat))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	630
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	631 try:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	632 origcopyfile = util.copyfile
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	633 copiedfiles = []
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	634 def overridecopyfile(src, dest):
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	635 if (lfutil.shortname in src and
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	636 dest.startswith(repo.wjoin(lfutil.shortname))):
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	637 destlfile = dest.replace(lfutil.shortname, '')
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	638 if not opts['force'] and os.path.exists(destlfile):
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	639 raise IOError('',
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	640 _('destination largefile already exists'))
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	641 copiedfiles.append((src, dest))
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	642 origcopyfile(src, dest)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	643
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	644 util.copyfile = overridecopyfile
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	645 result += orig(ui, repo, listpats, opts, rename)
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	646 finally:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	647 util.copyfile = origcopyfile
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	648
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	649 lfdirstate = lfutil.openlfdirstate(ui, repo)
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	650 for (src, dest) in copiedfiles:
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	651 if (lfutil.shortname in src and
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	652 dest.startswith(repo.wjoin(lfutil.shortname))):
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	653 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '')
a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	654 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '')
17245 6e84171a61c8 largefiles: fix path handling for cp/mv (issue3516) Matt Harbison <matt_harbison@yahoo.com> parents: 17232 diff changeset	655 destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.'
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	656 if not os.path.isdir(destlfiledir):
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	657 os.makedirs(destlfiledir)
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	658 if rename:
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	659 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile))
21196 5c0d5b95b824 largefiles: remove directories emptied after their files are moved (issue3515) Matt Harbison <matt_harbison@yahoo.com> parents: 21110 diff changeset	660
5c0d5b95b824 largefiles: remove directories emptied after their files are moved (issue3515) Matt Harbison <matt_harbison@yahoo.com> parents: 21110 diff changeset	661 # The file is gone, but this deletes any empty parent
5c0d5b95b824 largefiles: remove directories emptied after their files are moved (issue3515) Matt Harbison <matt_harbison@yahoo.com> parents: 21110 diff changeset	662 # directories as a side-effect.
5c0d5b95b824 largefiles: remove directories emptied after their files are moved (issue3515) Matt Harbison <matt_harbison@yahoo.com> parents: 21110 diff changeset	663 util.unlinkpath(repo.wjoin(srclfile), True)
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	664 lfdirstate.remove(srclfile)
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	665 else:
17245 6e84171a61c8 largefiles: fix path handling for cp/mv (issue3516) Matt Harbison <matt_harbison@yahoo.com> parents: 17232 diff changeset	666 util.copyfile(repo.wjoin(srclfile),
6e84171a61c8 largefiles: fix path handling for cp/mv (issue3516) Matt Harbison <matt_harbison@yahoo.com> parents: 17232 diff changeset	667 repo.wjoin(destlfile))
6e84171a61c8 largefiles: fix path handling for cp/mv (issue3516) Matt Harbison <matt_harbison@yahoo.com> parents: 17232 diff changeset	668
15598 a77ce45584ef largefiles: fix rename (issue3093) Na'Tosha Bard <natosha@unity3d.com> parents: 15576 diff changeset	669 lfdirstate.add(destlfile)
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	670 lfdirstate.write()
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	671 except util.Abort, e:
17263 c4ebdc36c17e largefiles: fix exception hack for i18n (issue3197) Matt Mackall <mpm@selenic.com> parents: 17245 diff changeset	672 if str(e) != _('no files to copy'):
15277 018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	673 raise e
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	674 else:
018608160299 largefiles: use separate try/except and try/finally as needed for python2.4 Thomas Arendsen Hein <thomas@intevation.de> parents: 15255 diff changeset	675 nolfiles = True
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	676 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	677 restorematchfn()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	678 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	679
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	680 if nolfiles and nonormalfiles:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	681 raise util.Abort(_('no files to copy'))
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	682
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	683 return result
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	684
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	685 # When the user calls revert, we have to be careful to not revert any
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	686 # changes to other largefiles accidentally. This means we have to keep
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	687 # track of the largefiles that are being reverted so we only pull down
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	688 # the necessary largefiles.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	689 #
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	690 # Standins are only updated (to match the hash of largefiles) before
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	691 # commits. Update the standins then run the original revert, changing
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	692 # the matcher to hit standins instead of largefiles. Based on the
21094 4643bfec2485 largefiles: simplify revert - use getstandinsstate like other commands do Mads Kiilerich <madski@unity3d.com> parents: 21093 diff changeset	693 # resulting standins update the largefiles.
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	694 def overriderevert(orig, ui, repo, pats, *opts):
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	695 # Because we put the standins in a bad state (by updating them)
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	696 # and then return them to a correct state we need to lock to
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	697 # prevent others from changing them in their incorrect state.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	698 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	699 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	700 lfdirstate = lfutil.openlfdirstate(ui, repo)
23039 1350b9170089 largefiles: remove confusing rev parameter for lfdirstatestatus Mads Kiilerich <madski@unity3d.com> parents: 23038 diff changeset	701 s = lfutil.lfdirstatestatus(lfdirstate, repo)
18140 e388273f3ad1 largefiles revert: update lfdirstate with result from first cleanliness check Mads Kiilerich <madski@unity3d.com> parents: 17894 diff changeset	702 lfdirstate.write()
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	703 for lfile in s.modified:
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	704 lfutil.updatestandin(repo, lfutil.standin(lfile))
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	705 for lfile in s.deleted:
16646 29fe533fe447 largefiles: fix deletion of multiple missing largefiles (issue3329) Na'Tosha Bard <natosha@unity3d.com> parents: 16644 diff changeset	706 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
29fe533fe447 largefiles: fix deletion of multiple missing largefiles (issue3329) Na'Tosha Bard <natosha@unity3d.com> parents: 16644 diff changeset	707 os.unlink(repo.wjoin(lfutil.standin(lfile)))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	708
21094 4643bfec2485 largefiles: simplify revert - use getstandinsstate like other commands do Mads Kiilerich <madski@unity3d.com> parents: 21093 diff changeset	709 oldstandins = lfutil.getstandinsstate(repo)
4643bfec2485 largefiles: simplify revert - use getstandinsstate like other commands do Mads Kiilerich <madski@unity3d.com> parents: 21093 diff changeset	710
21095 ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	711 def overridematch(ctx, pats=[], opts={}, globbed=False,
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	712 default='relpath'):
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	713 match = oldmatch(ctx, pats, opts, globbed, default)
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	714 m = copy.copy(match)
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	715 def tostandin(f):
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	716 if lfutil.standin(f) in ctx:
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	717 return lfutil.standin(f)
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	718 elif lfutil.standin(f) in repo[None]:
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	719 return None
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	720 return f
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	721 m._files = [tostandin(f) for f in m._files]
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	722 m._files = [f for f in m._files if f is not None]
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	723 m._fmap = set(m._files)
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	724 origmatchfn = m.matchfn
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	725 def matchfn(f):
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	726 if lfutil.isstandin(f):
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	727 return (origmatchfn(lfutil.splitstandin(f)) and
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	728 (f in repo[None] or f in ctx))
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	729 return origmatchfn(f)
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	730 m.matchfn = matchfn
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	731 return m
ec309395aa45 largefiles: revert override, install matchfn outside the try/except restoring it Mads Kiilerich <madski@unity3d.com> parents: 21094 diff changeset	732 oldmatch = installmatchfn(overridematch)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	733 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	734 orig(ui, repo, pats, *opts)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	735 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	736 restorematchfn()
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	737
21094 4643bfec2485 largefiles: simplify revert - use getstandinsstate like other commands do Mads Kiilerich <madski@unity3d.com> parents: 21093 diff changeset	738 newstandins = lfutil.getstandinsstate(repo)
4643bfec2485 largefiles: simplify revert - use getstandinsstate like other commands do Mads Kiilerich <madski@unity3d.com> parents: 21093 diff changeset	739 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
21934 0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	740 # lfdirstate should be 'normallookup'-ed for updated files,
0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	741 # because reverting doesn't touch dirstate for 'normal' files
0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	742 # when target revision is explicitly specified: in such case,
0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	743 # 'n' and valid timestamp in dirstate doesn't ensure 'clean'
0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	744 # of target (standin) file.
0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	745 lfcommands.updatelfiles(ui, repo, filelist, printmessage=False,
0cb34b3991f8 largefiles: use "normallookup" on "lfdirstate" while reverting FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21884 diff changeset	746 normallookup=True)
21094 4643bfec2485 largefiles: simplify revert - use getstandinsstate like other commands do Mads Kiilerich <madski@unity3d.com> parents: 21093 diff changeset	747
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	748 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	749 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	750
23183 51c9196a6bd0 largefiles: remove meaningless code path for "hg pull --rebase" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23145 diff changeset	751 # after pulling changesets, we need to take some extra care to get
51c9196a6bd0 largefiles: remove meaningless code path for "hg pull --rebase" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23145 diff changeset	752 # largefiles updated remotely
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	753 def overridepull(orig, ui, repo, source=None, **opts):
16692 b9969574540a largefiles: add --all-largefiles flag to pull Na'Tosha Bard <natosha@unity3d.com> parents: 16691 diff changeset	754 revsprepull = len(repo)
18977 864232481e76 largefiles: refactor overridepull internals Mads Kiilerich <madski@unity3d.com> parents: 18974 diff changeset	755 if not source:
864232481e76 largefiles: refactor overridepull internals Mads Kiilerich <madski@unity3d.com> parents: 18974 diff changeset	756 source = 'default'
864232481e76 largefiles: refactor overridepull internals Mads Kiilerich <madski@unity3d.com> parents: 18974 diff changeset	757 repo.lfpullsource = source
23183 51c9196a6bd0 largefiles: remove meaningless code path for "hg pull --rebase" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23145 diff changeset	758 result = orig(ui, repo, source, **opts)
18977 864232481e76 largefiles: refactor overridepull internals Mads Kiilerich <madski@unity3d.com> parents: 18974 diff changeset	759 revspostpull = len(repo)
18981 83ead8cb0ff2 largefiles: implement pull --all-largefiles as a special case of --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18980 diff changeset	760 lfrevs = opts.get('lfrev', [])
16692 b9969574540a largefiles: add --all-largefiles flag to pull Na'Tosha Bard <natosha@unity3d.com> parents: 16691 diff changeset	761 if opts.get('all_largefiles'):
18981 83ead8cb0ff2 largefiles: implement pull --all-largefiles as a special case of --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18980 diff changeset	762 lfrevs.append('pulled()')
18978 8abaadab9abb largefiles: introduce pull --lfrev option Mads Kiilerich <madski@unity3d.com> parents: 18977 diff changeset	763 if lfrevs and revspostpull > revsprepull:
8abaadab9abb largefiles: introduce pull --lfrev option Mads Kiilerich <madski@unity3d.com> parents: 18977 diff changeset	764 numcached = 0
18979 1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	765 repo.firstpulled = revsprepull # for pulled() revset expression
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	766 try:
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	767 for rev in scmutil.revrange(repo, lfrevs):
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	768 ui.note(_('pulling largefiles for revision %s\n') % rev)
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	769 (cached, missing) = lfcommands.cachelfiles(ui, repo, rev)
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	770 numcached += len(cached)
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	771 finally:
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	772 del repo.firstpulled
18978 8abaadab9abb largefiles: introduce pull --lfrev option Mads Kiilerich <madski@unity3d.com> parents: 18977 diff changeset	773 ui.status(_("%d largefiles cached\n") % numcached)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	774 return result
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	775
18979 1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	776 def pulledrevsetsymbol(repo, subset, x):
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	777 """``pulled()``
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	778 Changesets that just has been pulled.
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	779
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	780 Only available with largefiles from pull --lfrev expressions.
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	781
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	782 .. container:: verbose
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	783
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	784 Some examples:
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	785
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	786 - pull largefiles for all new changesets::
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	787
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	788 hg pull -lfrev "pulled()"
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	789
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	790 - pull largefiles for all new branch heads::
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	791
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	792 hg pull -lfrev "head(pulled()) and not closed()"
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	793
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	794 """
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	795
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	796 try:
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	797 firstpulled = repo.firstpulled
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	798 except AttributeError:
1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	799 raise util.Abort(_("pulled() only available in --lfrev"))
20442 8524cdf66a12 hgext: updated extensions to return a baseset when adding symbols Lucas Moscovicz <lmoscovicz@fb.com> parents: 20298 diff changeset	800 return revset.baseset([r for r in subset if r >= firstpulled])
18979 1176832fc757 largefiles: introduce pulled() revset expression for use in --lfrev Mads Kiilerich <madski@unity3d.com> parents: 18978 diff changeset	801
16652 98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188) Na'Tosha Bard <natosha@unity3d.com> parents: 16650 diff changeset	802 def overrideclone(orig, ui, source, dest=None, **opts):
17616 3a1c6b64e052 largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17615 diff changeset	803 d = dest
3a1c6b64e052 largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17615 diff changeset	804 if d is None:
3a1c6b64e052 largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17615 diff changeset	805 d = hg.defaultdest(source)
3a1c6b64e052 largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17615 diff changeset	806 if opts.get('all_largefiles') and not hg.islocal(d):
16725 68da5ae6e470 largefiles: don't attempt to clone all largefiles to non-local destinations Levi Bard <levi@unity3d.com> parents: 16692 diff changeset	807 raise util.Abort(_(
21096 a45ed365904a i18n: fix "% inside _()" problem FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21095 diff changeset	808 '--all-largefiles is incompatible with non-local destination %s') %
a45ed365904a i18n: fix "% inside _()" problem FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21095 diff changeset	809 d)
17617 6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	810
6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	811 return orig(ui, source, dest, **opts)
6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	812
6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	813 def hgclone(orig, ui, opts, args, *kwargs):
6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	814 result = orig(ui, opts, args, *kwargs)
6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	815
17824 221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	816 if result is not None:
16652 98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188) Na'Tosha Bard <natosha@unity3d.com> parents: 16650 diff changeset	817 sourcerepo, destrepo = result
17615 56136786000f largefiles: restore caching of largefiles with 'clone -U --all-largefiles' Matt Harbison <matt_harbison@yahoo.com> parents: 17614 diff changeset	818 repo = destrepo.local()
56136786000f largefiles: restore caching of largefiles with 'clone -U --all-largefiles' Matt Harbison <matt_harbison@yahoo.com> parents: 17614 diff changeset	819
56136786000f largefiles: restore caching of largefiles with 'clone -U --all-largefiles' Matt Harbison <matt_harbison@yahoo.com> parents: 17614 diff changeset	820 # Caching is implicitly limited to 'rev' option, since the dest repo was
17824 221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	821 # truncated at that point. The user may expect a download count with
221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	822 # this option, so attempt whether or not this is a largefile repo.
221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	823 if opts.get('all_largefiles'):
221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	824 success, missing = lfcommands.downloadlfiles(ui, repo, None)
17617 6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	825
17824 221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	826 if missing != 0:
221c9c3146eb largefiles: always create the cache and standin directories when cloning Matt Harbison <matt_harbison@yahoo.com> parents: 17702 diff changeset	827 return None
17617 6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	828
6e2ab601be3f largefiles: delegate to the wrapped clone command Matt Harbison <matt_harbison@yahoo.com> parents: 17616 diff changeset	829 return result
16652 98a9266db803 largefiles: add --all-largefiles flag to clone (issue3188) Na'Tosha Bard <natosha@unity3d.com> parents: 16650 diff changeset	830
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	831 def overriderebase(orig, ui, repo, **opts):
23187 f726b05ecfe6 largefiles: update standins only at the 1st commit of "hg rebase --continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23183 diff changeset	832 resuming = opts.get('continue')
f726b05ecfe6 largefiles: update standins only at the 1st commit of "hg rebase --continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23183 diff changeset	833 repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
23190 383ff455cab8 largefiles: avoid printing messages while rebasing by "_lfstatuswriters" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23189 diff changeset	834 repo._lfstatuswriters.append(lambda msg, *opts: None)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	835 try:
17590 40c988f108d0 largefiles: preserve the exit status of the rebase command Matt Harbison <matt_harbison@yahoo.com> parents: 17589 diff changeset	836 return orig(ui, repo, **opts)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	837 finally:
23190 383ff455cab8 largefiles: avoid printing messages while rebasing by "_lfstatuswriters" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23189 diff changeset	838 repo._lfstatuswriters.pop()
23187 f726b05ecfe6 largefiles: update standins only at the 1st commit of "hg rebase --continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23183 diff changeset	839 repo._lfcommithooks.pop()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	840
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	841 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	842 prefix=None, mtime=None, subrepos=None):
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	843 # No need to lock because we are only reading history and
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	844 # largefile caches, neither of which are modified.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	845 lfcommands.cachelfiles(repo.ui, repo, node)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	846
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	847 if kind not in archival.archivers:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	848 raise util.Abort(_("unknown archive type '%s'") % kind)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	849
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	850 ctx = repo[node]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	851
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	852 if kind == 'files':
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	853 if prefix:
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	854 raise util.Abort(
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	855 _('cannot give prefix when archiving to files'))
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	856 else:
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	857 prefix = archival.tidyprefix(dest, kind, prefix)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	858
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	859 def write(name, mode, islink, getdata):
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	860 if matchfn and not matchfn(name):
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	861 return
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	862 data = getdata()
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	863 if decode:
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	864 data = repo.wwritedata(name, data)
7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	865 archiver.addfile(prefix + name, mode, islink, data)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	866
15224 7c604d8c7e83 largefiles: remove pre-1.9 code from extension first bundled with 1.9 Na'Tosha Bard <natosha@unity3d.com> parents: 15170 diff changeset	867 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0])
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	868
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	869 if repo.ui.configbool("ui", "archivemeta", True):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	870 def metadata():
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	871 base = 'repo: %s\nnode: %s\nbranch: %s\n' % (
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	872 hex(repo.changelog.node(0)), hex(node), ctx.branch())
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	873
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	874 tags = ''.join('tag: %s\n' % t for t in ctx.tags()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	875 if repo.tagtype(t) == 'global')
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	876 if not tags:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	877 repo.ui.pushbuffer()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	878 opts = {'template': '{latesttag}\n{latesttagdistance}',
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	879 'style': '', 'patch': None, 'git': None}
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	880 cmdutil.show_changeset(repo.ui, repo, opts).show(ctx)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	881 ltags, dist = repo.ui.popbuffer().split('\n')
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	882 tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':'))
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	883 tags += 'latesttagdistance: %s\n' % dist
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	884
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	885 return base + tags
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	886
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	887 write('.hg_archival.txt', 0644, False, metadata)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	888
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	889 for f in ctx:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	890 ff = ctx.flags(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	891 getdata = ctx[f].data
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	892 if lfutil.isstandin(f):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	893 path = lfutil.findfile(repo, getdata().strip())
15914 264087940d5b largefiles: check if largefile could be found when archiving (issue3193) Na'Tosha Bard <natosha@unity3d.com> parents: 15860 diff changeset	894 if path is None:
264087940d5b largefiles: check if largefile could be found when archiving (issue3193) Na'Tosha Bard <natosha@unity3d.com> parents: 15860 diff changeset	895 raise util.Abort(
264087940d5b largefiles: check if largefile could be found when archiving (issue3193) Na'Tosha Bard <natosha@unity3d.com> parents: 15860 diff changeset	896 _('largefile %s not found in repo store or system cache')
264087940d5b largefiles: check if largefile could be found when archiving (issue3193) Na'Tosha Bard <natosha@unity3d.com> parents: 15860 diff changeset	897 % lfutil.splitstandin(f))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	898 f = lfutil.splitstandin(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	899
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	900 def getdatafn():
15576 e387e760b207 largefiles: avoid use of uinitialized variable in case of errors Mads Kiilerich <mads@kiilerich.com> parents: 15383 diff changeset	901 fd = None
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	902 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	903 fd = open(path, 'rb')
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	904 return fd.read()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	905 finally:
15576 e387e760b207 largefiles: avoid use of uinitialized variable in case of errors Mads Kiilerich <mads@kiilerich.com> parents: 15383 diff changeset	906 if fd:
e387e760b207 largefiles: avoid use of uinitialized variable in case of errors Mads Kiilerich <mads@kiilerich.com> parents: 15383 diff changeset	907 fd.close()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	908
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	909 getdata = getdatafn
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	910 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	911
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	912 if subrepos:
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18341 diff changeset	913 for subpath in sorted(ctx.substate):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	914 sub = ctx.sub(subpath)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17107 diff changeset	915 submatch = match_.narrowmatcher(subpath, matchfn)
23587 a2f139d25845 subrepo: drop the 'ui' parameter to archive() Matt Harbison <matt_harbison@yahoo.com> parents: 23551 diff changeset	916 sub.archive(archiver, prefix, submatch)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	917
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	918 archiver.done()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	919
23587 a2f139d25845 subrepo: drop the 'ui' parameter to archive() Matt Harbison <matt_harbison@yahoo.com> parents: 23551 diff changeset	920 def hgsubrepoarchive(orig, repo, archiver, prefix, match=None):
17695 75f25bd4c7d4 largefiles: download missing subrepo revs when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17658 diff changeset	921 repo._get(repo._state + ('hg',))
16578 43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	922 rev = repo._state[1]
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	923 ctx = repo._repo[rev]
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	924
23587 a2f139d25845 subrepo: drop the 'ui' parameter to archive() Matt Harbison <matt_harbison@yahoo.com> parents: 23551 diff changeset	925 lfcommands.cachelfiles(repo.ui, repo._repo, ctx.node())
16578 43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	926
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	927 def write(name, mode, islink, getdata):
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17107 diff changeset	928 # At this point, the standin has been replaced with the largefile name,
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17107 diff changeset	929 # so the normal matcher works here without the lfutil variants.
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17107 diff changeset	930 if match and not match(f):
1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17107 diff changeset	931 return
16578 43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	932 data = getdata()
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	933
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	934 archiver.addfile(prefix + repo._path + '/' + name, mode, islink, data)
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	935
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	936 for f in ctx:
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	937 ff = ctx.flags(f)
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	938 getdata = ctx[f].data
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	939 if lfutil.isstandin(f):
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	940 path = lfutil.findfile(repo._repo, getdata().strip())
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	941 if path is None:
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	942 raise util.Abort(
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	943 _('largefile %s not found in repo store or system cache')
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	944 % lfutil.splitstandin(f))
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	945 f = lfutil.splitstandin(f)
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	946
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	947 def getdatafn():
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	948 fd = None
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	949 try:
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	950 fd = open(os.path.join(prefix, path), 'rb')
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	951 return fd.read()
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	952 finally:
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	953 if fd:
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	954 fd.close()
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	955
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	956 getdata = getdatafn
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	957
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	958 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	959
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18341 diff changeset	960 for subpath in sorted(ctx.substate):
16578 43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	961 sub = ctx.sub(subpath)
17108 1894dac619de subrepo: propagate matcher to subrepos when archiving Matt Harbison <matt_harbison@yahoo.com> parents: 17107 diff changeset	962 submatch = match_.narrowmatcher(subpath, match)
23587 a2f139d25845 subrepo: drop the 'ui' parameter to archive() Matt Harbison <matt_harbison@yahoo.com> parents: 23551 diff changeset	963 sub.archive(archiver, os.path.join(prefix, repo._path) + '/', submatch)
16578 43fb170a23bd largefiles: make archive -S store largefiles instead of standins Matt Harbison <matt_harbison@yahoo.com> parents: 16516 diff changeset	964
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	965 # If a largefile is modified, the change is not reflected in its
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	966 # standin until a commit. cmdutil.bailifchanged() raises an exception
dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	967 # if the repo has uncommitted changes. Wrap it to also check if
23441 d289ba74dba3 largefiles: drop the override for 'fetch' Matt Harbison <matt_harbison@yahoo.com> parents: 23428 diff changeset	968 # largefiles were changed. This is used by bisect, backout and fetch.
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	969 def overridebailifchanged(orig, repo):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	970 orig(repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	971 repo.lfstatus = True
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	972 s = repo.status()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	973 repo.lfstatus = False
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	974 if s.modified or s.added or s.removed or s.deleted:
19805 9b088e9c2690 largefiles: standardize error message for dirty working dir Siddharth Agarwal <sid0@fb.com> parents: 19775 diff changeset	975 raise util.Abort(_('uncommitted changes'))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	976
23849 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	977 def cmdutilforget(orig, ui, repo, match, prefix, explicitonly):
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	978 normalmatcher = composenormalfilematcher(match, repo[None].manifest())
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	979 bad, forgot = orig(ui, repo, normalmatcher, prefix, explicitonly)
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	980 m = composelargefilematcher(match, repo[None].manifest())
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	981
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	982 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	983 repo.lfstatus = True
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	984 s = repo.status(match=m, clean=True)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	985 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	986 repo.lfstatus = False
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	987 forget = sorted(s.modified + s.added + s.deleted + s.clean)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	988 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	989
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	990 for f in forget:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	991 if lfutil.standin(f) not in repo.dirstate and not \
23685 69cd91d04117 forget: use vfs instead of os.path + match.rel() for filesystem checks Matt Harbison <matt_harbison@yahoo.com> parents: 23670 diff changeset	992 repo.wvfs.isdir(lfutil.standin(f)):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	993 ui.warn(_('not removing %s: file is already untracked\n')
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	994 % m.rel(f))
23849 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	995 bad.append(f)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	996
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	997 for f in forget:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	998 if ui.verbose or not m.exact(f):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	999 ui.status(_('removing %s\n') % m.rel(f))
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1000
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1001 # Need to lock because standin files are deleted then removed from the
17407 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17299 diff changeset	1002 # repository and we could race in-between.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1003 wlock = repo.wlock()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1004 try:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1005 lfdirstate = lfutil.openlfdirstate(ui, repo)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1006 for f in forget:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1007 if lfdirstate[f] == 'a':
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1008 lfdirstate.drop(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1009 else:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1010 lfdirstate.remove(f)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1011 lfdirstate.write()
18153 51837a31b425 largefiles: remove reporemove portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	1012 standins = [lfutil.standin(f) for f in forget]
51837a31b425 largefiles: remove reporemove portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	1013 for f in standins:
51837a31b425 largefiles: remove reporemove portability wrapper Mads Kiilerich <madski@unity3d.com> parents: 18152 diff changeset	1014 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
23849 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	1015 rejected = repo[None].forget(standins)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1016 finally:
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1017 wlock.release()
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1018
23849 2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	1019 bad.extend(f for f in rejected if f in m.files())
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	1020 forgot.extend(f for f in forget if f not in rejected)
2b79d124a12f largefiles: enable subrepo support for forget Matt Harbison <matt_harbison@yahoo.com> parents: 23794 diff changeset	1021 return bad, forgot
17591 cbacb5a813dd largefiles: preserve the exit status of the forget command Matt Harbison <matt_harbison@yahoo.com> parents: 17590 diff changeset	1022
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1023 def _getoutgoings(repo, other, missing, addfunc):
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1024 """get pairs of filename and largefile hash in outgoing revisions
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1025 in 'missing'.
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1026
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1027 largefiles already existing on 'other' repository are ignored.
a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1028
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1029 'addfunc' is invoked with each unique pairs of filename and
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1030 largefile hash value.
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1031 """
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1032 knowns = set()
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1033 lfhashes = set()
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1034 def dedup(fn, lfhash):
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1035 k = (fn, lfhash)
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1036 if k not in knowns:
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1037 knowns.add(k)
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1038 lfhashes.add(lfhash)
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1039 lfutil.getlfilestoupload(repo, missing, dedup)
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1040 if lfhashes:
a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1041 lfexists = basestore._openstore(repo, other).exists(lfhashes)
a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1042 for fn, lfhash in knowns:
a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1043 if not lfexists[lfhash]: # lfhash doesn't exist on "other"
a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1044 addfunc(fn, lfhash)
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1045
21052 cde32cb5a565 largefiles: use "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21048 diff changeset	1046 def outgoinghook(ui, repo, other, opts, missing):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1047 if opts.pop('large', None):
21883 87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1048 lfhashes = set()
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1049 if ui.debugflag:
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1050 toupload = {}
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1051 def addfunc(fn, lfhash):
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1052 if fn not in toupload:
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1053 toupload[fn] = []
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1054 toupload[fn].append(lfhash)
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1055 lfhashes.add(lfhash)
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1056 def showhashes(fn):
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1057 for lfhash in sorted(toupload[fn]):
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1058 ui.debug(' %s\n' % (lfhash))
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1059 else:
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1060 toupload = set()
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1061 def addfunc(fn, lfhash):
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1062 toupload.add(fn)
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1063 lfhashes.add(lfhash)
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1064 def showhashes(fn):
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1065 pass
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1066 _getoutgoings(repo, other, missing, addfunc)
21883 87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1067
21052 cde32cb5a565 largefiles: use "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21048 diff changeset	1068 if not toupload:
17835 08d11b82d9fc largefiles: distinguish "no remote repo" from "no files to upload" (issue3651) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17824 diff changeset	1069 ui.status(_('largefiles: no files to upload\n'))
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1070 else:
21883 87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1071 ui.status(_('largefiles to upload (%d entities):\n')
87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1072 % (len(lfhashes)))
21052 cde32cb5a565 largefiles: use "outgoinghooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21048 diff changeset	1073 for file in sorted(toupload):
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1074 ui.status(lfutil.splitstandin(file) + '\n')
21883 87aa279f7073 largefiles: show also how many data entities are outgoing at "hg outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21882 diff changeset	1075 showhashes(file)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1076 ui.status('\n')
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1077
21048 ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1078 def summaryremotehook(ui, repo, opts, changes):
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1079 largeopt = opts.get('large', False)
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1080 if changes is None:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1081 if largeopt:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1082 return (False, True) # only outgoing check is needed
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1083 else:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1084 return (False, False)
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1085 elif largeopt:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1086 url, branch, peer, outgoing = changes[1]
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1087 if peer is None:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1088 # i18n: column positioning for "hg summary"
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1089 ui.status(_('largefiles: (no remote repo)\n'))
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1090 return
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1091
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1092 toupload = set()
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1093 lfhashes = set()
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1094 def addfunc(fn, lfhash):
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1095 toupload.add(fn)
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1096 lfhashes.add(lfhash)
21884 a858d3de0d32 largefiles: confirm existence of outgoing largefile entities in remote store FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21883 diff changeset	1097 _getoutgoings(repo, peer, outgoing.missing, addfunc)
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1098
21048 ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1099 if not toupload:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1100 # i18n: column positioning for "hg summary"
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1101 ui.status(_('largefiles: (no files to upload)\n'))
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1102 else:
ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1103 # i18n: column positioning for "hg summary"
21882 12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1104 ui.status(_('largefiles: %d entities for %d files to upload\n')
12019e6aa8a2 largefiles: show also how many data entities are outgoing at "hg summary" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21545 diff changeset	1105 % (len(lfhashes), len(toupload)))
21048 ca7a57464fb3 largefiles: use "summaryremotehooks" to avoid redundant outgoing check FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21042 diff changeset	1106
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	1107 def overridesummary(orig, ui, repo, pats, *opts):
15787 0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	1108 try:
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	1109 repo.lfstatus = True
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	1110 orig(ui, repo, pats, *opts)
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	1111 finally:
0c7b83a057aa largefiles: fix output of hg summary (issue3060) Na'Tosha Bard <natosha@unity3d.com> parents: 15786 diff changeset	1112 repo.lfstatus = False
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1113
23545 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23541 diff changeset	1114 def scmutiladdremove(orig, repo, matcher, prefix, opts={}, dry_run=None,
17658 a02c1ffddae9 largefiles: handle commit -A properly, after a --large commit (issue3542) Matt Harbison <matt_harbison@yahoo.com> parents: 17617 diff changeset	1115 similarity=None):
16644 b371056ae353 largefiles: follow normal codepath for addremove if non-largefiles repo (issue3249) Na'Tosha Bard <natosha@unity3d.com> parents: 16516 diff changeset	1116 if not lfutil.islfilesrepo(repo):
23545 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23541 diff changeset	1117 return orig(repo, matcher, prefix, opts, dry_run, similarity)
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1118 # Get the list of missing largefiles so we can remove them
17658 a02c1ffddae9 largefiles: handle commit -A properly, after a --large commit (issue3542) Matt Harbison <matt_harbison@yahoo.com> parents: 17617 diff changeset	1119 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
22911 509e2cbee679 dirstate: separate 'lookup' status field from others Martin von Zweigbergk <martinvonz@gmail.com> parents: 22630 diff changeset	1120 unsure, s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [],
509e2cbee679 dirstate: separate 'lookup' status field from others Martin von Zweigbergk <martinvonz@gmail.com> parents: 22630 diff changeset	1121 False, False, False)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1122
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1123 # Call into the normal remove code, but the removing of the standin, we want
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1124 # to have handled by original addremove. Monkey patching here makes sure
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1125 # we don't remove the standin in the largefiles code, preventing a very
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1126 # confused state later.
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	1127 if s.deleted:
23753 f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1128 m = copy.copy(matcher)
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1129
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1130 # The m._files and m._map attributes are not changed to the deleted list
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1131 # because that affects the m.exact() test, which in turn governs whether
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1132 # or not the file name is printed, and how. Simply limit the original
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1133 # matches to those in the deleted status list.
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1134 matchfn = m.matchfn
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1135 m.matchfn = lambda f: f in s.deleted and matchfn(f)
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1136
f2893cd8d1e5 largefiles: pass a matcher instead of a raw file list to removelargefiles() Matt Harbison <matt_harbison@yahoo.com> parents: 23745 diff changeset	1137 removelargefiles(repo.ui, repo, True, m, **opts)
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1138 # Call into the normal add code, and any files that should be added as
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1139 # largefiles will be
23781 bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	1140 added, bad = addlargefiles(repo.ui, repo, True, matcher, **opts)
15792 7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1141 # Now that we've handled largefiles, hand off to the original addremove
7cbba3adabc7 largefiles: implement addremove (issue3064) Na'Tosha Bard <natosha@unity3d.com> parents: 15788 diff changeset	1142 # function to take care of the rest. Make sure it doesn't do anything with
23541 891aaa7c0c70 scmutil: pass a matcher to scmutil.addremove() instead of a list of patterns Matt Harbison <matt_harbison@yahoo.com> parents: 23538 diff changeset	1143 # largefiles by passing a matcher that will ignore them.
23781 bb3ee61cfaa1 largefiles: don't print files as both large and normal in addremove dryruns Matt Harbison <matt_harbison@yahoo.com> parents: 23780 diff changeset	1144 matcher = composenormalfilematcher(matcher, repo[None].manifest(), added)
23545 f1b06a8aad42 commit: propagate --addremove to subrepos if -S is specified (issue3759) Matt Harbison <matt_harbison@yahoo.com> parents: 23541 diff changeset	1145 return orig(repo, matcher, prefix, opts, dry_run, similarity)
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1146
15254 dd03d3a9f888 largefiles: more work on cleaning up comments Greg Ward <greg@gerg.ca> parents: 15252 diff changeset	1147 # Calling purge with --all will cause the largefiles to be deleted.
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1148 # Override repo.status to prevent this from happening.
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	1149 def overridepurge(orig, ui, repo, dirs, *opts):
23647 faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1150 # XXX Monkey patching a repoview will not work. The assigned attribute will
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1151 # be set on the unfiltered repo, but we will only lookup attributes in the
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1152 # unfiltered repo if the lookup in the repoview object itself fails. As the
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1153 # monkey patched method exists on the repoview class the lookup will not
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1154 # fail. As a result, the original version will shadow the monkey patched
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1155 # one, defeating the monkey patch.
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1156 #
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1157 # As a work around we use an unfiltered repo here. We should do something
faec11cfb645 largefile: explain why no monkey patching on a repoview Pierre-Yves David <pierre-yves.david@fb.com> parents: 23646 diff changeset	1158 # cleaner instead.
18011 848c428bb5ee largefile: status is buggy on repoproxy, so run unfiltered Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17894 diff changeset	1159 repo = repo.unfiltered()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1160 oldstatus = repo.status
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	1161 def overridestatus(node1='.', node2=None, match=None, ignored=False,
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1162 clean=False, unknown=False, listsubrepos=False):
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1163 r = oldstatus(node1, node2, match, ignored, clean, unknown,
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1164 listsubrepos)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1165 lfdirstate = lfutil.openlfdirstate(ui, repo)
22919 1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	1166 unknown = [f for f in r.unknown if lfdirstate[f] == '?']
1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	1167 ignored = [f for f in r.ignored if lfdirstate[f] == '?']
1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	1168 return scmutil.status(r.modified, r.added, r.removed, r.deleted,
1982bdb7e2cc largefiles: access status fields by name rather than index Martin von Zweigbergk <martinvonz@gmail.com> parents: 22914 diff changeset	1169 unknown, ignored, r.clean)
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	1170 repo.status = overridestatus
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1171 orig(ui, repo, dirs, *opts)
cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1172 repo.status = oldstatus
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	1173 def overriderollback(orig, ui, repo, **opts):
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1174 wlock = repo.wlock()
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1175 try:
22283 cb556ea76dcd largefiles: omit restoring standins if working parent is not rollbacked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22196 diff changeset	1176 before = repo.dirstate.parents()
22286 3f3b9483e7ef largefiles: unlink standins not known to the restored dirstate at rollback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22285 diff changeset	1177 orphans = set(f for f in repo.dirstate
3f3b9483e7ef largefiles: unlink standins not known to the restored dirstate at rollback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22285 diff changeset	1178 if lfutil.isstandin(f) and repo.dirstate[f] != 'r')
22094 7d7065476fea largefiles: put whole rollback-ing process into the same "wlock" scope FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21934 diff changeset	1179 result = orig(ui, repo, **opts)
22283 cb556ea76dcd largefiles: omit restoring standins if working parent is not rollbacked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22196 diff changeset	1180 after = repo.dirstate.parents()
cb556ea76dcd largefiles: omit restoring standins if working parent is not rollbacked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22196 diff changeset	1181 if before == after:
cb556ea76dcd largefiles: omit restoring standins if working parent is not rollbacked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22196 diff changeset	1182 return result # no need to restore standins
cb556ea76dcd largefiles: omit restoring standins if working parent is not rollbacked FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22196 diff changeset	1183
22285 85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1184 pctx = repo['.']
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1185 for f in repo.dirstate:
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1186 if lfutil.isstandin(f):
22286 3f3b9483e7ef largefiles: unlink standins not known to the restored dirstate at rollback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22285 diff changeset	1187 orphans.discard(f)
22285 85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1188 if repo.dirstate[f] == 'r':
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1189 repo.wvfs.unlinkpath(f, ignoremissing=True)
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1190 elif f in pctx:
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1191 fctx = pctx[f]
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1192 repo.wwrite(f, fctx.data(), fctx.flags())
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1193 else:
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1194 # content of standin is not so important in 'a',
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1195 # 'm' or 'n' (coming from the 2nd parent) cases
85bded43cc80 largefiles: restore standins according to restored dirstate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22284 diff changeset	1196 lfutil.writestandin(repo, f, '', False)
22286 3f3b9483e7ef largefiles: unlink standins not known to the restored dirstate at rollback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22285 diff changeset	1197 for standin in orphans:
3f3b9483e7ef largefiles: unlink standins not known to the restored dirstate at rollback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22285 diff changeset	1198 repo.wvfs.unlinkpath(standin, ignoremissing=True)
22094 7d7065476fea largefiles: put whole rollback-ing process into the same "wlock" scope FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21934 diff changeset	1199
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1200 lfdirstate = lfutil.openlfdirstate(ui, repo)
22097 7d1eac06ab2b largefiles: drop orphan entries from lfdristat at "hg rollback" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22096 diff changeset	1201 orphans = set(lfdirstate)
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1202 lfiles = lfutil.listlfiles(repo)
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1203 for file in lfiles:
22096 61e526585b20 largefiles: restore R status of removed largefiles correctly at "hg rollback" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22094 diff changeset	1204 lfutil.synclfdirstate(repo, lfdirstate, file, True)
22097 7d1eac06ab2b largefiles: drop orphan entries from lfdristat at "hg rollback" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22096 diff changeset	1205 orphans.discard(file)
7d1eac06ab2b largefiles: drop orphan entries from lfdristat at "hg rollback" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22096 diff changeset	1206 for lfile in orphans:
7d1eac06ab2b largefiles: drop orphan entries from lfdristat at "hg rollback" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22096 diff changeset	1207 lfdirstate.drop(lfile)
15794 0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1208 lfdirstate.write()
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1209 finally:
0d91211dd12f largefiles: fix inappropriate locking (issue3182) Levi Bard <levi@unity3d.com> parents: 15792 diff changeset	1210 wlock.release()
15168 cfccd3bee7b3 hgext: add largefiles extension various parents: diff changeset	1211 return result
15383 155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15369 diff changeset	1212
16247 d87d9d8a8e03 largefiles: remove use of underscores that breaks coding convention Na'Tosha Bard <natosha@unity3d.com> parents: 16246 diff changeset	1213 def overridetransplant(orig, ui, repo, revs, *opts):
23274 0ec2e124fcc0 largefiles: update standins only at the 1st commit of "transplant --continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23273 diff changeset	1214 resuming = opts.get('continue')
0ec2e124fcc0 largefiles: update standins only at the 1st commit of "transplant --continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23273 diff changeset	1215 repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
23275 fae708cb32d1 largefiles: avoid printing messages while transplanting by "_lfstatuswriters" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23274 diff changeset	1216 repo._lfstatuswriters.append(lambda msg, *opts: None)
15982 bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15967 diff changeset	1217 try:
bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15967 diff changeset	1218 result = orig(ui, repo, revs, *opts)
bf502ccc46d7 largefiles: fix transplant for all cases (issue3192) Na'Tosha Bard <natosha@unity3d.com> parents: 15967 diff changeset	1219 finally:
23275 fae708cb32d1 largefiles: avoid printing messages while transplanting by "_lfstatuswriters" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23274 diff changeset	1220 repo._lfstatuswriters.pop()
23274 0ec2e124fcc0 largefiles: update standins only at the 1st commit of "transplant --continue" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23273 diff changeset	1221 repo._lfcommithooks.pop()
15383 155d0f8fb7e5 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on Na'Tosha Bard <natosha@unity3d.com> parents: 15369 diff changeset	1222 return result
16439 290850e7aa43 largefiles: fix cat for largefiles (issue3352) Na'Tosha Bard <natosha@unity3d.com> parents: 16248 diff changeset	1223
290850e7aa43 largefiles: fix cat for largefiles (issue3352) Na'Tosha Bard <natosha@unity3d.com> parents: 16248 diff changeset	1224 def overridecat(orig, ui, repo, file1, pats, *opts):
17269 acfab0754584 largefiles: support revsets for cat Matt Harbison <matt_harbison@yahoo.com> parents: 17268 diff changeset	1225 ctx = scmutil.revsingle(repo, opts.get('rev'))
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1226 err = 1
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1227 notbad = set()
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1228 m = scmutil.match(ctx, (file1,) + pats, opts)
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1229 origmatchfn = m.matchfn
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1230 def lfmatchfn(f):
21087 3fb2affb023f largefiles: make cat on standins do something Mads Kiilerich <madski@unity3d.com> parents: 21086 diff changeset	1231 if origmatchfn(f):
3fb2affb023f largefiles: make cat on standins do something Mads Kiilerich <madski@unity3d.com> parents: 21086 diff changeset	1232 return True
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1233 lf = lfutil.splitstandin(f)
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1234 if lf is None:
21087 3fb2affb023f largefiles: make cat on standins do something Mads Kiilerich <madski@unity3d.com> parents: 21086 diff changeset	1235 return False
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1236 notbad.add(lf)
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1237 return origmatchfn(lf)
b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1238 m.matchfn = lfmatchfn
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1239 origbadfn = m.bad
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1240 def lfbadfn(f, msg):
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1241 if not f in notbad:
21086 718f56c47414 largefiles: remove confusing handling of .bad return value - it is void Mads Kiilerich <madski@unity3d.com> parents: 21081 diff changeset	1242 origbadfn(f, msg)
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1243 m.bad = lfbadfn
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1244 for f in ctx.walk(m):
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1245 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1246 pathname=f)
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1247 lf = lfutil.splitstandin(f)
21087 3fb2affb023f largefiles: make cat on standins do something Mads Kiilerich <madski@unity3d.com> parents: 21086 diff changeset	1248 if lf is None or origmatchfn(f):
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1249 # duplicating unreachable code from commands.cat
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1250 data = ctx[f].data()
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1251 if opts.get('decode'):
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1252 data = repo.wwritedata(f, data)
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1253 fp.write(data)
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1254 else:
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1255 hash = lfutil.readstandin(repo, lf, ctx.rev())
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1256 if not lfutil.inusercache(repo.ui, hash):
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1257 store = basestore._openstore(repo)
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1258 success, missing = store.get([(lf, hash)])
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1259 if len(success) != 1:
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1260 raise util.Abort(
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1261 _('largefile %s is not in cache and could not be '
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1262 'downloaded') % lf)
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1263 path = lfutil.usercachepath(repo.ui, hash)
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1264 fpin = open(path, "rb")
19001 2a35296a6304 largefiles: drop lfutil.blockstream - use filechunkiter like everybody else Mads Kiilerich <madski@unity3d.com> parents: 18981 diff changeset	1265 for chunk in util.filechunkiter(fpin, 128 * 1024):
18974 d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1266 fp.write(chunk)
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1267 fpin.close()
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1268 fp.close()
d78a136a8036 largefiles: fix cat of non-largefiles from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18813 diff changeset	1269 err = 0
18491 b7da9c042b9e largefiles: fix cat when using relative paths from subdirectory Mads Kiilerich <madski@unity3d.com> parents: 18458 diff changeset	1270 return err
17878 d1d0140287b8 largefiles: don't copy largefiles from working dir to the store while converting Matt Harbison <matt_harbison@yahoo.com> parents: 17850 diff changeset	1271
22288 4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1272 def mergeupdate(orig, repo, node, branchmerge, force, partial,
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1273 args, *kwargs):
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1274 wlock = repo.wlock()
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1275 try:
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1276 # branch \| \| \|
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1277 # merge \| force \| partial \| action
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1278 # -------+-------+---------+--------------
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1279 # x \| x \| x \| linear-merge
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1280 # o \| x \| x \| branch-merge
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1281 # x \| o \| x \| overwrite (as clean update)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1282 # o \| o \| x \| force-branch-merge (*1)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1283 # x \| x \| o \| (*)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1284 # o \| x \| o \| (*)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1285 # x \| o \| o \| overwrite (as revert)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1286 # o \| o \| o \| (*)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1287 #
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1288 # (*) don't care
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1289 # (*1) deprecated, but used internally (e.g: "rebase --collapse")
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1290
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1291 linearmerge = not branchmerge and not force and not partial
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1292
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1293 if linearmerge or (branchmerge and force and not partial):
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1294 # update standins for linear-merge or force-branch-merge,
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1295 # because largefiles in the working directory may be modified
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1296 lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
22911 509e2cbee679 dirstate: separate 'lookup' status field from others Martin von Zweigbergk <martinvonz@gmail.com> parents: 22630 diff changeset	1297 unsure, s = lfdirstate.status(match_.always(repo.root,
509e2cbee679 dirstate: separate 'lookup' status field from others Martin von Zweigbergk <martinvonz@gmail.com> parents: 22630 diff changeset	1298 repo.getcwd()),
509e2cbee679 dirstate: separate 'lookup' status field from others Martin von Zweigbergk <martinvonz@gmail.com> parents: 22630 diff changeset	1299 [], False, False, False)
23853 9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1300 pctx = repo['.']
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1301 for lfile in unsure + s.modified:
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1302 lfileabs = repo.wvfs.join(lfile)
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1303 if not os.path.exists(lfileabs):
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1304 continue
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1305 lfhash = lfutil.hashrepofile(repo, lfile)
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1306 standin = lfutil.standin(lfile)
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1307 lfutil.writestandin(repo, standin, lfhash,
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1308 lfutil.getexecutable(lfileabs))
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1309 if (standin in pctx and
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1310 lfhash == lfutil.readstandin(repo, lfile, '.')):
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1311 lfdirstate.normal(lfile)
9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1312 for lfile in s.added:
22288 4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1313 lfutil.updatestandin(repo, lfutil.standin(lfile))
23853 9d25bb84cf6c largefiles: make linear update set unsure largefiles normal if unchanged Mads Kiilerich <madski@unity3d.com> parents: 23849 diff changeset	1314 lfdirstate.write()
22288 4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1315
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1316 if linearmerge:
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1317 # Only call updatelfiles on the standins that have changed
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1318 # to save time
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1319 oldstandins = lfutil.getstandinsstate(repo)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1320
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1321 result = orig(repo, node, branchmerge, force, partial, args, *kwargs)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1322
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1323 filelist = None
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1324 if linearmerge:
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1325 newstandins = lfutil.getstandinsstate(repo)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1326 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1327
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1328 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1329 normallookup=partial)
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1330
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1331 return result
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1332 finally:
4e2559841d6c largefiles: update largefiles even if rebase is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22287 diff changeset	1333 wlock.release()
22289 e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1334
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1335 def scmutilmarktouched(orig, repo, files, args, *kwargs):
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1336 result = orig(repo, files, args, *kwargs)
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1337
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1338 filelist = [lfutil.splitstandin(f) for f in files if lfutil.isstandin(f)]
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1339 if filelist:
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1340 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1341 printmessage=False, normallookup=True)
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1342
e26df4e774f6 largefiles: update largefiles even if transplant is aborted by conflict FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22288 diff changeset	1343 return result

Mercurial > hg > mercurial-source

annotate hgext/largefiles/overrides.py @ 23898:5ce8dcd05dc4