overrides.py
1903 lines
| 61.9 KiB
| text/x-python
|
PythonLexer
|
r15168 | # Copyright 2009-2010 Gregory P. Ward | ||
# Copyright 2009-2010 Intelerad Medical Systems Incorporated | ||||
# Copyright 2010-2011 Fog Creek Software | ||||
# Copyright 2010-2011 Unity Technologies | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
# GNU General Public License version 2 or any later version. | ||||
'''Overridden Mercurial commands and functions for the largefiles extension''' | ||||
r50922 | import contextlib | |||
|
r15168 | import copy | ||
|
r29311 | import os | ||
|
r15168 | |||
from mercurial.i18n import _ | ||||
|
r43355 | from mercurial.pycompat import open | ||
|
r43346 | from mercurial.hgweb import webcommands | ||
|
r41092 | |||
|
r29311 | from mercurial import ( | ||
archival, | ||||
cmdutil, | ||||
|
r41092 | copies as copiesmod, | ||
r50922 | dirstate, | |||
|
r29311 | error, | ||
|
r41092 | exchange, | ||
|
r41719 | extensions, | ||
|
r41091 | exthelper, | ||
|
r41092 | filemerge, | ||
|
r29311 | hg, | ||
|
r35903 | logcmdutil, | ||
|
r29318 | match as matchmod, | ||
|
r41092 | merge, | ||
|
r45383 | mergestate as mergestatemod, | ||
|
r29311 | pathutil, | ||
|
r35349 | pycompat, | ||
|
r29311 | scmutil, | ||
|
r31023 | smartset, | ||
|
r41092 | subrepo, | ||
url as urlmod, | ||||
|
r29311 | util, | ||
) | ||||
r46662 | from mercurial.upgrade_utils import ( | |||
actions as upgrade_actions, | ||||
) | ||||
|
r29311 | from . import ( | ||
lfcommands, | ||||
lfutil, | ||||
storefactory, | ||||
) | ||||
|
r15168 | |||
r49558 | ACTION_ADD = mergestatemod.ACTION_ADD | |||
ACTION_DELETED_CHANGED = mergestatemod.ACTION_DELETED_CHANGED | ||||
ACTION_GET = mergestatemod.ACTION_GET | ||||
ACTION_KEEP = mergestatemod.ACTION_KEEP | ||||
ACTION_REMOVE = mergestatemod.ACTION_REMOVE | ||||
|
r41091 | eh = exthelper.exthelper() | ||
|
r43982 | lfstatus = lfutil.lfstatus | ||
r49560 | MERGE_ACTION_LARGEFILE_MARK_REMOVED = mergestatemod.MergeAction('lfmr') | |||
|
r45855 | |||
|
r15792 | # -- Utility functions: commonly/repeatedly needed functionality --------------- | ||
|
r43346 | |||
|
r23617 | def composelargefilematcher(match, manifest): | ||
|
r46554 | """create a matcher that matches only the largefiles in the original | ||
matcher""" | ||||
|
r23617 | m = copy.copy(match) | ||
lfile = lambda f: lfutil.standin(f) in manifest | ||||
|
r36329 | m._files = [lf for lf in m._files if lfile(lf)] | ||
|
r32323 | m._fileset = set(m._files) | ||
|
r32387 | m.always = lambda: False | ||
|
r23617 | origmatchfn = m.matchfn | ||
m.matchfn = lambda f: lfile(f) and origmatchfn(f) | ||||
return m | ||||
|
r43346 | |||
|
r23769 | def composenormalfilematcher(match, manifest, exclude=None): | ||
excluded = set() | ||||
if exclude is not None: | ||||
excluded.update(exclude) | ||||
|
r23428 | m = copy.copy(match) | ||
|
r43346 | notlfile = lambda f: not ( | ||
lfutil.isstandin(f) or lfutil.standin(f) in manifest or f in excluded | ||||
) | ||||
|
r36329 | m._files = [lf for lf in m._files if notlfile(lf)] | ||
|
r32323 | m._fileset = set(m._files) | ||
|
r32387 | m.always = lambda: False | ||
|
r23428 | origmatchfn = m.matchfn | ||
m.matchfn = lambda f: notlfile(f) and origmatchfn(f) | ||||
return m | ||||
|
r43346 | |||
|
r41803 | def addlargefiles(ui, repo, isaddremove, matcher, uipathfn, **opts): | ||
|
r43906 | large = opts.get('large') | ||
|
r15227 | lfsize = lfutil.getminsize( | ||
|
r43906 | ui, lfutil.islfilesrepo(repo), opts.get('lfsize') | ||
|
r43346 | ) | ||
|
r15168 | |||
lfmatcher = None | ||||
|
r15739 | if lfutil.islfilesrepo(repo): | ||
|
r43347 | lfpats = ui.configlist(lfutil.longname, b'patterns') | ||
|
r15168 | if lfpats: | ||
|
r43347 | lfmatcher = matchmod.match(repo.root, b'', list(lfpats)) | ||
|
r15168 | |||
lfnames = [] | ||||
|
r25440 | m = matcher | ||
|
r15168 | wctx = repo[None] | ||
|
r32382 | for f in wctx.walk(matchmod.badmatch(m, lambda x, y: None)): | ||
|
r15168 | exact = m.exact(f) | ||
lfile = lfutil.standin(f) in wctx | ||||
nfile = f in wctx | ||||
exists = lfile or nfile | ||||
# Don't warn the user when they attempt to add a normal tracked file. | ||||
# The normal add code will do that for us. | ||||
if exact and exists: | ||||
if lfile: | ||||
|
r43347 | ui.warn(_(b'%s already a largefile\n') % uipathfn(f)) | ||
|
r15168 | continue | ||
|
r17232 | if (exact or not exists) and not lfutil.isstandin(f): | ||
|
r17231 | # In case the file was removed previously, but not committed | ||
# (issue3507) | ||||
|
r23733 | if not repo.wvfs.exists(f): | ||
|
r17231 | continue | ||
|
r43346 | abovemin = ( | ||
lfsize and repo.wvfs.lstat(f).st_size >= lfsize * 1024 * 1024 | ||||
) | ||||
|
r15255 | if large or abovemin or (lfmatcher and lfmatcher(f)): | ||
|
r15168 | lfnames.append(f) | ||
if ui.verbose or not exact: | ||||
|
r43347 | ui.status(_(b'adding %s as a largefile\n') % uipathfn(f)) | ||
|
r15168 | |||
bad = [] | ||||
|
r15252 | # Need to lock, otherwise there could be a race condition between | ||
# when standins are created and added to the repo. | ||||
|
r27821 | with repo.wlock(): | ||
|
r43906 | if not opts.get('dry_run'): | ||
|
r23041 | standins = [] | ||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
for f in lfnames: | ||||
standinname = lfutil.standin(f) | ||||
|
r43346 | lfutil.writestandin( | ||
repo, | ||||
standinname, | ||||
|
r43347 | hash=b'', | ||
|
r43346 | executable=lfutil.getexecutable(repo.wjoin(f)), | ||
) | ||||
|
r15168 | standins.append(standinname) | ||
r48448 | lfdirstate.set_tracked(f) | |||
|
r48982 | lfdirstate.write(repo.currenttransaction()) | ||
|
r43346 | bad += [ | ||
lfutil.splitstandin(f) | ||||
for f in repo[None].add(standins) | ||||
if f in m.files() | ||||
] | ||||
|
r23768 | |||
added = [f for f in lfnames if f not in bad] | ||||
return added, bad | ||||
|
r15168 | |||
|
r43346 | |||
|
r41803 | def removelargefiles(ui, repo, isaddremove, matcher, uipathfn, dryrun, **opts): | ||
|
r43906 | after = opts.get('after') | ||
|
r23741 | m = composelargefilematcher(matcher, repo[None].manifest()) | ||
|
r43588 | with lfstatus(repo): | ||
|
r23741 | s = repo.status(match=m, clean=not isaddremove) | ||
|
r15792 | manifest = repo[None].manifest() | ||
|
r43346 | modified, added, deleted, clean = [ | ||
[f for f in list if lfutil.standin(f) in manifest] | ||||
for list in (s.modified, s.added, s.deleted, s.clean) | ||||
] | ||||
|
r15168 | |||
|
r18066 | def warn(files, msg): | ||
|
r15168 | for f in files: | ||
|
r41803 | ui.warn(msg % uipathfn(f)) | ||
|
r17576 | return int(len(files) > 0) | ||
|
r15786 | if after: | ||
|
r22630 | remove = deleted | ||
|
r43346 | result = warn( | ||
|
r43347 | modified + added + clean, _(b'not removing %s: file still exists\n') | ||
|
r43346 | ) | ||
|
r15168 | else: | ||
|
r22630 | remove = deleted + clean | ||
|
r43346 | result = warn( | ||
modified, | ||||
_( | ||||
|
r43347 | b'not removing %s: file is modified (use -f' | ||
b' to force removal)\n' | ||||
|
r43346 | ), | ||
) | ||||
result = ( | ||||
warn( | ||||
added, | ||||
_( | ||||
|
r43347 | b'not removing %s: file has been marked for add' | ||
b' (use forget to undo)\n' | ||||
|
r43346 | ), | ||
) | ||||
or result | ||||
) | ||||
|
r15168 | |||
# Need to lock because standin files are deleted then removed from the | ||||
|
r17424 | # repository and we could race in-between. | ||
|
r27822 | with repo.wlock(): | ||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
|
r23658 | for f in sorted(remove): | ||
|
r23766 | if ui.verbose or not m.exact(f): | ||
|
r43347 | ui.status(_(b'removing %s\n') % uipathfn(f)) | ||
|
r23592 | |||
|
r37168 | if not dryrun: | ||
|
r23592 | if not after: | ||
|
r31309 | repo.wvfs.unlinkpath(f, ignoremissing=True) | ||
|
r23592 | |||
|
r37168 | if dryrun: | ||
|
r23592 | return result | ||
|
r15168 | remove = [lfutil.standin(f) for f in remove] | ||
|
r15792 | # If this is being called by addremove, let the original addremove | ||
# function handle this. | ||||
|
r23038 | if not isaddremove: | ||
|
r18153 | for f in remove: | ||
|
r31309 | repo.wvfs.unlinkpath(f, ignoremissing=True) | ||
|
r18153 | repo[None].forget(remove) | ||
|
r23721 | |||
for f in remove: | ||||
r48453 | lfdirstate.set_untracked(lfutil.splitstandin(f)) | |||
|
r23721 | |||
|
r48982 | lfdirstate.write(repo.currenttransaction()) | ||
|
r15168 | |||
|
r17576 | return result | ||
|
r43346 | |||
|
r16449 | # For overriding mercurial.hgweb.webcommands so that largefiles will | ||
# appear at their right place in the manifests. | ||||
|
r43347 | @eh.wrapfunction(webcommands, b'decodepath') | ||
|
r16449 | def decodepath(orig, path): | ||
return lfutil.splitstandin(path) or path | ||||
|
r43346 | |||
|
r15792 | # -- Wrappers: modify existing commands -------------------------------- | ||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'add', | ||
|
r43346 | opts=[ | ||
|
r43347 | (b'', b'large', None, _(b'add as largefile')), | ||
(b'', b'normal', None, _(b'add as normal file')), | ||||
|
r43346 | ( | ||
|
r43347 | b'', | ||
b'lfsize', | ||||
b'', | ||||
|
r43346 | _( | ||
|
r43347 | b'add all files above this size (in megabytes) ' | ||
b'as largefiles (default: 10)' | ||||
|
r43346 | ), | ||
), | ||||
], | ||||
) | ||||
|
r16247 | def overrideadd(orig, ui, repo, *pats, **opts): | ||
|
r43906 | if opts.get('normal') and opts.get('large'): | ||
|
r43347 | raise error.Abort(_(b'--normal cannot be used with --large')) | ||
|
r23886 | return orig(ui, repo, *pats, **opts) | ||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(cmdutil, b'add') | ||
|
r41799 | def cmdutiladd(orig, ui, repo, matcher, prefix, uipathfn, explicitonly, **opts): | ||
|
r23886 | # The --normal flag short circuits this override | ||
|
r43906 | if opts.get('normal'): | ||
|
r41799 | return orig(ui, repo, matcher, prefix, uipathfn, explicitonly, **opts) | ||
|
r15792 | |||
|
r41803 | ladded, lbad = addlargefiles(ui, repo, False, matcher, uipathfn, **opts) | ||
|
r43346 | normalmatcher = composenormalfilematcher( | ||
matcher, repo[None].manifest(), ladded | ||||
) | ||||
|
r41799 | bad = orig(ui, repo, normalmatcher, prefix, uipathfn, explicitonly, **opts) | ||
|
r23886 | |||
bad.extend(f for f in lbad) | ||||
return bad | ||||
|
r15792 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(cmdutil, b'remove') | ||
|
r43346 | def cmdutilremove( | ||
orig, ui, repo, matcher, prefix, uipathfn, after, force, subrepos, dryrun | ||||
): | ||||
|
r23782 | normalmatcher = composenormalfilematcher(matcher, repo[None].manifest()) | ||
|
r43346 | result = orig( | ||
ui, | ||||
repo, | ||||
normalmatcher, | ||||
prefix, | ||||
uipathfn, | ||||
after, | ||||
force, | ||||
subrepos, | ||||
dryrun, | ||||
) | ||||
return ( | ||||
removelargefiles( | ||||
ui, repo, False, matcher, uipathfn, dryrun, after=after, force=force | ||||
) | ||||
or result | ||||
) | ||||
|
r15792 | |||
r50922 | @eh.wrapfunction(dirstate.dirstate, b'_changing') | |||
@contextlib.contextmanager | ||||
def _changing(orig, self, repo, change_type): | ||||
pre = sub_dirstate = getattr(self, '_sub_dirstate', None) | ||||
try: | ||||
lfd = getattr(self, '_large_file_dirstate', False) | ||||
if sub_dirstate is None and not lfd: | ||||
sub_dirstate = lfutil.openlfdirstate(repo.ui, repo) | ||||
self._sub_dirstate = sub_dirstate | ||||
if not lfd: | ||||
assert self._sub_dirstate is not None | ||||
with orig(self, repo, change_type): | ||||
if sub_dirstate is None: | ||||
yield | ||||
else: | ||||
with sub_dirstate._changing(repo, change_type): | ||||
yield | ||||
finally: | ||||
self._sub_dirstate = pre | ||||
|
r43347 | @eh.wrapfunction(subrepo.hgsubrepo, b'status') | ||
|
r16515 | def overridestatusfn(orig, repo, rev2, **opts): | ||
|
r43588 | with lfstatus(repo._repo): | ||
|
r16515 | return orig(repo, rev2, **opts) | ||
|
r43346 | |||
|
r43347 | @eh.wrapcommand(b'status') | ||
|
r16247 | def overridestatus(orig, ui, repo, *pats, **opts): | ||
|
r43588 | with lfstatus(repo): | ||
|
r15168 | return orig(ui, repo, *pats, **opts) | ||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(subrepo.hgsubrepo, b'dirty') | ||
|
r33364 | def overridedirty(orig, repo, ignoreupdate=False, missing=False): | ||
|
r43588 | with lfstatus(repo._repo): | ||
|
r33364 | return orig(repo, ignoreupdate=ignoreupdate, missing=missing) | ||
|
r16516 | |||
|
r43346 | |||
|
r43347 | @eh.wrapcommand(b'log') | ||
|
r16247 | def overridelog(orig, ui, repo, *pats, **opts): | ||
|
r43346 | def overridematchandpats( | ||
orig, | ||||
ctx, | ||||
pats=(), | ||||
opts=None, | ||||
globbed=False, | ||||
|
r43347 | default=b'relpath', | ||
|
r43346 | badfn=None, | ||
): | ||||
|
r18341 | """Matcher that merges root directory with .hglf, suitable for log. | ||
It is still possible to match .hglf directly. | ||||
For any listed files run log on the standin too. | ||||
matchfn tries both the given filename and with .hglf stripped. | ||||
""" | ||||
|
r26339 | if opts is None: | ||
opts = {} | ||||
|
r41719 | matchandpats = orig(ctx, pats, opts, globbed, default, badfn=badfn) | ||
|
r21110 | m, p = copy.copy(matchandpats) | ||
|
r22170 | if m.always(): | ||
# We want to match everything anyway, so there's no benefit trying | ||||
# to add standins. | ||||
return matchandpats | ||||
|
r21110 | pats = set(p) | ||
|
r24206 | |||
def fixpats(pat, tostandin=lfutil.standin): | ||||
|
r43347 | if pat.startswith(b'set:'): | ||
|
r24813 | return pat | ||
|
r29318 | kindpat = matchmod._patsplit(pat, None) | ||
|
r24206 | |||
if kindpat[0] is not None: | ||||
|
r43347 | return kindpat[0] + b':' + tostandin(kindpat[1]) | ||
|
r24206 | return tostandin(kindpat[1]) | ||
|
r41816 | cwd = repo.getcwd() | ||
if cwd: | ||||
|
r24208 | hglf = lfutil.shortname | ||
|
r43346 | back = util.pconvert(repo.pathto(hglf)[: -len(hglf)]) | ||
|
r24206 | |||
def tostandin(f): | ||||
|
r26781 | # The file may already be a standin, so truncate the back | ||
|
r24208 | # prefix and test before mangling it. This avoids turning | ||
|
r24207 | # 'glob:../.hglf/foo*' into 'glob:../.hglf/../.hglf/foo*'. | ||
|
r43346 | if f.startswith(back) and lfutil.splitstandin(f[len(back) :]): | ||
|
r24207 | return f | ||
|
r24208 | # An absolute path is from outside the repo, so truncate the | ||
# path to the root before building the standin. Otherwise cwd | ||||
# is somewhere in the repo, relative to root, and needs to be | ||||
# prepended before building the standin. | ||||
|
r41816 | if os.path.isabs(cwd): | ||
|
r43346 | f = f[len(back) :] | ||
|
r24208 | else: | ||
|
r43347 | f = cwd + b'/' + f | ||
|
r24208 | return back + lfutil.standin(f) | ||
|
r43346 | |||
|
r21110 | else: | ||
|
r43346 | |||
|
r24207 | def tostandin(f): | ||
|
r31614 | if lfutil.isstandin(f): | ||
|
r24207 | return f | ||
return lfutil.standin(f) | ||||
|
r43346 | |||
|
r32301 | pats.update(fixpats(f, tostandin) for f in p) | ||
|
r21110 | |||
|
r19472 | for i in range(0, len(m._files)): | ||
|
r24206 | # Don't add '.hglf' to m.files, since that is already covered by '.' | ||
|
r43347 | if m._files[i] == b'.': | ||
|
r24206 | continue | ||
|
r19472 | standin = lfutil.standin(m._files[i]) | ||
|
r23976 | # If the "standin" is a directory, append instead of replace to | ||
# support naming a directory on the command line with only | ||||
# largefiles. The original directory is kept to support normal | ||||
# files. | ||||
|
r31655 | if standin in ctx: | ||
|
r19472 | m._files[i] = standin | ||
|
r31655 | elif m._files[i] not in ctx and repo.wvfs.isdir(standin): | ||
|
r21275 | m._files.append(standin) | ||
|
r21110 | |||
|
r32323 | m._fileset = set(m._files) | ||
|
r32387 | m.always = lambda: False | ||
|
r18341 | origmatchfn = m.matchfn | ||
|
r43346 | |||
|
r18341 | def lfmatchfn(f): | ||
lf = lfutil.splitstandin(f) | ||||
if lf is not None and origmatchfn(lf): | ||||
return True | ||||
r = origmatchfn(f) | ||||
return r | ||||
|
r43346 | |||
|
r18341 | m.matchfn = lfmatchfn | ||
|
r21110 | |||
|
r43347 | ui.debug(b'updated patterns: %s\n' % b', '.join(sorted(pats))) | ||
|
r21110 | return m, pats | ||
|
r22169 | # For hg log --patch, the match object is used in two different senses: | ||
# (1) to determine what revisions should be printed out, and | ||||
# (2) to determine what files to print out diffs for. | ||||
# The magic matchandpats override should be used for case (1) but not for | ||||
# case (2). | ||||
|
r41719 | oldmatchandpats = scmutil.matchandpats | ||
|
r43346 | |||
|
r41719 | def overridemakefilematcher(orig, repo, pats, opts, badfn=None): | ||
|
r24534 | wctx = repo[None] | ||
|
r25467 | match, pats = oldmatchandpats(wctx, pats, opts, badfn=badfn) | ||
|
r36019 | return lambda ctx: match | ||
|
r22169 | |||
|
r43346 | wrappedmatchandpats = extensions.wrappedfunction( | ||
|
r43347 | scmutil, b'matchandpats', overridematchandpats | ||
|
r43346 | ) | ||
|
r41719 | wrappedmakefilematcher = extensions.wrappedfunction( | ||
|
r43347 | logcmdutil, b'_makenofollowfilematcher', overridemakefilematcher | ||
|
r43346 | ) | ||
|
r41719 | with wrappedmatchandpats, wrappedmakefilematcher: | ||
|
r17577 | return orig(ui, repo, *pats, **opts) | ||
|
r15168 | |||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'verify', | ||
|
r43346 | opts=[ | ||
( | ||||
|
r43347 | b'', | ||
b'large', | ||||
|
r43346 | None, | ||
|
r43347 | _(b'verify that all largefiles in current revision exists'), | ||
|
r43346 | ), | ||
( | ||||
|
r43347 | b'', | ||
b'lfa', | ||||
|
r43346 | None, | ||
|
r43347 | _(b'verify largefiles in all revisions, not just current'), | ||
|
r43346 | ), | ||
( | ||||
|
r43347 | b'', | ||
b'lfc', | ||||
|
r43346 | None, | ||
|
r43347 | _(b'verify local largefile contents, not just existence'), | ||
|
r43346 | ), | ||
], | ||||
) | ||||
|
r16247 | def overrideverify(orig, ui, repo, *pats, **opts): | ||
|
r43906 | large = opts.pop('large', False) | ||
all = opts.pop('lfa', False) | ||||
contents = opts.pop('lfc', False) | ||||
|
r15168 | |||
result = orig(ui, repo, *pats, **opts) | ||||
|
r18547 | if large or all or contents: | ||
|
r15168 | result = result or lfcommands.verifylfiles(ui, repo, all, contents) | ||
return result | ||||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'debugstate', | ||
opts=[(b'', b'large', None, _(b'display largefiles dirstate'))], | ||||
|
r43346 | ) | ||
|
r18144 | def overridedebugstate(orig, ui, repo, *pats, **opts): | ||
|
r43906 | large = opts.pop('large', False) | ||
|
r18144 | if large: | ||
|
r43346 | |||
|
r49801 | class fakerepo: | ||
|
r21088 | dirstate = lfutil.openlfdirstate(ui, repo) | ||
|
r43346 | |||
|
r21088 | orig(ui, fakerepo, *pats, **opts) | ||
|
r18144 | else: | ||
orig(ui, repo, *pats, **opts) | ||||
|
r43346 | |||
|
r15663 | # Before starting the manifest merge, merge.updates will call | ||
|
r23543 | # _checkunknownfile to check if there are any files in the merged-in | ||
|
r15663 | # changeset that collide with unknown files in the working copy. | ||
# | ||||
# The largefiles are seen as unknown, so this prevents us from merging | ||||
# in a file 'foo' if we already have a largefile with the same name. | ||||
# | ||||
# The overridden function filters the unknown files by removing any | ||||
# largefiles. This makes the merge proceed and we can then handle this | ||||
|
r23307 | # case further in the overridden calculateupdates function below. | ||
|
r43347 | @eh.wrapfunction(merge, b'_checkunknownfile') | ||
|
r50805 | def overridecheckunknownfile( | ||
origfn, dirstate, wvfs, dircache, wctx, mctx, f, f2=None | ||||
): | ||||
if lfutil.standin(dirstate.normalize(f)) in wctx: | ||||
|
r16093 | return False | ||
|
r50805 | return origfn(dirstate, wvfs, dircache, wctx, mctx, f, f2) | ||
|
r15663 | |||
|
r43346 | |||
|
r15663 | # The manifest merge handles conflicts on the manifest level. We want | ||
# to handle changes in largefile-ness of files at this level too. | ||||
# | ||||
|
r23307 | # The strategy is to run the original calculateupdates and then process | ||
|
r15663 | # the action list it outputs. There are two cases we need to deal with: | ||
# | ||||
# 1. Normal file in p1, largefile in p2. Here the largefile is | ||||
# detected via its standin file, which will enter the working copy | ||||
# with a "get" action. It is not "merge" since the standin is all | ||||
# Mercurial is concerned with at this level -- the link to the | ||||
# existing normal file is not relevant here. | ||||
# | ||||
# 2. Largefile in p1, normal file in p2. Here we get a "merge" action | ||||
# since the largefile will be present in the working copy and | ||||
# different from the normal file in p2. Mercurial therefore | ||||
# triggers a merge action. | ||||
# | ||||
# In both cases, we prompt the user and emit new actions to either | ||||
# remove the standin (if the normal file was kept) or to remove the | ||||
# normal file and get the standin (if the largefile was kept). The | ||||
# default prompt answer is to use the largefile version since it was | ||||
# presumably changed on purpose. | ||||
# | ||||
# Finally, the merge.applyupdates function will then take care of | ||||
# writing the files into the working copy and lfcommands.updatelfiles | ||||
# will update the largefiles. | ||||
|
r43347 | @eh.wrapfunction(merge, b'calculateupdates') | ||
|
r43346 | def overridecalculateupdates( | ||
origfn, repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs | ||||
): | ||||
|
r18605 | overwrite = force and not branchmerge | ||
|
r45831 | mresult = origfn( | ||
|
r43346 | repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs | ||
) | ||||
|
r19952 | |||
if overwrite: | ||||
|
r45831 | return mresult | ||
|
r15663 | |||
|
r23529 | # Convert to dictionary with filename as key and action as value. | ||
|
r23530 | lfiles = set() | ||
|
r45905 | for f in mresult.files(): | ||
|
r27905 | splitstandin = lfutil.splitstandin(f) | ||
|
r43000 | if splitstandin is not None and splitstandin in p1: | ||
|
r23641 | lfiles.add(splitstandin) | ||
elif lfutil.standin(f) in p1: | ||||
lfiles.add(f) | ||||
|
r15663 | |||
|
r27904 | for lfile in sorted(lfiles): | ||
|
r23530 | standin = lfutil.standin(lfile) | ||
|
r45904 | (lm, largs, lmsg) = mresult.getfile(lfile, (None, None, None)) | ||
(sm, sargs, smsg) = mresult.getfile(standin, (None, None, None)) | ||||
r49558 | ||||
if sm in (ACTION_GET, ACTION_DELETED_CHANGED) and lm != ACTION_REMOVE: | ||||
if sm == ACTION_DELETED_CHANGED: | ||||
|
r26962 | f1, f2, fa, move, anc = sargs | ||
|
r27655 | sargs = (p2[f2].flags(), False) | ||
|
r15663 | # Case 1: normal file in the working copy, largefile in | ||
# the second parent | ||||
|
r43346 | usermsg = ( | ||
_( | ||||
|
r43347 | b'remote turned local normal file %s into a largefile\n' | ||
b'use (l)argefile or keep (n)ormal file?' | ||||
b'$$ &Largefile $$ &Normal file' | ||||
|
r43346 | ) | ||
% lfile | ||||
) | ||||
if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile | ||||
r49558 | mresult.addfile( | |||
lfile, ACTION_REMOVE, None, b'replaced by standin' | ||||
) | ||||
mresult.addfile(standin, ACTION_GET, sargs, b'replaces standin') | ||||
|
r43346 | else: # keep local normal file | ||
r49558 | mresult.addfile(lfile, ACTION_KEEP, None, b'replaces standin') | |||
|
r23493 | if branchmerge: | ||
|
r45839 | mresult.addfile( | ||
|
r46554 | standin, | ||
r49558 | ACTION_KEEP, | |||
|
r46554 | None, | ||
b'replaced by non-standin', | ||||
|
r45831 | ) | ||
|
r23493 | else: | ||
|
r45839 | mresult.addfile( | ||
|
r46554 | standin, | ||
r49558 | ACTION_REMOVE, | |||
|
r46554 | None, | ||
b'replaced by non-standin', | ||||
|
r45831 | ) | ||
r49558 | if lm in (ACTION_GET, ACTION_DELETED_CHANGED) and sm != ACTION_REMOVE: | |||
if lm == ACTION_DELETED_CHANGED: | ||||
|
r26962 | f1, f2, fa, move, anc = largs | ||
|
r27655 | largs = (p2[f2].flags(), False) | ||
|
r15663 | # Case 2: largefile in the working copy, normal file in | ||
# the second parent | ||||
|
r43346 | usermsg = ( | ||
_( | ||||
|
r43347 | b'remote turned local largefile %s into a normal file\n' | ||
b'keep (l)argefile or use (n)ormal file?' | ||||
b'$$ &Largefile $$ &Normal file' | ||||
|
r43346 | ) | ||
% lfile | ||||
) | ||||
if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile | ||||
|
r22196 | if branchmerge: | ||
# largefile can be restored from standin safely | ||||
|
r45839 | mresult.addfile( | ||
|
r46554 | lfile, | ||
r49558 | ACTION_KEEP, | |||
|
r46554 | None, | ||
b'replaced by standin', | ||||
|
r45831 | ) | ||
r49558 | mresult.addfile( | |||
standin, ACTION_KEEP, None, b'replaces standin' | ||||
) | ||||
|
r22196 | else: | ||
# "lfile" should be marked as "removed" without | ||||
# removal of itself | ||||
|
r45839 | mresult.addfile( | ||
|
r45855 | lfile, | ||
MERGE_ACTION_LARGEFILE_MARK_REMOVED, | ||||
None, | ||||
b'forget non-standin largefile', | ||||
|
r43346 | ) | ||
|
r22196 | |||
# linear-merge should treat this largefile as 're-added' | ||||
r49558 | mresult.addfile(standin, ACTION_ADD, None, b'keep standin') | |||
|
r43346 | else: # pick remote normal file | ||
r49558 | mresult.addfile(lfile, ACTION_GET, largs, b'replaces standin') | |||
|
r45839 | mresult.addfile( | ||
|
r46554 | standin, | ||
r49558 | ACTION_REMOVE, | |||
|
r46554 | None, | ||
b'replaced by non-standin', | ||||
|
r45831 | ) | ||
|
r15663 | |||
|
r45831 | return mresult | ||
|
r15663 | |||
|
r43346 | |||
|
r45383 | @eh.wrapfunction(mergestatemod, b'recordupdates') | ||
|
r42656 | def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): | ||
|
r45855 | if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions: | ||
|
r23695 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | ||
r50943 | for lfile, args, msg in actions[MERGE_ACTION_LARGEFILE_MARK_REMOVED]: | |||
# this should be executed before 'orig', to execute 'remove' | ||||
# before all other actions | ||||
repo.dirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) | ||||
# make sure lfile doesn't get synclfdirstate'd as normal | ||||
lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True) | ||||
|
r22196 | |||
|
r42656 | return orig(repo, actions, branchmerge, getfiledata) | ||
|
r22196 | |||
|
r43346 | |||
|
r15252 | # Override filemerge to prompt the user about how they wish to merge | ||
|
r20295 | # largefiles. This will handle identical edits without prompting the user. | ||
|
r49261 | @eh.wrapfunction(filemerge, b'filemerge') | ||
|
r43346 | def overridefilemerge( | ||
|
r49260 | origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None | ||
|
r43346 | ): | ||
|
r27050 | if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): | ||
|
r49260 | return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels) | ||
|
r20298 | |||
|
r31740 | ahash = lfutil.readasstandin(fca).lower() | ||
dhash = lfutil.readasstandin(fcd).lower() | ||||
ohash = lfutil.readasstandin(fco).lower() | ||||
|
r43346 | if ( | ||
ohash != ahash | ||||
and ohash != dhash | ||||
and ( | ||||
dhash == ahash | ||||
or repo.ui.promptchoice( | ||||
_( | ||||
|
r43347 | b'largefile %s has a merge conflict\nancestor was %s\n' | ||
b'you can keep (l)ocal %s or take (o)ther %s.\n' | ||||
b'what do you want to do?' | ||||
b'$$ &Local $$ &Other' | ||||
|
r43346 | ) | ||
% (lfutil.splitstandin(orig), ahash, dhash, ohash), | ||||
0, | ||||
) | ||||
== 1 | ||||
) | ||||
): | ||||
|
r20298 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | ||
|
r49337 | return 0, False | ||
|
r15168 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(copiesmod, b'pathcopies') | ||
|
r24782 | def copiespathcopies(orig, ctx1, ctx2, match=None): | ||
copies = orig(ctx1, ctx2, match=match) | ||||
|
r24230 | updated = {} | ||
|
r49768 | for k, v in copies.items(): | ||
|
r24230 | updated[lfutil.splitstandin(k) or k] = lfutil.splitstandin(v) or v | ||
return updated | ||||
|
r43346 | |||
|
r15252 | # Copy first changes the matchers to match standins instead of | ||
# largefiles. Then it overrides util.copyfile in that function it | ||||
# checks if the destination largefile already exists. It also keeps a | ||||
# list of copied files so that the largefiles can be copied and the | ||||
# dirstate updated. | ||||
|
r43347 | @eh.wrapfunction(cmdutil, b'copy') | ||
|
r16247 | def overridecopy(orig, ui, repo, pats, opts, rename=False): | ||
|
r15252 | # doesn't remove largefile on rename | ||
|
r15168 | if len(pats) < 2: | ||
# this isn't legal, let the original function deal with it | ||||
return orig(ui, repo, pats, opts, rename) | ||||
|
r15254 | # This could copy both lfiles and normal files in one command, | ||
# but we don't want to do that. First replace their matcher to | ||||
# only match normal files and run it, then replace it to just | ||||
# match largefiles and run it again. | ||||
|
r15168 | nonormalfiles = False | ||
nolfiles = False | ||||
|
r41722 | manifest = repo[None].manifest() | ||
|
r43346 | |||
def normalfilesmatchfn( | ||||
orig, | ||||
ctx, | ||||
pats=(), | ||||
opts=None, | ||||
globbed=False, | ||||
|
r43347 | default=b'relpath', | ||
|
r43346 | badfn=None, | ||
): | ||||
|
r41722 | if opts is None: | ||
opts = {} | ||||
match = orig(ctx, pats, opts, globbed, default, badfn=badfn) | ||||
return composenormalfilematcher(match, manifest) | ||||
|
r43346 | |||
|
r43347 | with extensions.wrappedfunction(scmutil, b'match', normalfilesmatchfn): | ||
|
r41722 | try: | ||
result = orig(ui, repo, pats, opts, rename) | ||||
except error.Abort as e: | ||||
|
r46274 | if e.message != _(b'no files to copy'): | ||
|
r41722 | raise e | ||
else: | ||||
nonormalfiles = True | ||||
result = 0 | ||||
|
r15168 | |||
# The first rename can cause our current working directory to be removed. | ||||
# In that case there is nothing left to copy/rename so just quit. | ||||
try: | ||||
repo.getcwd() | ||||
except OSError: | ||||
return result | ||||
|
r24006 | def makestandin(relpath): | ||
path = pathutil.canonpath(repo.root, repo.getcwd(), relpath) | ||||
|
r28715 | return repo.wvfs.join(lfutil.standin(path)) | ||
|
r24006 | |||
fullpats = scmutil.expandpats(pats) | ||||
dest = fullpats[-1] | ||||
if os.path.isdir(dest): | ||||
if not os.path.isdir(makestandin(dest)): | ||||
os.makedirs(makestandin(dest)) | ||||
|
r15168 | try: | ||
|
r25079 | # When we call orig below it creates the standins but we don't add | ||
# them to the dir state until later so lock during that time. | ||||
wlock = repo.wlock() | ||||
|
r15168 | |||
|
r25079 | manifest = repo[None].manifest() | ||
|
r43346 | |||
def overridematch( | ||||
orig, | ||||
ctx, | ||||
pats=(), | ||||
opts=None, | ||||
globbed=False, | ||||
|
r43347 | default=b'relpath', | ||
|
r43346 | badfn=None, | ||
): | ||||
|
r26341 | if opts is None: | ||
opts = {} | ||||
|
r25079 | newpats = [] | ||
# The patterns were previously mangled to add the standin | ||||
# directory; we need to remove that now | ||||
|
r15168 | for pat in pats: | ||
|
r29318 | if matchmod.patkind(pat) is None and lfutil.shortname in pat: | ||
|
r43347 | newpats.append(pat.replace(lfutil.shortname, b'')) | ||
|
r15168 | else: | ||
|
r25079 | newpats.append(pat) | ||
|
r41721 | match = orig(ctx, newpats, opts, globbed, default, badfn=badfn) | ||
|
r25079 | m = copy.copy(match) | ||
lfile = lambda f: lfutil.standin(f) in manifest | ||||
m._files = [lfutil.standin(f) for f in m._files if lfile(f)] | ||||
|
r32323 | m._fileset = set(m._files) | ||
|
r25079 | origmatchfn = m.matchfn | ||
|
r43346 | |||
|
r31613 | def matchfn(f): | ||
lfile = lfutil.splitstandin(f) | ||||
|
r43346 | return ( | ||
lfile is not None | ||||
and (f in manifest) | ||||
and origmatchfn(lfile) | ||||
or None | ||||
) | ||||
|
r31613 | m.matchfn = matchfn | ||
|
r25079 | return m | ||
|
r43346 | |||
|
r25079 | listpats = [] | ||
for pat in pats: | ||||
|
r29318 | if matchmod.patkind(pat) is not None: | ||
|
r25079 | listpats.append(pat) | ||
else: | ||||
listpats.append(makestandin(pat)) | ||||
|
r15168 | |||
|
r41720 | copiedfiles = [] | ||
|
r43346 | |||
|
r41720 | def overridecopyfile(orig, src, dest, *args, **kwargs): | ||
|
r43346 | if lfutil.shortname in src and dest.startswith( | ||
repo.wjoin(lfutil.shortname) | ||||
): | ||||
|
r43347 | destlfile = dest.replace(lfutil.shortname, b'') | ||
if not opts[b'force'] and os.path.exists(destlfile): | ||||
raise IOError( | ||||
b'', _(b'destination largefile already exists') | ||||
) | ||||
|
r41720 | copiedfiles.append((src, dest)) | ||
orig(src, dest, *args, **kwargs) | ||||
|
r43346 | |||
|
r43347 | with extensions.wrappedfunction(util, b'copyfile', overridecopyfile): | ||
with extensions.wrappedfunction(scmutil, b'match', overridematch): | ||||
|
r41926 | result += orig(ui, repo, listpats, opts, rename) | ||
|
r21196 | |||
|
r25079 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
for (src, dest) in copiedfiles: | ||||
|
r43346 | if lfutil.shortname in src and dest.startswith( | ||
repo.wjoin(lfutil.shortname) | ||||
): | ||||
|
r43347 | srclfile = src.replace(repo.wjoin(lfutil.standin(b'')), b'') | ||
destlfile = dest.replace(repo.wjoin(lfutil.standin(b'')), b'') | ||||
destlfiledir = repo.wvfs.dirname(repo.wjoin(destlfile)) or b'.' | ||||
|
r25079 | if not os.path.isdir(destlfiledir): | ||
os.makedirs(destlfiledir) | ||||
if rename: | ||||
os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile)) | ||||
|
r17245 | |||
|
r25079 | # The file is gone, but this deletes any empty parent | ||
# directories as a side-effect. | ||||
|
r31309 | repo.wvfs.unlinkpath(srclfile, ignoremissing=True) | ||
r48455 | lfdirstate.set_untracked(srclfile) | |||
|
r25079 | else: | ||
|
r43346 | util.copyfile(repo.wjoin(srclfile), repo.wjoin(destlfile)) | ||
|
r25079 | |||
r48450 | lfdirstate.set_tracked(destlfile) | |||
|
r48982 | lfdirstate.write(repo.currenttransaction()) | ||
|
r26587 | except error.Abort as e: | ||
|
r46274 | if e.message != _(b'no files to copy'): | ||
|
r25079 | raise e | ||
else: | ||||
nolfiles = True | ||||
|
r15168 | finally: | ||
wlock.release() | ||||
if nolfiles and nonormalfiles: | ||||
|
r43347 | raise error.Abort(_(b'no files to copy')) | ||
|
r15168 | |||
return result | ||||
|
r43346 | |||
|
r15254 | # When the user calls revert, we have to be careful to not revert any | ||
# changes to other largefiles accidentally. This means we have to keep | ||||
# track of the largefiles that are being reverted so we only pull down | ||||
# the necessary largefiles. | ||||
|
r15168 | # | ||
|
r15254 | # Standins are only updated (to match the hash of largefiles) before | ||
# commits. Update the standins then run the original revert, changing | ||||
# the matcher to hit standins instead of largefiles. Based on the | ||||
|
r21094 | # resulting standins update the largefiles. | ||
|
r43347 | @eh.wrapfunction(cmdutil, b'revert') | ||
|
r45935 | def overriderevert(orig, ui, repo, ctx, *pats, **opts): | ||
|
r15254 | # Because we put the standins in a bad state (by updating them) | ||
# and then return them to a correct state we need to lock to | ||||
# prevent others from changing them in their incorrect state. | ||||
r51033 | with repo.wlock(), repo.dirstate.running_status(repo): | |||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
|
r23039 | s = lfutil.lfdirstatestatus(lfdirstate, repo) | ||
|
r48982 | lfdirstate.write(repo.currenttransaction()) | ||
|
r22919 | for lfile in s.modified: | ||
|
r31659 | lfutil.updatestandin(repo, lfile, lfutil.standin(lfile)) | ||
|
r22919 | for lfile in s.deleted: | ||
|
r31618 | fstandin = lfutil.standin(lfile) | ||
|
r43346 | if repo.wvfs.exists(fstandin): | ||
|
r31618 | repo.wvfs.unlink(fstandin) | ||
|
r15168 | |||
|
r21094 | oldstandins = lfutil.getstandinsstate(repo) | ||
|
r43346 | def overridematch( | ||
orig, | ||||
mctx, | ||||
pats=(), | ||||
opts=None, | ||||
globbed=False, | ||||
|
r43347 | default=b'relpath', | ||
|
r43346 | badfn=None, | ||
): | ||||
|
r26343 | if opts is None: | ||
opts = {} | ||||
|
r41723 | match = orig(mctx, pats, opts, globbed, default, badfn=badfn) | ||
|
r21095 | m = copy.copy(match) | ||
|
r24133 | |||
# revert supports recursing into subrepos, and though largefiles | ||||
# currently doesn't work correctly in that case, this match is | ||||
# called, so the lfdirstate above may not be the correct one for | ||||
# this invocation of match. | ||||
|
r43346 | lfdirstate = lfutil.openlfdirstate( | ||
mctx.repo().ui, mctx.repo(), False | ||||
) | ||||
|
r24133 | |||
|
r31654 | wctx = repo[None] | ||
|
r31656 | matchfiles = [] | ||
for f in m._files: | ||||
|
r24437 | standin = lfutil.standin(f) | ||
|
r24438 | if standin in ctx or standin in mctx: | ||
|
r31656 | matchfiles.append(standin) | ||
r48918 | elif standin in wctx or lfdirstate.get_entry(f).removed: | |||
|
r31656 | continue | ||
else: | ||||
matchfiles.append(f) | ||||
m._files = matchfiles | ||||
|
r32323 | m._fileset = set(m._files) | ||
|
r21095 | origmatchfn = m.matchfn | ||
|
r43346 | |||
|
r21095 | def matchfn(f): | ||
|
r31613 | lfile = lfutil.splitstandin(f) | ||
if lfile is not None: | ||||
|
r43346 | return origmatchfn(lfile) and (f in ctx or f in mctx) | ||
|
r21095 | return origmatchfn(f) | ||
|
r43346 | |||
|
r21095 | m.matchfn = matchfn | ||
return m | ||||
|
r43346 | |||
|
r43347 | with extensions.wrappedfunction(scmutil, b'match', overridematch): | ||
|
r45935 | orig(ui, repo, ctx, *pats, **opts) | ||
|
r15254 | |||
|
r21094 | newstandins = lfutil.getstandinsstate(repo) | ||
filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | ||||
|
r21934 | # lfdirstate should be 'normallookup'-ed for updated files, | ||
# because reverting doesn't touch dirstate for 'normal' files | ||||
# when target revision is explicitly specified: in such case, | ||||
# 'n' and valid timestamp in dirstate doesn't ensure 'clean' | ||||
# of target (standin) file. | ||||
|
r43346 | lfcommands.updatelfiles( | ||
ui, repo, filelist, printmessage=False, normallookup=True | ||||
) | ||||
|
r21094 | |||
|
r23183 | # after pulling changesets, we need to take some extra care to get | ||
# largefiles updated remotely | ||||
|
r43346 | @eh.wrapcommand( | ||
|
r43347 | b'pull', | ||
|
r43346 | opts=[ | ||
( | ||||
|
r43347 | b'', | ||
b'all-largefiles', | ||||
|
r43346 | None, | ||
|
r43347 | _(b'download all pulled versions of largefiles (DEPRECATED)'), | ||
|
r43346 | ), | ||
( | ||||
|
r43347 | b'', | ||
b'lfrev', | ||||
|
r43346 | [], | ||
|
r43347 | _(b'download largefiles for these revisions'), | ||
_(b'REV'), | ||||
|
r43346 | ), | ||
], | ||||
) | ||||
|
r16247 | def overridepull(orig, ui, repo, source=None, **opts): | ||
|
r16692 | revsprepull = len(repo) | ||
|
r18977 | if not source: | ||
|
r43347 | source = b'default' | ||
|
r18977 | repo.lfpullsource = source | ||
|
r23183 | result = orig(ui, repo, source, **opts) | ||
|
r18977 | revspostpull = len(repo) | ||
|
r43906 | lfrevs = opts.get('lfrev', []) | ||
if opts.get('all_largefiles'): | ||||
|
r43347 | lfrevs.append(b'pulled()') | ||
|
r18978 | if lfrevs and revspostpull > revsprepull: | ||
numcached = 0 | ||||
|
r43346 | repo.firstpulled = revsprepull # for pulled() revset expression | ||
|
r18979 | try: | ||
|
r48928 | for rev in logcmdutil.revrange(repo, lfrevs): | ||
|
r43347 | ui.note(_(b'pulling largefiles for revision %d\n') % rev) | ||
|
r18979 | (cached, missing) = lfcommands.cachelfiles(ui, repo, rev) | ||
numcached += len(cached) | ||||
finally: | ||||
del repo.firstpulled | ||||
|
r43347 | ui.status(_(b"%d largefiles cached\n") % numcached) | ||
|
r15168 | return result | ||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'push', | ||
|
r43346 | opts=[ | ||
|
r43347 | ( | ||
b'', | ||||
b'lfrev', | ||||
[], | ||||
_(b'upload largefiles for these revisions'), | ||||
_(b'REV'), | ||||
) | ||||
|
r43346 | ], | ||
) | ||||
|
r28878 | def overridepush(orig, ui, repo, *args, **kwargs): | ||
"""Override push command and store --lfrev parameters in opargs""" | ||||
|
r43906 | lfrevs = kwargs.pop('lfrev', None) | ||
|
r28878 | if lfrevs: | ||
|
r43906 | opargs = kwargs.setdefault('opargs', {}) | ||
|
r48928 | opargs[b'lfrevs'] = logcmdutil.revrange(repo, lfrevs) | ||
|
r28878 | return orig(ui, repo, *args, **kwargs) | ||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(exchange, b'pushoperation') | ||
|
r28878 | def exchangepushoperation(orig, *args, **kwargs): | ||
"""Override pushoperation constructor and store lfrevs parameter""" | ||||
|
r43906 | lfrevs = kwargs.pop('lfrevs', None) | ||
|
r28878 | pushop = orig(*args, **kwargs) | ||
pushop.lfrevs = lfrevs | ||||
return pushop | ||||
|
r43346 | |||
|
r43347 | @eh.revsetpredicate(b'pulled()') | ||
|
r18979 | def pulledrevsetsymbol(repo, subset, x): | ||
|
r27586 | """Changesets that just has been pulled. | ||
|
r18979 | |||
Only available with largefiles from pull --lfrev expressions. | ||||
.. container:: verbose | ||||
Some examples: | ||||
- pull largefiles for all new changesets:: | ||||
hg pull -lfrev "pulled()" | ||||
- pull largefiles for all new branch heads:: | ||||
hg pull -lfrev "head(pulled()) and not closed()" | ||||
""" | ||||
try: | ||||
firstpulled = repo.firstpulled | ||||
except AttributeError: | ||||
|
r43347 | raise error.Abort(_(b"pulled() only available in --lfrev")) | ||
|
r31023 | return smartset.baseset([r for r in subset if r >= firstpulled]) | ||
|
r18979 | |||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'clone', | ||
|
r43346 | opts=[ | ||
( | ||||
|
r43347 | b'', | ||
b'all-largefiles', | ||||
|
r43346 | None, | ||
|
r43347 | _(b'download all versions of all largefiles'), | ||
|
r43346 | ) | ||
], | ||||
) | ||||
|
r16644 | def overrideclone(orig, ui, source, dest=None, **opts): | ||
|
r17600 | d = dest | ||
if d is None: | ||||
d = hg.defaultdest(source) | ||||
|
r43906 | if opts.get('all_largefiles') and not hg.islocal(d): | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b'--all-largefiles is incompatible with non-local destination %s') | ||
|
r43346 | % d | ||
) | ||||
|
r17601 | |||
return orig(ui, source, dest, **opts) | ||||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(hg, b'clone') | ||
|
r17601 | def hgclone(orig, ui, opts, *args, **kwargs): | ||
result = orig(ui, opts, *args, **kwargs) | ||||
|
r17824 | if result is not None: | ||
|
r16644 | sourcerepo, destrepo = result | ||
|
r17599 | repo = destrepo.local() | ||
|
r24812 | # When cloning to a remote repo (like through SSH), no repo is available | ||
# from the peer. Therefore the largefiles can't be downloaded and the | ||||
# hgrc can't be updated. | ||||
if not repo: | ||||
return result | ||||
|
r17599 | # Caching is implicitly limited to 'rev' option, since the dest repo was | ||
|
r17824 | # truncated at that point. The user may expect a download count with | ||
# this option, so attempt whether or not this is a largefile repo. | ||||
|
r43347 | if opts.get(b'all_largefiles'): | ||
|
r46025 | success, missing = lfcommands.downloadlfiles(ui, repo) | ||
|
r17601 | |||
|
r17824 | if missing != 0: | ||
return None | ||||
|
r17601 | |||
return result | ||||
|
r16644 | |||
|
r43346 | |||
|
r43347 | @eh.wrapcommand(b'rebase', extension=b'rebase') | ||
|
r46118 | def overriderebasecmd(orig, ui, repo, **opts): | ||
|
r43347 | if not util.safehasattr(repo, b'_largefilesenabled'): | ||
|
r24158 | return orig(ui, repo, **opts) | ||
|
r43906 | resuming = opts.get('continue') | ||
|
r23187 | repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) | ||
|
r23190 | repo._lfstatuswriters.append(lambda *msg, **opts: None) | ||
|
r15168 | try: | ||
|
r46118 | with ui.configoverride( | ||
{(b'rebase', b'experimental.inmemory'): False}, b"largefiles" | ||||
): | ||||
return orig(ui, repo, **opts) | ||||
|
r15168 | finally: | ||
|
r23190 | repo._lfstatuswriters.pop() | ||
|
r23187 | repo._lfcommithooks.pop() | ||
|
r15168 | |||
|
r43346 | |||
|
r46118 | @eh.extsetup | ||
def overriderebase(ui): | ||||
try: | ||||
rebase = extensions.find(b'rebase') | ||||
except KeyError: | ||||
pass | ||||
else: | ||||
def _dorebase(orig, *args, **kwargs): | ||||
kwargs['inmemory'] = False | ||||
return orig(*args, **kwargs) | ||||
extensions.wrapfunction(rebase, b'_dorebase', _dorebase) | ||||
|
r43347 | @eh.wrapcommand(b'archive') | ||
|
r25811 | def overridearchivecmd(orig, ui, repo, dest, **opts): | ||
|
r43588 | with lfstatus(repo.unfiltered()): | ||
|
r25811 | return orig(ui, repo.unfiltered(), dest, **opts) | ||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(webcommands, b'archive') | ||
|
r36903 | def hgwebarchive(orig, web): | ||
|
r43588 | with lfstatus(web.repo): | ||
|
r36903 | return orig(web) | ||
|
r26417 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(archival, b'archive') | ||
|
r43346 | def overridearchive( | ||
orig, | ||||
repo, | ||||
dest, | ||||
node, | ||||
kind, | ||||
decode=True, | ||||
match=None, | ||||
|
r43347 | prefix=b'', | ||
|
r43346 | mtime=None, | ||
subrepos=None, | ||||
): | ||||
|
r26417 | # For some reason setting repo.lfstatus in hgwebarchive only changes the | ||
# unfiltered repo's attr, so check that as well. | ||||
if not repo.lfstatus and not repo.unfiltered().lfstatus: | ||||
|
r43346 | return orig( | ||
repo, dest, node, kind, decode, match, prefix, mtime, subrepos | ||||
) | ||||
|
r25811 | |||
|
r15254 | # No need to lock because we are only reading history and | ||
# largefile caches, neither of which are modified. | ||||
|
r25601 | if node is not None: | ||
lfcommands.cachelfiles(repo.ui, repo, node) | ||||
|
r15168 | |||
if kind not in archival.archivers: | ||||
|
r43347 | raise error.Abort(_(b"unknown archive type '%s'") % kind) | ||
|
r15168 | |||
ctx = repo[node] | ||||
|
r43347 | if kind == b'files': | ||
|
r15224 | if prefix: | ||
|
r43347 | raise error.Abort(_(b'cannot give prefix when archiving to files')) | ||
|
r15224 | else: | ||
prefix = archival.tidyprefix(dest, kind, prefix) | ||||
|
r15168 | |||
|
r15224 | def write(name, mode, islink, getdata): | ||
|
r40443 | if match and not match(name): | ||
|
r15224 | return | ||
data = getdata() | ||||
if decode: | ||||
data = repo.wwritedata(name, data) | ||||
archiver.addfile(prefix + name, mode, islink, data) | ||||
|
r15168 | |||
|
r15224 | archiver = archival.archivers[kind](dest, mtime or ctx.date()[0]) | ||
|
r15168 | |||
|
r43347 | if repo.ui.configbool(b"ui", b"archivemeta"): | ||
|
r43346 | write( | ||
|
r43347 | b'.hg_archival.txt', | ||
|
r43346 | 0o644, | ||
False, | ||||
lambda: archival.buildmetadata(ctx), | ||||
) | ||||
|
r15168 | |||
for f in ctx: | ||||
ff = ctx.flags(f) | ||||
getdata = ctx[f].data | ||||
|
r31613 | lfile = lfutil.splitstandin(f) | ||
if lfile is not None: | ||||
|
r25601 | if node is not None: | ||
path = lfutil.findfile(repo, getdata().strip()) | ||||
if path is None: | ||||
|
r26587 | raise error.Abort( | ||
|
r43346 | _( | ||
|
r43347 | b'largefile %s not found in repo store or system cache' | ||
|
r43346 | ) | ||
% lfile | ||||
) | ||||
|
r25601 | else: | ||
|
r31613 | path = lfile | ||
|
r25601 | |||
|
r31613 | f = lfile | ||
|
r15168 | |||
|
r27772 | getdata = lambda: util.readfile(path) | ||
|
r43347 | write(f, b'x' in ff and 0o755 or 0o644, b'l' in ff, getdata) | ||
|
r15168 | |||
if subrepos: | ||||
|
r18364 | for subpath in sorted(ctx.substate): | ||
|
r25601 | sub = ctx.workingsub(subpath) | ||
|
r40443 | submatch = matchmod.subdirmatcher(subpath, match) | ||
|
r43347 | subprefix = prefix + subpath + b'/' | ||
|
r44467 | |||
# TODO: Only hgsubrepo instances have `_repo`, so figure out how to | ||||
# infer and possibly set lfstatus in hgsubrepoarchive. That would | ||||
# allow only hgsubrepos to set this, instead of the current scheme | ||||
# where the parent sets this for the child. | ||||
with ( | ||||
util.safehasattr(sub, '_repo') | ||||
and lfstatus(sub._repo) | ||||
or util.nullcontextmanager() | ||||
): | ||||
|
r43590 | sub.archive(archiver, subprefix, submatch) | ||
|
r15168 | |||
archiver.done() | ||||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(subrepo.hgsubrepo, b'archive') | ||
|
r31099 | def hgsubrepoarchive(orig, repo, archiver, prefix, match=None, decode=True): | ||
|
r43347 | lfenabled = util.safehasattr(repo._repo, b'_largefilesenabled') | ||
|
r32835 | if not lfenabled or not repo._repo.lfstatus: | ||
|
r31099 | return orig(repo, archiver, prefix, match, decode) | ||
|
r25811 | |||
|
r43347 | repo._get(repo._state + (b'hg',)) | ||
|
r16578 | rev = repo._state[1] | ||
ctx = repo._repo[rev] | ||||
|
r25601 | if ctx.node() is not None: | ||
lfcommands.cachelfiles(repo.ui, repo._repo, ctx.node()) | ||||
|
r16578 | |||
def write(name, mode, islink, getdata): | ||||
|
r17108 | # At this point, the standin has been replaced with the largefile name, | ||
# so the normal matcher works here without the lfutil variants. | ||||
if match and not match(f): | ||||
return | ||||
|
r16578 | data = getdata() | ||
|
r31099 | if decode: | ||
data = repo._repo.wwritedata(name, data) | ||||
|
r16578 | |||
|
r41780 | archiver.addfile(prefix + name, mode, islink, data) | ||
|
r16578 | |||
for f in ctx: | ||||
ff = ctx.flags(f) | ||||
getdata = ctx[f].data | ||||
|
r31613 | lfile = lfutil.splitstandin(f) | ||
if lfile is not None: | ||||
|
r25601 | if ctx.node() is not None: | ||
path = lfutil.findfile(repo._repo, getdata().strip()) | ||||
if path is None: | ||||
|
r26587 | raise error.Abort( | ||
|
r43346 | _( | ||
|
r43347 | b'largefile %s not found in repo store or system cache' | ||
|
r43346 | ) | ||
% lfile | ||||
) | ||||
|
r25601 | else: | ||
|
r31613 | path = lfile | ||
|
r25601 | |||
|
r31613 | f = lfile | ||
|
r16578 | |||
|
r27772 | getdata = lambda: util.readfile(os.path.join(prefix, path)) | ||
|
r16578 | |||
|
r43347 | write(f, b'x' in ff and 0o755 or 0o644, b'l' in ff, getdata) | ||
|
r16578 | |||
|
r18364 | for subpath in sorted(ctx.substate): | ||
|
r25601 | sub = ctx.workingsub(subpath) | ||
|
r29318 | submatch = matchmod.subdirmatcher(subpath, match) | ||
|
r43347 | subprefix = prefix + subpath + b'/' | ||
|
r44467 | # TODO: Only hgsubrepo instances have `_repo`, so figure out how to | ||
# infer and possibly set lfstatus at the top of this function. That | ||||
# would allow only hgsubrepos to set this, instead of the current scheme | ||||
# where the parent sets this for the child. | ||||
with ( | ||||
util.safehasattr(sub, '_repo') | ||||
and lfstatus(sub._repo) | ||||
or util.nullcontextmanager() | ||||
): | ||||
|
r43590 | sub.archive(archiver, subprefix, submatch, decode) | ||
|
r16578 | |||
|
r43346 | |||
|
r15254 | # If a largefile is modified, the change is not reflected in its | ||
# standin until a commit. cmdutil.bailifchanged() raises an exception | ||||
# if the repo has uncommitted changes. Wrap it to also check if | ||||
|
r23441 | # largefiles were changed. This is used by bisect, backout and fetch. | ||
|
r43347 | @eh.wrapfunction(cmdutil, b'bailifchanged') | ||
|
r24472 | def overridebailifchanged(orig, repo, *args, **kwargs): | ||
orig(repo, *args, **kwargs) | ||||
|
r43588 | with lfstatus(repo): | ||
s = repo.status() | ||||
|
r22919 | if s.modified or s.added or s.removed or s.deleted: | ||
|
r43347 | raise error.Abort(_(b'uncommitted changes')) | ||
|
r15168 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(cmdutil, b'postcommitstatus') | ||
|
r27944 | def postcommitstatus(orig, repo, *args, **kwargs): | ||
|
r43588 | with lfstatus(repo): | ||
|
r27944 | return orig(repo, *args, **kwargs) | ||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(cmdutil, b'forget') | ||
|
r43346 | def cmdutilforget( | ||
orig, ui, repo, match, prefix, uipathfn, explicitonly, dryrun, interactive | ||||
): | ||||
|
r23837 | normalmatcher = composenormalfilematcher(match, repo[None].manifest()) | ||
|
r43346 | bad, forgot = orig( | ||
ui, | ||||
repo, | ||||
normalmatcher, | ||||
prefix, | ||||
uipathfn, | ||||
explicitonly, | ||||
dryrun, | ||||
interactive, | ||||
) | ||||
|
r23837 | m = composelargefilematcher(match, repo[None].manifest()) | ||
|
r15168 | |||
|
r43588 | with lfstatus(repo): | ||
|
r15168 | s = repo.status(match=m, clean=True) | ||
|
r31654 | manifest = repo[None].manifest() | ||
|
r22919 | forget = sorted(s.modified + s.added + s.deleted + s.clean) | ||
|
r31654 | forget = [f for f in forget if lfutil.standin(f) in manifest] | ||
|
r15168 | |||
for f in forget: | ||||
|
r31618 | fstandin = lfutil.standin(f) | ||
if fstandin not in repo.dirstate and not repo.wvfs.isdir(fstandin): | ||||
|
r43346 | ui.warn( | ||
|
r43347 | _(b'not removing %s: file is already untracked\n') % uipathfn(f) | ||
|
r43346 | ) | ||
|
r23837 | bad.append(f) | ||
|
r15168 | |||
for f in forget: | ||||
if ui.verbose or not m.exact(f): | ||||
|
r43347 | ui.status(_(b'removing %s\n') % uipathfn(f)) | ||
|
r15168 | |||
# Need to lock because standin files are deleted then removed from the | ||||
|
r17424 | # repository and we could race in-between. | ||
|
r27824 | with repo.wlock(): | ||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
for f in forget: | ||||
r48454 | lfdirstate.set_untracked(f) | |||
|
r48982 | lfdirstate.write(repo.currenttransaction()) | ||
|
r18153 | standins = [lfutil.standin(f) for f in forget] | ||
for f in standins: | ||||
|
r31309 | repo.wvfs.unlinkpath(f, ignoremissing=True) | ||
|
r23837 | rejected = repo[None].forget(standins) | ||
|
r15168 | |||
|
r23837 | bad.extend(f for f in rejected if f in m.files()) | ||
forgot.extend(f for f in forget if f not in rejected) | ||||
return bad, forgot | ||||
|
r17579 | |||
|
r43346 | |||
|
r21884 | def _getoutgoings(repo, other, missing, addfunc): | ||
|
r21882 | """get pairs of filename and largefile hash in outgoing revisions | ||
in 'missing'. | ||||
|
r21884 | largefiles already existing on 'other' repository are ignored. | ||
|
r21882 | 'addfunc' is invoked with each unique pairs of filename and | ||
largefile hash value. | ||||
""" | ||||
knowns = set() | ||||
|
r21884 | lfhashes = set() | ||
|
r43346 | |||
|
r21882 | def dedup(fn, lfhash): | ||
k = (fn, lfhash) | ||||
if k not in knowns: | ||||
knowns.add(k) | ||||
|
r21884 | lfhashes.add(lfhash) | ||
|
r43346 | |||
|
r21882 | lfutil.getlfilestoupload(repo, missing, dedup) | ||
|
r21884 | if lfhashes: | ||
|
r29355 | lfexists = storefactory.openstore(repo, other).exists(lfhashes) | ||
|
r21884 | for fn, lfhash in knowns: | ||
|
r43346 | if not lfexists[lfhash]: # lfhash doesn't exist on "other" | ||
|
r21884 | addfunc(fn, lfhash) | ||
|
r21882 | |||
|
r43346 | |||
|
r21052 | def outgoinghook(ui, repo, other, opts, missing): | ||
|
r43347 | if opts.pop(b'large', None): | ||
|
r21883 | lfhashes = set() | ||
if ui.debugflag: | ||||
toupload = {} | ||||
|
r43346 | |||
|
r21883 | def addfunc(fn, lfhash): | ||
if fn not in toupload: | ||||
|
r50749 | toupload[fn] = [] # pytype: disable=unsupported-operands | ||
|
r21883 | toupload[fn].append(lfhash) | ||
lfhashes.add(lfhash) | ||||
|
r43346 | |||
|
r21883 | def showhashes(fn): | ||
for lfhash in sorted(toupload[fn]): | ||||
|
r43347 | ui.debug(b' %s\n' % lfhash) | ||
|
r43346 | |||
|
r21883 | else: | ||
toupload = set() | ||||
|
r43346 | |||
|
r21883 | def addfunc(fn, lfhash): | ||
toupload.add(fn) | ||||
lfhashes.add(lfhash) | ||||
|
r43346 | |||
|
r21883 | def showhashes(fn): | ||
pass | ||||
|
r43346 | |||
|
r21884 | _getoutgoings(repo, other, missing, addfunc) | ||
|
r21883 | |||
|
r21052 | if not toupload: | ||
|
r43347 | ui.status(_(b'largefiles: no files to upload\n')) | ||
|
r15168 | else: | ||
|
r43346 | ui.status( | ||
|
r43347 | _(b'largefiles to upload (%d entities):\n') % (len(lfhashes)) | ||
|
r43346 | ) | ||
|
r21052 | for file in sorted(toupload): | ||
|
r43347 | ui.status(lfutil.splitstandin(file) + b'\n') | ||
|
r21883 | showhashes(file) | ||
|
r43347 | ui.status(b'\n') | ||
|
r15168 | |||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'outgoing', opts=[(b'', b'large', None, _(b'display outgoing largefiles'))] | ||
|
r43346 | ) | ||
|
r41091 | def _outgoingcmd(orig, *args, **kwargs): | ||
# Nothing to do here other than add the extra help option- the hook above | ||||
# processes it. | ||||
return orig(*args, **kwargs) | ||||
|
r43346 | |||
|
r21048 | def summaryremotehook(ui, repo, opts, changes): | ||
|
r43347 | largeopt = opts.get(b'large', False) | ||
|
r21048 | if changes is None: | ||
if largeopt: | ||||
|
r43346 | return (False, True) # only outgoing check is needed | ||
|
r21048 | else: | ||
return (False, False) | ||||
elif largeopt: | ||||
url, branch, peer, outgoing = changes[1] | ||||
if peer is None: | ||||
# i18n: column positioning for "hg summary" | ||||
|
r43347 | ui.status(_(b'largefiles: (no remote repo)\n')) | ||
|
r21048 | return | ||
toupload = set() | ||||
|
r21882 | lfhashes = set() | ||
|
r43346 | |||
|
r21882 | def addfunc(fn, lfhash): | ||
toupload.add(fn) | ||||
lfhashes.add(lfhash) | ||||
|
r43346 | |||
|
r21884 | _getoutgoings(repo, peer, outgoing.missing, addfunc) | ||
|
r21882 | |||
|
r21048 | if not toupload: | ||
# i18n: column positioning for "hg summary" | ||||
|
r43347 | ui.status(_(b'largefiles: (no files to upload)\n')) | ||
|
r21048 | else: | ||
# i18n: column positioning for "hg summary" | ||||
|
r43346 | ui.status( | ||
|
r43347 | _(b'largefiles: %d entities for %d files to upload\n') | ||
|
r43346 | % (len(lfhashes), len(toupload)) | ||
) | ||||
|
r21048 | |||
|
r43346 | |||
@eh.wrapcommand( | ||||
|
r43347 | b'summary', opts=[(b'', b'large', None, _(b'display outgoing largefiles'))] | ||
|
r43346 | ) | ||
|
r16247 | def overridesummary(orig, ui, repo, *pats, **opts): | ||
|
r43588 | with lfstatus(repo): | ||
|
r15787 | orig(ui, repo, *pats, **opts) | ||
|
r15168 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(scmutil, b'addremove') | ||
r50924 | def scmutiladdremove( | |||
orig, | ||||
repo, | ||||
matcher, | ||||
prefix, | ||||
uipathfn, | ||||
opts=None, | ||||
open_tr=None, | ||||
): | ||||
|
r26344 | if opts is None: | ||
opts = {} | ||||
|
r16636 | if not lfutil.islfilesrepo(repo): | ||
r50924 | return orig(repo, matcher, prefix, uipathfn, opts, open_tr=open_tr) | |||
r51034 | ||||
# open the transaction and changing_files context | ||||
if open_tr is not None: | ||||
open_tr() | ||||
|
r15792 | # Get the list of missing largefiles so we can remove them | ||
|
r17658 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | ||
r49213 | unsure, s, mtime_boundary = lfdirstate.status( | |||
|
r43346 | matchmod.always(), | ||
subrepos=[], | ||||
ignored=False, | ||||
clean=False, | ||||
unknown=False, | ||||
) | ||||
|
r15168 | |||
|
r15792 | # Call into the normal remove code, but the removing of the standin, we want | ||
# to have handled by original addremove. Monkey patching here makes sure | ||||
# we don't remove the standin in the largefiles code, preventing a very | ||||
# confused state later. | ||||
|
r22919 | if s.deleted: | ||
|
r23741 | m = copy.copy(matcher) | ||
# The m._files and m._map attributes are not changed to the deleted list | ||||
# because that affects the m.exact() test, which in turn governs whether | ||||
# or not the file name is printed, and how. Simply limit the original | ||||
# matches to those in the deleted status list. | ||||
matchfn = m.matchfn | ||||
m.matchfn = lambda f: f in s.deleted and matchfn(f) | ||||
|
r43346 | removelargefiles( | ||
repo.ui, | ||||
repo, | ||||
True, | ||||
m, | ||||
uipathfn, | ||||
|
r43347 | opts.get(b'dry_run'), | ||
|
r43346 | **pycompat.strkwargs(opts) | ||
) | ||||
|
r15792 | # Call into the normal add code, and any files that *should* be added as | ||
# largefiles will be | ||||
|
r43346 | added, bad = addlargefiles( | ||
repo.ui, repo, True, matcher, uipathfn, **pycompat.strkwargs(opts) | ||||
) | ||||
|
r15792 | # Now that we've handled largefiles, hand off to the original addremove | ||
# function to take care of the rest. Make sure it doesn't do anything with | ||||
|
r23533 | # largefiles by passing a matcher that will ignore them. | ||
|
r23769 | matcher = composenormalfilematcher(matcher, repo[None].manifest(), added) | ||
r50924 | ||||
return orig(repo, matcher, prefix, uipathfn, opts, open_tr=open_tr) | ||||
|
r15168 | |||
|
r43346 | |||
|
r15254 | # Calling purge with --all will cause the largefiles to be deleted. | ||
|
r15168 | # Override repo.status to prevent this from happening. | ||
|
r47080 | @eh.wrapcommand(b'purge') | ||
|
r16247 | def overridepurge(orig, ui, repo, *dirs, **opts): | ||
|
r23635 | # XXX Monkey patching a repoview will not work. The assigned attribute will | ||
# be set on the unfiltered repo, but we will only lookup attributes in the | ||||
# unfiltered repo if the lookup in the repoview object itself fails. As the | ||||
# monkey patched method exists on the repoview class the lookup will not | ||||
# fail. As a result, the original version will shadow the monkey patched | ||||
# one, defeating the monkey patch. | ||||
# | ||||
# As a work around we use an unfiltered repo here. We should do something | ||||
# cleaner instead. | ||||
|
r18012 | repo = repo.unfiltered() | ||
|
r15168 | oldstatus = repo.status | ||
|
r43346 | |||
def overridestatus( | ||||
|
r43347 | node1=b'.', | ||
|
r43346 | node2=None, | ||
match=None, | ||||
ignored=False, | ||||
clean=False, | ||||
unknown=False, | ||||
listsubrepos=False, | ||||
): | ||||
r = oldstatus( | ||||
node1, node2, match, ignored, clean, unknown, listsubrepos | ||||
) | ||||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
r48918 | unknown = [ | |||
f for f in r.unknown if not lfdirstate.get_entry(f).any_tracked | ||||
] | ||||
ignored = [ | ||||
f for f in r.ignored if not lfdirstate.get_entry(f).any_tracked | ||||
] | ||||
|
r43346 | return scmutil.status( | ||
r.modified, r.added, r.removed, r.deleted, unknown, ignored, r.clean | ||||
) | ||||
|
r16247 | repo.status = overridestatus | ||
|
r15168 | orig(ui, repo, *dirs, **opts) | ||
repo.status = oldstatus | ||||
|
r35349 | |||
|
r43346 | |||
|
r43347 | @eh.wrapcommand(b'rollback') | ||
|
r16247 | def overriderollback(orig, ui, repo, **opts): | ||
|
r27825 | with repo.wlock(): | ||
|
r22283 | before = repo.dirstate.parents() | ||
|
r44937 | orphans = { | ||
|
r43346 | f | ||
for f in repo.dirstate | ||||
r48918 | if lfutil.isstandin(f) and not repo.dirstate.get_entry(f).removed | |||
|
r44937 | } | ||
|
r22094 | result = orig(ui, repo, **opts) | ||
|
r22283 | after = repo.dirstate.parents() | ||
if before == after: | ||||
|
r43346 | return result # no need to restore standins | ||
|
r22283 | |||
|
r43347 | pctx = repo[b'.'] | ||
|
r22285 | for f in repo.dirstate: | ||
if lfutil.isstandin(f): | ||||
|
r22286 | orphans.discard(f) | ||
r48918 | if repo.dirstate.get_entry(f).removed: | |||
|
r22285 | repo.wvfs.unlinkpath(f, ignoremissing=True) | ||
elif f in pctx: | ||||
fctx = pctx[f] | ||||
repo.wwrite(f, fctx.data(), fctx.flags()) | ||||
else: | ||||
# content of standin is not so important in 'a', | ||||
# 'm' or 'n' (coming from the 2nd parent) cases | ||||
|
r43347 | lfutil.writestandin(repo, f, b'', False) | ||
|
r22286 | for standin in orphans: | ||
repo.wvfs.unlinkpath(standin, ignoremissing=True) | ||||
|
r22094 | |||
|
r15168 | return result | ||
|
r15383 | |||
|
r43346 | |||
|
r43347 | @eh.wrapcommand(b'transplant', extension=b'transplant') | ||
|
r16247 | def overridetransplant(orig, ui, repo, *revs, **opts): | ||
|
r43906 | resuming = opts.get('continue') | ||
|
r23274 | repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) | ||
|
r23275 | repo._lfstatuswriters.append(lambda *msg, **opts: None) | ||
|
r15982 | try: | ||
result = orig(ui, repo, *revs, **opts) | ||||
finally: | ||||
|
r23275 | repo._lfstatuswriters.pop() | ||
|
r23274 | repo._lfcommithooks.pop() | ||
|
r15383 | return result | ||
|
r16439 | |||
|
r43346 | |||
|
r43347 | @eh.wrapcommand(b'cat') | ||
|
r16439 | def overridecat(orig, ui, repo, file1, *pats, **opts): | ||
|
r35349 | opts = pycompat.byteskwargs(opts) | ||
|
r48930 | ctx = logcmdutil.revsingle(repo, opts.get(b'rev')) | ||
|
r18491 | err = 1 | ||
notbad = set() | ||||
m = scmutil.match(ctx, (file1,) + pats, opts) | ||||
origmatchfn = m.matchfn | ||||
|
r43346 | |||
|
r18491 | def lfmatchfn(f): | ||
|
r21087 | if origmatchfn(f): | ||
return True | ||||
|
r18491 | lf = lfutil.splitstandin(f) | ||
if lf is None: | ||||
|
r21087 | return False | ||
|
r18491 | notbad.add(lf) | ||
return origmatchfn(lf) | ||||
|
r43346 | |||
|
r18491 | m.matchfn = lfmatchfn | ||
|
r18974 | origbadfn = m.bad | ||
|
r43346 | |||
|
r18974 | def lfbadfn(f, msg): | ||
if not f in notbad: | ||||
|
r21086 | origbadfn(f, msg) | ||
|
r43346 | |||
|
r18974 | m.bad = lfbadfn | ||
|
r24670 | |||
origvisitdirfn = m.visitdir | ||||
|
r43346 | |||
|
r24670 | def lfvisitdirfn(dir): | ||
if dir == lfutil.shortname: | ||||
return True | ||||
ret = origvisitdirfn(dir) | ||||
if ret: | ||||
return ret | ||||
lf = lfutil.splitstandin(dir) | ||||
if lf is None: | ||||
return False | ||||
return origvisitdirfn(lf) | ||||
|
r43346 | |||
|
r24670 | m.visitdir = lfvisitdirfn | ||
|
r18491 | for f in ctx.walk(m): | ||
|
r43347 | with cmdutil.makefileobj(ctx, opts.get(b'output'), pathname=f) as fp: | ||
|
r30142 | lf = lfutil.splitstandin(f) | ||
if lf is None or origmatchfn(f): | ||||
# duplicating unreachable code from commands.cat | ||||
data = ctx[f].data() | ||||
|
r43347 | if opts.get(b'decode'): | ||
|
r30142 | data = repo.wwritedata(f, data) | ||
fp.write(data) | ||||
else: | ||||
|
r31735 | hash = lfutil.readasstandin(ctx[f]) | ||
|
r30142 | if not lfutil.inusercache(repo.ui, hash): | ||
store = storefactory.openstore(repo) | ||||
success, missing = store.get([(lf, hash)]) | ||||
if len(success) != 1: | ||||
raise error.Abort( | ||||
|
r43346 | _( | ||
|
r43347 | b'largefile %s is not in cache and could not be ' | ||
b'downloaded' | ||||
|
r43346 | ) | ||
% lf | ||||
) | ||||
|
r30142 | path = lfutil.usercachepath(repo.ui, hash) | ||
|
r43347 | with open(path, b"rb") as fpin: | ||
|
r30181 | for chunk in util.filechunkiter(fpin): | ||
|
r30142 | fp.write(chunk) | ||
|
r18974 | err = 0 | ||
|
r18491 | return err | ||
|
r17878 | |||
|
r43346 | |||
|
r46134 | @eh.wrapfunction(merge, b'_update') | ||
|
r43346 | def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): | ||
|
r43906 | matcher = kwargs.get('matcher', None) | ||
|
r27344 | # note if this is a partial update | ||
partial = matcher and not matcher.always() | ||||
r50998 | with repo.wlock(), repo.dirstate.changing_parents(repo): | |||
|
r22288 | # branch | | | | ||
# merge | force | partial | action | ||||
# -------+-------+---------+-------------- | ||||
# x | x | x | linear-merge | ||||
# o | x | x | branch-merge | ||||
# x | o | x | overwrite (as clean update) | ||||
# o | o | x | force-branch-merge (*1) | ||||
# x | x | o | (*) | ||||
# o | x | o | (*) | ||||
# x | o | o | overwrite (as revert) | ||||
# o | o | o | (*) | ||||
# | ||||
# (*) don't care | ||||
# (*1) deprecated, but used internally (e.g: "rebase --collapse") | ||||
|
r24787 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | ||
r49213 | unsure, s, mtime_boundary = lfdirstate.status( | |||
|
r43346 | matchmod.always(), | ||
subrepos=[], | ||||
ignored=False, | ||||
clean=True, | ||||
unknown=False, | ||||
) | ||||
|
r30190 | oldclean = set(s.clean) | ||
|
r43347 | pctx = repo[b'.'] | ||
|
r31653 | dctx = repo[node] | ||
|
r24787 | for lfile in unsure + s.modified: | ||
lfileabs = repo.wvfs.join(lfile) | ||||
|
r28715 | if not repo.wvfs.exists(lfileabs): | ||
|
r24787 | continue | ||
|
r31617 | lfhash = lfutil.hashfile(lfileabs) | ||
|
r24787 | standin = lfutil.standin(lfile) | ||
|
r43346 | lfutil.writestandin( | ||
repo, standin, lfhash, lfutil.getexecutable(lfileabs) | ||||
) | ||||
if standin in pctx and lfhash == lfutil.readasstandin( | ||||
pctx[standin] | ||||
): | ||||
|
r30190 | oldclean.add(lfile) | ||
|
r24787 | for lfile in s.added: | ||
|
r31653 | fstandin = lfutil.standin(lfile) | ||
if fstandin not in dctx: | ||||
# in this case, content of standin file is meaningless | ||||
# (in dctx, lfile is unknown, or normal file) | ||||
continue | ||||
|
r31659 | lfutil.updatestandin(repo, lfile, fstandin) | ||
|
r30190 | # mark all clean largefiles as dirty, just in case the update gets | ||
# interrupted before largefiles and lfdirstate are synchronized | ||||
for lfile in oldclean: | ||||
r50997 | entry = lfdirstate.get_entry(lfile) | |||
lfdirstate.hacky_extension_update_file( | ||||
lfile, | ||||
wc_tracked=entry.tracked, | ||||
p1_tracked=entry.p1_tracked, | ||||
p2_info=entry.p2_info, | ||||
possibly_dirty=True, | ||||
) | ||||
|
r48982 | lfdirstate.write(repo.currenttransaction()) | ||
|
r22288 | |||
|
r24787 | oldstandins = lfutil.getstandinsstate(repo) | ||
|
r46118 | wc = kwargs.get('wc') | ||
if wc and wc.isinmemory(): | ||||
# largefiles is not a good candidate for in-memory merge (large | ||||
# files, custom dirstate, matcher usage). | ||||
raise error.ProgrammingError( | ||||
b'largefiles is not compatible with in-memory merge' | ||||
) | ||||
r50998 | result = orig(repo, node, branchmerge, force, *args, **kwargs) | |||
|
r22288 | |||
r50998 | newstandins = lfutil.getstandinsstate(repo) | |||
filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | ||||
|
r30190 | |||
r50998 | # to avoid leaving all largefiles as dirty and thus rehash them, mark | |||
# all the ones that didn't change as clean | ||||
for lfile in oldclean.difference(filelist): | ||||
lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) | ||||
|
r30190 | |||
r50998 | if branchmerge or force or partial: | |||
filelist.extend(s.deleted + s.removed) | ||||
|
r22288 | |||
r50998 | lfcommands.updatelfiles( | |||
repo.ui, repo, filelist=filelist, normallookup=partial | ||||
) | ||||
|
r22288 | |||
return result | ||||
|
r22289 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(scmutil, b'marktouched') | ||
|
r22289 | def scmutilmarktouched(orig, repo, files, *args, **kwargs): | ||
result = orig(repo, files, *args, **kwargs) | ||||
|
r31613 | filelist = [] | ||
for f in files: | ||||
lf = lfutil.splitstandin(f) | ||||
if lf is not None: | ||||
filelist.append(lf) | ||||
|
r22289 | if filelist: | ||
|
r43346 | lfcommands.updatelfiles( | ||
repo.ui, | ||||
repo, | ||||
filelist=filelist, | ||||
printmessage=False, | ||||
normallookup=True, | ||||
) | ||||
|
r22289 | |||
return result | ||||
|
r35304 | |||
|
r43346 | |||
r46662 | @eh.wrapfunction(upgrade_actions, b'preservedrequirements') | |||
@eh.wrapfunction(upgrade_actions, b'supporteddestrequirements') | ||||
|
r35304 | def upgraderequirements(orig, repo): | ||
reqs = orig(repo) | ||||
|
r43347 | if b'largefiles' in repo.requirements: | ||
reqs.add(b'largefiles') | ||||
|
r35304 | return reqs | ||
|
r35580 | |||
|
r43346 | |||
|
r43347 | _lfscheme = b'largefile://' | ||
|
r41092 | |||
|
r43346 | |||
|
r43347 | @eh.wrapfunction(urlmod, b'open') | ||
|
r47202 | def openlargefile(orig, ui, url_, data=None, **kwargs): | ||
|
r35580 | if url_.startswith(_lfscheme): | ||
if data: | ||||
|
r43347 | msg = b"cannot use data on a 'largefile://' url" | ||
|
r35580 | raise error.ProgrammingError(msg) | ||
|
r43346 | lfid = url_[len(_lfscheme) :] | ||
|
r35580 | return storefactory.getlfile(ui, lfid) | ||
else: | ||||
|
r47202 | return orig(ui, url_, data=data, **kwargs) | ||