mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
b72ba540fe
Before this patch, largefiles in the working directory aren't updated
correctly, if transplant is aborted by conflict. This prevents users
from viewing appropriate largefiles while resolving conflicts.
While transplant, largefiles in the working directory are updated only
at successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if transplant is aborted by conflict, this
patch wraps "scmutil.marktouched", which is invoked from "patch.patch"
with "files" list of added/modified/deleted files.
This patch invokes "updatelfiles" with:
- "printmessage=False", to suppress "getting changed largefiles ..."
messages while automated committing by transplant
- "normallookup=True", because "patch.patch" doesn't update dirstate
for modified files
in such case, "normallookup=False" may cause marking modified
largefiles as "clean" unexpectedly
182 lines
8.5 KiB
Python
182 lines
8.5 KiB
Python
# 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.
|
|
|
|
'''setup for largefiles extension: uisetup'''
|
|
|
|
from mercurial import archival, cmdutil, commands, extensions, filemerge, hg, \
|
|
httppeer, merge, scmutil, sshpeer, wireproto, revset, subrepo
|
|
from mercurial.i18n import _
|
|
from mercurial.hgweb import hgweb_mod, webcommands
|
|
|
|
import overrides
|
|
import proto
|
|
|
|
def uisetup(ui):
|
|
# Disable auto-status for some commands which assume that all
|
|
# files in the result are under Mercurial's control
|
|
|
|
entry = extensions.wrapcommand(commands.table, 'add',
|
|
overrides.overrideadd)
|
|
addopt = [('', 'large', None, _('add as largefile')),
|
|
('', 'normal', None, _('add as normal file')),
|
|
('', 'lfsize', '', _('add all files above this size '
|
|
'(in megabytes) as largefiles '
|
|
'(default: 10)'))]
|
|
entry[1].extend(addopt)
|
|
|
|
# The scmutil function is called both by the (trivial) addremove command,
|
|
# and in the process of handling commit -A (issue3542)
|
|
entry = extensions.wrapfunction(scmutil, 'addremove',
|
|
overrides.scmutiladdremove)
|
|
entry = extensions.wrapcommand(commands.table, 'remove',
|
|
overrides.overrideremove)
|
|
entry = extensions.wrapcommand(commands.table, 'forget',
|
|
overrides.overrideforget)
|
|
|
|
# Subrepos call status function
|
|
entry = extensions.wrapcommand(commands.table, 'status',
|
|
overrides.overridestatus)
|
|
entry = extensions.wrapfunction(subrepo.hgsubrepo, 'status',
|
|
overrides.overridestatusfn)
|
|
|
|
entry = extensions.wrapcommand(commands.table, 'log',
|
|
overrides.overridelog)
|
|
entry = extensions.wrapcommand(commands.table, 'rollback',
|
|
overrides.overriderollback)
|
|
entry = extensions.wrapcommand(commands.table, 'verify',
|
|
overrides.overrideverify)
|
|
|
|
verifyopt = [('', 'large', None,
|
|
_('verify that all largefiles in current revision exists')),
|
|
('', 'lfa', None,
|
|
_('verify largefiles in all revisions, not just current')),
|
|
('', 'lfc', None,
|
|
_('verify local largefile contents, not just existence'))]
|
|
entry[1].extend(verifyopt)
|
|
|
|
entry = extensions.wrapcommand(commands.table, 'debugstate',
|
|
overrides.overridedebugstate)
|
|
debugstateopt = [('', 'large', None, _('display largefiles dirstate'))]
|
|
entry[1].extend(debugstateopt)
|
|
|
|
outgoing = lambda orgfunc, *arg, **kwargs: orgfunc(*arg, **kwargs)
|
|
entry = extensions.wrapcommand(commands.table, 'outgoing', outgoing)
|
|
outgoingopt = [('', 'large', None, _('display outgoing largefiles'))]
|
|
entry[1].extend(outgoingopt)
|
|
cmdutil.outgoinghooks.add('largefiles', overrides.outgoinghook)
|
|
entry = extensions.wrapcommand(commands.table, 'summary',
|
|
overrides.overridesummary)
|
|
summaryopt = [('', 'large', None, _('display outgoing largefiles'))]
|
|
entry[1].extend(summaryopt)
|
|
cmdutil.summaryremotehooks.add('largefiles', overrides.summaryremotehook)
|
|
|
|
entry = extensions.wrapcommand(commands.table, 'update',
|
|
overrides.overrideupdate)
|
|
entry = extensions.wrapcommand(commands.table, 'pull',
|
|
overrides.overridepull)
|
|
pullopt = [('', 'all-largefiles', None,
|
|
_('download all pulled versions of largefiles (DEPRECATED)')),
|
|
('', 'lfrev', [],
|
|
_('download largefiles for these revisions'), _('REV'))]
|
|
entry[1].extend(pullopt)
|
|
revset.symbols['pulled'] = overrides.pulledrevsetsymbol
|
|
|
|
entry = extensions.wrapcommand(commands.table, 'clone',
|
|
overrides.overrideclone)
|
|
cloneopt = [('', 'all-largefiles', None,
|
|
_('download all versions of all largefiles'))]
|
|
entry[1].extend(cloneopt)
|
|
entry = extensions.wrapfunction(hg, 'clone', overrides.hgclone)
|
|
|
|
entry = extensions.wrapcommand(commands.table, 'cat',
|
|
overrides.overridecat)
|
|
entry = extensions.wrapfunction(merge, '_checkunknownfile',
|
|
overrides.overridecheckunknownfile)
|
|
entry = extensions.wrapfunction(merge, 'calculateupdates',
|
|
overrides.overridecalculateupdates)
|
|
entry = extensions.wrapfunction(merge, 'recordupdates',
|
|
overrides.mergerecordupdates)
|
|
entry = extensions.wrapfunction(merge, 'update',
|
|
overrides.mergeupdate)
|
|
entry = extensions.wrapfunction(filemerge, 'filemerge',
|
|
overrides.overridefilemerge)
|
|
entry = extensions.wrapfunction(cmdutil, 'copy',
|
|
overrides.overridecopy)
|
|
|
|
# Summary calls dirty on the subrepos
|
|
entry = extensions.wrapfunction(subrepo.hgsubrepo, 'dirty',
|
|
overrides.overridedirty)
|
|
|
|
# Backout calls revert so we need to override both the command and the
|
|
# function
|
|
entry = extensions.wrapcommand(commands.table, 'revert',
|
|
overrides.overriderevert)
|
|
entry = extensions.wrapfunction(commands, 'revert',
|
|
overrides.overriderevert)
|
|
|
|
extensions.wrapfunction(archival, 'archive', overrides.overridearchive)
|
|
extensions.wrapfunction(subrepo.hgsubrepo, 'archive',
|
|
overrides.hgsubrepoarchive)
|
|
extensions.wrapfunction(cmdutil, 'bailifchanged',
|
|
overrides.overridebailifchanged)
|
|
|
|
extensions.wrapfunction(scmutil, 'marktouched',
|
|
overrides.scmutilmarktouched)
|
|
|
|
# create the new wireproto commands ...
|
|
wireproto.commands['putlfile'] = (proto.putlfile, 'sha')
|
|
wireproto.commands['getlfile'] = (proto.getlfile, 'sha')
|
|
wireproto.commands['statlfile'] = (proto.statlfile, 'sha')
|
|
|
|
# ... and wrap some existing ones
|
|
wireproto.commands['capabilities'] = (proto.capabilities, '')
|
|
wireproto.commands['heads'] = (proto.heads, '')
|
|
wireproto.commands['lheads'] = (wireproto.heads, '')
|
|
|
|
# make putlfile behave the same as push and {get,stat}lfile behave
|
|
# the same as pull w.r.t. permissions checks
|
|
hgweb_mod.perms['putlfile'] = 'push'
|
|
hgweb_mod.perms['getlfile'] = 'pull'
|
|
hgweb_mod.perms['statlfile'] = 'pull'
|
|
|
|
extensions.wrapfunction(webcommands, 'decodepath', overrides.decodepath)
|
|
|
|
# the hello wireproto command uses wireproto.capabilities, so it won't see
|
|
# our largefiles capability unless we replace the actual function as well.
|
|
proto.capabilitiesorig = wireproto.capabilities
|
|
wireproto.capabilities = proto.capabilities
|
|
|
|
# can't do this in reposetup because it needs to have happened before
|
|
# wirerepo.__init__ is called
|
|
proto.ssholdcallstream = sshpeer.sshpeer._callstream
|
|
proto.httpoldcallstream = httppeer.httppeer._callstream
|
|
sshpeer.sshpeer._callstream = proto.sshrepocallstream
|
|
httppeer.httppeer._callstream = proto.httprepocallstream
|
|
|
|
# override some extensions' stuff as well
|
|
for name, module in extensions.extensions():
|
|
if name == 'fetch':
|
|
extensions.wrapcommand(getattr(module, 'cmdtable'), 'fetch',
|
|
overrides.overridefetch)
|
|
if name == 'purge':
|
|
extensions.wrapcommand(getattr(module, 'cmdtable'), 'purge',
|
|
overrides.overridepurge)
|
|
if name == 'rebase':
|
|
extensions.wrapcommand(getattr(module, 'cmdtable'), 'rebase',
|
|
overrides.overriderebase)
|
|
if name == 'transplant':
|
|
extensions.wrapcommand(getattr(module, 'cmdtable'), 'transplant',
|
|
overrides.overridetransplant)
|
|
if name == 'convert':
|
|
convcmd = getattr(module, 'convcmd')
|
|
hgsink = getattr(convcmd, 'mercurial_sink')
|
|
extensions.wrapfunction(hgsink, 'before',
|
|
overrides.mercurialsinkbefore)
|
|
extensions.wrapfunction(hgsink, 'after',
|
|
overrides.mercurialsinkafter)
|