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