overrides.py
1495 lines
| 55.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''' | ||||
|
r29311 | from __future__ import absolute_import | ||
|
r15168 | |||
import copy | ||||
|
r29311 | import os | ||
|
r15168 | |||
from mercurial.i18n import _ | ||||
|
r29311 | from mercurial import ( | ||
archival, | ||||
cmdutil, | ||||
error, | ||||
hg, | ||||
|
r35903 | logcmdutil, | ||
|
r29318 | match as matchmod, | ||
|
r29311 | pathutil, | ||
|
r35349 | pycompat, | ||
|
r29311 | registrar, | ||
scmutil, | ||||
|
r31023 | smartset, | ||
|
r29311 | util, | ||
) | ||||
from . import ( | ||||
lfcommands, | ||||
lfutil, | ||||
storefactory, | ||||
) | ||||
|
r15168 | |||
|
r15792 | # -- Utility functions: commonly/repeatedly needed functionality --------------- | ||
|
r23617 | def composelargefilematcher(match, manifest): | ||
'''create a matcher that matches only the largefiles in the original | ||||
matcher''' | ||||
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 | ||||
|
r23769 | def composenormalfilematcher(match, manifest, exclude=None): | ||
excluded = set() | ||||
if exclude is not None: | ||||
excluded.update(exclude) | ||||
|
r23428 | m = copy.copy(match) | ||
notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in | ||||
|
r23769 | 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 | ||||
|
r15168 | def installnormalfilesmatchfn(manifest): | ||
|
r21090 | '''installmatchfn with a matchfn that ignores all largefiles''' | ||
|
r26337 | def overridematch(ctx, pats=(), opts=None, globbed=False, | ||
|
r25467 | default='relpath', badfn=None): | ||
|
r26337 | if opts is None: | ||
opts = {} | ||||
|
r25467 | match = oldmatch(ctx, pats, opts, globbed, default, badfn=badfn) | ||
|
r23428 | return composenormalfilematcher(match, manifest) | ||
|
r16247 | oldmatch = installmatchfn(overridematch) | ||
|
r15168 | |||
def installmatchfn(f): | ||||
|
r21090 | '''monkey patch the scmutil module with a custom match function. | ||
Warning: it is monkey patching the _module_ on runtime! Not thread safe!''' | ||||
|
r15224 | oldmatch = scmutil.match | ||
|
r15168 | setattr(f, 'oldmatch', oldmatch) | ||
|
r15224 | scmutil.match = f | ||
|
r15168 | return oldmatch | ||
def restorematchfn(): | ||||
|
r21090 | '''restores scmutil.match to what it was before installmatchfn | ||
|
r15168 | was called. no-op if scmutil.match is its original function. | ||
|
r21090 | Note that n calls to installmatchfn will require n calls to | ||
|
r23543 | restore the original matchfn.''' | ||
|
r21092 | scmutil.match = getattr(scmutil.match, 'oldmatch') | ||
|
r15168 | |||
|
r21110 | def installmatchandpatsfn(f): | ||
oldmatchandpats = scmutil.matchandpats | ||||
setattr(f, 'oldmatchandpats', oldmatchandpats) | ||||
scmutil.matchandpats = f | ||||
return oldmatchandpats | ||||
def restorematchandpatsfn(): | ||||
'''restores scmutil.matchandpats to what it was before | ||||
|
r23139 | installmatchandpatsfn was called. No-op if scmutil.matchandpats | ||
|
r21110 | is its original function. | ||
|
r23139 | Note that n calls to installmatchandpatsfn will require n calls | ||
|
r23543 | to restore the original matchfn.''' | ||
|
r21110 | scmutil.matchandpats = getattr(scmutil.matchandpats, 'oldmatchandpats', | ||
scmutil.matchandpats) | ||||
|
r23767 | def addlargefiles(ui, repo, isaddremove, matcher, **opts): | ||
|
r32157 | large = opts.get(r'large') | ||
|
r15227 | lfsize = lfutil.getminsize( | ||
|
r32157 | ui, lfutil.islfilesrepo(repo), opts.get(r'lfsize')) | ||
|
r15168 | |||
lfmatcher = None | ||||
|
r15739 | if lfutil.islfilesrepo(repo): | ||
|
r34757 | lfpats = ui.configlist(lfutil.longname, 'patterns') | ||
|
r15168 | if lfpats: | ||
|
r29318 | lfmatcher = matchmod.match(repo.root, '', 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 | ||||
|
r23767 | # addremove in core gets fancy with the name, add doesn't | ||
if isaddremove: | ||||
name = m.uipath(f) | ||||
else: | ||||
name = m.rel(f) | ||||
|
r15168 | # 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: | ||||
|
r23767 | ui.warn(_('%s already a largefile\n') % name) | ||
|
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 | ||
|
r15255 | abovemin = (lfsize and | ||
|
r23733 | 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: | ||||
|
r23767 | ui.status(_('adding %s as a largefile\n') % name) | ||
|
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(): | ||
|
r35349 | if not opts.get(r'dry_run'): | ||
|
r23041 | standins = [] | ||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
for f in lfnames: | ||||
standinname = lfutil.standin(f) | ||||
lfutil.writestandin(repo, standinname, hash='', | ||||
executable=lfutil.getexecutable(repo.wjoin(f))) | ||||
standins.append(standinname) | ||||
if lfdirstate[f] == 'r': | ||||
lfdirstate.normallookup(f) | ||||
else: | ||||
lfdirstate.add(f) | ||||
lfdirstate.write() | ||||
|
r15255 | bad += [lfutil.splitstandin(f) | ||
|
r18154 | for f in repo[None].add(standins) | ||
|
r15255 | if f in m.files()] | ||
|
r23768 | |||
added = [f for f in lfnames if f not in bad] | ||||
return added, bad | ||||
|
r15168 | |||
|
r37168 | def removelargefiles(ui, repo, isaddremove, matcher, dryrun, **opts): | ||
|
r35349 | after = opts.get(r'after') | ||
|
r23741 | m = composelargefilematcher(matcher, repo[None].manifest()) | ||
|
r15168 | try: | ||
repo.lfstatus = True | ||||
|
r23741 | s = repo.status(match=m, clean=not isaddremove) | ||
|
r15168 | finally: | ||
repo.lfstatus = False | ||||
|
r15792 | manifest = repo[None].manifest() | ||
|
r15255 | modified, added, deleted, clean = [[f for f in list | ||
if lfutil.standin(f) in manifest] | ||||
|
r22919 | for list in (s.modified, s.added, | ||
s.deleted, s.clean)] | ||||
|
r15168 | |||
|
r18066 | def warn(files, msg): | ||
|
r15168 | for f in files: | ||
|
r18066 | ui.warn(msg % m.rel(f)) | ||
|
r17576 | return int(len(files) > 0) | ||
result = 0 | ||||
|
r15168 | |||
|
r15786 | if after: | ||
|
r22630 | remove = deleted | ||
|
r18066 | result = warn(modified + added + clean, | ||
_('not removing %s: file still exists\n')) | ||||
|
r15168 | else: | ||
|
r22630 | remove = deleted + clean | ||
|
r18066 | result = warn(modified, _('not removing %s: file is modified (use -f' | ||
' to force removal)\n')) | ||||
result = warn(added, _('not removing %s: file has been marked for add' | ||||
' (use forget to undo)\n')) 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): | ||
# addremove in core gets fancy with the name, remove doesn't | ||||
if isaddremove: | ||||
name = m.uipath(f) | ||||
else: | ||||
name = m.rel(f) | ||||
ui.status(_('removing %s\n') % name) | ||||
|
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: | ||||
lfutil.synclfdirstate(repo, lfdirstate, lfutil.splitstandin(f), | ||||
False) | ||||
lfdirstate.write() | ||||
|
r15168 | |||
|
r17576 | return result | ||
|
r16449 | # For overriding mercurial.hgweb.webcommands so that largefiles will | ||
# appear at their right place in the manifests. | ||||
def decodepath(orig, path): | ||||
return lfutil.splitstandin(path) or path | ||||
|
r15792 | # -- Wrappers: modify existing commands -------------------------------- | ||
|
r16247 | def overrideadd(orig, ui, repo, *pats, **opts): | ||
|
r35349 | if opts.get(r'normal') and opts.get(r'large'): | ||
|
r26587 | raise error.Abort(_('--normal cannot be used with --large')) | ||
|
r23886 | return orig(ui, repo, *pats, **opts) | ||
def cmdutiladd(orig, ui, repo, matcher, prefix, explicitonly, **opts): | ||||
# The --normal flag short circuits this override | ||||
|
r32157 | if opts.get(r'normal'): | ||
|
r23886 | return orig(ui, repo, matcher, prefix, explicitonly, **opts) | ||
|
r15792 | |||
|
r23886 | ladded, lbad = addlargefiles(ui, repo, False, matcher, **opts) | ||
normalmatcher = composenormalfilematcher(matcher, repo[None].manifest(), | ||||
ladded) | ||||
bad = orig(ui, repo, normalmatcher, prefix, explicitonly, **opts) | ||||
bad.extend(f for f in lbad) | ||||
return bad | ||||
|
r15792 | |||
|
r37168 | def cmdutilremove(orig, ui, repo, matcher, prefix, after, force, subrepos, | ||
dryrun): | ||||
|
r23782 | normalmatcher = composenormalfilematcher(matcher, repo[None].manifest()) | ||
|
r37168 | result = orig(ui, repo, normalmatcher, prefix, after, force, subrepos, | ||
dryrun) | ||||
return removelargefiles(ui, repo, False, matcher, dryrun, after=after, | ||||
|
r23782 | force=force) or result | ||
|
r15792 | |||
|
r16515 | def overridestatusfn(orig, repo, rev2, **opts): | ||
try: | ||||
repo._repo.lfstatus = True | ||||
return orig(repo, rev2, **opts) | ||||
finally: | ||||
repo._repo.lfstatus = False | ||||
|
r16247 | def overridestatus(orig, ui, repo, *pats, **opts): | ||
|
r15168 | try: | ||
repo.lfstatus = True | ||||
return orig(ui, repo, *pats, **opts) | ||||
finally: | ||||
repo.lfstatus = False | ||||
|
r33364 | def overridedirty(orig, repo, ignoreupdate=False, missing=False): | ||
|
r16516 | try: | ||
repo._repo.lfstatus = True | ||||
|
r33364 | return orig(repo, ignoreupdate=ignoreupdate, missing=missing) | ||
|
r16516 | finally: | ||
repo._repo.lfstatus = False | ||||
|
r16247 | def overridelog(orig, ui, repo, *pats, **opts): | ||
|
r26339 | def overridematchandpats(ctx, pats=(), opts=None, globbed=False, | ||
|
r25467 | default='relpath', 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 = {} | ||||
|
r25467 | matchandpats = oldmatchandpats(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): | ||||
|
r24813 | if pat.startswith('set:'): | ||
return pat | ||||
|
r29318 | kindpat = matchmod._patsplit(pat, None) | ||
|
r24206 | |||
if kindpat[0] is not None: | ||||
return kindpat[0] + ':' + tostandin(kindpat[1]) | ||||
return tostandin(kindpat[1]) | ||||
|
r21110 | if m._cwd: | ||
|
r24208 | hglf = lfutil.shortname | ||
back = util.pconvert(m.rel(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*'. | ||
if f.startswith(back) and lfutil.splitstandin(f[len(back):]): | ||||
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. | ||||
if os.path.isabs(m._cwd): | ||||
f = f[len(back):] | ||||
else: | ||||
f = m._cwd + '/' + f | ||||
return back + lfutil.standin(f) | ||||
|
r21110 | else: | ||
|
r24207 | def tostandin(f): | ||
|
r31614 | if lfutil.isstandin(f): | ||
|
r24207 | return f | ||
return lfutil.standin(f) | ||||
|
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 '.' | ||
if m._files[i] == '.': | ||||
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 | ||
def lfmatchfn(f): | ||||
lf = lfutil.splitstandin(f) | ||||
if lf is not None and origmatchfn(lf): | ||||
return True | ||||
r = origmatchfn(f) | ||||
return r | ||||
m.matchfn = lfmatchfn | ||||
|
r21110 | |||
|
r32308 | ui.debug('updated patterns: %s\n' % ', '.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). | ||||
|
r35905 | def overridemakefilematcher(repo, pats, opts, badfn=None): | ||
|
r24534 | wctx = repo[None] | ||
|
r25467 | match, pats = oldmatchandpats(wctx, pats, opts, badfn=badfn) | ||
|
r36019 | return lambda ctx: match | ||
|
r22169 | |||
|
r21110 | oldmatchandpats = installmatchandpatsfn(overridematchandpats) | ||
|
r35905 | oldmakefilematcher = logcmdutil._makenofollowfilematcher | ||
setattr(logcmdutil, '_makenofollowfilematcher', overridemakefilematcher) | ||||
|
r22169 | |||
|
r15168 | try: | ||
|
r17577 | return orig(ui, repo, *pats, **opts) | ||
|
r15168 | finally: | ||
|
r21110 | restorematchandpatsfn() | ||
|
r35905 | setattr(logcmdutil, '_makenofollowfilematcher', oldmakefilematcher) | ||
|
r15168 | |||
|
r16247 | def overrideverify(orig, ui, repo, *pats, **opts): | ||
|
r35349 | large = opts.pop(r'large', False) | ||
all = opts.pop(r'lfa', False) | ||||
contents = opts.pop(r'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 | ||||
|
r18144 | def overridedebugstate(orig, ui, repo, *pats, **opts): | ||
|
r35349 | large = opts.pop(r'large', False) | ||
|
r18144 | if large: | ||
|
r21088 | class fakerepo(object): | ||
dirstate = lfutil.openlfdirstate(ui, repo) | ||||
orig(ui, fakerepo, *pats, **opts) | ||||
|
r18144 | else: | ||
orig(ui, repo, *pats, **opts) | ||||
|
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. | ||
|
r23653 | def overridecheckunknownfile(origfn, repo, wctx, mctx, f, f2=None): | ||
|
r19161 | if lfutil.standin(repo.dirstate.normalize(f)) in wctx: | ||
|
r16093 | return False | ||
|
r23653 | return origfn(repo, wctx, mctx, f, f2) | ||
|
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. | ||||
|
r21081 | def overridecalculateupdates(origfn, repo, p1, p2, pas, branchmerge, force, | ||
|
r28193 | acceptremote, *args, **kwargs): | ||
|
r18605 | overwrite = force and not branchmerge | ||
|
r23526 | actions, diverge, renamedelete = origfn( | ||
|
r28193 | repo, p1, p2, pas, branchmerge, force, acceptremote, *args, **kwargs) | ||
|
r19952 | |||
if overwrite: | ||||
|
r23526 | return actions, diverge, renamedelete | ||
|
r15663 | |||
|
r23529 | # Convert to dictionary with filename as key and action as value. | ||
|
r23530 | lfiles = set() | ||
|
r23642 | for f in actions: | ||
|
r27905 | splitstandin = lfutil.splitstandin(f) | ||
|
r23641 | if splitstandin in p1: | ||
lfiles.add(splitstandin) | ||||
elif lfutil.standin(f) in p1: | ||||
lfiles.add(f) | ||||
|
r15663 | |||
|
r27904 | for lfile in sorted(lfiles): | ||
|
r23530 | standin = lfutil.standin(lfile) | ||
|
r23642 | (lm, largs, lmsg) = actions.get(lfile, (None, None, None)) | ||
(sm, sargs, smsg) = actions.get(standin, (None, None, None)) | ||||
|
r23541 | if sm in ('g', 'dc') and lm != 'r': | ||
|
r26962 | if sm == 'dc': | ||
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 | ||||
|
r23470 | usermsg = _('remote turned local normal file %s into a largefile\n' | ||
'use (l)argefile or keep (n)ormal file?' | ||||
'$$ &Largefile $$ &Normal file') % lfile | ||||
|
r23483 | if repo.ui.promptchoice(usermsg, 0) == 0: # pick remote largefile | ||
|
r23642 | actions[lfile] = ('r', None, 'replaced by standin') | ||
actions[standin] = ('g', sargs, 'replaces standin') | ||||
|
r23419 | else: # keep local normal file | ||
|
r23642 | actions[lfile] = ('k', None, 'replaces standin') | ||
|
r23493 | if branchmerge: | ||
|
r23642 | actions[standin] = ('k', None, 'replaced by non-standin') | ||
|
r23493 | else: | ||
|
r23642 | actions[standin] = ('r', None, 'replaced by non-standin') | ||
|
r23541 | elif lm in ('g', 'dc') and sm != 'r': | ||
|
r26962 | if lm == 'dc': | ||
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 | ||||
|
r23470 | usermsg = _('remote turned local largefile %s into a normal file\n' | ||
|
r19967 | 'keep (l)argefile or use (n)ormal file?' | ||
|
r19226 | '$$ &Largefile $$ &Normal file') % lfile | ||
|
r23483 | if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile | ||
|
r22196 | if branchmerge: | ||
# largefile can be restored from standin safely | ||||
|
r23642 | actions[lfile] = ('k', None, 'replaced by standin') | ||
actions[standin] = ('k', None, 'replaces standin') | ||||
|
r22196 | else: | ||
# "lfile" should be marked as "removed" without | ||||
# removal of itself | ||||
|
r23642 | actions[lfile] = ('lfmr', None, | ||
'forget non-standin largefile') | ||||
|
r22196 | |||
# linear-merge should treat this largefile as 're-added' | ||||
|
r23642 | actions[standin] = ('a', None, 'keep standin') | ||
|
r23419 | else: # pick remote normal file | ||
|
r23642 | actions[lfile] = ('g', largs, 'replaces standin') | ||
actions[standin] = ('r', None, 'replaced by non-standin') | ||||
|
r15663 | |||
|
r23642 | return actions, diverge, renamedelete | ||
|
r15663 | |||
|
r22196 | def mergerecordupdates(orig, repo, actions, branchmerge): | ||
if 'lfmr' in actions: | ||||
|
r23695 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | ||
|
r22196 | for lfile, args, msg in actions['lfmr']: | ||
|
r23695 | # this should be executed before 'orig', to execute 'remove' | ||
# before all other actions | ||||
|
r22196 | repo.dirstate.remove(lfile) | ||
|
r23695 | # make sure lfile doesn't get synclfdirstate'd as normal | ||
lfdirstate.add(lfile) | ||||
lfdirstate.write() | ||||
|
r22196 | |||
return orig(repo, actions, branchmerge) | ||||
|
r15252 | # Override filemerge to prompt the user about how they wish to merge | ||
|
r20295 | # largefiles. This will handle identical edits without prompting the user. | ||
|
r34124 | def overridefilemerge(origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, | ||
|
r26607 | labels=None): | ||
|
r27050 | if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): | ||
|
r34124 | return origfn(premerge, repo, wctx, mynode, orig, fcd, fco, fca, | ||
|
r26607 | labels=labels) | ||
|
r20298 | |||
|
r31740 | ahash = lfutil.readasstandin(fca).lower() | ||
dhash = lfutil.readasstandin(fcd).lower() | ||||
ohash = lfutil.readasstandin(fco).lower() | ||||
|
r20994 | if (ohash != ahash and | ||
ohash != dhash and | ||||
(dhash == ahash or | ||||
repo.ui.promptchoice( | ||||
_('largefile %s has a merge conflict\nancestor was %s\n' | ||||
'keep (l)ocal %s or\ntake (o)ther %s?' | ||||
'$$ &Local $$ &Other') % | ||||
(lfutil.splitstandin(orig), ahash, dhash, ohash), | ||||
0) == 1)): | ||||
|
r20298 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | ||
|
r27034 | return True, 0, False | ||
|
r15168 | |||
|
r24782 | def copiespathcopies(orig, ctx1, ctx2, match=None): | ||
copies = orig(ctx1, ctx2, match=match) | ||||
|
r24230 | updated = {} | ||
for k, v in copies.iteritems(): | ||||
updated[lfutil.splitstandin(k) or k] = lfutil.splitstandin(v) or v | ||||
return updated | ||||
|
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. | ||||
|
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 | ||||
|
r21091 | installnormalfilesmatchfn(repo[None].manifest()) | ||
|
r15168 | try: | ||
|
r25079 | result = orig(ui, repo, pats, opts, rename) | ||
|
r26587 | except error.Abort as e: | ||
|
r36671 | if pycompat.bytestr(e) != _('no files to copy'): | ||
|
r25079 | raise e | ||
else: | ||||
nonormalfiles = True | ||||
result = 0 | ||||
|
r15168 | finally: | ||
restorematchfn() | ||||
# 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() | ||
|
r26341 | def overridematch(ctx, pats=(), opts=None, globbed=False, | ||
|
r25467 | default='relpath', 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: | ||
|
r25079 | newpats.append(pat.replace(lfutil.shortname, '')) | ||
|
r15168 | else: | ||
|
r25079 | newpats.append(pat) | ||
|
r25467 | match = oldmatch(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 | ||
|
r31613 | def matchfn(f): | ||
lfile = lfutil.splitstandin(f) | ||||
return (lfile is not None and | ||||
(f in manifest) and | ||||
origmatchfn(lfile) or | ||||
None) | ||||
m.matchfn = matchfn | ||||
|
r25079 | return m | ||
oldmatch = installmatchfn(overridematch) | ||||
listpats = [] | ||||
for pat in pats: | ||||
|
r29318 | if matchmod.patkind(pat) is not None: | ||
|
r25079 | listpats.append(pat) | ||
else: | ||||
listpats.append(makestandin(pat)) | ||||
|
r15168 | |||
|
r25079 | try: | ||
origcopyfile = util.copyfile | ||||
copiedfiles = [] | ||||
|
r37106 | def overridecopyfile(src, dest, *args, **kwargs): | ||
|
r15598 | if (lfutil.shortname in src and | ||
dest.startswith(repo.wjoin(lfutil.shortname))): | ||||
|
r25079 | destlfile = dest.replace(lfutil.shortname, '') | ||
if not opts['force'] and os.path.exists(destlfile): | ||||
raise IOError('', | ||||
_('destination largefile already exists')) | ||||
copiedfiles.append((src, dest)) | ||||
|
r37106 | origcopyfile(src, dest, *args, **kwargs) | ||
|
r25079 | |||
util.copyfile = overridecopyfile | ||||
result += orig(ui, repo, listpats, opts, rename) | ||||
finally: | ||||
util.copyfile = origcopyfile | ||||
|
r21196 | |||
|
r25079 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
for (src, dest) in copiedfiles: | ||||
if (lfutil.shortname in src and | ||||
dest.startswith(repo.wjoin(lfutil.shortname))): | ||||
srclfile = src.replace(repo.wjoin(lfutil.standin('')), '') | ||||
destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '') | ||||
|
r28715 | destlfiledir = repo.wvfs.dirname(repo.wjoin(destlfile)) or '.' | ||
|
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) | ||
|
r25079 | lfdirstate.remove(srclfile) | ||
else: | ||||
util.copyfile(repo.wjoin(srclfile), | ||||
repo.wjoin(destlfile)) | ||||
lfdirstate.add(destlfile) | ||||
lfdirstate.write() | ||||
|
r26587 | except error.Abort as e: | ||
|
r36671 | if pycompat.bytestr(e) != _('no files to copy'): | ||
|
r25079 | raise e | ||
else: | ||||
nolfiles = True | ||||
|
r15168 | finally: | ||
restorematchfn() | ||||
wlock.release() | ||||
if nolfiles and nonormalfiles: | ||||
|
r26587 | raise error.Abort(_('no files to copy')) | ||
|
r15168 | |||
return result | ||||
|
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. | ||
|
r24436 | def overriderevert(orig, ui, repo, ctx, parents, *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. | ||||
|
r27823 | with repo.wlock(): | ||
|
r15168 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
|
r23039 | s = lfutil.lfdirstatestatus(lfdirstate, repo) | ||
|
r18140 | lfdirstate.write() | ||
|
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) | ||
if (repo.wvfs.exists(fstandin)): | ||||
repo.wvfs.unlink(fstandin) | ||||
|
r15168 | |||
|
r21094 | oldstandins = lfutil.getstandinsstate(repo) | ||
|
r26343 | def overridematch(mctx, pats=(), opts=None, globbed=False, | ||
|
r25467 | default='relpath', badfn=None): | ||
|
r26343 | if opts is None: | ||
opts = {} | ||||
|
r25467 | match = oldmatch(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. | ||||
|
r24436 | 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) | ||
|
r31654 | elif standin in wctx or lfdirstate[f] == 'r': | ||
|
r31656 | continue | ||
else: | ||||
matchfiles.append(f) | ||||
m._files = matchfiles | ||||
|
r32323 | m._fileset = set(m._files) | ||
|
r21095 | origmatchfn = m.matchfn | ||
def matchfn(f): | ||||
|
r31613 | lfile = lfutil.splitstandin(f) | ||
if lfile is not None: | ||||
return (origmatchfn(lfile) and | ||||
|
r24438 | (f in ctx or f in mctx)) | ||
|
r21095 | return origmatchfn(f) | ||
m.matchfn = matchfn | ||||
return m | ||||
oldmatch = installmatchfn(overridematch) | ||||
|
r15168 | try: | ||
|
r24436 | orig(ui, repo, ctx, parents, *pats, **opts) | ||
|
r15168 | finally: | ||
restorematchfn() | ||||
|
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. | ||||
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 | ||||
|
r16247 | def overridepull(orig, ui, repo, source=None, **opts): | ||
|
r16692 | revsprepull = len(repo) | ||
|
r18977 | if not source: | ||
source = 'default' | ||||
repo.lfpullsource = source | ||||
|
r23183 | result = orig(ui, repo, source, **opts) | ||
|
r18977 | revspostpull = len(repo) | ||
|
r35349 | lfrevs = opts.get(r'lfrev', []) | ||
if opts.get(r'all_largefiles'): | ||||
|
r18981 | lfrevs.append('pulled()') | ||
|
r18978 | if lfrevs and revspostpull > revsprepull: | ||
numcached = 0 | ||||
|
r18979 | repo.firstpulled = revsprepull # for pulled() revset expression | ||
try: | ||||
for rev in scmutil.revrange(repo, lfrevs): | ||||
|
r36754 | ui.note(_('pulling largefiles for revision %d\n') % rev) | ||
|
r18979 | (cached, missing) = lfcommands.cachelfiles(ui, repo, rev) | ||
numcached += len(cached) | ||||
finally: | ||||
del repo.firstpulled | ||||
|
r18978 | ui.status(_("%d largefiles cached\n") % numcached) | ||
|
r15168 | return result | ||
|
r28878 | def overridepush(orig, ui, repo, *args, **kwargs): | ||
"""Override push command and store --lfrev parameters in opargs""" | ||||
|
r35349 | lfrevs = kwargs.pop(r'lfrev', None) | ||
|
r28878 | if lfrevs: | ||
|
r36418 | opargs = kwargs.setdefault(r'opargs', {}) | ||
|
r28878 | opargs['lfrevs'] = scmutil.revrange(repo, lfrevs) | ||
return orig(ui, repo, *args, **kwargs) | ||||
def exchangepushoperation(orig, *args, **kwargs): | ||||
"""Override pushoperation constructor and store lfrevs parameter""" | ||||
|
r35349 | lfrevs = kwargs.pop(r'lfrevs', None) | ||
|
r28878 | pushop = orig(*args, **kwargs) | ||
pushop.lfrevs = lfrevs | ||||
return pushop | ||||
|
r28394 | revsetpredicate = registrar.revsetpredicate() | ||
|
r27586 | |||
@revsetpredicate('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: | ||||
|
r26587 | raise error.Abort(_("pulled() only available in --lfrev")) | ||
|
r31023 | return smartset.baseset([r for r in subset if r >= firstpulled]) | ||
|
r18979 | |||
|
r16644 | def overrideclone(orig, ui, source, dest=None, **opts): | ||
|
r17600 | d = dest | ||
if d is None: | ||||
d = hg.defaultdest(source) | ||||
|
r35349 | if opts.get(r'all_largefiles') and not hg.islocal(d): | ||
|
r26587 | raise error.Abort(_( | ||
|
r21096 | '--all-largefiles is incompatible with non-local destination %s') % | ||
d) | ||||
|
r17601 | |||
return orig(ui, source, dest, **opts) | ||||
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 | ||||
|
r24029 | # If largefiles is required for this repo, permanently enable it locally | ||
if 'largefiles' in repo.requirements: | ||||
|
r35641 | repo.vfs.append('hgrc', | ||
util.tonativeeol('\n[extensions]\nlargefiles=\n')) | ||||
|
r24029 | |||
|
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. | ||||
|
r35349 | if opts.get(r'all_largefiles'): | ||
|
r17824 | success, missing = lfcommands.downloadlfiles(ui, repo, None) | ||
|
r17601 | |||
|
r17824 | if missing != 0: | ||
return None | ||||
|
r17601 | |||
return result | ||||
|
r16644 | |||
|
r31892 | def hgpostshare(orig, sourcerepo, destrepo, bookmarks=True, defaultpath=None): | ||
orig(sourcerepo, destrepo, bookmarks, defaultpath) | ||||
# If largefiles is required for this repo, permanently enable it locally | ||||
if 'largefiles' in destrepo.requirements: | ||||
|
r35641 | destrepo.vfs.append('hgrc', | ||
util.tonativeeol('\n[extensions]\nlargefiles=\n')) | ||||
|
r31892 | |||
|
r16247 | def overriderebase(orig, ui, repo, **opts): | ||
|
r24158 | if not util.safehasattr(repo, '_largefilesenabled'): | ||
return orig(ui, repo, **opts) | ||||
|
r35349 | resuming = opts.get(r'continue') | ||
|
r23187 | repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) | ||
|
r23190 | repo._lfstatuswriters.append(lambda *msg, **opts: None) | ||
|
r15168 | try: | ||
|
r17578 | return orig(ui, repo, **opts) | ||
|
r15168 | finally: | ||
|
r23190 | repo._lfstatuswriters.pop() | ||
|
r23187 | repo._lfcommithooks.pop() | ||
|
r15168 | |||
|
r25811 | def overridearchivecmd(orig, ui, repo, dest, **opts): | ||
repo.unfiltered().lfstatus = True | ||||
try: | ||||
return orig(ui, repo.unfiltered(), dest, **opts) | ||||
finally: | ||||
repo.unfiltered().lfstatus = False | ||||
|
r36903 | def hgwebarchive(orig, web): | ||
|
r26417 | web.repo.lfstatus = True | ||
try: | ||||
|
r36903 | return orig(web) | ||
|
r26417 | finally: | ||
web.repo.lfstatus = False | ||||
|
r16247 | def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None, | ||
|
r24172 | prefix='', 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: | ||||
|
r25811 | return orig(repo, dest, node, kind, decode, matchfn, prefix, mtime, | ||
subrepos) | ||||
|
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: | ||||
|
r26587 | raise error.Abort(_("unknown archive type '%s'") % kind) | ||
|
r15168 | |||
ctx = repo[node] | ||||
|
r15224 | if kind == 'files': | ||
if prefix: | ||||
|
r26587 | raise error.Abort( | ||
|
r15224 | _('cannot give prefix when archiving to files')) | ||
else: | ||||
prefix = archival.tidyprefix(dest, kind, prefix) | ||||
|
r15168 | |||
|
r15224 | def write(name, mode, islink, getdata): | ||
if matchfn and not matchfn(name): | ||||
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 | |||
|
r33499 | if repo.ui.configbool("ui", "archivemeta"): | ||
|
r25658 | write('.hg_archival.txt', 0o644, False, | ||
|
r24680 | 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( | ||
|
r25601 | _('largefile %s not found in repo store or system cache') | ||
|
r31613 | % lfile) | ||
|
r25601 | else: | ||
|
r31613 | path = lfile | ||
|
r25601 | |||
|
r31613 | f = lfile | ||
|
r15168 | |||
|
r27772 | getdata = lambda: util.readfile(path) | ||
|
r25658 | write(f, 'x' in ff and 0o755 or 0o644, 'l' in ff, getdata) | ||
|
r15168 | |||
if subrepos: | ||||
|
r18364 | for subpath in sorted(ctx.substate): | ||
|
r25601 | sub = ctx.workingsub(subpath) | ||
|
r29318 | submatch = matchmod.subdirmatcher(subpath, matchfn) | ||
|
r25811 | sub._repo.lfstatus = True | ||
|
r23575 | sub.archive(archiver, prefix, submatch) | ||
|
r15168 | |||
archiver.done() | ||||
|
r31099 | def hgsubrepoarchive(orig, repo, archiver, prefix, match=None, decode=True): | ||
|
r32835 | lfenabled = util.safehasattr(repo._repo, '_largefilesenabled') | ||
if not lfenabled or not repo._repo.lfstatus: | ||||
|
r31099 | return orig(repo, archiver, prefix, match, decode) | ||
|
r25811 | |||
|
r17695 | repo._get(repo._state + ('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 | |||
archiver.addfile(prefix + repo._path + '/' + name, mode, islink, data) | ||||
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( | ||
|
r25601 | _('largefile %s not found in repo store or system cache') | ||
|
r31613 | % lfile) | ||
|
r25601 | else: | ||
|
r31613 | path = lfile | ||
|
r25601 | |||
|
r31613 | f = lfile | ||
|
r16578 | |||
|
r27772 | getdata = lambda: util.readfile(os.path.join(prefix, path)) | ||
|
r16578 | |||
|
r25658 | write(f, 'x' in ff and 0o755 or 0o644, 'l' in ff, getdata) | ||
|
r16578 | |||
|
r18364 | for subpath in sorted(ctx.substate): | ||
|
r25601 | sub = ctx.workingsub(subpath) | ||
|
r29318 | submatch = matchmod.subdirmatcher(subpath, match) | ||
|
r25811 | sub._repo.lfstatus = True | ||
|
r31099 | sub.archive(archiver, prefix + repo._path + '/', submatch, decode) | ||
|
r16578 | |||
|
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. | ||
|
r24472 | def overridebailifchanged(orig, repo, *args, **kwargs): | ||
orig(repo, *args, **kwargs) | ||||
|
r15168 | repo.lfstatus = True | ||
|
r22919 | s = repo.status() | ||
|
r15168 | repo.lfstatus = False | ||
|
r22919 | if s.modified or s.added or s.removed or s.deleted: | ||
|
r26587 | raise error.Abort(_('uncommitted changes')) | ||
|
r15168 | |||
|
r27944 | def postcommitstatus(orig, repo, *args, **kwargs): | ||
repo.lfstatus = True | ||||
try: | ||||
return orig(repo, *args, **kwargs) | ||||
finally: | ||||
repo.lfstatus = False | ||||
|
r36957 | def cmdutilforget(orig, ui, repo, match, prefix, explicitonly, dryrun): | ||
|
r23837 | normalmatcher = composenormalfilematcher(match, repo[None].manifest()) | ||
|
r36957 | bad, forgot = orig(ui, repo, normalmatcher, prefix, explicitonly, dryrun) | ||
|
r23837 | m = composelargefilematcher(match, repo[None].manifest()) | ||
|
r15168 | |||
try: | ||||
repo.lfstatus = True | ||||
s = repo.status(match=m, clean=True) | ||||
finally: | ||||
repo.lfstatus = False | ||||
|
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): | ||||
|
r15168 | ui.warn(_('not removing %s: file is already untracked\n') | ||
% m.rel(f)) | ||||
|
r23837 | bad.append(f) | ||
|
r15168 | |||
for f in forget: | ||||
if ui.verbose or not m.exact(f): | ||||
ui.status(_('removing %s\n') % m.rel(f)) | ||||
# 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: | ||||
if lfdirstate[f] == 'a': | ||||
lfdirstate.drop(f) | ||||
else: | ||||
lfdirstate.remove(f) | ||||
lfdirstate.write() | ||||
|
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 | |||
|
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() | ||
|
r21882 | def dedup(fn, lfhash): | ||
k = (fn, lfhash) | ||||
if k not in knowns: | ||||
knowns.add(k) | ||||
|
r21884 | lfhashes.add(lfhash) | ||
|
r21882 | lfutil.getlfilestoupload(repo, missing, dedup) | ||
|
r21884 | if lfhashes: | ||
|
r29355 | lfexists = storefactory.openstore(repo, other).exists(lfhashes) | ||
|
r21884 | for fn, lfhash in knowns: | ||
if not lfexists[lfhash]: # lfhash doesn't exist on "other" | ||||
addfunc(fn, lfhash) | ||||
|
r21882 | |||
|
r21052 | def outgoinghook(ui, repo, other, opts, missing): | ||
|
r15168 | if opts.pop('large', None): | ||
|
r21883 | lfhashes = set() | ||
if ui.debugflag: | ||||
toupload = {} | ||||
def addfunc(fn, lfhash): | ||||
if fn not in toupload: | ||||
toupload[fn] = [] | ||||
toupload[fn].append(lfhash) | ||||
lfhashes.add(lfhash) | ||||
def showhashes(fn): | ||||
for lfhash in sorted(toupload[fn]): | ||||
ui.debug(' %s\n' % (lfhash)) | ||||
else: | ||||
toupload = set() | ||||
def addfunc(fn, lfhash): | ||||
toupload.add(fn) | ||||
lfhashes.add(lfhash) | ||||
def showhashes(fn): | ||||
pass | ||||
|
r21884 | _getoutgoings(repo, other, missing, addfunc) | ||
|
r21883 | |||
|
r21052 | if not toupload: | ||
|
r17835 | ui.status(_('largefiles: no files to upload\n')) | ||
|
r15168 | else: | ||
|
r21883 | ui.status(_('largefiles to upload (%d entities):\n') | ||
% (len(lfhashes))) | ||||
|
r21052 | for file in sorted(toupload): | ||
|
r15168 | ui.status(lfutil.splitstandin(file) + '\n') | ||
|
r21883 | showhashes(file) | ||
|
r15168 | ui.status('\n') | ||
|
r21048 | def summaryremotehook(ui, repo, opts, changes): | ||
largeopt = opts.get('large', False) | ||||
if changes is None: | ||||
if largeopt: | ||||
return (False, True) # only outgoing check is needed | ||||
else: | ||||
return (False, False) | ||||
elif largeopt: | ||||
url, branch, peer, outgoing = changes[1] | ||||
if peer is None: | ||||
# i18n: column positioning for "hg summary" | ||||
ui.status(_('largefiles: (no remote repo)\n')) | ||||
return | ||||
toupload = set() | ||||
|
r21882 | lfhashes = set() | ||
def addfunc(fn, lfhash): | ||||
toupload.add(fn) | ||||
lfhashes.add(lfhash) | ||||
|
r21884 | _getoutgoings(repo, peer, outgoing.missing, addfunc) | ||
|
r21882 | |||
|
r21048 | if not toupload: | ||
# i18n: column positioning for "hg summary" | ||||
ui.status(_('largefiles: (no files to upload)\n')) | ||||
else: | ||||
# i18n: column positioning for "hg summary" | ||||
|
r21882 | ui.status(_('largefiles: %d entities for %d files to upload\n') | ||
% (len(lfhashes), len(toupload))) | ||||
|
r21048 | |||
|
r16247 | def overridesummary(orig, ui, repo, *pats, **opts): | ||
|
r15787 | try: | ||
repo.lfstatus = True | ||||
orig(ui, repo, *pats, **opts) | ||||
finally: | ||||
repo.lfstatus = False | ||||
|
r15168 | |||
|
r37286 | def scmutiladdremove(orig, repo, matcher, prefix, opts=None): | ||
|
r26344 | if opts is None: | ||
opts = {} | ||||
|
r16636 | if not lfutil.islfilesrepo(repo): | ||
|
r37286 | return orig(repo, matcher, prefix, opts) | ||
|
r15792 | # Get the list of missing largefiles so we can remove them | ||
|
r17658 | lfdirstate = lfutil.openlfdirstate(repo.ui, repo) | ||
|
r34345 | unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()), | ||
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) | ||||
|
r37168 | removelargefiles(repo.ui, repo, True, m, opts.get('dry_run'), | ||
**pycompat.strkwargs(opts)) | ||||
|
r15792 | # Call into the normal add code, and any files that *should* be added as | ||
# largefiles will be | ||||
|
r36333 | added, bad = addlargefiles(repo.ui, repo, True, matcher, | ||
**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) | ||
|
r37286 | return orig(repo, matcher, prefix, opts) | ||
|
r15168 | |||
|
r15254 | # Calling purge with --all will cause the largefiles to be deleted. | ||
|
r15168 | # Override repo.status to prevent this from happening. | ||
|
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 | ||
|
r16247 | def overridestatus(node1='.', node2=None, match=None, ignored=False, | ||
|
r15168 | clean=False, unknown=False, listsubrepos=False): | ||
r = oldstatus(node1, node2, match, ignored, clean, unknown, | ||||
listsubrepos) | ||||
lfdirstate = lfutil.openlfdirstate(ui, repo) | ||||
|
r22919 | unknown = [f for f in r.unknown if lfdirstate[f] == '?'] | ||
ignored = [f for f in r.ignored if lfdirstate[f] == '?'] | ||||
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 | |||
|
r16247 | def overriderollback(orig, ui, repo, **opts): | ||
|
r27825 | with repo.wlock(): | ||
|
r22283 | before = repo.dirstate.parents() | ||
|
r22286 | orphans = set(f for f in repo.dirstate | ||
if lfutil.isstandin(f) and repo.dirstate[f] != 'r') | ||||
|
r22094 | result = orig(ui, repo, **opts) | ||
|
r22283 | after = repo.dirstate.parents() | ||
if before == after: | ||||
return result # no need to restore standins | ||||
|
r22285 | pctx = repo['.'] | ||
for f in repo.dirstate: | ||||
if lfutil.isstandin(f): | ||||
|
r22286 | orphans.discard(f) | ||
|
r22285 | if repo.dirstate[f] == 'r': | ||
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 | ||||
lfutil.writestandin(repo, f, '', False) | ||||
|
r22286 | for standin in orphans: | ||
repo.wvfs.unlinkpath(standin, ignoremissing=True) | ||||
|
r22094 | |||
|
r15794 | lfdirstate = lfutil.openlfdirstate(ui, repo) | ||
|
r22097 | orphans = set(lfdirstate) | ||
|
r15794 | lfiles = lfutil.listlfiles(repo) | ||
for file in lfiles: | ||||
|
r22096 | lfutil.synclfdirstate(repo, lfdirstate, file, True) | ||
|
r22097 | orphans.discard(file) | ||
for lfile in orphans: | ||||
lfdirstate.drop(lfile) | ||||
|
r15794 | lfdirstate.write() | ||
|
r15168 | return result | ||
|
r15383 | |||
|
r16247 | def overridetransplant(orig, ui, repo, *revs, **opts): | ||
|
r35349 | resuming = opts.get(r'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 | |||
def overridecat(orig, ui, repo, file1, *pats, **opts): | ||||
|
r35349 | opts = pycompat.byteskwargs(opts) | ||
|
r17269 | ctx = scmutil.revsingle(repo, opts.get('rev')) | ||
|
r18491 | err = 1 | ||
notbad = set() | ||||
m = scmutil.match(ctx, (file1,) + pats, opts) | ||||
origmatchfn = m.matchfn | ||||
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) | ||||
m.matchfn = lfmatchfn | ||||
|
r18974 | origbadfn = m.bad | ||
def lfbadfn(f, msg): | ||||
if not f in notbad: | ||||
|
r21086 | origbadfn(f, msg) | ||
|
r18974 | m.bad = lfbadfn | ||
|
r24670 | |||
origvisitdirfn = m.visitdir | ||||
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) | ||||
m.visitdir = lfvisitdirfn | ||||
|
r18491 | for f in ctx.walk(m): | ||
|
r36223 | with cmdutil.makefileobj(ctx, opts.get('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() | ||||
if opts.get('decode'): | ||||
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( | ||||
_('largefile %s is not in cache and could not be ' | ||||
'downloaded') % lf) | ||||
path = lfutil.usercachepath(repo.ui, hash) | ||||
with open(path, "rb") as fpin: | ||||
|
r30181 | for chunk in util.filechunkiter(fpin): | ||
|
r30142 | fp.write(chunk) | ||
|
r18974 | err = 0 | ||
|
r18491 | return err | ||
|
r17878 | |||
|
r27344 | def mergeupdate(orig, repo, node, branchmerge, force, | ||
|
r22288 | *args, **kwargs): | ||
|
r35349 | matcher = kwargs.get(r'matcher', None) | ||
|
r27344 | # note if this is a partial update | ||
partial = matcher and not matcher.always() | ||||
|
r27826 | with repo.wlock(): | ||
|
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) | ||
|
r29318 | unsure, s = lfdirstate.status(matchmod.always(repo.root, | ||
|
r24787 | repo.getcwd()), | ||
|
r34345 | subrepos=[], ignored=False, | ||
clean=True, unknown=False) | ||||
|
r30190 | oldclean = set(s.clean) | ||
|
r24787 | pctx = repo['.'] | ||
|
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) | ||
lfutil.writestandin(repo, standin, lfhash, | ||||
lfutil.getexecutable(lfileabs)) | ||||
if (standin in pctx and | ||||
|
r31735 | 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: | ||||
lfdirstate.normallookup(lfile) | ||||
|
r24787 | lfdirstate.write() | ||
|
r22288 | |||
|
r24787 | oldstandins = lfutil.getstandinsstate(repo) | ||
|
r34304 | # Make sure the merge runs on disk, not in-memory. largefiles is not a | ||
# good candidate for in-memory merge (large files, custom dirstate, | ||||
# matcher usage). | ||||
|
r35349 | kwargs[r'wc'] = repo[None] | ||
|
r27344 | result = orig(repo, node, branchmerge, force, *args, **kwargs) | ||
|
r22288 | |||
|
r24787 | newstandins = lfutil.getstandinsstate(repo) | ||
filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | ||||
|
r30190 | |||
# 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.normal(lfile) | ||||
lfdirstate.write() | ||||
|
r24787 | if branchmerge or force or partial: | ||
filelist.extend(s.deleted + s.removed) | ||||
|
r22288 | |||
lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, | ||||
|
r24788 | normallookup=partial) | ||
|
r22288 | |||
return result | ||||
|
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: | ||
lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, | ||||
printmessage=False, normallookup=True) | ||||
return result | ||||
|
r35304 | |||
def upgraderequirements(orig, repo): | ||||
reqs = orig(repo) | ||||
if 'largefiles' in repo.requirements: | ||||
reqs.add('largefiles') | ||||
return reqs | ||||
|
r35580 | |||
_lfscheme = 'largefile://' | ||||
def openlargefile(orig, ui, url_, data=None): | ||||
if url_.startswith(_lfscheme): | ||||
if data: | ||||
msg = "cannot use data on a 'largefile://' url" | ||||
raise error.ProgrammingError(msg) | ||||
lfid = url_[len(_lfscheme):] | ||||
return storefactory.getlfile(ui, lfid) | ||||
else: | ||||
return orig(ui, url_, data=data) | ||||