author | Greg Ward <greg@gerg.ca> |
Wed, 12 Oct 2011 20:59:27 -0400 | |
changeset 15252 | 6e809bb4f969 |
parent 15229 | 89e19ca2a90e |
child 15254 | dd03d3a9f888 |
permissions | -rw-r--r-- |
15168 | 1 |
# Copyright 2009-2010 Gregory P. Ward |
2 |
# Copyright 2009-2010 Intelerad Medical Systems Incorporated |
|
3 |
# Copyright 2010-2011 Fog Creek Software |
|
4 |
# Copyright 2010-2011 Unity Technologies |
|
5 |
# |
|
6 |
# This software may be used and distributed according to the terms of the |
|
7 |
# GNU General Public License version 2 or any later version. |
|
8 |
||
9 |
'''Overridden Mercurial commands and functions for the largefiles extension''' |
|
10 |
||
11 |
import os |
|
12 |
import copy |
|
13 |
||
14 |
from mercurial import hg, commands, util, cmdutil, match as match_, node, \ |
|
15 |
archival, error, merge |
|
16 |
from mercurial.i18n import _ |
|
17 |
from mercurial.node import hex |
|
18 |
from hgext import rebase |
|
15227
a7686abf73a6
largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
19 |
import lfutil |
15168 | 20 |
|
21 |
try: |
|
22 |
from mercurial import scmutil |
|
23 |
except ImportError: |
|
24 |
pass |
|
25 |
||
26 |
import lfutil |
|
27 |
import lfcommands |
|
28 |
||
29 |
def installnormalfilesmatchfn(manifest): |
|
30 |
'''overrides scmutil.match so that the matcher it returns will ignore all |
|
31 |
largefiles''' |
|
32 |
oldmatch = None # for the closure |
|
33 |
def override_match(repo, pats=[], opts={}, globbed=False, |
|
34 |
default='relpath'): |
|
35 |
match = oldmatch(repo, pats, opts, globbed, default) |
|
36 |
m = copy.copy(match) |
|
37 |
notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in |
|
38 |
manifest) |
|
39 |
m._files = filter(notlfile, m._files) |
|
40 |
m._fmap = set(m._files) |
|
41 |
orig_matchfn = m.matchfn |
|
42 |
m.matchfn = lambda f: notlfile(f) and orig_matchfn(f) or None |
|
43 |
return m |
|
44 |
oldmatch = installmatchfn(override_match) |
|
45 |
||
46 |
def installmatchfn(f): |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
47 |
oldmatch = scmutil.match |
15168 | 48 |
setattr(f, 'oldmatch', oldmatch) |
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
49 |
scmutil.match = f |
15168 | 50 |
return oldmatch |
51 |
||
52 |
def restorematchfn(): |
|
53 |
'''restores scmutil.match to what it was before installnormalfilesmatchfn |
|
54 |
was called. no-op if scmutil.match is its original function. |
|
55 |
||
56 |
Note that n calls to installnormalfilesmatchfn will require n calls to |
|
57 |
restore matchfn to reverse''' |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
58 |
scmutil.match = getattr(scmutil.match, 'oldmatch', scmutil.match) |
15168 | 59 |
|
60 |
# -- Wrappers: modify existing commands -------------------------------- |
|
61 |
||
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
62 |
# Add works by going through the files that the user wanted to add and |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
63 |
# checking if they should be added as largefiles. Then it makes a new |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
64 |
# matcher which matches only the normal files and runs the original |
15168 | 65 |
# version of add. |
66 |
def override_add(orig, ui, repo, *pats, **opts): |
|
67 |
large = opts.pop('large', None) |
|
15227
a7686abf73a6
largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
68 |
lfsize = lfutil.getminsize( |
a7686abf73a6
largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca>
parents:
15224
diff
changeset
|
69 |
ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None)) |
15168 | 70 |
|
71 |
lfmatcher = None |
|
72 |
if os.path.exists(repo.wjoin(lfutil.shortname)): |
|
15229
89e19ca2a90e
largefiles: use ui.configlist() to split largefiles.patterns
Greg Ward <greg@gerg.ca>
parents:
15227
diff
changeset
|
73 |
lfpats = ui.configlist(lfutil.longname, 'patterns', default=[]) |
15168 | 74 |
if lfpats: |
75 |
lfmatcher = match_.match(repo.root, '', list(lfpats)) |
|
76 |
||
77 |
lfnames = [] |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
78 |
m = scmutil.match(repo[None], pats, opts) |
15168 | 79 |
m.bad = lambda x, y: None |
80 |
wctx = repo[None] |
|
81 |
for f in repo.walk(m): |
|
82 |
exact = m.exact(f) |
|
83 |
lfile = lfutil.standin(f) in wctx |
|
84 |
nfile = f in wctx |
|
85 |
exists = lfile or nfile |
|
86 |
||
87 |
# Don't warn the user when they attempt to add a normal tracked file. |
|
88 |
# The normal add code will do that for us. |
|
89 |
if exact and exists: |
|
90 |
if lfile: |
|
91 |
ui.warn(_('%s already a largefile\n') % f) |
|
92 |
continue |
|
93 |
||
94 |
if exact or not exists: |
|
95 |
if large or (lfsize and os.path.getsize(repo.wjoin(f)) >= \ |
|
96 |
lfsize * 1024 * 1024) or (lfmatcher and lfmatcher(f)): |
|
97 |
lfnames.append(f) |
|
98 |
if ui.verbose or not exact: |
|
99 |
ui.status(_('adding %s as a largefile\n') % m.rel(f)) |
|
100 |
||
101 |
bad = [] |
|
102 |
standins = [] |
|
103 |
||
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
104 |
# Need to lock, otherwise there could be a race condition between |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
105 |
# when standins are created and added to the repo. |
15168 | 106 |
wlock = repo.wlock() |
107 |
try: |
|
108 |
if not opts.get('dry_run'): |
|
109 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
110 |
for f in lfnames: |
|
111 |
standinname = lfutil.standin(f) |
|
112 |
lfutil.writestandin(repo, standinname, hash='', |
|
113 |
executable=lfutil.getexecutable(repo.wjoin(f))) |
|
114 |
standins.append(standinname) |
|
115 |
if lfdirstate[f] == 'r': |
|
116 |
lfdirstate.normallookup(f) |
|
117 |
else: |
|
118 |
lfdirstate.add(f) |
|
119 |
lfdirstate.write() |
|
120 |
bad += [lfutil.splitstandin(f) for f in lfutil.repo_add(repo, |
|
121 |
standins) if f in m.files()] |
|
122 |
finally: |
|
123 |
wlock.release() |
|
124 |
||
125 |
installnormalfilesmatchfn(repo[None].manifest()) |
|
126 |
result = orig(ui, repo, *pats, **opts) |
|
127 |
restorematchfn() |
|
128 |
||
129 |
return (result == 1 or bad) and 1 or 0 |
|
130 |
||
131 |
def override_remove(orig, ui, repo, *pats, **opts): |
|
132 |
manifest = repo[None].manifest() |
|
133 |
installnormalfilesmatchfn(manifest) |
|
134 |
orig(ui, repo, *pats, **opts) |
|
135 |
restorematchfn() |
|
136 |
||
137 |
after, force = opts.get('after'), opts.get('force') |
|
138 |
if not pats and not after: |
|
139 |
raise util.Abort(_('no files specified')) |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
140 |
m = scmutil.match(repo[None], pats, opts) |
15168 | 141 |
try: |
142 |
repo.lfstatus = True |
|
143 |
s = repo.status(match=m, clean=True) |
|
144 |
finally: |
|
145 |
repo.lfstatus = False |
|
146 |
modified, added, deleted, clean = [[f for f in list if lfutil.standin(f) \ |
|
147 |
in manifest] for list in [s[0], s[1], s[3], s[6]]] |
|
148 |
||
149 |
def warn(files, reason): |
|
150 |
for f in files: |
|
151 |
ui.warn(_('not removing %s: file %s (use -f to force removal)\n') |
|
152 |
% (m.rel(f), reason)) |
|
153 |
||
154 |
if force: |
|
155 |
remove, forget = modified + deleted + clean, added |
|
156 |
elif after: |
|
157 |
remove, forget = deleted, [] |
|
158 |
warn(modified + added + clean, _('still exists')) |
|
159 |
else: |
|
160 |
remove, forget = deleted + clean, [] |
|
161 |
warn(modified, _('is modified')) |
|
162 |
warn(added, _('has been marked for add')) |
|
163 |
||
164 |
for f in sorted(remove + forget): |
|
165 |
if ui.verbose or not m.exact(f): |
|
166 |
ui.status(_('removing %s\n') % m.rel(f)) |
|
167 |
||
168 |
# Need to lock because standin files are deleted then removed from the |
|
169 |
# repository and we could race inbetween. |
|
170 |
wlock = repo.wlock() |
|
171 |
try: |
|
172 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
173 |
for f in remove: |
|
174 |
if not after: |
|
175 |
os.unlink(repo.wjoin(f)) |
|
176 |
currentdir = os.path.split(f)[0] |
|
177 |
while currentdir and not os.listdir(repo.wjoin(currentdir)): |
|
178 |
os.rmdir(repo.wjoin(currentdir)) |
|
179 |
currentdir = os.path.split(currentdir)[0] |
|
180 |
lfdirstate.remove(f) |
|
181 |
lfdirstate.write() |
|
182 |
||
183 |
forget = [lfutil.standin(f) for f in forget] |
|
184 |
remove = [lfutil.standin(f) for f in remove] |
|
185 |
lfutil.repo_forget(repo, forget) |
|
186 |
lfutil.repo_remove(repo, remove, unlink=True) |
|
187 |
finally: |
|
188 |
wlock.release() |
|
189 |
||
190 |
def override_status(orig, ui, repo, *pats, **opts): |
|
191 |
try: |
|
192 |
repo.lfstatus = True |
|
193 |
return orig(ui, repo, *pats, **opts) |
|
194 |
finally: |
|
195 |
repo.lfstatus = False |
|
196 |
||
197 |
def override_log(orig, ui, repo, *pats, **opts): |
|
198 |
try: |
|
199 |
repo.lfstatus = True |
|
200 |
orig(ui, repo, *pats, **opts) |
|
201 |
finally: |
|
202 |
repo.lfstatus = False |
|
203 |
||
204 |
def override_verify(orig, ui, repo, *pats, **opts): |
|
205 |
large = opts.pop('large', False) |
|
206 |
all = opts.pop('lfa', False) |
|
207 |
contents = opts.pop('lfc', False) |
|
208 |
||
209 |
result = orig(ui, repo, *pats, **opts) |
|
210 |
if large: |
|
211 |
result = result or lfcommands.verifylfiles(ui, repo, all, contents) |
|
212 |
return result |
|
213 |
||
214 |
# Override needs to refresh standins so that update's normal merge |
|
215 |
# will go through properly. Then the other update hook (overriding repo.update) |
|
216 |
# will get the new files. Filemerge is also overriden so that the merge |
|
217 |
# will merge standins correctly. |
|
218 |
def override_update(orig, ui, repo, *pats, **opts): |
|
219 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
220 |
s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False, |
|
221 |
False, False) |
|
222 |
(unsure, modified, added, removed, missing, unknown, ignored, clean) = s |
|
223 |
||
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
224 |
# Need to lock between the standins getting updated and their |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
225 |
# largefiles getting updated |
15168 | 226 |
wlock = repo.wlock() |
227 |
try: |
|
228 |
if opts['check']: |
|
229 |
mod = len(modified) > 0 |
|
230 |
for lfile in unsure: |
|
231 |
standin = lfutil.standin(lfile) |
|
232 |
if repo['.'][standin].data().strip() != \ |
|
233 |
lfutil.hashfile(repo.wjoin(lfile)): |
|
234 |
mod = True |
|
235 |
else: |
|
236 |
lfdirstate.normal(lfile) |
|
237 |
lfdirstate.write() |
|
238 |
if mod: |
|
239 |
raise util.Abort(_('uncommitted local changes')) |
|
240 |
# XXX handle removed differently |
|
241 |
if not opts['clean']: |
|
242 |
for lfile in unsure + modified + added: |
|
243 |
lfutil.updatestandin(repo, lfutil.standin(lfile)) |
|
244 |
finally: |
|
245 |
wlock.release() |
|
246 |
return orig(ui, repo, *pats, **opts) |
|
247 |
||
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
248 |
# Override filemerge to prompt the user about how they wish to merge |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
249 |
# largefiles. This will handle identical edits, and copy/rename + |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
250 |
# edit without prompting the user. |
15168 | 251 |
def override_filemerge(origfn, repo, mynode, orig, fcd, fco, fca): |
252 |
# Use better variable names here. Because this is a wrapper we cannot |
|
253 |
# change the variable names in the function declaration. |
|
254 |
fcdest, fcother, fcancestor = fcd, fco, fca |
|
255 |
if not lfutil.isstandin(orig): |
|
256 |
return origfn(repo, mynode, orig, fcdest, fcother, fcancestor) |
|
257 |
else: |
|
258 |
if not fcother.cmp(fcdest): # files identical? |
|
259 |
return None |
|
260 |
||
261 |
# backwards, use working dir parent as ancestor |
|
262 |
if fcancestor == fcother: |
|
263 |
fcancestor = fcdest.parents()[0] |
|
264 |
||
265 |
if orig != fcother.path(): |
|
266 |
repo.ui.status(_('merging %s and %s to %s\n') |
|
267 |
% (lfutil.splitstandin(orig), |
|
268 |
lfutil.splitstandin(fcother.path()), |
|
269 |
lfutil.splitstandin(fcdest.path()))) |
|
270 |
else: |
|
271 |
repo.ui.status(_('merging %s\n') |
|
272 |
% lfutil.splitstandin(fcdest.path())) |
|
273 |
||
274 |
if fcancestor.path() != fcother.path() and fcother.data() == \ |
|
275 |
fcancestor.data(): |
|
276 |
return 0 |
|
277 |
if fcancestor.path() != fcdest.path() and fcdest.data() == \ |
|
278 |
fcancestor.data(): |
|
279 |
repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) |
|
280 |
return 0 |
|
281 |
||
282 |
if repo.ui.promptchoice(_('largefile %s has a merge conflict\n' |
|
283 |
'keep (l)ocal or take (o)ther?') % |
|
284 |
lfutil.splitstandin(orig), |
|
285 |
(_('&Local'), _('&Other')), 0) == 0: |
|
286 |
return 0 |
|
287 |
else: |
|
288 |
repo.wwrite(fcdest.path(), fcother.data(), fcother.flags()) |
|
289 |
return 0 |
|
290 |
||
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
291 |
# Copy first changes the matchers to match standins instead of |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
292 |
# largefiles. Then it overrides util.copyfile in that function it |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
293 |
# checks if the destination largefile already exists. It also keeps a |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
294 |
# list of copied files so that the largefiles can be copied and the |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
295 |
# dirstate updated. |
15168 | 296 |
def override_copy(orig, ui, repo, pats, opts, rename=False): |
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
297 |
# doesn't remove largefile on rename |
15168 | 298 |
if len(pats) < 2: |
299 |
# this isn't legal, let the original function deal with it |
|
300 |
return orig(ui, repo, pats, opts, rename) |
|
301 |
||
302 |
def makestandin(relpath): |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
303 |
path = scmutil.canonpath(repo.root, repo.getcwd(), relpath) |
15168 | 304 |
return os.path.join(os.path.relpath('.', repo.getcwd()), |
305 |
lfutil.standin(path)) |
|
306 |
||
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
307 |
fullpats = scmutil.expandpats(pats) |
15168 | 308 |
dest = fullpats[-1] |
309 |
||
310 |
if os.path.isdir(dest): |
|
311 |
if not os.path.isdir(makestandin(dest)): |
|
312 |
os.makedirs(makestandin(dest)) |
|
15252
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
313 |
# This could copy both largefiles and normal files in one command, |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
314 |
# but we don't want to do that first replace their matcher to only |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
315 |
# match normal files and run it then replace it to just match |
6e809bb4f969
largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca>
parents:
15229
diff
changeset
|
316 |
# lfiles and run it again |
15168 | 317 |
nonormalfiles = False |
318 |
nolfiles = False |
|
319 |
try: |
|
320 |
installnormalfilesmatchfn(repo[None].manifest()) |
|
321 |
result = orig(ui, repo, pats, opts, rename) |
|
322 |
except util.Abort, e: |
|
323 |
if str(e) != 'no files to copy': |
|
324 |
raise e |
|
325 |
else: |
|
326 |
nonormalfiles = True |
|
327 |
result = 0 |
|
328 |
finally: |
|
329 |
restorematchfn() |
|
330 |
||
331 |
# The first rename can cause our current working directory to be removed. |
|
332 |
# In that case there is nothing left to copy/rename so just quit. |
|
333 |
try: |
|
334 |
repo.getcwd() |
|
335 |
except OSError: |
|
336 |
return result |
|
337 |
||
338 |
try: |
|
339 |
# When we call orig below it creates the standins but we don't add them |
|
340 |
# to the dir state until later so lock during that time. |
|
341 |
wlock = repo.wlock() |
|
342 |
||
343 |
manifest = repo[None].manifest() |
|
344 |
oldmatch = None # for the closure |
|
345 |
def override_match(repo, pats=[], opts={}, globbed=False, |
|
346 |
default='relpath'): |
|
347 |
newpats = [] |
|
348 |
# The patterns were previously mangled to add the standin |
|
349 |
# directory; we need to remove that now |
|
350 |
for pat in pats: |
|
351 |
if match_.patkind(pat) is None and lfutil.shortname in pat: |
|
352 |
newpats.append(pat.replace(lfutil.shortname, '')) |
|
353 |
else: |
|
354 |
newpats.append(pat) |
|
355 |
match = oldmatch(repo, newpats, opts, globbed, default) |
|
356 |
m = copy.copy(match) |
|
357 |
lfile = lambda f: lfutil.standin(f) in manifest |
|
358 |
m._files = [lfutil.standin(f) for f in m._files if lfile(f)] |
|
359 |
m._fmap = set(m._files) |
|
360 |
orig_matchfn = m.matchfn |
|
361 |
m.matchfn = lambda f: lfutil.isstandin(f) and \ |
|
362 |
lfile(lfutil.splitstandin(f)) and \ |
|
363 |
orig_matchfn(lfutil.splitstandin(f)) or None |
|
364 |
return m |
|
365 |
oldmatch = installmatchfn(override_match) |
|
366 |
listpats = [] |
|
367 |
for pat in pats: |
|
368 |
if match_.patkind(pat) is not None: |
|
369 |
listpats.append(pat) |
|
370 |
else: |
|
371 |
listpats.append(makestandin(pat)) |
|
372 |
||
373 |
try: |
|
374 |
origcopyfile = util.copyfile |
|
375 |
copiedfiles = [] |
|
376 |
def override_copyfile(src, dest): |
|
377 |
if lfutil.shortname in src and lfutil.shortname in dest: |
|
378 |
destlfile = dest.replace(lfutil.shortname, '') |
|
379 |
if not opts['force'] and os.path.exists(destlfile): |
|
380 |
raise IOError('', |
|
381 |
_('destination largefile already exists')) |
|
382 |
copiedfiles.append((src, dest)) |
|
383 |
origcopyfile(src, dest) |
|
384 |
||
385 |
util.copyfile = override_copyfile |
|
386 |
result += orig(ui, repo, listpats, opts, rename) |
|
387 |
finally: |
|
388 |
util.copyfile = origcopyfile |
|
389 |
||
390 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
391 |
for (src, dest) in copiedfiles: |
|
392 |
if lfutil.shortname in src and lfutil.shortname in dest: |
|
393 |
srclfile = src.replace(lfutil.shortname, '') |
|
394 |
destlfile = dest.replace(lfutil.shortname, '') |
|
395 |
destlfiledir = os.path.dirname(destlfile) or '.' |
|
396 |
if not os.path.isdir(destlfiledir): |
|
397 |
os.makedirs(destlfiledir) |
|
398 |
if rename: |
|
399 |
os.rename(srclfile, destlfile) |
|
400 |
lfdirstate.remove(os.path.relpath(srclfile, |
|
401 |
repo.root)) |
|
402 |
else: |
|
403 |
util.copyfile(srclfile, destlfile) |
|
404 |
lfdirstate.add(os.path.relpath(destlfile, |
|
405 |
repo.root)) |
|
406 |
lfdirstate.write() |
|
407 |
except util.Abort, e: |
|
408 |
if str(e) != 'no files to copy': |
|
409 |
raise e |
|
410 |
else: |
|
411 |
nolfiles = True |
|
412 |
finally: |
|
413 |
restorematchfn() |
|
414 |
wlock.release() |
|
415 |
||
416 |
if nolfiles and nonormalfiles: |
|
417 |
raise util.Abort(_('no files to copy')) |
|
418 |
||
419 |
return result |
|
420 |
||
421 |
# When the user calls revert, we have to be careful to not revert any changes |
|
422 |
# to other lfiles accidentally. This means we have to keep track of the lfiles |
|
423 |
# that are being reverted so we only pull down the necessary lfiles. |
|
424 |
# |
|
425 |
# Standins are only updated (to match the hash of lfiles) before commits. |
|
426 |
# Update the standins then run the original revert (changing the matcher to hit |
|
427 |
# standins instead of lfiles). Based on the resulting standins update the |
|
428 |
# lfiles. Then return the standins to their proper state |
|
429 |
def override_revert(orig, ui, repo, *pats, **opts): |
|
430 |
# Because we put the standins in a bad state (by updating them) and then |
|
431 |
# return them to a correct state we need to lock to prevent others from |
|
432 |
# changing them in their incorrect state. |
|
433 |
wlock = repo.wlock() |
|
434 |
try: |
|
435 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
436 |
(modified, added, removed, missing, unknown, ignored, clean) = \ |
|
437 |
lfutil.lfdirstate_status(lfdirstate, repo, repo['.'].rev()) |
|
438 |
for lfile in modified: |
|
439 |
lfutil.updatestandin(repo, lfutil.standin(lfile)) |
|
440 |
||
441 |
try: |
|
442 |
ctx = repo[opts.get('rev')] |
|
443 |
oldmatch = None # for the closure |
|
444 |
def override_match(ctxorrepo, pats=[], opts={}, globbed=False, |
|
445 |
default='relpath'): |
|
15169
aa262fff87ac
largefile: fix up hasattr usage
Matt Mackall <mpm@selenic.com>
parents:
15168
diff
changeset
|
446 |
if util.safehasattr(ctxorrepo, 'match'): |
15168 | 447 |
ctx0 = ctxorrepo |
448 |
else: |
|
449 |
ctx0 = ctxorrepo[None] |
|
450 |
match = oldmatch(ctxorrepo, pats, opts, globbed, default) |
|
451 |
m = copy.copy(match) |
|
452 |
def tostandin(f): |
|
453 |
if lfutil.standin(f) in ctx0 or lfutil.standin(f) in ctx: |
|
454 |
return lfutil.standin(f) |
|
455 |
elif lfutil.standin(f) in repo[None]: |
|
456 |
return None |
|
457 |
return f |
|
458 |
m._files = [tostandin(f) for f in m._files] |
|
459 |
m._files = [f for f in m._files if f is not None] |
|
460 |
m._fmap = set(m._files) |
|
461 |
orig_matchfn = m.matchfn |
|
462 |
def matchfn(f): |
|
463 |
if lfutil.isstandin(f): |
|
464 |
# We need to keep track of what lfiles are being |
|
465 |
# matched so we know which ones to update later |
|
466 |
# (otherwise we revert changes to other lfiles |
|
467 |
# accidentally). This is repo specific, so duckpunch |
|
468 |
# the repo object to keep the list of lfiles for us |
|
469 |
# later. |
|
470 |
if orig_matchfn(lfutil.splitstandin(f)) and \ |
|
471 |
(f in repo[None] or f in ctx): |
|
472 |
lfileslist = getattr(repo, '_lfilestoupdate', []) |
|
473 |
lfileslist.append(lfutil.splitstandin(f)) |
|
474 |
repo._lfilestoupdate = lfileslist |
|
475 |
return True |
|
476 |
else: |
|
477 |
return False |
|
478 |
return orig_matchfn(f) |
|
479 |
m.matchfn = matchfn |
|
480 |
return m |
|
481 |
oldmatch = installmatchfn(override_match) |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
482 |
scmutil.match |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
483 |
matches = override_match(repo[None], pats, opts) |
15168 | 484 |
orig(ui, repo, *pats, **opts) |
485 |
finally: |
|
486 |
restorematchfn() |
|
487 |
lfileslist = getattr(repo, '_lfilestoupdate', []) |
|
15170
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15169
diff
changeset
|
488 |
lfcommands.updatelfiles(ui, repo, filelist=lfileslist, |
c1a4a3220711
largefiles: fix over-long lines
Matt Mackall <mpm@selenic.com>
parents:
15169
diff
changeset
|
489 |
printmessage=False) |
15168 | 490 |
# Empty out the lfiles list so we start fresh next time |
491 |
repo._lfilestoupdate = [] |
|
492 |
for lfile in modified: |
|
493 |
if lfile in lfileslist: |
|
494 |
if os.path.exists(repo.wjoin(lfutil.standin(lfile))) and lfile\ |
|
495 |
in repo['.']: |
|
496 |
lfutil.writestandin(repo, lfutil.standin(lfile), |
|
497 |
repo['.'][lfile].data().strip(), |
|
498 |
'x' in repo['.'][lfile].flags()) |
|
499 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
500 |
for lfile in added: |
|
501 |
standin = lfutil.standin(lfile) |
|
502 |
if standin not in ctx and (standin in matches or opts.get('all')): |
|
503 |
if lfile in lfdirstate: |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
504 |
lfdirstate.drop(lfile) |
15168 | 505 |
util.unlinkpath(repo.wjoin(standin)) |
506 |
lfdirstate.write() |
|
507 |
finally: |
|
508 |
wlock.release() |
|
509 |
||
510 |
def hg_update(orig, repo, node): |
|
511 |
result = orig(repo, node) |
|
512 |
# XXX check if it worked first |
|
513 |
lfcommands.updatelfiles(repo.ui, repo) |
|
514 |
return result |
|
515 |
||
516 |
def hg_clean(orig, repo, node, show_stats=True): |
|
517 |
result = orig(repo, node, show_stats) |
|
518 |
lfcommands.updatelfiles(repo.ui, repo) |
|
519 |
return result |
|
520 |
||
521 |
def hg_merge(orig, repo, node, force=None, remind=True): |
|
522 |
result = orig(repo, node, force, remind) |
|
523 |
lfcommands.updatelfiles(repo.ui, repo) |
|
524 |
return result |
|
525 |
||
526 |
# When we rebase a repository with remotely changed lfiles, we need |
|
527 |
# to take some extra care so that the lfiles are correctly updated |
|
528 |
# in the working copy |
|
529 |
def override_pull(orig, ui, repo, source=None, **opts): |
|
530 |
if opts.get('rebase', False): |
|
531 |
repo._isrebasing = True |
|
532 |
try: |
|
533 |
if opts.get('update'): |
|
534 |
del opts['update'] |
|
535 |
ui.debug('--update and --rebase are not compatible, ignoring ' |
|
536 |
'the update flag\n') |
|
537 |
del opts['rebase'] |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
538 |
cmdutil.bailifchanged(repo) |
15168 | 539 |
revsprepull = len(repo) |
540 |
origpostincoming = commands.postincoming |
|
541 |
def _dummy(*args, **kwargs): |
|
542 |
pass |
|
543 |
commands.postincoming = _dummy |
|
544 |
repo.lfpullsource = source |
|
545 |
if not source: |
|
546 |
source = 'default' |
|
547 |
try: |
|
548 |
result = commands.pull(ui, repo, source, **opts) |
|
549 |
finally: |
|
550 |
commands.postincoming = origpostincoming |
|
551 |
revspostpull = len(repo) |
|
552 |
if revspostpull > revsprepull: |
|
553 |
result = result or rebase.rebase(ui, repo) |
|
554 |
finally: |
|
555 |
repo._isrebasing = False |
|
556 |
else: |
|
557 |
repo.lfpullsource = source |
|
558 |
if not source: |
|
559 |
source = 'default' |
|
560 |
result = orig(ui, repo, source, **opts) |
|
561 |
return result |
|
562 |
||
563 |
def override_rebase(orig, ui, repo, **opts): |
|
564 |
repo._isrebasing = True |
|
565 |
try: |
|
566 |
orig(ui, repo, **opts) |
|
567 |
finally: |
|
568 |
repo._isrebasing = False |
|
569 |
||
570 |
def override_archive(orig, repo, dest, node, kind, decode=True, matchfn=None, |
|
571 |
prefix=None, mtime=None, subrepos=None): |
|
572 |
# No need to lock because we are only reading history and lfile caches |
|
573 |
# neither of which are modified |
|
574 |
||
575 |
lfcommands.cachelfiles(repo.ui, repo, node) |
|
576 |
||
577 |
if kind not in archival.archivers: |
|
578 |
raise util.Abort(_("unknown archive type '%s'") % kind) |
|
579 |
||
580 |
ctx = repo[node] |
|
581 |
||
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
582 |
if kind == 'files': |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
583 |
if prefix: |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
584 |
raise util.Abort( |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
585 |
_('cannot give prefix when archiving to files')) |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
586 |
else: |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
587 |
prefix = archival.tidyprefix(dest, kind, prefix) |
15168 | 588 |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
589 |
def write(name, mode, islink, getdata): |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
590 |
if matchfn and not matchfn(name): |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
591 |
return |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
592 |
data = getdata() |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
593 |
if decode: |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
594 |
data = repo.wwritedata(name, data) |
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
595 |
archiver.addfile(prefix + name, mode, islink, data) |
15168 | 596 |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
597 |
archiver = archival.archivers[kind](dest, mtime or ctx.date()[0]) |
15168 | 598 |
|
599 |
if repo.ui.configbool("ui", "archivemeta", True): |
|
600 |
def metadata(): |
|
601 |
base = 'repo: %s\nnode: %s\nbranch: %s\n' % ( |
|
602 |
hex(repo.changelog.node(0)), hex(node), ctx.branch()) |
|
603 |
||
604 |
tags = ''.join('tag: %s\n' % t for t in ctx.tags() |
|
605 |
if repo.tagtype(t) == 'global') |
|
606 |
if not tags: |
|
607 |
repo.ui.pushbuffer() |
|
608 |
opts = {'template': '{latesttag}\n{latesttagdistance}', |
|
609 |
'style': '', 'patch': None, 'git': None} |
|
610 |
cmdutil.show_changeset(repo.ui, repo, opts).show(ctx) |
|
611 |
ltags, dist = repo.ui.popbuffer().split('\n') |
|
612 |
tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':')) |
|
613 |
tags += 'latesttagdistance: %s\n' % dist |
|
614 |
||
615 |
return base + tags |
|
616 |
||
617 |
write('.hg_archival.txt', 0644, False, metadata) |
|
618 |
||
619 |
for f in ctx: |
|
620 |
ff = ctx.flags(f) |
|
621 |
getdata = ctx[f].data |
|
622 |
if lfutil.isstandin(f): |
|
623 |
path = lfutil.findfile(repo, getdata().strip()) |
|
624 |
f = lfutil.splitstandin(f) |
|
625 |
||
626 |
def getdatafn(): |
|
627 |
try: |
|
628 |
fd = open(path, 'rb') |
|
629 |
return fd.read() |
|
630 |
finally: |
|
631 |
fd.close() |
|
632 |
||
633 |
getdata = getdatafn |
|
634 |
write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata) |
|
635 |
||
636 |
if subrepos: |
|
637 |
for subpath in ctx.substate: |
|
638 |
sub = ctx.sub(subpath) |
|
639 |
try: |
|
640 |
sub.archive(repo.ui, archiver, prefix) |
|
641 |
except TypeError: |
|
642 |
sub.archive(archiver, prefix) |
|
643 |
||
644 |
archiver.done() |
|
645 |
||
646 |
# If a lfile is modified the change is not reflected in its standin until a |
|
647 |
# commit. cmdutil.bailifchanged raises an exception if the repo has |
|
648 |
# uncommitted changes. Wrap it to also check if lfiles were changed. This is |
|
649 |
# used by bisect and backout. |
|
650 |
def override_bailifchanged(orig, repo): |
|
651 |
orig(repo) |
|
652 |
repo.lfstatus = True |
|
653 |
modified, added, removed, deleted = repo.status()[:4] |
|
654 |
repo.lfstatus = False |
|
655 |
if modified or added or removed or deleted: |
|
656 |
raise util.Abort(_('outstanding uncommitted changes')) |
|
657 |
||
658 |
# Fetch doesn't use cmdutil.bail_if_changed so override it to add the check |
|
659 |
def override_fetch(orig, ui, repo, *pats, **opts): |
|
660 |
repo.lfstatus = True |
|
661 |
modified, added, removed, deleted = repo.status()[:4] |
|
662 |
repo.lfstatus = False |
|
663 |
if modified or added or removed or deleted: |
|
664 |
raise util.Abort(_('outstanding uncommitted changes')) |
|
665 |
return orig(ui, repo, *pats, **opts) |
|
666 |
||
667 |
def override_forget(orig, ui, repo, *pats, **opts): |
|
668 |
installnormalfilesmatchfn(repo[None].manifest()) |
|
669 |
orig(ui, repo, *pats, **opts) |
|
670 |
restorematchfn() |
|
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
671 |
m = scmutil.match(repo[None], pats, opts) |
15168 | 672 |
|
673 |
try: |
|
674 |
repo.lfstatus = True |
|
675 |
s = repo.status(match=m, clean=True) |
|
676 |
finally: |
|
677 |
repo.lfstatus = False |
|
678 |
forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
679 |
forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()] |
|
680 |
||
681 |
for f in forget: |
|
682 |
if lfutil.standin(f) not in repo.dirstate and not \ |
|
683 |
os.path.isdir(m.rel(lfutil.standin(f))): |
|
684 |
ui.warn(_('not removing %s: file is already untracked\n') |
|
685 |
% m.rel(f)) |
|
686 |
||
687 |
for f in forget: |
|
688 |
if ui.verbose or not m.exact(f): |
|
689 |
ui.status(_('removing %s\n') % m.rel(f)) |
|
690 |
||
691 |
# Need to lock because standin files are deleted then removed from the |
|
692 |
# repository and we could race inbetween. |
|
693 |
wlock = repo.wlock() |
|
694 |
try: |
|
695 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
696 |
for f in forget: |
|
697 |
if lfdirstate[f] == 'a': |
|
698 |
lfdirstate.drop(f) |
|
699 |
else: |
|
700 |
lfdirstate.remove(f) |
|
701 |
lfdirstate.write() |
|
702 |
lfutil.repo_remove(repo, [lfutil.standin(f) for f in forget], |
|
703 |
unlink=True) |
|
704 |
finally: |
|
705 |
wlock.release() |
|
706 |
||
707 |
def getoutgoinglfiles(ui, repo, dest=None, **opts): |
|
708 |
dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
709 |
dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
710 |
revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
711 |
if revs: |
|
712 |
revs = [repo.lookup(rev) for rev in revs] |
|
713 |
||
15224
7c604d8c7e83
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com>
parents:
15170
diff
changeset
|
714 |
remoteui = hg.remoteui |
15168 | 715 |
|
716 |
try: |
|
717 |
remote = hg.repository(remoteui(repo, opts), dest) |
|
718 |
except error.RepoError: |
|
719 |
return None |
|
720 |
o = lfutil.findoutgoing(repo, remote, False) |
|
721 |
if not o: |
|
722 |
return None |
|
723 |
o = repo.changelog.nodesbetween(o, revs)[0] |
|
724 |
if opts.get('newest_first'): |
|
725 |
o.reverse() |
|
726 |
||
727 |
toupload = set() |
|
728 |
for n in o: |
|
729 |
parents = [p for p in repo.changelog.parents(n) if p != node.nullid] |
|
730 |
ctx = repo[n] |
|
731 |
files = set(ctx.files()) |
|
732 |
if len(parents) == 2: |
|
733 |
mc = ctx.manifest() |
|
734 |
mp1 = ctx.parents()[0].manifest() |
|
735 |
mp2 = ctx.parents()[1].manifest() |
|
736 |
for f in mp1: |
|
737 |
if f not in mc: |
|
738 |
files.add(f) |
|
739 |
for f in mp2: |
|
740 |
if f not in mc: |
|
741 |
files.add(f) |
|
742 |
for f in mc: |
|
743 |
if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): |
|
744 |
files.add(f) |
|
745 |
toupload = toupload.union(set([f for f in files if lfutil.isstandin(f)\ |
|
746 |
and f in ctx])) |
|
747 |
return toupload |
|
748 |
||
749 |
def override_outgoing(orig, ui, repo, dest=None, **opts): |
|
750 |
orig(ui, repo, dest, **opts) |
|
751 |
||
752 |
if opts.pop('large', None): |
|
753 |
toupload = getoutgoinglfiles(ui, repo, dest, **opts) |
|
754 |
if toupload is None: |
|
755 |
ui.status(_('largefiles: No remote repo\n')) |
|
756 |
else: |
|
757 |
ui.status(_('largefiles to upload:\n')) |
|
758 |
for file in toupload: |
|
759 |
ui.status(lfutil.splitstandin(file) + '\n') |
|
760 |
ui.status('\n') |
|
761 |
||
762 |
def override_summary(orig, ui, repo, *pats, **opts): |
|
763 |
orig(ui, repo, *pats, **opts) |
|
764 |
||
765 |
if opts.pop('large', None): |
|
766 |
toupload = getoutgoinglfiles(ui, repo, None, **opts) |
|
767 |
if toupload is None: |
|
768 |
ui.status(_('largefiles: No remote repo\n')) |
|
769 |
else: |
|
770 |
ui.status(_('largefiles: %d to upload\n') % len(toupload)) |
|
771 |
||
772 |
def override_addremove(orig, ui, repo, *pats, **opts): |
|
773 |
# Check if the parent or child has lfiles if they do don't allow it. If |
|
774 |
# there is a symlink in the manifest then getting the manifest throws an |
|
775 |
# exception catch it and let addremove deal with it. This happens in |
|
776 |
# Mercurial's test test-addremove-symlink |
|
777 |
try: |
|
778 |
manifesttip = set(repo['tip'].manifest()) |
|
779 |
except util.Abort: |
|
780 |
manifesttip = set() |
|
781 |
try: |
|
782 |
manifestworking = set(repo[None].manifest()) |
|
783 |
except util.Abort: |
|
784 |
manifestworking = set() |
|
785 |
||
786 |
# Manifests are only iterable so turn them into sets then union |
|
787 |
for file in manifesttip.union(manifestworking): |
|
788 |
if file.startswith(lfutil.shortname): |
|
789 |
raise util.Abort( |
|
790 |
_('addremove cannot be run on a repo with largefiles')) |
|
791 |
||
792 |
return orig(ui, repo, *pats, **opts) |
|
793 |
||
794 |
# Calling purge with --all will cause the lfiles to be deleted. |
|
795 |
# Override repo.status to prevent this from happening. |
|
796 |
def override_purge(orig, ui, repo, *dirs, **opts): |
|
797 |
oldstatus = repo.status |
|
798 |
def override_status(node1='.', node2=None, match=None, ignored=False, |
|
799 |
clean=False, unknown=False, listsubrepos=False): |
|
800 |
r = oldstatus(node1, node2, match, ignored, clean, unknown, |
|
801 |
listsubrepos) |
|
802 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
803 |
modified, added, removed, deleted, unknown, ignored, clean = r |
|
804 |
unknown = [f for f in unknown if lfdirstate[f] == '?'] |
|
805 |
ignored = [f for f in ignored if lfdirstate[f] == '?'] |
|
806 |
return modified, added, removed, deleted, unknown, ignored, clean |
|
807 |
repo.status = override_status |
|
808 |
orig(ui, repo, *dirs, **opts) |
|
809 |
repo.status = oldstatus |
|
810 |
||
811 |
def override_rollback(orig, ui, repo, **opts): |
|
812 |
result = orig(ui, repo, **opts) |
|
813 |
merge.update(repo, node=None, branchmerge=False, force=True, |
|
814 |
partial=lfutil.isstandin) |
|
815 |
lfdirstate = lfutil.openlfdirstate(ui, repo) |
|
816 |
lfiles = lfutil.listlfiles(repo) |
|
817 |
oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev()) |
|
818 |
for file in lfiles: |
|
819 |
if file in oldlfiles: |
|
820 |
lfdirstate.normallookup(file) |
|
821 |
else: |
|
822 |
lfdirstate.add(file) |
|
823 |
lfdirstate.write() |
|
824 |
return result |