2011-09-24 19:35:45 +04:00
|
|
|
# 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 repositories: reposetup'''
|
|
|
|
import copy
|
|
|
|
import os
|
|
|
|
|
2014-04-15 19:37:24 +04:00
|
|
|
from mercurial import error, manifest, match as match_, util
|
2011-09-24 19:35:45 +04:00
|
|
|
from mercurial.i18n import _
|
2012-10-08 20:11:56 +04:00
|
|
|
from mercurial import localrepo
|
2011-09-24 19:35:45 +04:00
|
|
|
|
|
|
|
import lfcommands
|
|
|
|
import lfutil
|
|
|
|
|
|
|
|
def reposetup(ui, repo):
|
2014-03-28 20:20:07 +04:00
|
|
|
# wire repositories should be given new wireproto functions
|
|
|
|
# by "proto.wirereposetup()" via "hg.wirepeersetupfuncs"
|
2011-09-24 19:35:45 +04:00
|
|
|
if not repo.local():
|
2014-03-28 20:20:07 +04:00
|
|
|
return
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2012-03-09 19:11:52 +04:00
|
|
|
class lfilesrepo(repo.__class__):
|
2011-09-24 19:35:45 +04:00
|
|
|
lfstatus = False
|
|
|
|
def status_nolfiles(self, *args, **kwargs):
|
2012-03-09 19:11:52 +04:00
|
|
|
return super(lfilesrepo, self).status(*args, **kwargs)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2011-10-13 04:59:27 +04:00
|
|
|
# When lfstatus is set, return a context that gives the names
|
|
|
|
# of largefiles instead of their corresponding standins and
|
|
|
|
# identifies the largefiles as always binary, regardless of
|
|
|
|
# their actual contents.
|
2011-09-24 19:35:45 +04:00
|
|
|
def __getitem__(self, changeid):
|
2012-03-09 19:11:52 +04:00
|
|
|
ctx = super(lfilesrepo, self).__getitem__(changeid)
|
2011-09-24 19:35:45 +04:00
|
|
|
if self.lfstatus:
|
2012-03-09 19:11:52 +04:00
|
|
|
class lfilesmanifestdict(manifest.manifestdict):
|
2011-09-24 19:35:45 +04:00
|
|
|
def __contains__(self, filename):
|
2014-09-17 01:50:38 +04:00
|
|
|
orig = super(lfilesmanifestdict, self).__contains__
|
|
|
|
return orig(filename) or orig(lfutil.standin(filename))
|
2012-03-09 19:11:52 +04:00
|
|
|
class lfilesctx(ctx.__class__):
|
2011-09-24 19:35:45 +04:00
|
|
|
def files(self):
|
2012-03-09 19:11:52 +04:00
|
|
|
filenames = super(lfilesctx, self).files()
|
2011-12-09 20:34:57 +04:00
|
|
|
return [lfutil.splitstandin(f) or f for f in filenames]
|
2011-09-24 19:35:45 +04:00
|
|
|
def manifest(self):
|
2012-03-09 19:11:52 +04:00
|
|
|
man1 = super(lfilesctx, self).manifest()
|
|
|
|
man1.__class__ = lfilesmanifestdict
|
2011-09-24 19:35:45 +04:00
|
|
|
return man1
|
|
|
|
def filectx(self, path, fileid=None, filelog=None):
|
2014-09-17 01:51:25 +04:00
|
|
|
orig = super(lfilesctx, self).filectx
|
2011-09-24 19:35:45 +04:00
|
|
|
try:
|
2012-02-20 20:59:48 +04:00
|
|
|
if filelog is not None:
|
2014-09-17 01:51:25 +04:00
|
|
|
result = orig(path, fileid, filelog)
|
2012-02-20 20:59:48 +04:00
|
|
|
else:
|
2014-09-17 01:51:25 +04:00
|
|
|
result = orig(path, fileid)
|
2011-09-24 19:35:45 +04:00
|
|
|
except error.LookupError:
|
|
|
|
# Adding a null character will cause Mercurial to
|
|
|
|
# identify this as a binary file.
|
2012-02-20 20:59:48 +04:00
|
|
|
if filelog is not None:
|
2014-09-17 01:51:25 +04:00
|
|
|
result = orig(lfutil.standin(path), fileid,
|
|
|
|
filelog)
|
2012-02-20 20:59:48 +04:00
|
|
|
else:
|
2014-09-17 01:51:25 +04:00
|
|
|
result = orig(lfutil.standin(path), fileid)
|
2011-09-24 19:35:45 +04:00
|
|
|
olddata = result.data
|
|
|
|
result.data = lambda: olddata() + '\0'
|
|
|
|
return result
|
2012-03-09 19:11:52 +04:00
|
|
|
ctx.__class__ = lfilesctx
|
2011-09-24 19:35:45 +04:00
|
|
|
return ctx
|
|
|
|
|
|
|
|
# Figure out the status of big files and insert them into the
|
2011-10-13 04:59:27 +04:00
|
|
|
# appropriate list in the result. Also removes standin files
|
|
|
|
# from the listing. Revert to the original status if
|
|
|
|
# self.lfstatus is False.
|
2012-10-08 20:11:56 +04:00
|
|
|
# XXX large file status is buggy when used on repo proxy.
|
|
|
|
# XXX this needs to be investigated.
|
2012-12-01 01:34:21 +04:00
|
|
|
@localrepo.unfilteredmethod
|
2011-09-24 19:35:45 +04:00
|
|
|
def status(self, node1='.', node2=None, match=None, ignored=False,
|
|
|
|
clean=False, unknown=False, listsubrepos=False):
|
|
|
|
listignored, listclean, listunknown = ignored, clean, unknown
|
|
|
|
if not self.lfstatus:
|
2012-03-09 19:11:52 +04:00
|
|
|
return super(lfilesrepo, self).status(node1, node2, match,
|
2011-12-07 19:25:51 +04:00
|
|
|
listignored, listclean, listunknown, listsubrepos)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
# some calls in this function rely on the old version of status
|
|
|
|
self.lfstatus = False
|
|
|
|
ctx1 = self[node1]
|
|
|
|
ctx2 = self[node2]
|
|
|
|
working = ctx2.rev() is None
|
|
|
|
parentworking = working and ctx1 == self['.']
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
def inctx(file, ctx):
|
|
|
|
try:
|
|
|
|
if ctx.rev() is None:
|
|
|
|
return file in ctx.manifest()
|
|
|
|
ctx[file]
|
|
|
|
return True
|
|
|
|
except KeyError:
|
|
|
|
return False
|
|
|
|
|
|
|
|
if match is None:
|
|
|
|
match = match_.always(self.root, self.getcwd())
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
wlock = None
|
|
|
|
try:
|
2013-04-17 05:41:11 +04:00
|
|
|
try:
|
2014-09-17 01:40:25 +04:00
|
|
|
# updating the dirstate is optional
|
|
|
|
# so we don't wait on the lock
|
|
|
|
wlock = self.wlock(False)
|
|
|
|
except error.LockError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
# First check if there were files specified on the
|
|
|
|
# command line. If there were, and none of them were
|
|
|
|
# largefiles, we should just bail here and let super
|
|
|
|
# handle it -- thus gaining a big performance boost.
|
|
|
|
lfdirstate = lfutil.openlfdirstate(ui, self)
|
|
|
|
if match.files() and not match.anypats():
|
|
|
|
for f in lfdirstate:
|
|
|
|
if match(f):
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
return super(lfilesrepo, self).status(node1, node2,
|
|
|
|
match, listignored, listclean,
|
|
|
|
listunknown, listsubrepos)
|
2011-12-15 19:23:26 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
# Create a copy of match that matches standins instead
|
|
|
|
# of largefiles.
|
|
|
|
def tostandins(files):
|
|
|
|
if not working:
|
|
|
|
return files
|
|
|
|
newfiles = []
|
|
|
|
dirstate = self.dirstate
|
|
|
|
for f in files:
|
|
|
|
sf = lfutil.standin(f)
|
|
|
|
if sf in dirstate:
|
|
|
|
newfiles.append(sf)
|
|
|
|
elif sf in dirstate.dirs():
|
|
|
|
# Directory entries could be regular or
|
|
|
|
# standin, check both
|
|
|
|
newfiles.extend((f, sf))
|
2012-05-06 15:14:58 +04:00
|
|
|
else:
|
2014-09-17 01:40:25 +04:00
|
|
|
newfiles.append(f)
|
|
|
|
return newfiles
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
m = copy.copy(match)
|
|
|
|
m._files = tostandins(m._files)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
result = super(lfilesrepo, self).status(node1, node2, m,
|
|
|
|
ignored, clean, unknown, listsubrepos)
|
|
|
|
if working:
|
2011-12-07 15:56:44 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
def sfindirstate(f):
|
|
|
|
sf = lfutil.standin(f)
|
|
|
|
dirstate = self.dirstate
|
|
|
|
return sf in dirstate or sf in dirstate.dirs()
|
2012-12-28 14:55:57 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
match._files = [f for f in match._files
|
|
|
|
if sfindirstate(f)]
|
|
|
|
# Don't waste time getting the ignored and unknown
|
|
|
|
# files from lfdirstate
|
|
|
|
s = lfdirstate.status(match, [], False,
|
|
|
|
listclean, False)
|
|
|
|
(unsure, modified, added, removed, missing, _unknown,
|
|
|
|
_ignored, clean) = s
|
|
|
|
if parentworking:
|
|
|
|
for lfile in unsure:
|
|
|
|
standin = lfutil.standin(lfile)
|
|
|
|
if standin not in ctx1:
|
|
|
|
# from second parent
|
|
|
|
modified.append(lfile)
|
|
|
|
elif ctx1[standin].data().strip() \
|
|
|
|
!= lfutil.hashfile(self.wjoin(lfile)):
|
|
|
|
modified.append(lfile)
|
|
|
|
else:
|
|
|
|
clean.append(lfile)
|
|
|
|
lfdirstate.normal(lfile)
|
|
|
|
else:
|
|
|
|
tocheck = unsure + modified + added + clean
|
|
|
|
modified, added, clean = [], [], []
|
2012-12-28 14:55:57 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
for lfile in tocheck:
|
|
|
|
standin = lfutil.standin(lfile)
|
|
|
|
if inctx(standin, ctx1):
|
|
|
|
if ctx1[standin].data().strip() != \
|
|
|
|
lfutil.hashfile(self.wjoin(lfile)):
|
2011-09-24 19:35:45 +04:00
|
|
|
modified.append(lfile)
|
|
|
|
else:
|
|
|
|
clean.append(lfile)
|
2014-09-17 01:40:25 +04:00
|
|
|
else:
|
|
|
|
added.append(lfile)
|
2011-12-09 20:35:00 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
# Standins no longer found in lfdirstate has been
|
|
|
|
# removed
|
|
|
|
for standin in ctx1.manifest():
|
|
|
|
if not lfutil.isstandin(standin):
|
|
|
|
continue
|
|
|
|
lfile = lfutil.splitstandin(standin)
|
|
|
|
if not match(lfile):
|
|
|
|
continue
|
|
|
|
if lfile not in lfdirstate:
|
|
|
|
removed.append(lfile)
|
2011-12-09 20:35:00 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
# Filter result lists
|
|
|
|
result = list(result)
|
2011-12-09 20:35:00 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
# Largefiles are not really removed when they're
|
|
|
|
# still in the normal dirstate. Likewise, normal
|
|
|
|
# files are not really removed if they are still in
|
|
|
|
# lfdirstate. This happens in merges where files
|
|
|
|
# change type.
|
|
|
|
removed = [f for f in removed
|
|
|
|
if f not in self.dirstate]
|
|
|
|
result[2] = [f for f in result[2]
|
|
|
|
if f not in lfdirstate]
|
2013-04-17 05:41:11 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
lfiles = set(lfdirstate._map)
|
|
|
|
# Unknown files
|
|
|
|
result[4] = set(result[4]).difference(lfiles)
|
|
|
|
# Ignored files
|
|
|
|
result[5] = set(result[5]).difference(lfiles)
|
|
|
|
# combine normal files and largefiles
|
|
|
|
normals = [[fn for fn in filelist
|
|
|
|
if not lfutil.isstandin(fn)]
|
|
|
|
for filelist in result]
|
|
|
|
lfiles = (modified, added, removed, missing, [], [], clean)
|
|
|
|
result = [sorted(list1 + list2)
|
|
|
|
for (list1, list2) in zip(normals, lfiles)]
|
|
|
|
else:
|
|
|
|
def toname(f):
|
|
|
|
if lfutil.isstandin(f):
|
|
|
|
return lfutil.splitstandin(f)
|
|
|
|
return f
|
|
|
|
result = [[toname(f) for f in items]
|
|
|
|
for items in result]
|
2013-04-17 05:41:11 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
if wlock:
|
|
|
|
lfdirstate.write()
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
finally:
|
|
|
|
if wlock:
|
|
|
|
wlock.release()
|
2012-12-13 22:19:06 +04:00
|
|
|
|
2014-09-17 01:40:25 +04:00
|
|
|
if not listunknown:
|
|
|
|
result[4] = []
|
|
|
|
if not listignored:
|
|
|
|
result[5] = []
|
|
|
|
if not listclean:
|
|
|
|
result[6] = []
|
|
|
|
self.lfstatus = True
|
|
|
|
return result
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2011-10-14 04:45:49 +04:00
|
|
|
# As part of committing, copy all of the largefiles into the
|
|
|
|
# cache.
|
2011-09-24 19:35:45 +04:00
|
|
|
def commitctx(self, *args, **kwargs):
|
2012-03-09 19:11:52 +04:00
|
|
|
node = super(lfilesrepo, self).commitctx(*args, **kwargs)
|
2012-01-08 17:33:10 +04:00
|
|
|
lfutil.copyalltostore(self, node)
|
2011-09-24 19:35:45 +04:00
|
|
|
return node
|
|
|
|
|
2011-10-14 04:45:49 +04:00
|
|
|
# Before commit, largefile standins have not had their
|
|
|
|
# contents updated to reflect the hash of their largefile.
|
|
|
|
# Do that here.
|
2011-09-24 19:35:45 +04:00
|
|
|
def commit(self, text="", user=None, date=None, match=None,
|
|
|
|
force=False, editor=False, extra={}):
|
2012-03-09 19:11:52 +04:00
|
|
|
orig = super(lfilesrepo, self).commit
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2012-10-08 17:41:58 +04:00
|
|
|
wlock = self.wlock()
|
2011-09-24 19:35:45 +04:00
|
|
|
try:
|
2014-08-24 18:47:26 +04:00
|
|
|
# Case 0: Automated committing
|
|
|
|
#
|
|
|
|
# While automated committing (like rebase, transplant
|
|
|
|
# and so on), this code path is used to avoid:
|
|
|
|
# (1) updating standins, because standins should
|
|
|
|
# be already updated at this point
|
|
|
|
# (2) aborting when stadnins are matched by "match",
|
|
|
|
# because automated committing may specify them directly
|
|
|
|
#
|
2012-10-08 17:41:58 +04:00
|
|
|
if getattr(self, "_isrebasing", False) or \
|
|
|
|
getattr(self, "_istransplanting", False):
|
2012-01-07 21:43:34 +04:00
|
|
|
result = orig(text=text, user=user, date=date, match=match,
|
|
|
|
force=force, editor=editor, extra=extra)
|
largefiles: synchronize lfdirstate with dirstate after automated committing
Before this patch, after successful "hg rebase" of the revision
removing largefiles, "hg status" may still show ""R" for such
largefiles unexpectedly.
"lfilesrepo.commit" executes the special code path for automated
committing while rebase/transplant, and lfdirstate entries for removed
files aren't updated in this code path, even after successful
committing.
Then, "R" entries still existing in lfdirstate cause unexpected "hg
status" output.
This patch synchronizes lfdirstate with dirstate after automated
committing.
This patch passes False as "normallookup" to "synclfdirstate", because
modified files in "files()" of the recent (= just committed) context
should be "normal"-ed.
This is a temporary way to fix with less changes. For fundamental
resolution of this kind of problems in the future, lfdirstate should
be updated with dirstate simultaneously. Hooking "markcommitted" of
ctx in "localrepository.commitctx" may achieve this.
This problem occurs, only when (1) the parent of the working directory
is rebased and (2) it removes largefiles, because:
- if the parent of the working directory isn't rebased, returning to
the initial revision (= update) after rebase hides this problem
- files added on "other" branch (= rebase target) are treated not as
"added" but as "modified" (= "normal" status and "unset"
timestamp) at merging
This patch tests also the status of added largefile, but it is only
for avoiding regression.
In addition to conditions above, "hg status" must not take existing
files to reproduce this problem, because existing files make
"match._files" not empty in "lfilesrepo.status" code path below:
def sfindirstate(f):
sf = lfutil.standin(f)
dirstate = self.dirstate
return sf in dirstate or sf in dirstate.dirs()
match._files = [f for f in match._files
if sfindirstate(f)]
Not empty "match._files" prevents "status" on lfdirstate from
returning the result containing problematic "R" files.
This is reason why "large1" (removed) and "largeX" (added) are checked
separately in this patch.
Problematic code path in "lfilesrepo.commit" is used also by "hg
transplant", but this problem doesn't occur at "hg transplant",
because invocation of "updatelfiles" after transplant-ing in
"overridetransplant" causes cleaning lfdirstate up.
This patch tests also "hg transplant" as same as "hg rebase", but it
is only for avoiding regression.
2014-08-11 17:29:43 +04:00
|
|
|
|
|
|
|
if result:
|
|
|
|
lfdirstate = lfutil.openlfdirstate(ui, self)
|
|
|
|
for f in self[result].files():
|
|
|
|
if lfutil.isstandin(f):
|
|
|
|
lfile = lfutil.splitstandin(f)
|
|
|
|
lfutil.synclfdirstate(self, lfdirstate, lfile,
|
|
|
|
False)
|
|
|
|
lfdirstate.write()
|
|
|
|
|
2012-01-07 21:43:34 +04:00
|
|
|
return result
|
2011-09-24 19:35:45 +04:00
|
|
|
# Case 1: user calls commit with no specific files or
|
2011-10-13 14:11:25 +04:00
|
|
|
# include/exclude patterns: refresh and commit all files that
|
|
|
|
# are "dirty".
|
2011-10-14 05:42:54 +04:00
|
|
|
if ((match is None) or
|
|
|
|
(not match.anypats() and not match.files())):
|
2011-10-13 14:11:25 +04:00
|
|
|
# Spend a bit of time here to get a list of files we know
|
|
|
|
# are modified so we can compare only against those.
|
|
|
|
# It can cost a lot of time (several seconds)
|
|
|
|
# otherwise to update all standins if the largefiles are
|
|
|
|
# large.
|
2011-09-24 19:35:45 +04:00
|
|
|
lfdirstate = lfutil.openlfdirstate(ui, self)
|
2012-10-08 17:41:58 +04:00
|
|
|
dirtymatch = match_.always(self.root, self.getcwd())
|
2011-10-13 14:11:25 +04:00
|
|
|
s = lfdirstate.status(dirtymatch, [], False, False, False)
|
2013-02-28 16:45:18 +04:00
|
|
|
(unsure, modified, added, removed, _missing, _unknown,
|
|
|
|
_ignored, _clean) = s
|
|
|
|
modifiedfiles = unsure + modified + added + removed
|
2011-10-13 14:11:25 +04:00
|
|
|
lfiles = lfutil.listlfiles(self)
|
2011-10-14 04:45:49 +04:00
|
|
|
# this only loops through largefiles that exist (not
|
2011-09-24 19:35:45 +04:00
|
|
|
# removed/renamed)
|
|
|
|
for lfile in lfiles:
|
2011-10-13 14:11:25 +04:00
|
|
|
if lfile in modifiedfiles:
|
2012-03-09 20:11:07 +04:00
|
|
|
if os.path.exists(
|
|
|
|
self.wjoin(lfutil.standin(lfile))):
|
2011-10-13 14:11:25 +04:00
|
|
|
# this handles the case where a rebase is being
|
|
|
|
# performed and the working copy is not updated
|
|
|
|
# yet.
|
|
|
|
if os.path.exists(self.wjoin(lfile)):
|
|
|
|
lfutil.updatestandin(self,
|
|
|
|
lfutil.standin(lfile))
|
|
|
|
lfdirstate.normal(lfile)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2012-01-07 22:05:59 +04:00
|
|
|
result = orig(text=text, user=user, date=date, match=match,
|
2011-09-24 19:35:45 +04:00
|
|
|
force=force, editor=editor, extra=extra)
|
2012-07-19 18:00:15 +04:00
|
|
|
|
|
|
|
if result is not None:
|
|
|
|
for lfile in lfdirstate:
|
|
|
|
if lfile in modifiedfiles:
|
2012-10-08 17:41:58 +04:00
|
|
|
if (not os.path.exists(self.wjoin(
|
2012-07-19 18:00:15 +04:00
|
|
|
lfutil.standin(lfile)))) or \
|
2012-10-08 17:41:58 +04:00
|
|
|
(not os.path.exists(self.wjoin(lfile))):
|
2012-07-19 18:00:15 +04:00
|
|
|
lfdirstate.drop(lfile)
|
|
|
|
|
2012-01-07 22:05:59 +04:00
|
|
|
# This needs to be after commit; otherwise precommit hooks
|
|
|
|
# get the wrong status
|
|
|
|
lfdirstate.write()
|
|
|
|
return result
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2012-12-10 17:58:42 +04:00
|
|
|
lfiles = lfutil.listlfiles(self)
|
|
|
|
match._files = self._subdirlfs(match.files(), lfiles)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
|
|
|
# Case 2: user calls commit with specified patterns: refresh
|
|
|
|
# any matching big files.
|
|
|
|
smatcher = lfutil.composestandinmatcher(self, match)
|
2012-12-13 22:19:06 +04:00
|
|
|
standins = self.dirstate.walk(smatcher, [], False, False)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
|
|
|
# No matching big files: get out of the way and pass control to
|
|
|
|
# the usual commit() method.
|
|
|
|
if not standins:
|
|
|
|
return orig(text=text, user=user, date=date, match=match,
|
|
|
|
force=force, editor=editor, extra=extra)
|
|
|
|
|
|
|
|
# Refresh all matching big files. It's possible that the
|
|
|
|
# commit will end up failing, in which case the big files will
|
|
|
|
# stay refreshed. No harm done: the user modified them and
|
|
|
|
# asked to commit them, so sooner or later we're going to
|
|
|
|
# refresh the standins. Might as well leave them refreshed.
|
|
|
|
lfdirstate = lfutil.openlfdirstate(ui, self)
|
|
|
|
for standin in standins:
|
|
|
|
lfile = lfutil.splitstandin(standin)
|
2013-01-01 23:04:40 +04:00
|
|
|
if lfdirstate[lfile] != 'r':
|
2011-09-24 19:35:45 +04:00
|
|
|
lfutil.updatestandin(self, standin)
|
|
|
|
lfdirstate.normal(lfile)
|
|
|
|
else:
|
2011-10-11 12:42:56 +04:00
|
|
|
lfdirstate.drop(lfile)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
|
|
|
# Cook up a new matcher that only matches regular files or
|
|
|
|
# standins corresponding to the big files requested by the
|
|
|
|
# user. Have to modify _files to prevent commit() from
|
|
|
|
# complaining "not tracked" for big files.
|
|
|
|
match = copy.copy(match)
|
2012-03-09 19:11:52 +04:00
|
|
|
origmatchfn = match.matchfn
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2011-10-14 04:45:49 +04:00
|
|
|
# Check both the list of largefiles and the list of
|
|
|
|
# standins because if a largefile was removed, it
|
|
|
|
# won't be in the list of largefiles at this point
|
2011-09-24 19:35:45 +04:00
|
|
|
match._files += sorted(standins)
|
|
|
|
|
|
|
|
actualfiles = []
|
|
|
|
for f in match._files:
|
|
|
|
fstandin = lfutil.standin(f)
|
|
|
|
|
2011-10-13 04:59:27 +04:00
|
|
|
# ignore known largefiles and standins
|
2011-09-24 19:35:45 +04:00
|
|
|
if f in lfiles or fstandin in standins:
|
|
|
|
continue
|
|
|
|
|
|
|
|
actualfiles.append(f)
|
|
|
|
match._files = actualfiles
|
|
|
|
|
|
|
|
def matchfn(f):
|
2012-03-09 19:11:52 +04:00
|
|
|
if origmatchfn(f):
|
2011-09-24 19:35:45 +04:00
|
|
|
return f not in lfiles
|
|
|
|
else:
|
|
|
|
return f in standins
|
|
|
|
|
|
|
|
match.matchfn = matchfn
|
2012-01-07 22:05:59 +04:00
|
|
|
result = orig(text=text, user=user, date=date, match=match,
|
2011-09-24 19:35:45 +04:00
|
|
|
force=force, editor=editor, extra=extra)
|
2012-01-07 22:05:59 +04:00
|
|
|
# This needs to be after commit; otherwise precommit hooks
|
|
|
|
# get the wrong status
|
|
|
|
lfdirstate.write()
|
|
|
|
return result
|
2011-09-24 19:35:45 +04:00
|
|
|
finally:
|
|
|
|
wlock.release()
|
|
|
|
|
|
|
|
def push(self, remote, force=False, revs=None, newbranch=False):
|
2013-09-21 16:33:29 +04:00
|
|
|
if remote.local():
|
|
|
|
missing = set(self.requirements) - remote.local().supported
|
|
|
|
if missing:
|
|
|
|
msg = _("required features are not"
|
|
|
|
" supported in the destination:"
|
|
|
|
" %s") % (', '.join(sorted(missing)))
|
|
|
|
raise util.Abort(msg)
|
2013-12-03 22:28:04 +04:00
|
|
|
return super(lfilesrepo, self).push(remote, force=force, revs=revs,
|
|
|
|
newbranch=newbranch)
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2012-12-10 17:58:42 +04:00
|
|
|
def _subdirlfs(self, files, lfiles):
|
|
|
|
'''
|
|
|
|
Adjust matched file list
|
|
|
|
If we pass a directory to commit whose only commitable files
|
|
|
|
are largefiles, the core commit code aborts before finding
|
|
|
|
the largefiles.
|
|
|
|
So we do the following:
|
|
|
|
For directories that only have largefiles as matches,
|
2013-02-10 21:24:29 +04:00
|
|
|
we explicitly add the largefiles to the match list and remove
|
2012-12-10 17:58:42 +04:00
|
|
|
the directory.
|
|
|
|
In other cases, we leave the match list unmodified.
|
|
|
|
'''
|
|
|
|
actualfiles = []
|
|
|
|
dirs = []
|
|
|
|
regulars = []
|
|
|
|
|
|
|
|
for f in files:
|
|
|
|
if lfutil.isstandin(f + '/'):
|
|
|
|
raise util.Abort(
|
|
|
|
_('file "%s" is a largefile standin') % f,
|
|
|
|
hint=('commit the largefile itself instead'))
|
|
|
|
# Scan directories
|
|
|
|
if os.path.isdir(self.wjoin(f)):
|
|
|
|
dirs.append(f)
|
|
|
|
else:
|
|
|
|
regulars.append(f)
|
|
|
|
|
|
|
|
for f in dirs:
|
|
|
|
matcheddir = False
|
|
|
|
d = self.dirstate.normalize(f) + '/'
|
|
|
|
# Check for matched normal files
|
|
|
|
for mf in regulars:
|
|
|
|
if self.dirstate.normalize(mf).startswith(d):
|
|
|
|
actualfiles.append(f)
|
|
|
|
matcheddir = True
|
|
|
|
break
|
|
|
|
if not matcheddir:
|
|
|
|
# If no normal match, manually append
|
|
|
|
# any matching largefiles
|
|
|
|
for lf in lfiles:
|
|
|
|
if self.dirstate.normalize(lf).startswith(d):
|
|
|
|
actualfiles.append(lf)
|
|
|
|
if not matcheddir:
|
|
|
|
actualfiles.append(lfutil.standin(f))
|
|
|
|
matcheddir = True
|
|
|
|
# Nothing in dir, so readd it
|
|
|
|
# and let commit reject it
|
|
|
|
if not matcheddir:
|
|
|
|
actualfiles.append(f)
|
|
|
|
|
|
|
|
# Always add normal files
|
|
|
|
actualfiles += regulars
|
|
|
|
return actualfiles
|
|
|
|
|
2012-03-09 19:11:52 +04:00
|
|
|
repo.__class__ = lfilesrepo
|
2011-09-24 19:35:45 +04:00
|
|
|
|
2014-04-15 19:37:24 +04:00
|
|
|
def prepushoutgoinghook(local, remote, outgoing):
|
|
|
|
if outgoing.missing:
|
|
|
|
toupload = set()
|
|
|
|
addfunc = lambda fn, lfhash: toupload.add(lfhash)
|
|
|
|
lfutil.getlfilestoupload(local, outgoing.missing, addfunc)
|
|
|
|
lfcommands.uploadlfiles(ui, local, remote, toupload)
|
|
|
|
repo.prepushoutgoinghooks.add("largefiles", prepushoutgoinghook)
|
|
|
|
|
2011-09-24 19:35:45 +04:00
|
|
|
def checkrequireslfiles(ui, repo, **kwargs):
|
2011-10-20 04:40:55 +04:00
|
|
|
if 'largefiles' not in repo.requirements and util.any(
|
2011-09-24 19:35:45 +04:00
|
|
|
lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()):
|
2011-10-20 00:37:03 +04:00
|
|
|
repo.requirements.add('largefiles')
|
2011-09-24 19:35:45 +04:00
|
|
|
repo._writerequirements()
|
|
|
|
|
2014-03-19 05:45:14 +04:00
|
|
|
ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles,
|
|
|
|
'largefiles')
|
|
|
|
ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles')
|