##// END OF EJS Templates
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command...
Matt Harbison -
r17600:3a1c6b64 stable
parent child Browse files
Show More
@@ -1,1102 +1,1103 b''
1 # Copyright 2009-2010 Gregory P. Ward
1 # Copyright 2009-2010 Gregory P. Ward
2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated
2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated
3 # Copyright 2010-2011 Fog Creek Software
3 # Copyright 2010-2011 Fog Creek Software
4 # Copyright 2010-2011 Unity Technologies
4 # Copyright 2010-2011 Unity Technologies
5 #
5 #
6 # This software may be used and distributed according to the terms of the
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.
7 # GNU General Public License version 2 or any later version.
8
8
9 '''Overridden Mercurial commands and functions for the largefiles extension'''
9 '''Overridden Mercurial commands and functions for the largefiles extension'''
10
10
11 import os
11 import os
12 import copy
12 import copy
13
13
14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \
14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \
15 node, archival, error, merge
15 node, archival, error, merge
16 from mercurial.i18n import _
16 from mercurial.i18n import _
17 from mercurial.node import hex
17 from mercurial.node import hex
18 from hgext import rebase
18 from hgext import rebase
19
19
20 import lfutil
20 import lfutil
21 import lfcommands
21 import lfcommands
22
22
23 # -- Utility functions: commonly/repeatedly needed functionality ---------------
23 # -- Utility functions: commonly/repeatedly needed functionality ---------------
24
24
25 def installnormalfilesmatchfn(manifest):
25 def installnormalfilesmatchfn(manifest):
26 '''overrides scmutil.match so that the matcher it returns will ignore all
26 '''overrides scmutil.match so that the matcher it returns will ignore all
27 largefiles'''
27 largefiles'''
28 oldmatch = None # for the closure
28 oldmatch = None # for the closure
29 def overridematch(ctx, pats=[], opts={}, globbed=False,
29 def overridematch(ctx, pats=[], opts={}, globbed=False,
30 default='relpath'):
30 default='relpath'):
31 match = oldmatch(ctx, pats, opts, globbed, default)
31 match = oldmatch(ctx, pats, opts, globbed, default)
32 m = copy.copy(match)
32 m = copy.copy(match)
33 notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in
33 notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in
34 manifest)
34 manifest)
35 m._files = filter(notlfile, m._files)
35 m._files = filter(notlfile, m._files)
36 m._fmap = set(m._files)
36 m._fmap = set(m._files)
37 origmatchfn = m.matchfn
37 origmatchfn = m.matchfn
38 m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None
38 m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None
39 return m
39 return m
40 oldmatch = installmatchfn(overridematch)
40 oldmatch = installmatchfn(overridematch)
41
41
42 def installmatchfn(f):
42 def installmatchfn(f):
43 oldmatch = scmutil.match
43 oldmatch = scmutil.match
44 setattr(f, 'oldmatch', oldmatch)
44 setattr(f, 'oldmatch', oldmatch)
45 scmutil.match = f
45 scmutil.match = f
46 return oldmatch
46 return oldmatch
47
47
48 def restorematchfn():
48 def restorematchfn():
49 '''restores scmutil.match to what it was before installnormalfilesmatchfn
49 '''restores scmutil.match to what it was before installnormalfilesmatchfn
50 was called. no-op if scmutil.match is its original function.
50 was called. no-op if scmutil.match is its original function.
51
51
52 Note that n calls to installnormalfilesmatchfn will require n calls to
52 Note that n calls to installnormalfilesmatchfn will require n calls to
53 restore matchfn to reverse'''
53 restore matchfn to reverse'''
54 scmutil.match = getattr(scmutil.match, 'oldmatch', scmutil.match)
54 scmutil.match = getattr(scmutil.match, 'oldmatch', scmutil.match)
55
55
56 def addlargefiles(ui, repo, *pats, **opts):
56 def addlargefiles(ui, repo, *pats, **opts):
57 large = opts.pop('large', None)
57 large = opts.pop('large', None)
58 lfsize = lfutil.getminsize(
58 lfsize = lfutil.getminsize(
59 ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None))
59 ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None))
60
60
61 lfmatcher = None
61 lfmatcher = None
62 if lfutil.islfilesrepo(repo):
62 if lfutil.islfilesrepo(repo):
63 lfpats = ui.configlist(lfutil.longname, 'patterns', default=[])
63 lfpats = ui.configlist(lfutil.longname, 'patterns', default=[])
64 if lfpats:
64 if lfpats:
65 lfmatcher = match_.match(repo.root, '', list(lfpats))
65 lfmatcher = match_.match(repo.root, '', list(lfpats))
66
66
67 lfnames = []
67 lfnames = []
68 m = scmutil.match(repo[None], pats, opts)
68 m = scmutil.match(repo[None], pats, opts)
69 m.bad = lambda x, y: None
69 m.bad = lambda x, y: None
70 wctx = repo[None]
70 wctx = repo[None]
71 for f in repo.walk(m):
71 for f in repo.walk(m):
72 exact = m.exact(f)
72 exact = m.exact(f)
73 lfile = lfutil.standin(f) in wctx
73 lfile = lfutil.standin(f) in wctx
74 nfile = f in wctx
74 nfile = f in wctx
75 exists = lfile or nfile
75 exists = lfile or nfile
76
76
77 # Don't warn the user when they attempt to add a normal tracked file.
77 # Don't warn the user when they attempt to add a normal tracked file.
78 # The normal add code will do that for us.
78 # The normal add code will do that for us.
79 if exact and exists:
79 if exact and exists:
80 if lfile:
80 if lfile:
81 ui.warn(_('%s already a largefile\n') % f)
81 ui.warn(_('%s already a largefile\n') % f)
82 continue
82 continue
83
83
84 if (exact or not exists) and not lfutil.isstandin(f):
84 if (exact or not exists) and not lfutil.isstandin(f):
85 wfile = repo.wjoin(f)
85 wfile = repo.wjoin(f)
86
86
87 # In case the file was removed previously, but not committed
87 # In case the file was removed previously, but not committed
88 # (issue3507)
88 # (issue3507)
89 if not os.path.exists(wfile):
89 if not os.path.exists(wfile):
90 continue
90 continue
91
91
92 abovemin = (lfsize and
92 abovemin = (lfsize and
93 os.lstat(wfile).st_size >= lfsize * 1024 * 1024)
93 os.lstat(wfile).st_size >= lfsize * 1024 * 1024)
94 if large or abovemin or (lfmatcher and lfmatcher(f)):
94 if large or abovemin or (lfmatcher and lfmatcher(f)):
95 lfnames.append(f)
95 lfnames.append(f)
96 if ui.verbose or not exact:
96 if ui.verbose or not exact:
97 ui.status(_('adding %s as a largefile\n') % m.rel(f))
97 ui.status(_('adding %s as a largefile\n') % m.rel(f))
98
98
99 bad = []
99 bad = []
100 standins = []
100 standins = []
101
101
102 # Need to lock, otherwise there could be a race condition between
102 # Need to lock, otherwise there could be a race condition between
103 # when standins are created and added to the repo.
103 # when standins are created and added to the repo.
104 wlock = repo.wlock()
104 wlock = repo.wlock()
105 try:
105 try:
106 if not opts.get('dry_run'):
106 if not opts.get('dry_run'):
107 lfdirstate = lfutil.openlfdirstate(ui, repo)
107 lfdirstate = lfutil.openlfdirstate(ui, repo)
108 for f in lfnames:
108 for f in lfnames:
109 standinname = lfutil.standin(f)
109 standinname = lfutil.standin(f)
110 lfutil.writestandin(repo, standinname, hash='',
110 lfutil.writestandin(repo, standinname, hash='',
111 executable=lfutil.getexecutable(repo.wjoin(f)))
111 executable=lfutil.getexecutable(repo.wjoin(f)))
112 standins.append(standinname)
112 standins.append(standinname)
113 if lfdirstate[f] == 'r':
113 if lfdirstate[f] == 'r':
114 lfdirstate.normallookup(f)
114 lfdirstate.normallookup(f)
115 else:
115 else:
116 lfdirstate.add(f)
116 lfdirstate.add(f)
117 lfdirstate.write()
117 lfdirstate.write()
118 bad += [lfutil.splitstandin(f)
118 bad += [lfutil.splitstandin(f)
119 for f in lfutil.repoadd(repo, standins)
119 for f in lfutil.repoadd(repo, standins)
120 if f in m.files()]
120 if f in m.files()]
121 finally:
121 finally:
122 wlock.release()
122 wlock.release()
123 return bad
123 return bad
124
124
125 def removelargefiles(ui, repo, *pats, **opts):
125 def removelargefiles(ui, repo, *pats, **opts):
126 after = opts.get('after')
126 after = opts.get('after')
127 if not pats and not after:
127 if not pats and not after:
128 raise util.Abort(_('no files specified'))
128 raise util.Abort(_('no files specified'))
129 m = scmutil.match(repo[None], pats, opts)
129 m = scmutil.match(repo[None], pats, opts)
130 try:
130 try:
131 repo.lfstatus = True
131 repo.lfstatus = True
132 s = repo.status(match=m, clean=True)
132 s = repo.status(match=m, clean=True)
133 finally:
133 finally:
134 repo.lfstatus = False
134 repo.lfstatus = False
135 manifest = repo[None].manifest()
135 manifest = repo[None].manifest()
136 modified, added, deleted, clean = [[f for f in list
136 modified, added, deleted, clean = [[f for f in list
137 if lfutil.standin(f) in manifest]
137 if lfutil.standin(f) in manifest]
138 for list in [s[0], s[1], s[3], s[6]]]
138 for list in [s[0], s[1], s[3], s[6]]]
139
139
140 def warn(files, reason):
140 def warn(files, reason):
141 for f in files:
141 for f in files:
142 ui.warn(_('not removing %s: %s (use forget to undo)\n')
142 ui.warn(_('not removing %s: %s (use forget to undo)\n')
143 % (m.rel(f), reason))
143 % (m.rel(f), reason))
144 return int(len(files) > 0)
144 return int(len(files) > 0)
145
145
146 result = 0
146 result = 0
147
147
148 if after:
148 if after:
149 remove, forget = deleted, []
149 remove, forget = deleted, []
150 result = warn(modified + added + clean, _('file still exists'))
150 result = warn(modified + added + clean, _('file still exists'))
151 else:
151 else:
152 remove, forget = deleted + clean, []
152 remove, forget = deleted + clean, []
153 result = warn(modified, _('file is modified'))
153 result = warn(modified, _('file is modified'))
154 result = warn(added, _('file has been marked for add')) or result
154 result = warn(added, _('file has been marked for add')) or result
155
155
156 for f in sorted(remove + forget):
156 for f in sorted(remove + forget):
157 if ui.verbose or not m.exact(f):
157 if ui.verbose or not m.exact(f):
158 ui.status(_('removing %s\n') % m.rel(f))
158 ui.status(_('removing %s\n') % m.rel(f))
159
159
160 # Need to lock because standin files are deleted then removed from the
160 # Need to lock because standin files are deleted then removed from the
161 # repository and we could race inbetween.
161 # repository and we could race inbetween.
162 wlock = repo.wlock()
162 wlock = repo.wlock()
163 try:
163 try:
164 lfdirstate = lfutil.openlfdirstate(ui, repo)
164 lfdirstate = lfutil.openlfdirstate(ui, repo)
165 for f in remove:
165 for f in remove:
166 if not after:
166 if not after:
167 # If this is being called by addremove, notify the user that we
167 # If this is being called by addremove, notify the user that we
168 # are removing the file.
168 # are removing the file.
169 if getattr(repo, "_isaddremove", False):
169 if getattr(repo, "_isaddremove", False):
170 ui.status(_('removing %s\n') % f)
170 ui.status(_('removing %s\n') % f)
171 if os.path.exists(repo.wjoin(f)):
171 if os.path.exists(repo.wjoin(f)):
172 util.unlinkpath(repo.wjoin(f))
172 util.unlinkpath(repo.wjoin(f))
173 lfdirstate.remove(f)
173 lfdirstate.remove(f)
174 lfdirstate.write()
174 lfdirstate.write()
175 forget = [lfutil.standin(f) for f in forget]
175 forget = [lfutil.standin(f) for f in forget]
176 remove = [lfutil.standin(f) for f in remove]
176 remove = [lfutil.standin(f) for f in remove]
177 lfutil.repoforget(repo, forget)
177 lfutil.repoforget(repo, forget)
178 # If this is being called by addremove, let the original addremove
178 # If this is being called by addremove, let the original addremove
179 # function handle this.
179 # function handle this.
180 if not getattr(repo, "_isaddremove", False):
180 if not getattr(repo, "_isaddremove", False):
181 lfutil.reporemove(repo, remove, unlink=True)
181 lfutil.reporemove(repo, remove, unlink=True)
182 else:
182 else:
183 lfutil.reporemove(repo, remove, unlink=False)
183 lfutil.reporemove(repo, remove, unlink=False)
184 finally:
184 finally:
185 wlock.release()
185 wlock.release()
186
186
187 return result
187 return result
188
188
189 # For overriding mercurial.hgweb.webcommands so that largefiles will
189 # For overriding mercurial.hgweb.webcommands so that largefiles will
190 # appear at their right place in the manifests.
190 # appear at their right place in the manifests.
191 def decodepath(orig, path):
191 def decodepath(orig, path):
192 return lfutil.splitstandin(path) or path
192 return lfutil.splitstandin(path) or path
193
193
194 # -- Wrappers: modify existing commands --------------------------------
194 # -- Wrappers: modify existing commands --------------------------------
195
195
196 # Add works by going through the files that the user wanted to add and
196 # Add works by going through the files that the user wanted to add and
197 # checking if they should be added as largefiles. Then it makes a new
197 # checking if they should be added as largefiles. Then it makes a new
198 # matcher which matches only the normal files and runs the original
198 # matcher which matches only the normal files and runs the original
199 # version of add.
199 # version of add.
200 def overrideadd(orig, ui, repo, *pats, **opts):
200 def overrideadd(orig, ui, repo, *pats, **opts):
201 normal = opts.pop('normal')
201 normal = opts.pop('normal')
202 if normal:
202 if normal:
203 if opts.get('large'):
203 if opts.get('large'):
204 raise util.Abort(_('--normal cannot be used with --large'))
204 raise util.Abort(_('--normal cannot be used with --large'))
205 return orig(ui, repo, *pats, **opts)
205 return orig(ui, repo, *pats, **opts)
206 bad = addlargefiles(ui, repo, *pats, **opts)
206 bad = addlargefiles(ui, repo, *pats, **opts)
207 installnormalfilesmatchfn(repo[None].manifest())
207 installnormalfilesmatchfn(repo[None].manifest())
208 result = orig(ui, repo, *pats, **opts)
208 result = orig(ui, repo, *pats, **opts)
209 restorematchfn()
209 restorematchfn()
210
210
211 return (result == 1 or bad) and 1 or 0
211 return (result == 1 or bad) and 1 or 0
212
212
213 def overrideremove(orig, ui, repo, *pats, **opts):
213 def overrideremove(orig, ui, repo, *pats, **opts):
214 installnormalfilesmatchfn(repo[None].manifest())
214 installnormalfilesmatchfn(repo[None].manifest())
215 result = orig(ui, repo, *pats, **opts)
215 result = orig(ui, repo, *pats, **opts)
216 restorematchfn()
216 restorematchfn()
217 return removelargefiles(ui, repo, *pats, **opts) or result
217 return removelargefiles(ui, repo, *pats, **opts) or result
218
218
219 def overridestatusfn(orig, repo, rev2, **opts):
219 def overridestatusfn(orig, repo, rev2, **opts):
220 try:
220 try:
221 repo._repo.lfstatus = True
221 repo._repo.lfstatus = True
222 return orig(repo, rev2, **opts)
222 return orig(repo, rev2, **opts)
223 finally:
223 finally:
224 repo._repo.lfstatus = False
224 repo._repo.lfstatus = False
225
225
226 def overridestatus(orig, ui, repo, *pats, **opts):
226 def overridestatus(orig, ui, repo, *pats, **opts):
227 try:
227 try:
228 repo.lfstatus = True
228 repo.lfstatus = True
229 return orig(ui, repo, *pats, **opts)
229 return orig(ui, repo, *pats, **opts)
230 finally:
230 finally:
231 repo.lfstatus = False
231 repo.lfstatus = False
232
232
233 def overridedirty(orig, repo, ignoreupdate=False):
233 def overridedirty(orig, repo, ignoreupdate=False):
234 try:
234 try:
235 repo._repo.lfstatus = True
235 repo._repo.lfstatus = True
236 return orig(repo, ignoreupdate)
236 return orig(repo, ignoreupdate)
237 finally:
237 finally:
238 repo._repo.lfstatus = False
238 repo._repo.lfstatus = False
239
239
240 def overridelog(orig, ui, repo, *pats, **opts):
240 def overridelog(orig, ui, repo, *pats, **opts):
241 try:
241 try:
242 repo.lfstatus = True
242 repo.lfstatus = True
243 return orig(ui, repo, *pats, **opts)
243 return orig(ui, repo, *pats, **opts)
244 finally:
244 finally:
245 repo.lfstatus = False
245 repo.lfstatus = False
246
246
247 def overrideverify(orig, ui, repo, *pats, **opts):
247 def overrideverify(orig, ui, repo, *pats, **opts):
248 large = opts.pop('large', False)
248 large = opts.pop('large', False)
249 all = opts.pop('lfa', False)
249 all = opts.pop('lfa', False)
250 contents = opts.pop('lfc', False)
250 contents = opts.pop('lfc', False)
251
251
252 result = orig(ui, repo, *pats, **opts)
252 result = orig(ui, repo, *pats, **opts)
253 if large:
253 if large:
254 result = result or lfcommands.verifylfiles(ui, repo, all, contents)
254 result = result or lfcommands.verifylfiles(ui, repo, all, contents)
255 return result
255 return result
256
256
257 # Override needs to refresh standins so that update's normal merge
257 # Override needs to refresh standins so that update's normal merge
258 # will go through properly. Then the other update hook (overriding repo.update)
258 # will go through properly. Then the other update hook (overriding repo.update)
259 # will get the new files. Filemerge is also overriden so that the merge
259 # will get the new files. Filemerge is also overriden so that the merge
260 # will merge standins correctly.
260 # will merge standins correctly.
261 def overrideupdate(orig, ui, repo, *pats, **opts):
261 def overrideupdate(orig, ui, repo, *pats, **opts):
262 lfdirstate = lfutil.openlfdirstate(ui, repo)
262 lfdirstate = lfutil.openlfdirstate(ui, repo)
263 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False,
263 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False,
264 False, False)
264 False, False)
265 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s
265 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s
266
266
267 # Need to lock between the standins getting updated and their
267 # Need to lock between the standins getting updated and their
268 # largefiles getting updated
268 # largefiles getting updated
269 wlock = repo.wlock()
269 wlock = repo.wlock()
270 try:
270 try:
271 if opts['check']:
271 if opts['check']:
272 mod = len(modified) > 0
272 mod = len(modified) > 0
273 for lfile in unsure:
273 for lfile in unsure:
274 standin = lfutil.standin(lfile)
274 standin = lfutil.standin(lfile)
275 if repo['.'][standin].data().strip() != \
275 if repo['.'][standin].data().strip() != \
276 lfutil.hashfile(repo.wjoin(lfile)):
276 lfutil.hashfile(repo.wjoin(lfile)):
277 mod = True
277 mod = True
278 else:
278 else:
279 lfdirstate.normal(lfile)
279 lfdirstate.normal(lfile)
280 lfdirstate.write()
280 lfdirstate.write()
281 if mod:
281 if mod:
282 raise util.Abort(_('uncommitted local changes'))
282 raise util.Abort(_('uncommitted local changes'))
283 # XXX handle removed differently
283 # XXX handle removed differently
284 if not opts['clean']:
284 if not opts['clean']:
285 for lfile in unsure + modified + added:
285 for lfile in unsure + modified + added:
286 lfutil.updatestandin(repo, lfutil.standin(lfile))
286 lfutil.updatestandin(repo, lfutil.standin(lfile))
287 finally:
287 finally:
288 wlock.release()
288 wlock.release()
289 return orig(ui, repo, *pats, **opts)
289 return orig(ui, repo, *pats, **opts)
290
290
291 # Before starting the manifest merge, merge.updates will call
291 # Before starting the manifest merge, merge.updates will call
292 # _checkunknown to check if there are any files in the merged-in
292 # _checkunknown to check if there are any files in the merged-in
293 # changeset that collide with unknown files in the working copy.
293 # changeset that collide with unknown files in the working copy.
294 #
294 #
295 # The largefiles are seen as unknown, so this prevents us from merging
295 # The largefiles are seen as unknown, so this prevents us from merging
296 # in a file 'foo' if we already have a largefile with the same name.
296 # in a file 'foo' if we already have a largefile with the same name.
297 #
297 #
298 # The overridden function filters the unknown files by removing any
298 # The overridden function filters the unknown files by removing any
299 # largefiles. This makes the merge proceed and we can then handle this
299 # largefiles. This makes the merge proceed and we can then handle this
300 # case further in the overridden manifestmerge function below.
300 # case further in the overridden manifestmerge function below.
301 def overridecheckunknownfile(origfn, repo, wctx, mctx, f):
301 def overridecheckunknownfile(origfn, repo, wctx, mctx, f):
302 if lfutil.standin(f) in wctx:
302 if lfutil.standin(f) in wctx:
303 return False
303 return False
304 return origfn(repo, wctx, mctx, f)
304 return origfn(repo, wctx, mctx, f)
305
305
306 # The manifest merge handles conflicts on the manifest level. We want
306 # The manifest merge handles conflicts on the manifest level. We want
307 # to handle changes in largefile-ness of files at this level too.
307 # to handle changes in largefile-ness of files at this level too.
308 #
308 #
309 # The strategy is to run the original manifestmerge and then process
309 # The strategy is to run the original manifestmerge and then process
310 # the action list it outputs. There are two cases we need to deal with:
310 # the action list it outputs. There are two cases we need to deal with:
311 #
311 #
312 # 1. Normal file in p1, largefile in p2. Here the largefile is
312 # 1. Normal file in p1, largefile in p2. Here the largefile is
313 # detected via its standin file, which will enter the working copy
313 # detected via its standin file, which will enter the working copy
314 # with a "get" action. It is not "merge" since the standin is all
314 # with a "get" action. It is not "merge" since the standin is all
315 # Mercurial is concerned with at this level -- the link to the
315 # Mercurial is concerned with at this level -- the link to the
316 # existing normal file is not relevant here.
316 # existing normal file is not relevant here.
317 #
317 #
318 # 2. Largefile in p1, normal file in p2. Here we get a "merge" action
318 # 2. Largefile in p1, normal file in p2. Here we get a "merge" action
319 # since the largefile will be present in the working copy and
319 # since the largefile will be present in the working copy and
320 # different from the normal file in p2. Mercurial therefore
320 # different from the normal file in p2. Mercurial therefore
321 # triggers a merge action.
321 # triggers a merge action.
322 #
322 #
323 # In both cases, we prompt the user and emit new actions to either
323 # In both cases, we prompt the user and emit new actions to either
324 # remove the standin (if the normal file was kept) or to remove the
324 # remove the standin (if the normal file was kept) or to remove the
325 # normal file and get the standin (if the largefile was kept). The
325 # normal file and get the standin (if the largefile was kept). The
326 # default prompt answer is to use the largefile version since it was
326 # default prompt answer is to use the largefile version since it was
327 # presumably changed on purpose.
327 # presumably changed on purpose.
328 #
328 #
329 # Finally, the merge.applyupdates function will then take care of
329 # Finally, the merge.applyupdates function will then take care of
330 # writing the files into the working copy and lfcommands.updatelfiles
330 # writing the files into the working copy and lfcommands.updatelfiles
331 # will update the largefiles.
331 # will update the largefiles.
332 def overridemanifestmerge(origfn, repo, p1, p2, pa, overwrite, partial):
332 def overridemanifestmerge(origfn, repo, p1, p2, pa, overwrite, partial):
333 actions = origfn(repo, p1, p2, pa, overwrite, partial)
333 actions = origfn(repo, p1, p2, pa, overwrite, partial)
334 processed = []
334 processed = []
335
335
336 for action in actions:
336 for action in actions:
337 if overwrite:
337 if overwrite:
338 processed.append(action)
338 processed.append(action)
339 continue
339 continue
340 f, m = action[:2]
340 f, m = action[:2]
341
341
342 choices = (_('&Largefile'), _('&Normal file'))
342 choices = (_('&Largefile'), _('&Normal file'))
343 if m == "g" and lfutil.splitstandin(f) in p1 and f in p2:
343 if m == "g" and lfutil.splitstandin(f) in p1 and f in p2:
344 # Case 1: normal file in the working copy, largefile in
344 # Case 1: normal file in the working copy, largefile in
345 # the second parent
345 # the second parent
346 lfile = lfutil.splitstandin(f)
346 lfile = lfutil.splitstandin(f)
347 standin = f
347 standin = f
348 msg = _('%s has been turned into a largefile\n'
348 msg = _('%s has been turned into a largefile\n'
349 'use (l)argefile or keep as (n)ormal file?') % lfile
349 'use (l)argefile or keep as (n)ormal file?') % lfile
350 if repo.ui.promptchoice(msg, choices, 0) == 0:
350 if repo.ui.promptchoice(msg, choices, 0) == 0:
351 processed.append((lfile, "r"))
351 processed.append((lfile, "r"))
352 processed.append((standin, "g", p2.flags(standin)))
352 processed.append((standin, "g", p2.flags(standin)))
353 else:
353 else:
354 processed.append((standin, "r"))
354 processed.append((standin, "r"))
355 elif m == "g" and lfutil.standin(f) in p1 and f in p2:
355 elif m == "g" and lfutil.standin(f) in p1 and f in p2:
356 # Case 2: largefile in the working copy, normal file in
356 # Case 2: largefile in the working copy, normal file in
357 # the second parent
357 # the second parent
358 standin = lfutil.standin(f)
358 standin = lfutil.standin(f)
359 lfile = f
359 lfile = f
360 msg = _('%s has been turned into a normal file\n'
360 msg = _('%s has been turned into a normal file\n'
361 'keep as (l)argefile or use (n)ormal file?') % lfile
361 'keep as (l)argefile or use (n)ormal file?') % lfile
362 if repo.ui.promptchoice(msg, choices, 0) == 0:
362 if repo.ui.promptchoice(msg, choices, 0) == 0:
363 processed.append((lfile, "r"))
363 processed.append((lfile, "r"))
364 else:
364 else:
365 processed.append((standin, "r"))
365 processed.append((standin, "r"))
366 processed.append((lfile, "g", p2.flags(lfile)))
366 processed.append((lfile, "g", p2.flags(lfile)))
367 else:
367 else:
368 processed.append(action)
368 processed.append(action)
369
369
370 return processed
370 return processed
371
371
372 # Override filemerge to prompt the user about how they wish to merge
372 # Override filemerge to prompt the user about how they wish to merge
373 # largefiles. This will handle identical edits, and copy/rename +
373 # largefiles. This will handle identical edits, and copy/rename +
374 # edit without prompting the user.
374 # edit without prompting the user.
375 def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca):
375 def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca):
376 # Use better variable names here. Because this is a wrapper we cannot
376 # Use better variable names here. Because this is a wrapper we cannot
377 # change the variable names in the function declaration.
377 # change the variable names in the function declaration.
378 fcdest, fcother, fcancestor = fcd, fco, fca
378 fcdest, fcother, fcancestor = fcd, fco, fca
379 if not lfutil.isstandin(orig):
379 if not lfutil.isstandin(orig):
380 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor)
380 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor)
381 else:
381 else:
382 if not fcother.cmp(fcdest): # files identical?
382 if not fcother.cmp(fcdest): # files identical?
383 return None
383 return None
384
384
385 # backwards, use working dir parent as ancestor
385 # backwards, use working dir parent as ancestor
386 if fcancestor == fcother:
386 if fcancestor == fcother:
387 fcancestor = fcdest.parents()[0]
387 fcancestor = fcdest.parents()[0]
388
388
389 if orig != fcother.path():
389 if orig != fcother.path():
390 repo.ui.status(_('merging %s and %s to %s\n')
390 repo.ui.status(_('merging %s and %s to %s\n')
391 % (lfutil.splitstandin(orig),
391 % (lfutil.splitstandin(orig),
392 lfutil.splitstandin(fcother.path()),
392 lfutil.splitstandin(fcother.path()),
393 lfutil.splitstandin(fcdest.path())))
393 lfutil.splitstandin(fcdest.path())))
394 else:
394 else:
395 repo.ui.status(_('merging %s\n')
395 repo.ui.status(_('merging %s\n')
396 % lfutil.splitstandin(fcdest.path()))
396 % lfutil.splitstandin(fcdest.path()))
397
397
398 if fcancestor.path() != fcother.path() and fcother.data() == \
398 if fcancestor.path() != fcother.path() and fcother.data() == \
399 fcancestor.data():
399 fcancestor.data():
400 return 0
400 return 0
401 if fcancestor.path() != fcdest.path() and fcdest.data() == \
401 if fcancestor.path() != fcdest.path() and fcdest.data() == \
402 fcancestor.data():
402 fcancestor.data():
403 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())
403 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())
404 return 0
404 return 0
405
405
406 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n'
406 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n'
407 'keep (l)ocal or take (o)ther?') %
407 'keep (l)ocal or take (o)ther?') %
408 lfutil.splitstandin(orig),
408 lfutil.splitstandin(orig),
409 (_('&Local'), _('&Other')), 0) == 0:
409 (_('&Local'), _('&Other')), 0) == 0:
410 return 0
410 return 0
411 else:
411 else:
412 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())
412 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())
413 return 0
413 return 0
414
414
415 # Copy first changes the matchers to match standins instead of
415 # Copy first changes the matchers to match standins instead of
416 # largefiles. Then it overrides util.copyfile in that function it
416 # largefiles. Then it overrides util.copyfile in that function it
417 # checks if the destination largefile already exists. It also keeps a
417 # checks if the destination largefile already exists. It also keeps a
418 # list of copied files so that the largefiles can be copied and the
418 # list of copied files so that the largefiles can be copied and the
419 # dirstate updated.
419 # dirstate updated.
420 def overridecopy(orig, ui, repo, pats, opts, rename=False):
420 def overridecopy(orig, ui, repo, pats, opts, rename=False):
421 # doesn't remove largefile on rename
421 # doesn't remove largefile on rename
422 if len(pats) < 2:
422 if len(pats) < 2:
423 # this isn't legal, let the original function deal with it
423 # this isn't legal, let the original function deal with it
424 return orig(ui, repo, pats, opts, rename)
424 return orig(ui, repo, pats, opts, rename)
425
425
426 def makestandin(relpath):
426 def makestandin(relpath):
427 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath)
427 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath)
428 return os.path.join(repo.wjoin(lfutil.standin(path)))
428 return os.path.join(repo.wjoin(lfutil.standin(path)))
429
429
430 fullpats = scmutil.expandpats(pats)
430 fullpats = scmutil.expandpats(pats)
431 dest = fullpats[-1]
431 dest = fullpats[-1]
432
432
433 if os.path.isdir(dest):
433 if os.path.isdir(dest):
434 if not os.path.isdir(makestandin(dest)):
434 if not os.path.isdir(makestandin(dest)):
435 os.makedirs(makestandin(dest))
435 os.makedirs(makestandin(dest))
436 # This could copy both lfiles and normal files in one command,
436 # This could copy both lfiles and normal files in one command,
437 # but we don't want to do that. First replace their matcher to
437 # but we don't want to do that. First replace their matcher to
438 # only match normal files and run it, then replace it to just
438 # only match normal files and run it, then replace it to just
439 # match largefiles and run it again.
439 # match largefiles and run it again.
440 nonormalfiles = False
440 nonormalfiles = False
441 nolfiles = False
441 nolfiles = False
442 try:
442 try:
443 try:
443 try:
444 installnormalfilesmatchfn(repo[None].manifest())
444 installnormalfilesmatchfn(repo[None].manifest())
445 result = orig(ui, repo, pats, opts, rename)
445 result = orig(ui, repo, pats, opts, rename)
446 except util.Abort, e:
446 except util.Abort, e:
447 if str(e) != _('no files to copy'):
447 if str(e) != _('no files to copy'):
448 raise e
448 raise e
449 else:
449 else:
450 nonormalfiles = True
450 nonormalfiles = True
451 result = 0
451 result = 0
452 finally:
452 finally:
453 restorematchfn()
453 restorematchfn()
454
454
455 # The first rename can cause our current working directory to be removed.
455 # The first rename can cause our current working directory to be removed.
456 # In that case there is nothing left to copy/rename so just quit.
456 # In that case there is nothing left to copy/rename so just quit.
457 try:
457 try:
458 repo.getcwd()
458 repo.getcwd()
459 except OSError:
459 except OSError:
460 return result
460 return result
461
461
462 try:
462 try:
463 try:
463 try:
464 # When we call orig below it creates the standins but we don't add
464 # When we call orig below it creates the standins but we don't add
465 # them to the dir state until later so lock during that time.
465 # them to the dir state until later so lock during that time.
466 wlock = repo.wlock()
466 wlock = repo.wlock()
467
467
468 manifest = repo[None].manifest()
468 manifest = repo[None].manifest()
469 oldmatch = None # for the closure
469 oldmatch = None # for the closure
470 def overridematch(ctx, pats=[], opts={}, globbed=False,
470 def overridematch(ctx, pats=[], opts={}, globbed=False,
471 default='relpath'):
471 default='relpath'):
472 newpats = []
472 newpats = []
473 # The patterns were previously mangled to add the standin
473 # The patterns were previously mangled to add the standin
474 # directory; we need to remove that now
474 # directory; we need to remove that now
475 for pat in pats:
475 for pat in pats:
476 if match_.patkind(pat) is None and lfutil.shortname in pat:
476 if match_.patkind(pat) is None and lfutil.shortname in pat:
477 newpats.append(pat.replace(lfutil.shortname, ''))
477 newpats.append(pat.replace(lfutil.shortname, ''))
478 else:
478 else:
479 newpats.append(pat)
479 newpats.append(pat)
480 match = oldmatch(ctx, newpats, opts, globbed, default)
480 match = oldmatch(ctx, newpats, opts, globbed, default)
481 m = copy.copy(match)
481 m = copy.copy(match)
482 lfile = lambda f: lfutil.standin(f) in manifest
482 lfile = lambda f: lfutil.standin(f) in manifest
483 m._files = [lfutil.standin(f) for f in m._files if lfile(f)]
483 m._files = [lfutil.standin(f) for f in m._files if lfile(f)]
484 m._fmap = set(m._files)
484 m._fmap = set(m._files)
485 origmatchfn = m.matchfn
485 origmatchfn = m.matchfn
486 m.matchfn = lambda f: (lfutil.isstandin(f) and
486 m.matchfn = lambda f: (lfutil.isstandin(f) and
487 (f in manifest) and
487 (f in manifest) and
488 origmatchfn(lfutil.splitstandin(f)) or
488 origmatchfn(lfutil.splitstandin(f)) or
489 None)
489 None)
490 return m
490 return m
491 oldmatch = installmatchfn(overridematch)
491 oldmatch = installmatchfn(overridematch)
492 listpats = []
492 listpats = []
493 for pat in pats:
493 for pat in pats:
494 if match_.patkind(pat) is not None:
494 if match_.patkind(pat) is not None:
495 listpats.append(pat)
495 listpats.append(pat)
496 else:
496 else:
497 listpats.append(makestandin(pat))
497 listpats.append(makestandin(pat))
498
498
499 try:
499 try:
500 origcopyfile = util.copyfile
500 origcopyfile = util.copyfile
501 copiedfiles = []
501 copiedfiles = []
502 def overridecopyfile(src, dest):
502 def overridecopyfile(src, dest):
503 if (lfutil.shortname in src and
503 if (lfutil.shortname in src and
504 dest.startswith(repo.wjoin(lfutil.shortname))):
504 dest.startswith(repo.wjoin(lfutil.shortname))):
505 destlfile = dest.replace(lfutil.shortname, '')
505 destlfile = dest.replace(lfutil.shortname, '')
506 if not opts['force'] and os.path.exists(destlfile):
506 if not opts['force'] and os.path.exists(destlfile):
507 raise IOError('',
507 raise IOError('',
508 _('destination largefile already exists'))
508 _('destination largefile already exists'))
509 copiedfiles.append((src, dest))
509 copiedfiles.append((src, dest))
510 origcopyfile(src, dest)
510 origcopyfile(src, dest)
511
511
512 util.copyfile = overridecopyfile
512 util.copyfile = overridecopyfile
513 result += orig(ui, repo, listpats, opts, rename)
513 result += orig(ui, repo, listpats, opts, rename)
514 finally:
514 finally:
515 util.copyfile = origcopyfile
515 util.copyfile = origcopyfile
516
516
517 lfdirstate = lfutil.openlfdirstate(ui, repo)
517 lfdirstate = lfutil.openlfdirstate(ui, repo)
518 for (src, dest) in copiedfiles:
518 for (src, dest) in copiedfiles:
519 if (lfutil.shortname in src and
519 if (lfutil.shortname in src and
520 dest.startswith(repo.wjoin(lfutil.shortname))):
520 dest.startswith(repo.wjoin(lfutil.shortname))):
521 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '')
521 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '')
522 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '')
522 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '')
523 destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.'
523 destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.'
524 if not os.path.isdir(destlfiledir):
524 if not os.path.isdir(destlfiledir):
525 os.makedirs(destlfiledir)
525 os.makedirs(destlfiledir)
526 if rename:
526 if rename:
527 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile))
527 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile))
528 lfdirstate.remove(srclfile)
528 lfdirstate.remove(srclfile)
529 else:
529 else:
530 util.copyfile(repo.wjoin(srclfile),
530 util.copyfile(repo.wjoin(srclfile),
531 repo.wjoin(destlfile))
531 repo.wjoin(destlfile))
532
532
533 lfdirstate.add(destlfile)
533 lfdirstate.add(destlfile)
534 lfdirstate.write()
534 lfdirstate.write()
535 except util.Abort, e:
535 except util.Abort, e:
536 if str(e) != _('no files to copy'):
536 if str(e) != _('no files to copy'):
537 raise e
537 raise e
538 else:
538 else:
539 nolfiles = True
539 nolfiles = True
540 finally:
540 finally:
541 restorematchfn()
541 restorematchfn()
542 wlock.release()
542 wlock.release()
543
543
544 if nolfiles and nonormalfiles:
544 if nolfiles and nonormalfiles:
545 raise util.Abort(_('no files to copy'))
545 raise util.Abort(_('no files to copy'))
546
546
547 return result
547 return result
548
548
549 # When the user calls revert, we have to be careful to not revert any
549 # When the user calls revert, we have to be careful to not revert any
550 # changes to other largefiles accidentally. This means we have to keep
550 # changes to other largefiles accidentally. This means we have to keep
551 # track of the largefiles that are being reverted so we only pull down
551 # track of the largefiles that are being reverted so we only pull down
552 # the necessary largefiles.
552 # the necessary largefiles.
553 #
553 #
554 # Standins are only updated (to match the hash of largefiles) before
554 # Standins are only updated (to match the hash of largefiles) before
555 # commits. Update the standins then run the original revert, changing
555 # commits. Update the standins then run the original revert, changing
556 # the matcher to hit standins instead of largefiles. Based on the
556 # the matcher to hit standins instead of largefiles. Based on the
557 # resulting standins update the largefiles. Then return the standins
557 # resulting standins update the largefiles. Then return the standins
558 # to their proper state
558 # to their proper state
559 def overriderevert(orig, ui, repo, *pats, **opts):
559 def overriderevert(orig, ui, repo, *pats, **opts):
560 # Because we put the standins in a bad state (by updating them)
560 # Because we put the standins in a bad state (by updating them)
561 # and then return them to a correct state we need to lock to
561 # and then return them to a correct state we need to lock to
562 # prevent others from changing them in their incorrect state.
562 # prevent others from changing them in their incorrect state.
563 wlock = repo.wlock()
563 wlock = repo.wlock()
564 try:
564 try:
565 lfdirstate = lfutil.openlfdirstate(ui, repo)
565 lfdirstate = lfutil.openlfdirstate(ui, repo)
566 (modified, added, removed, missing, unknown, ignored, clean) = \
566 (modified, added, removed, missing, unknown, ignored, clean) = \
567 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev())
567 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev())
568 for lfile in modified:
568 for lfile in modified:
569 lfutil.updatestandin(repo, lfutil.standin(lfile))
569 lfutil.updatestandin(repo, lfutil.standin(lfile))
570 for lfile in missing:
570 for lfile in missing:
571 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
571 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
572 os.unlink(repo.wjoin(lfutil.standin(lfile)))
572 os.unlink(repo.wjoin(lfutil.standin(lfile)))
573
573
574 try:
574 try:
575 ctx = scmutil.revsingle(repo, opts.get('rev'))
575 ctx = scmutil.revsingle(repo, opts.get('rev'))
576 oldmatch = None # for the closure
576 oldmatch = None # for the closure
577 def overridematch(ctx, pats=[], opts={}, globbed=False,
577 def overridematch(ctx, pats=[], opts={}, globbed=False,
578 default='relpath'):
578 default='relpath'):
579 match = oldmatch(ctx, pats, opts, globbed, default)
579 match = oldmatch(ctx, pats, opts, globbed, default)
580 m = copy.copy(match)
580 m = copy.copy(match)
581 def tostandin(f):
581 def tostandin(f):
582 if lfutil.standin(f) in ctx:
582 if lfutil.standin(f) in ctx:
583 return lfutil.standin(f)
583 return lfutil.standin(f)
584 elif lfutil.standin(f) in repo[None]:
584 elif lfutil.standin(f) in repo[None]:
585 return None
585 return None
586 return f
586 return f
587 m._files = [tostandin(f) for f in m._files]
587 m._files = [tostandin(f) for f in m._files]
588 m._files = [f for f in m._files if f is not None]
588 m._files = [f for f in m._files if f is not None]
589 m._fmap = set(m._files)
589 m._fmap = set(m._files)
590 origmatchfn = m.matchfn
590 origmatchfn = m.matchfn
591 def matchfn(f):
591 def matchfn(f):
592 if lfutil.isstandin(f):
592 if lfutil.isstandin(f):
593 # We need to keep track of what largefiles are being
593 # We need to keep track of what largefiles are being
594 # matched so we know which ones to update later --
594 # matched so we know which ones to update later --
595 # otherwise we accidentally revert changes to other
595 # otherwise we accidentally revert changes to other
596 # largefiles. This is repo-specific, so duckpunch the
596 # largefiles. This is repo-specific, so duckpunch the
597 # repo object to keep the list of largefiles for us
597 # repo object to keep the list of largefiles for us
598 # later.
598 # later.
599 if origmatchfn(lfutil.splitstandin(f)) and \
599 if origmatchfn(lfutil.splitstandin(f)) and \
600 (f in repo[None] or f in ctx):
600 (f in repo[None] or f in ctx):
601 lfileslist = getattr(repo, '_lfilestoupdate', [])
601 lfileslist = getattr(repo, '_lfilestoupdate', [])
602 lfileslist.append(lfutil.splitstandin(f))
602 lfileslist.append(lfutil.splitstandin(f))
603 repo._lfilestoupdate = lfileslist
603 repo._lfilestoupdate = lfileslist
604 return True
604 return True
605 else:
605 else:
606 return False
606 return False
607 return origmatchfn(f)
607 return origmatchfn(f)
608 m.matchfn = matchfn
608 m.matchfn = matchfn
609 return m
609 return m
610 oldmatch = installmatchfn(overridematch)
610 oldmatch = installmatchfn(overridematch)
611 scmutil.match
611 scmutil.match
612 matches = overridematch(repo[None], pats, opts)
612 matches = overridematch(repo[None], pats, opts)
613 orig(ui, repo, *pats, **opts)
613 orig(ui, repo, *pats, **opts)
614 finally:
614 finally:
615 restorematchfn()
615 restorematchfn()
616 lfileslist = getattr(repo, '_lfilestoupdate', [])
616 lfileslist = getattr(repo, '_lfilestoupdate', [])
617 lfcommands.updatelfiles(ui, repo, filelist=lfileslist,
617 lfcommands.updatelfiles(ui, repo, filelist=lfileslist,
618 printmessage=False)
618 printmessage=False)
619
619
620 # empty out the largefiles list so we start fresh next time
620 # empty out the largefiles list so we start fresh next time
621 repo._lfilestoupdate = []
621 repo._lfilestoupdate = []
622 for lfile in modified:
622 for lfile in modified:
623 if lfile in lfileslist:
623 if lfile in lfileslist:
624 if os.path.exists(repo.wjoin(lfutil.standin(lfile))) and lfile\
624 if os.path.exists(repo.wjoin(lfutil.standin(lfile))) and lfile\
625 in repo['.']:
625 in repo['.']:
626 lfutil.writestandin(repo, lfutil.standin(lfile),
626 lfutil.writestandin(repo, lfutil.standin(lfile),
627 repo['.'][lfile].data().strip(),
627 repo['.'][lfile].data().strip(),
628 'x' in repo['.'][lfile].flags())
628 'x' in repo['.'][lfile].flags())
629 lfdirstate = lfutil.openlfdirstate(ui, repo)
629 lfdirstate = lfutil.openlfdirstate(ui, repo)
630 for lfile in added:
630 for lfile in added:
631 standin = lfutil.standin(lfile)
631 standin = lfutil.standin(lfile)
632 if standin not in ctx and (standin in matches or opts.get('all')):
632 if standin not in ctx and (standin in matches or opts.get('all')):
633 if lfile in lfdirstate:
633 if lfile in lfdirstate:
634 lfdirstate.drop(lfile)
634 lfdirstate.drop(lfile)
635 util.unlinkpath(repo.wjoin(standin))
635 util.unlinkpath(repo.wjoin(standin))
636 lfdirstate.write()
636 lfdirstate.write()
637 finally:
637 finally:
638 wlock.release()
638 wlock.release()
639
639
640 def hgupdate(orig, repo, node):
640 def hgupdate(orig, repo, node):
641 # Only call updatelfiles the standins that have changed to save time
641 # Only call updatelfiles the standins that have changed to save time
642 oldstandins = lfutil.getstandinsstate(repo)
642 oldstandins = lfutil.getstandinsstate(repo)
643 result = orig(repo, node)
643 result = orig(repo, node)
644 newstandins = lfutil.getstandinsstate(repo)
644 newstandins = lfutil.getstandinsstate(repo)
645 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
645 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
646 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, printmessage=True)
646 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, printmessage=True)
647 return result
647 return result
648
648
649 def hgclean(orig, repo, node, show_stats=True):
649 def hgclean(orig, repo, node, show_stats=True):
650 result = orig(repo, node, show_stats)
650 result = orig(repo, node, show_stats)
651 lfcommands.updatelfiles(repo.ui, repo)
651 lfcommands.updatelfiles(repo.ui, repo)
652 return result
652 return result
653
653
654 def hgmerge(orig, repo, node, force=None, remind=True):
654 def hgmerge(orig, repo, node, force=None, remind=True):
655 # Mark the repo as being in the middle of a merge, so that
655 # Mark the repo as being in the middle of a merge, so that
656 # updatelfiles() will know that it needs to trust the standins in
656 # updatelfiles() will know that it needs to trust the standins in
657 # the working copy, not in the standins in the current node
657 # the working copy, not in the standins in the current node
658 repo._ismerging = True
658 repo._ismerging = True
659 try:
659 try:
660 result = orig(repo, node, force, remind)
660 result = orig(repo, node, force, remind)
661 lfcommands.updatelfiles(repo.ui, repo)
661 lfcommands.updatelfiles(repo.ui, repo)
662 finally:
662 finally:
663 repo._ismerging = False
663 repo._ismerging = False
664 return result
664 return result
665
665
666 # When we rebase a repository with remotely changed largefiles, we need to
666 # When we rebase a repository with remotely changed largefiles, we need to
667 # take some extra care so that the largefiles are correctly updated in the
667 # take some extra care so that the largefiles are correctly updated in the
668 # working copy
668 # working copy
669 def overridepull(orig, ui, repo, source=None, **opts):
669 def overridepull(orig, ui, repo, source=None, **opts):
670 revsprepull = len(repo)
670 revsprepull = len(repo)
671 if opts.get('rebase', False):
671 if opts.get('rebase', False):
672 repo._isrebasing = True
672 repo._isrebasing = True
673 try:
673 try:
674 if opts.get('update'):
674 if opts.get('update'):
675 del opts['update']
675 del opts['update']
676 ui.debug('--update and --rebase are not compatible, ignoring '
676 ui.debug('--update and --rebase are not compatible, ignoring '
677 'the update flag\n')
677 'the update flag\n')
678 del opts['rebase']
678 del opts['rebase']
679 cmdutil.bailifchanged(repo)
679 cmdutil.bailifchanged(repo)
680 origpostincoming = commands.postincoming
680 origpostincoming = commands.postincoming
681 def _dummy(*args, **kwargs):
681 def _dummy(*args, **kwargs):
682 pass
682 pass
683 commands.postincoming = _dummy
683 commands.postincoming = _dummy
684 repo.lfpullsource = source
684 repo.lfpullsource = source
685 if not source:
685 if not source:
686 source = 'default'
686 source = 'default'
687 try:
687 try:
688 result = commands.pull(ui, repo, source, **opts)
688 result = commands.pull(ui, repo, source, **opts)
689 finally:
689 finally:
690 commands.postincoming = origpostincoming
690 commands.postincoming = origpostincoming
691 revspostpull = len(repo)
691 revspostpull = len(repo)
692 if revspostpull > revsprepull:
692 if revspostpull > revsprepull:
693 result = result or rebase.rebase(ui, repo)
693 result = result or rebase.rebase(ui, repo)
694 finally:
694 finally:
695 repo._isrebasing = False
695 repo._isrebasing = False
696 else:
696 else:
697 repo.lfpullsource = source
697 repo.lfpullsource = source
698 if not source:
698 if not source:
699 source = 'default'
699 source = 'default'
700 oldheads = lfutil.getcurrentheads(repo)
700 oldheads = lfutil.getcurrentheads(repo)
701 result = orig(ui, repo, source, **opts)
701 result = orig(ui, repo, source, **opts)
702 # If we do not have the new largefiles for any new heads we pulled, we
702 # If we do not have the new largefiles for any new heads we pulled, we
703 # will run into a problem later if we try to merge or rebase with one of
703 # will run into a problem later if we try to merge or rebase with one of
704 # these heads, so cache the largefiles now direclty into the system
704 # these heads, so cache the largefiles now direclty into the system
705 # cache.
705 # cache.
706 ui.status(_("caching new largefiles\n"))
706 ui.status(_("caching new largefiles\n"))
707 numcached = 0
707 numcached = 0
708 heads = lfutil.getcurrentheads(repo)
708 heads = lfutil.getcurrentheads(repo)
709 newheads = set(heads).difference(set(oldheads))
709 newheads = set(heads).difference(set(oldheads))
710 for head in newheads:
710 for head in newheads:
711 (cached, missing) = lfcommands.cachelfiles(ui, repo, head)
711 (cached, missing) = lfcommands.cachelfiles(ui, repo, head)
712 numcached += len(cached)
712 numcached += len(cached)
713 ui.status(_("%d largefiles cached\n") % numcached)
713 ui.status(_("%d largefiles cached\n") % numcached)
714 if opts.get('all_largefiles'):
714 if opts.get('all_largefiles'):
715 revspostpull = len(repo)
715 revspostpull = len(repo)
716 revs = []
716 revs = []
717 for rev in xrange(revsprepull + 1, revspostpull):
717 for rev in xrange(revsprepull + 1, revspostpull):
718 revs.append(repo[rev].rev())
718 revs.append(repo[rev].rev())
719 lfcommands.downloadlfiles(ui, repo, revs)
719 lfcommands.downloadlfiles(ui, repo, revs)
720 return result
720 return result
721
721
722 def overrideclone(orig, ui, source, dest=None, **opts):
722 def overrideclone(orig, ui, source, dest=None, **opts):
723 if dest is None:
723 d = dest
724 dest = hg.defaultdest(source)
724 if d is None:
725 if opts.get('all_largefiles') and not hg.islocal(dest):
725 d = hg.defaultdest(source)
726 if opts.get('all_largefiles') and not hg.islocal(d):
726 raise util.Abort(_(
727 raise util.Abort(_(
727 '--all-largefiles is incompatible with non-local destination %s' %
728 '--all-largefiles is incompatible with non-local destination %s' %
728 dest))
729 d))
729 result = hg.clone(ui, opts, source, dest,
730 result = hg.clone(ui, opts, source, dest,
730 pull=opts.get('pull'),
731 pull=opts.get('pull'),
731 stream=opts.get('uncompressed'),
732 stream=opts.get('uncompressed'),
732 rev=opts.get('rev'),
733 rev=opts.get('rev'),
733 update=opts.get('updaterev') or not opts.get('noupdate'),
734 update=opts.get('updaterev') or not opts.get('noupdate'),
734 branch=opts.get('branch'))
735 branch=opts.get('branch'))
735 if result is None:
736 if result is None:
736 return True
737 return True
737 if opts.get('all_largefiles'):
738 if opts.get('all_largefiles'):
738 sourcerepo, destrepo = result
739 sourcerepo, destrepo = result
739 repo = destrepo.local()
740 repo = destrepo.local()
740
741
741 # The .hglf directory must exist for the standin matcher to match
742 # The .hglf directory must exist for the standin matcher to match
742 # anything (which listlfiles uses for each rev), and .hg/largefiles is
743 # anything (which listlfiles uses for each rev), and .hg/largefiles is
743 # assumed to exist by the code that caches the downloaded file. These
744 # assumed to exist by the code that caches the downloaded file. These
744 # directories exist if clone updated to any rev.
745 # directories exist if clone updated to any rev.
745 if opts.get('noupdate'):
746 if opts.get('noupdate'):
746 util.makedirs(repo.pathto(lfutil.shortname))
747 util.makedirs(repo.pathto(lfutil.shortname))
747 util.makedirs(repo.join(lfutil.longname))
748 util.makedirs(repo.join(lfutil.longname))
748
749
749 # Caching is implicitly limited to 'rev' option, since the dest repo was
750 # Caching is implicitly limited to 'rev' option, since the dest repo was
750 # truncated at that point.
751 # truncated at that point.
751 success, missing = lfcommands.downloadlfiles(ui, repo, None)
752 success, missing = lfcommands.downloadlfiles(ui, repo, None)
752 return missing != 0
753 return missing != 0
753 return result is None
754 return result is None
754
755
755 def overriderebase(orig, ui, repo, **opts):
756 def overriderebase(orig, ui, repo, **opts):
756 repo._isrebasing = True
757 repo._isrebasing = True
757 try:
758 try:
758 return orig(ui, repo, **opts)
759 return orig(ui, repo, **opts)
759 finally:
760 finally:
760 repo._isrebasing = False
761 repo._isrebasing = False
761
762
762 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None,
763 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None,
763 prefix=None, mtime=None, subrepos=None):
764 prefix=None, mtime=None, subrepos=None):
764 # No need to lock because we are only reading history and
765 # No need to lock because we are only reading history and
765 # largefile caches, neither of which are modified.
766 # largefile caches, neither of which are modified.
766 lfcommands.cachelfiles(repo.ui, repo, node)
767 lfcommands.cachelfiles(repo.ui, repo, node)
767
768
768 if kind not in archival.archivers:
769 if kind not in archival.archivers:
769 raise util.Abort(_("unknown archive type '%s'") % kind)
770 raise util.Abort(_("unknown archive type '%s'") % kind)
770
771
771 ctx = repo[node]
772 ctx = repo[node]
772
773
773 if kind == 'files':
774 if kind == 'files':
774 if prefix:
775 if prefix:
775 raise util.Abort(
776 raise util.Abort(
776 _('cannot give prefix when archiving to files'))
777 _('cannot give prefix when archiving to files'))
777 else:
778 else:
778 prefix = archival.tidyprefix(dest, kind, prefix)
779 prefix = archival.tidyprefix(dest, kind, prefix)
779
780
780 def write(name, mode, islink, getdata):
781 def write(name, mode, islink, getdata):
781 if matchfn and not matchfn(name):
782 if matchfn and not matchfn(name):
782 return
783 return
783 data = getdata()
784 data = getdata()
784 if decode:
785 if decode:
785 data = repo.wwritedata(name, data)
786 data = repo.wwritedata(name, data)
786 archiver.addfile(prefix + name, mode, islink, data)
787 archiver.addfile(prefix + name, mode, islink, data)
787
788
788 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0])
789 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0])
789
790
790 if repo.ui.configbool("ui", "archivemeta", True):
791 if repo.ui.configbool("ui", "archivemeta", True):
791 def metadata():
792 def metadata():
792 base = 'repo: %s\nnode: %s\nbranch: %s\n' % (
793 base = 'repo: %s\nnode: %s\nbranch: %s\n' % (
793 hex(repo.changelog.node(0)), hex(node), ctx.branch())
794 hex(repo.changelog.node(0)), hex(node), ctx.branch())
794
795
795 tags = ''.join('tag: %s\n' % t for t in ctx.tags()
796 tags = ''.join('tag: %s\n' % t for t in ctx.tags()
796 if repo.tagtype(t) == 'global')
797 if repo.tagtype(t) == 'global')
797 if not tags:
798 if not tags:
798 repo.ui.pushbuffer()
799 repo.ui.pushbuffer()
799 opts = {'template': '{latesttag}\n{latesttagdistance}',
800 opts = {'template': '{latesttag}\n{latesttagdistance}',
800 'style': '', 'patch': None, 'git': None}
801 'style': '', 'patch': None, 'git': None}
801 cmdutil.show_changeset(repo.ui, repo, opts).show(ctx)
802 cmdutil.show_changeset(repo.ui, repo, opts).show(ctx)
802 ltags, dist = repo.ui.popbuffer().split('\n')
803 ltags, dist = repo.ui.popbuffer().split('\n')
803 tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':'))
804 tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':'))
804 tags += 'latesttagdistance: %s\n' % dist
805 tags += 'latesttagdistance: %s\n' % dist
805
806
806 return base + tags
807 return base + tags
807
808
808 write('.hg_archival.txt', 0644, False, metadata)
809 write('.hg_archival.txt', 0644, False, metadata)
809
810
810 for f in ctx:
811 for f in ctx:
811 ff = ctx.flags(f)
812 ff = ctx.flags(f)
812 getdata = ctx[f].data
813 getdata = ctx[f].data
813 if lfutil.isstandin(f):
814 if lfutil.isstandin(f):
814 path = lfutil.findfile(repo, getdata().strip())
815 path = lfutil.findfile(repo, getdata().strip())
815 if path is None:
816 if path is None:
816 raise util.Abort(
817 raise util.Abort(
817 _('largefile %s not found in repo store or system cache')
818 _('largefile %s not found in repo store or system cache')
818 % lfutil.splitstandin(f))
819 % lfutil.splitstandin(f))
819 f = lfutil.splitstandin(f)
820 f = lfutil.splitstandin(f)
820
821
821 def getdatafn():
822 def getdatafn():
822 fd = None
823 fd = None
823 try:
824 try:
824 fd = open(path, 'rb')
825 fd = open(path, 'rb')
825 return fd.read()
826 return fd.read()
826 finally:
827 finally:
827 if fd:
828 if fd:
828 fd.close()
829 fd.close()
829
830
830 getdata = getdatafn
831 getdata = getdatafn
831 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
832 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
832
833
833 if subrepos:
834 if subrepos:
834 for subpath in ctx.substate:
835 for subpath in ctx.substate:
835 sub = ctx.sub(subpath)
836 sub = ctx.sub(subpath)
836 submatch = match_.narrowmatcher(subpath, matchfn)
837 submatch = match_.narrowmatcher(subpath, matchfn)
837 sub.archive(repo.ui, archiver, prefix, submatch)
838 sub.archive(repo.ui, archiver, prefix, submatch)
838
839
839 archiver.done()
840 archiver.done()
840
841
841 def hgsubrepoarchive(orig, repo, ui, archiver, prefix, match=None):
842 def hgsubrepoarchive(orig, repo, ui, archiver, prefix, match=None):
842 rev = repo._state[1]
843 rev = repo._state[1]
843 ctx = repo._repo[rev]
844 ctx = repo._repo[rev]
844
845
845 lfcommands.cachelfiles(ui, repo._repo, ctx.node())
846 lfcommands.cachelfiles(ui, repo._repo, ctx.node())
846
847
847 def write(name, mode, islink, getdata):
848 def write(name, mode, islink, getdata):
848 # At this point, the standin has been replaced with the largefile name,
849 # At this point, the standin has been replaced with the largefile name,
849 # so the normal matcher works here without the lfutil variants.
850 # so the normal matcher works here without the lfutil variants.
850 if match and not match(f):
851 if match and not match(f):
851 return
852 return
852 data = getdata()
853 data = getdata()
853
854
854 archiver.addfile(prefix + repo._path + '/' + name, mode, islink, data)
855 archiver.addfile(prefix + repo._path + '/' + name, mode, islink, data)
855
856
856 for f in ctx:
857 for f in ctx:
857 ff = ctx.flags(f)
858 ff = ctx.flags(f)
858 getdata = ctx[f].data
859 getdata = ctx[f].data
859 if lfutil.isstandin(f):
860 if lfutil.isstandin(f):
860 path = lfutil.findfile(repo._repo, getdata().strip())
861 path = lfutil.findfile(repo._repo, getdata().strip())
861 if path is None:
862 if path is None:
862 raise util.Abort(
863 raise util.Abort(
863 _('largefile %s not found in repo store or system cache')
864 _('largefile %s not found in repo store or system cache')
864 % lfutil.splitstandin(f))
865 % lfutil.splitstandin(f))
865 f = lfutil.splitstandin(f)
866 f = lfutil.splitstandin(f)
866
867
867 def getdatafn():
868 def getdatafn():
868 fd = None
869 fd = None
869 try:
870 try:
870 fd = open(os.path.join(prefix, path), 'rb')
871 fd = open(os.path.join(prefix, path), 'rb')
871 return fd.read()
872 return fd.read()
872 finally:
873 finally:
873 if fd:
874 if fd:
874 fd.close()
875 fd.close()
875
876
876 getdata = getdatafn
877 getdata = getdatafn
877
878
878 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
879 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
879
880
880 for subpath in ctx.substate:
881 for subpath in ctx.substate:
881 sub = ctx.sub(subpath)
882 sub = ctx.sub(subpath)
882 submatch = match_.narrowmatcher(subpath, match)
883 submatch = match_.narrowmatcher(subpath, match)
883 sub.archive(ui, archiver, os.path.join(prefix, repo._path) + '/',
884 sub.archive(ui, archiver, os.path.join(prefix, repo._path) + '/',
884 submatch)
885 submatch)
885
886
886 # If a largefile is modified, the change is not reflected in its
887 # If a largefile is modified, the change is not reflected in its
887 # standin until a commit. cmdutil.bailifchanged() raises an exception
888 # standin until a commit. cmdutil.bailifchanged() raises an exception
888 # if the repo has uncommitted changes. Wrap it to also check if
889 # if the repo has uncommitted changes. Wrap it to also check if
889 # largefiles were changed. This is used by bisect and backout.
890 # largefiles were changed. This is used by bisect and backout.
890 def overridebailifchanged(orig, repo):
891 def overridebailifchanged(orig, repo):
891 orig(repo)
892 orig(repo)
892 repo.lfstatus = True
893 repo.lfstatus = True
893 modified, added, removed, deleted = repo.status()[:4]
894 modified, added, removed, deleted = repo.status()[:4]
894 repo.lfstatus = False
895 repo.lfstatus = False
895 if modified or added or removed or deleted:
896 if modified or added or removed or deleted:
896 raise util.Abort(_('outstanding uncommitted changes'))
897 raise util.Abort(_('outstanding uncommitted changes'))
897
898
898 # Fetch doesn't use cmdutil.bailifchanged so override it to add the check
899 # Fetch doesn't use cmdutil.bailifchanged so override it to add the check
899 def overridefetch(orig, ui, repo, *pats, **opts):
900 def overridefetch(orig, ui, repo, *pats, **opts):
900 repo.lfstatus = True
901 repo.lfstatus = True
901 modified, added, removed, deleted = repo.status()[:4]
902 modified, added, removed, deleted = repo.status()[:4]
902 repo.lfstatus = False
903 repo.lfstatus = False
903 if modified or added or removed or deleted:
904 if modified or added or removed or deleted:
904 raise util.Abort(_('outstanding uncommitted changes'))
905 raise util.Abort(_('outstanding uncommitted changes'))
905 return orig(ui, repo, *pats, **opts)
906 return orig(ui, repo, *pats, **opts)
906
907
907 def overrideforget(orig, ui, repo, *pats, **opts):
908 def overrideforget(orig, ui, repo, *pats, **opts):
908 installnormalfilesmatchfn(repo[None].manifest())
909 installnormalfilesmatchfn(repo[None].manifest())
909 result = orig(ui, repo, *pats, **opts)
910 result = orig(ui, repo, *pats, **opts)
910 restorematchfn()
911 restorematchfn()
911 m = scmutil.match(repo[None], pats, opts)
912 m = scmutil.match(repo[None], pats, opts)
912
913
913 try:
914 try:
914 repo.lfstatus = True
915 repo.lfstatus = True
915 s = repo.status(match=m, clean=True)
916 s = repo.status(match=m, clean=True)
916 finally:
917 finally:
917 repo.lfstatus = False
918 repo.lfstatus = False
918 forget = sorted(s[0] + s[1] + s[3] + s[6])
919 forget = sorted(s[0] + s[1] + s[3] + s[6])
919 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
920 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
920
921
921 for f in forget:
922 for f in forget:
922 if lfutil.standin(f) not in repo.dirstate and not \
923 if lfutil.standin(f) not in repo.dirstate and not \
923 os.path.isdir(m.rel(lfutil.standin(f))):
924 os.path.isdir(m.rel(lfutil.standin(f))):
924 ui.warn(_('not removing %s: file is already untracked\n')
925 ui.warn(_('not removing %s: file is already untracked\n')
925 % m.rel(f))
926 % m.rel(f))
926 result = 1
927 result = 1
927
928
928 for f in forget:
929 for f in forget:
929 if ui.verbose or not m.exact(f):
930 if ui.verbose or not m.exact(f):
930 ui.status(_('removing %s\n') % m.rel(f))
931 ui.status(_('removing %s\n') % m.rel(f))
931
932
932 # Need to lock because standin files are deleted then removed from the
933 # Need to lock because standin files are deleted then removed from the
933 # repository and we could race inbetween.
934 # repository and we could race inbetween.
934 wlock = repo.wlock()
935 wlock = repo.wlock()
935 try:
936 try:
936 lfdirstate = lfutil.openlfdirstate(ui, repo)
937 lfdirstate = lfutil.openlfdirstate(ui, repo)
937 for f in forget:
938 for f in forget:
938 if lfdirstate[f] == 'a':
939 if lfdirstate[f] == 'a':
939 lfdirstate.drop(f)
940 lfdirstate.drop(f)
940 else:
941 else:
941 lfdirstate.remove(f)
942 lfdirstate.remove(f)
942 lfdirstate.write()
943 lfdirstate.write()
943 lfutil.reporemove(repo, [lfutil.standin(f) for f in forget],
944 lfutil.reporemove(repo, [lfutil.standin(f) for f in forget],
944 unlink=True)
945 unlink=True)
945 finally:
946 finally:
946 wlock.release()
947 wlock.release()
947
948
948 return result
949 return result
949
950
950 def getoutgoinglfiles(ui, repo, dest=None, **opts):
951 def getoutgoinglfiles(ui, repo, dest=None, **opts):
951 dest = ui.expandpath(dest or 'default-push', dest or 'default')
952 dest = ui.expandpath(dest or 'default-push', dest or 'default')
952 dest, branches = hg.parseurl(dest, opts.get('branch'))
953 dest, branches = hg.parseurl(dest, opts.get('branch'))
953 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
954 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
954 if revs:
955 if revs:
955 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
956 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
956
957
957 try:
958 try:
958 remote = hg.peer(repo, opts, dest)
959 remote = hg.peer(repo, opts, dest)
959 except error.RepoError:
960 except error.RepoError:
960 return None
961 return None
961 o = lfutil.findoutgoing(repo, remote, False)
962 o = lfutil.findoutgoing(repo, remote, False)
962 if not o:
963 if not o:
963 return None
964 return None
964 o = repo.changelog.nodesbetween(o, revs)[0]
965 o = repo.changelog.nodesbetween(o, revs)[0]
965 if opts.get('newest_first'):
966 if opts.get('newest_first'):
966 o.reverse()
967 o.reverse()
967
968
968 toupload = set()
969 toupload = set()
969 for n in o:
970 for n in o:
970 parents = [p for p in repo.changelog.parents(n) if p != node.nullid]
971 parents = [p for p in repo.changelog.parents(n) if p != node.nullid]
971 ctx = repo[n]
972 ctx = repo[n]
972 files = set(ctx.files())
973 files = set(ctx.files())
973 if len(parents) == 2:
974 if len(parents) == 2:
974 mc = ctx.manifest()
975 mc = ctx.manifest()
975 mp1 = ctx.parents()[0].manifest()
976 mp1 = ctx.parents()[0].manifest()
976 mp2 = ctx.parents()[1].manifest()
977 mp2 = ctx.parents()[1].manifest()
977 for f in mp1:
978 for f in mp1:
978 if f not in mc:
979 if f not in mc:
979 files.add(f)
980 files.add(f)
980 for f in mp2:
981 for f in mp2:
981 if f not in mc:
982 if f not in mc:
982 files.add(f)
983 files.add(f)
983 for f in mc:
984 for f in mc:
984 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):
985 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):
985 files.add(f)
986 files.add(f)
986 toupload = toupload.union(
987 toupload = toupload.union(
987 set([f for f in files if lfutil.isstandin(f) and f in ctx]))
988 set([f for f in files if lfutil.isstandin(f) and f in ctx]))
988 return toupload
989 return toupload
989
990
990 def overrideoutgoing(orig, ui, repo, dest=None, **opts):
991 def overrideoutgoing(orig, ui, repo, dest=None, **opts):
991 result = orig(ui, repo, dest, **opts)
992 result = orig(ui, repo, dest, **opts)
992
993
993 if opts.pop('large', None):
994 if opts.pop('large', None):
994 toupload = getoutgoinglfiles(ui, repo, dest, **opts)
995 toupload = getoutgoinglfiles(ui, repo, dest, **opts)
995 if toupload is None:
996 if toupload is None:
996 ui.status(_('largefiles: No remote repo\n'))
997 ui.status(_('largefiles: No remote repo\n'))
997 else:
998 else:
998 ui.status(_('largefiles to upload:\n'))
999 ui.status(_('largefiles to upload:\n'))
999 for file in toupload:
1000 for file in toupload:
1000 ui.status(lfutil.splitstandin(file) + '\n')
1001 ui.status(lfutil.splitstandin(file) + '\n')
1001 ui.status('\n')
1002 ui.status('\n')
1002
1003
1003 return result
1004 return result
1004
1005
1005 def overridesummary(orig, ui, repo, *pats, **opts):
1006 def overridesummary(orig, ui, repo, *pats, **opts):
1006 try:
1007 try:
1007 repo.lfstatus = True
1008 repo.lfstatus = True
1008 orig(ui, repo, *pats, **opts)
1009 orig(ui, repo, *pats, **opts)
1009 finally:
1010 finally:
1010 repo.lfstatus = False
1011 repo.lfstatus = False
1011
1012
1012 if opts.pop('large', None):
1013 if opts.pop('large', None):
1013 toupload = getoutgoinglfiles(ui, repo, None, **opts)
1014 toupload = getoutgoinglfiles(ui, repo, None, **opts)
1014 if toupload is None:
1015 if toupload is None:
1015 ui.status(_('largefiles: No remote repo\n'))
1016 ui.status(_('largefiles: No remote repo\n'))
1016 else:
1017 else:
1017 ui.status(_('largefiles: %d to upload\n') % len(toupload))
1018 ui.status(_('largefiles: %d to upload\n') % len(toupload))
1018
1019
1019 def overrideaddremove(orig, ui, repo, *pats, **opts):
1020 def overrideaddremove(orig, ui, repo, *pats, **opts):
1020 if not lfutil.islfilesrepo(repo):
1021 if not lfutil.islfilesrepo(repo):
1021 return orig(ui, repo, *pats, **opts)
1022 return orig(ui, repo, *pats, **opts)
1022 # Get the list of missing largefiles so we can remove them
1023 # Get the list of missing largefiles so we can remove them
1023 lfdirstate = lfutil.openlfdirstate(ui, repo)
1024 lfdirstate = lfutil.openlfdirstate(ui, repo)
1024 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False,
1025 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False,
1025 False, False)
1026 False, False)
1026 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s
1027 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s
1027
1028
1028 # Call into the normal remove code, but the removing of the standin, we want
1029 # Call into the normal remove code, but the removing of the standin, we want
1029 # to have handled by original addremove. Monkey patching here makes sure
1030 # to have handled by original addremove. Monkey patching here makes sure
1030 # we don't remove the standin in the largefiles code, preventing a very
1031 # we don't remove the standin in the largefiles code, preventing a very
1031 # confused state later.
1032 # confused state later.
1032 if missing:
1033 if missing:
1033 m = [repo.wjoin(f) for f in missing]
1034 m = [repo.wjoin(f) for f in missing]
1034 repo._isaddremove = True
1035 repo._isaddremove = True
1035 removelargefiles(ui, repo, *m, **opts)
1036 removelargefiles(ui, repo, *m, **opts)
1036 repo._isaddremove = False
1037 repo._isaddremove = False
1037 # Call into the normal add code, and any files that *should* be added as
1038 # Call into the normal add code, and any files that *should* be added as
1038 # largefiles will be
1039 # largefiles will be
1039 addlargefiles(ui, repo, *pats, **opts)
1040 addlargefiles(ui, repo, *pats, **opts)
1040 # Now that we've handled largefiles, hand off to the original addremove
1041 # Now that we've handled largefiles, hand off to the original addremove
1041 # function to take care of the rest. Make sure it doesn't do anything with
1042 # function to take care of the rest. Make sure it doesn't do anything with
1042 # largefiles by installing a matcher that will ignore them.
1043 # largefiles by installing a matcher that will ignore them.
1043 installnormalfilesmatchfn(repo[None].manifest())
1044 installnormalfilesmatchfn(repo[None].manifest())
1044 result = orig(ui, repo, *pats, **opts)
1045 result = orig(ui, repo, *pats, **opts)
1045 restorematchfn()
1046 restorematchfn()
1046 return result
1047 return result
1047
1048
1048 # Calling purge with --all will cause the largefiles to be deleted.
1049 # Calling purge with --all will cause the largefiles to be deleted.
1049 # Override repo.status to prevent this from happening.
1050 # Override repo.status to prevent this from happening.
1050 def overridepurge(orig, ui, repo, *dirs, **opts):
1051 def overridepurge(orig, ui, repo, *dirs, **opts):
1051 oldstatus = repo.status
1052 oldstatus = repo.status
1052 def overridestatus(node1='.', node2=None, match=None, ignored=False,
1053 def overridestatus(node1='.', node2=None, match=None, ignored=False,
1053 clean=False, unknown=False, listsubrepos=False):
1054 clean=False, unknown=False, listsubrepos=False):
1054 r = oldstatus(node1, node2, match, ignored, clean, unknown,
1055 r = oldstatus(node1, node2, match, ignored, clean, unknown,
1055 listsubrepos)
1056 listsubrepos)
1056 lfdirstate = lfutil.openlfdirstate(ui, repo)
1057 lfdirstate = lfutil.openlfdirstate(ui, repo)
1057 modified, added, removed, deleted, unknown, ignored, clean = r
1058 modified, added, removed, deleted, unknown, ignored, clean = r
1058 unknown = [f for f in unknown if lfdirstate[f] == '?']
1059 unknown = [f for f in unknown if lfdirstate[f] == '?']
1059 ignored = [f for f in ignored if lfdirstate[f] == '?']
1060 ignored = [f for f in ignored if lfdirstate[f] == '?']
1060 return modified, added, removed, deleted, unknown, ignored, clean
1061 return modified, added, removed, deleted, unknown, ignored, clean
1061 repo.status = overridestatus
1062 repo.status = overridestatus
1062 orig(ui, repo, *dirs, **opts)
1063 orig(ui, repo, *dirs, **opts)
1063 repo.status = oldstatus
1064 repo.status = oldstatus
1064
1065
1065 def overriderollback(orig, ui, repo, **opts):
1066 def overriderollback(orig, ui, repo, **opts):
1066 result = orig(ui, repo, **opts)
1067 result = orig(ui, repo, **opts)
1067 merge.update(repo, node=None, branchmerge=False, force=True,
1068 merge.update(repo, node=None, branchmerge=False, force=True,
1068 partial=lfutil.isstandin)
1069 partial=lfutil.isstandin)
1069 wlock = repo.wlock()
1070 wlock = repo.wlock()
1070 try:
1071 try:
1071 lfdirstate = lfutil.openlfdirstate(ui, repo)
1072 lfdirstate = lfutil.openlfdirstate(ui, repo)
1072 lfiles = lfutil.listlfiles(repo)
1073 lfiles = lfutil.listlfiles(repo)
1073 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev())
1074 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev())
1074 for file in lfiles:
1075 for file in lfiles:
1075 if file in oldlfiles:
1076 if file in oldlfiles:
1076 lfdirstate.normallookup(file)
1077 lfdirstate.normallookup(file)
1077 else:
1078 else:
1078 lfdirstate.add(file)
1079 lfdirstate.add(file)
1079 lfdirstate.write()
1080 lfdirstate.write()
1080 finally:
1081 finally:
1081 wlock.release()
1082 wlock.release()
1082 return result
1083 return result
1083
1084
1084 def overridetransplant(orig, ui, repo, *revs, **opts):
1085 def overridetransplant(orig, ui, repo, *revs, **opts):
1085 try:
1086 try:
1086 oldstandins = lfutil.getstandinsstate(repo)
1087 oldstandins = lfutil.getstandinsstate(repo)
1087 repo._istransplanting = True
1088 repo._istransplanting = True
1088 result = orig(ui, repo, *revs, **opts)
1089 result = orig(ui, repo, *revs, **opts)
1089 newstandins = lfutil.getstandinsstate(repo)
1090 newstandins = lfutil.getstandinsstate(repo)
1090 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
1091 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
1091 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1092 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1092 printmessage=True)
1093 printmessage=True)
1093 finally:
1094 finally:
1094 repo._istransplanting = False
1095 repo._istransplanting = False
1095 return result
1096 return result
1096
1097
1097 def overridecat(orig, ui, repo, file1, *pats, **opts):
1098 def overridecat(orig, ui, repo, file1, *pats, **opts):
1098 ctx = scmutil.revsingle(repo, opts.get('rev'))
1099 ctx = scmutil.revsingle(repo, opts.get('rev'))
1099 if not lfutil.standin(file1) in ctx:
1100 if not lfutil.standin(file1) in ctx:
1100 result = orig(ui, repo, file1, *pats, **opts)
1101 result = orig(ui, repo, file1, *pats, **opts)
1101 return result
1102 return result
1102 return lfcommands.catlfile(repo, file1, ctx.rev(), opts.get('output'))
1103 return lfcommands.catlfile(repo, file1, ctx.rev(), opts.get('output'))
@@ -1,1531 +1,1541 b''
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
2 $ mkdir "${USERCACHE}"
2 $ mkdir "${USERCACHE}"
3 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
4 > [extensions]
4 > [extensions]
5 > largefiles=
5 > largefiles=
6 > purge=
6 > purge=
7 > rebase=
7 > rebase=
8 > transplant=
8 > transplant=
9 > [phases]
9 > [phases]
10 > publish=False
10 > publish=False
11 > [largefiles]
11 > [largefiles]
12 > minsize=2
12 > minsize=2
13 > patterns=glob:**.dat
13 > patterns=glob:**.dat
14 > usercache=${USERCACHE}
14 > usercache=${USERCACHE}
15 > [hooks]
15 > [hooks]
16 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
16 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
17 > EOF
17 > EOF
18
18
19 Create the repo with a couple of revisions of both large and normal
19 Create the repo with a couple of revisions of both large and normal
20 files, testing that status correctly shows largefiles and that summary output
20 files, testing that status correctly shows largefiles and that summary output
21 is correct.
21 is correct.
22
22
23 $ hg init a
23 $ hg init a
24 $ cd a
24 $ cd a
25 $ mkdir sub
25 $ mkdir sub
26 $ echo normal1 > normal1
26 $ echo normal1 > normal1
27 $ echo normal2 > sub/normal2
27 $ echo normal2 > sub/normal2
28 $ echo large1 > large1
28 $ echo large1 > large1
29 $ echo large2 > sub/large2
29 $ echo large2 > sub/large2
30 $ hg add normal1 sub/normal2
30 $ hg add normal1 sub/normal2
31 $ hg add --large large1 sub/large2
31 $ hg add --large large1 sub/large2
32 $ hg commit -m "add files"
32 $ hg commit -m "add files"
33 Invoking status precommit hook
33 Invoking status precommit hook
34 A large1
34 A large1
35 A normal1
35 A normal1
36 A sub/large2
36 A sub/large2
37 A sub/normal2
37 A sub/normal2
38 $ echo normal11 > normal1
38 $ echo normal11 > normal1
39 $ echo normal22 > sub/normal2
39 $ echo normal22 > sub/normal2
40 $ echo large11 > large1
40 $ echo large11 > large1
41 $ echo large22 > sub/large2
41 $ echo large22 > sub/large2
42 $ hg commit -m "edit files"
42 $ hg commit -m "edit files"
43 Invoking status precommit hook
43 Invoking status precommit hook
44 M large1
44 M large1
45 M normal1
45 M normal1
46 M sub/large2
46 M sub/large2
47 M sub/normal2
47 M sub/normal2
48 $ hg sum --large
48 $ hg sum --large
49 parent: 1:ce8896473775 tip
49 parent: 1:ce8896473775 tip
50 edit files
50 edit files
51 branch: default
51 branch: default
52 commit: (clean)
52 commit: (clean)
53 update: (current)
53 update: (current)
54 largefiles: No remote repo
54 largefiles: No remote repo
55
55
56 Commit preserved largefile contents.
56 Commit preserved largefile contents.
57
57
58 $ cat normal1
58 $ cat normal1
59 normal11
59 normal11
60 $ cat large1
60 $ cat large1
61 large11
61 large11
62 $ cat sub/normal2
62 $ cat sub/normal2
63 normal22
63 normal22
64 $ cat sub/large2
64 $ cat sub/large2
65 large22
65 large22
66
66
67 Test status, subdir and unknown files
67 Test status, subdir and unknown files
68
68
69 $ echo unknown > sub/unknown
69 $ echo unknown > sub/unknown
70 $ hg st --all
70 $ hg st --all
71 ? sub/unknown
71 ? sub/unknown
72 C large1
72 C large1
73 C normal1
73 C normal1
74 C sub/large2
74 C sub/large2
75 C sub/normal2
75 C sub/normal2
76 $ hg st --all sub
76 $ hg st --all sub
77 ? sub/unknown
77 ? sub/unknown
78 C sub/large2
78 C sub/large2
79 C sub/normal2
79 C sub/normal2
80 $ rm sub/unknown
80 $ rm sub/unknown
81
81
82 Test exit codes for remove warning cases (modified and still exiting)
82 Test exit codes for remove warning cases (modified and still exiting)
83
83
84 $ hg remove -A large1
84 $ hg remove -A large1
85 not removing large1: file still exists (use forget to undo)
85 not removing large1: file still exists (use forget to undo)
86 [1]
86 [1]
87 $ echo 'modified' > large1
87 $ echo 'modified' > large1
88 $ hg remove large1
88 $ hg remove large1
89 not removing large1: file is modified (use forget to undo)
89 not removing large1: file is modified (use forget to undo)
90 [1]
90 [1]
91 $ hg up -Cq
91 $ hg up -Cq
92
92
93 Remove both largefiles and normal files.
93 Remove both largefiles and normal files.
94
94
95 $ hg remove normal1 large1
95 $ hg remove normal1 large1
96 $ hg status large1
96 $ hg status large1
97 R large1
97 R large1
98 $ hg commit -m "remove files"
98 $ hg commit -m "remove files"
99 Invoking status precommit hook
99 Invoking status precommit hook
100 R large1
100 R large1
101 R normal1
101 R normal1
102 $ ls
102 $ ls
103 sub
103 sub
104 $ echo "testlargefile" > large1-test
104 $ echo "testlargefile" > large1-test
105 $ hg add --large large1-test
105 $ hg add --large large1-test
106 $ hg st
106 $ hg st
107 A large1-test
107 A large1-test
108 $ hg rm large1-test
108 $ hg rm large1-test
109 not removing large1-test: file has been marked for add (use forget to undo)
109 not removing large1-test: file has been marked for add (use forget to undo)
110 [1]
110 [1]
111 $ hg st
111 $ hg st
112 A large1-test
112 A large1-test
113 $ hg forget large1-test
113 $ hg forget large1-test
114 $ hg st
114 $ hg st
115 ? large1-test
115 ? large1-test
116 $ hg remove large1-test
116 $ hg remove large1-test
117 not removing large1-test: file is untracked
117 not removing large1-test: file is untracked
118 [1]
118 [1]
119 $ hg forget large1-test
119 $ hg forget large1-test
120 not removing large1-test: file is already untracked
120 not removing large1-test: file is already untracked
121 [1]
121 [1]
122 $ rm large1-test
122 $ rm large1-test
123
123
124 Copy both largefiles and normal files (testing that status output is correct).
124 Copy both largefiles and normal files (testing that status output is correct).
125
125
126 $ hg cp sub/normal2 normal1
126 $ hg cp sub/normal2 normal1
127 $ hg cp sub/large2 large1
127 $ hg cp sub/large2 large1
128 $ hg commit -m "copy files"
128 $ hg commit -m "copy files"
129 Invoking status precommit hook
129 Invoking status precommit hook
130 A large1
130 A large1
131 A normal1
131 A normal1
132 $ cat normal1
132 $ cat normal1
133 normal22
133 normal22
134 $ cat large1
134 $ cat large1
135 large22
135 large22
136
136
137 Test moving largefiles and verify that normal files are also unaffected.
137 Test moving largefiles and verify that normal files are also unaffected.
138
138
139 $ hg mv normal1 normal3
139 $ hg mv normal1 normal3
140 $ hg mv large1 large3
140 $ hg mv large1 large3
141 $ hg mv sub/normal2 sub/normal4
141 $ hg mv sub/normal2 sub/normal4
142 $ hg mv sub/large2 sub/large4
142 $ hg mv sub/large2 sub/large4
143 $ hg commit -m "move files"
143 $ hg commit -m "move files"
144 Invoking status precommit hook
144 Invoking status precommit hook
145 A large3
145 A large3
146 A normal3
146 A normal3
147 A sub/large4
147 A sub/large4
148 A sub/normal4
148 A sub/normal4
149 R large1
149 R large1
150 R normal1
150 R normal1
151 R sub/large2
151 R sub/large2
152 R sub/normal2
152 R sub/normal2
153 $ cat normal3
153 $ cat normal3
154 normal22
154 normal22
155 $ cat large3
155 $ cat large3
156 large22
156 large22
157 $ cat sub/normal4
157 $ cat sub/normal4
158 normal22
158 normal22
159 $ cat sub/large4
159 $ cat sub/large4
160 large22
160 large22
161
161
162 Test copies and moves from a directory other than root (issue3516)
162 Test copies and moves from a directory other than root (issue3516)
163
163
164 $ cd ..
164 $ cd ..
165 $ hg init lf_cpmv
165 $ hg init lf_cpmv
166 $ cd lf_cpmv
166 $ cd lf_cpmv
167 $ mkdir dira
167 $ mkdir dira
168 $ mkdir dira/dirb
168 $ mkdir dira/dirb
169 $ touch dira/dirb/largefile
169 $ touch dira/dirb/largefile
170 $ hg add --large dira/dirb/largefile
170 $ hg add --large dira/dirb/largefile
171 $ hg commit -m "added"
171 $ hg commit -m "added"
172 Invoking status precommit hook
172 Invoking status precommit hook
173 A dira/dirb/largefile
173 A dira/dirb/largefile
174 $ cd dira
174 $ cd dira
175 $ hg cp dirb/largefile foo/largefile
175 $ hg cp dirb/largefile foo/largefile
176 $ hg ci -m "deep copy"
176 $ hg ci -m "deep copy"
177 Invoking status precommit hook
177 Invoking status precommit hook
178 A dira/foo/largefile
178 A dira/foo/largefile
179 $ find . | sort
179 $ find . | sort
180 .
180 .
181 ./dirb
181 ./dirb
182 ./dirb/largefile
182 ./dirb/largefile
183 ./foo
183 ./foo
184 ./foo/largefile
184 ./foo/largefile
185 $ hg mv foo/largefile baz/largefile
185 $ hg mv foo/largefile baz/largefile
186 $ hg ci -m "moved"
186 $ hg ci -m "moved"
187 Invoking status precommit hook
187 Invoking status precommit hook
188 A dira/baz/largefile
188 A dira/baz/largefile
189 R dira/foo/largefile
189 R dira/foo/largefile
190 $ find . | sort
190 $ find . | sort
191 .
191 .
192 ./baz
192 ./baz
193 ./baz/largefile
193 ./baz/largefile
194 ./dirb
194 ./dirb
195 ./dirb/largefile
195 ./dirb/largefile
196 ./foo
196 ./foo
197 $ cd ../../a
197 $ cd ../../a
198
198
199 #if hgweb
199 #if hgweb
200 Test display of largefiles in hgweb
200 Test display of largefiles in hgweb
201
201
202 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
202 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
203 $ cat ../hg.pid >> $DAEMON_PIDS
203 $ cat ../hg.pid >> $DAEMON_PIDS
204 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
204 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
205 200 Script output follows
205 200 Script output follows
206
206
207
207
208 drwxr-xr-x sub
208 drwxr-xr-x sub
209 -rw-r--r-- 41 large3
209 -rw-r--r-- 41 large3
210 -rw-r--r-- 9 normal3
210 -rw-r--r-- 9 normal3
211
211
212
212
213 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
213 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
214 200 Script output follows
214 200 Script output follows
215
215
216
216
217 -rw-r--r-- 41 large4
217 -rw-r--r-- 41 large4
218 -rw-r--r-- 9 normal4
218 -rw-r--r-- 9 normal4
219
219
220
220
221 $ "$TESTDIR/killdaemons.py"
221 $ "$TESTDIR/killdaemons.py"
222 #endif
222 #endif
223
223
224 Test archiving the various revisions. These hit corner cases known with
224 Test archiving the various revisions. These hit corner cases known with
225 archiving.
225 archiving.
226
226
227 $ hg archive -r 0 ../archive0
227 $ hg archive -r 0 ../archive0
228 $ hg archive -r 1 ../archive1
228 $ hg archive -r 1 ../archive1
229 $ hg archive -r 2 ../archive2
229 $ hg archive -r 2 ../archive2
230 $ hg archive -r 3 ../archive3
230 $ hg archive -r 3 ../archive3
231 $ hg archive -r 4 ../archive4
231 $ hg archive -r 4 ../archive4
232 $ cd ../archive0
232 $ cd ../archive0
233 $ cat normal1
233 $ cat normal1
234 normal1
234 normal1
235 $ cat large1
235 $ cat large1
236 large1
236 large1
237 $ cat sub/normal2
237 $ cat sub/normal2
238 normal2
238 normal2
239 $ cat sub/large2
239 $ cat sub/large2
240 large2
240 large2
241 $ cd ../archive1
241 $ cd ../archive1
242 $ cat normal1
242 $ cat normal1
243 normal11
243 normal11
244 $ cat large1
244 $ cat large1
245 large11
245 large11
246 $ cat sub/normal2
246 $ cat sub/normal2
247 normal22
247 normal22
248 $ cat sub/large2
248 $ cat sub/large2
249 large22
249 large22
250 $ cd ../archive2
250 $ cd ../archive2
251 $ ls
251 $ ls
252 sub
252 sub
253 $ cat sub/normal2
253 $ cat sub/normal2
254 normal22
254 normal22
255 $ cat sub/large2
255 $ cat sub/large2
256 large22
256 large22
257 $ cd ../archive3
257 $ cd ../archive3
258 $ cat normal1
258 $ cat normal1
259 normal22
259 normal22
260 $ cat large1
260 $ cat large1
261 large22
261 large22
262 $ cat sub/normal2
262 $ cat sub/normal2
263 normal22
263 normal22
264 $ cat sub/large2
264 $ cat sub/large2
265 large22
265 large22
266 $ cd ../archive4
266 $ cd ../archive4
267 $ cat normal3
267 $ cat normal3
268 normal22
268 normal22
269 $ cat large3
269 $ cat large3
270 large22
270 large22
271 $ cat sub/normal4
271 $ cat sub/normal4
272 normal22
272 normal22
273 $ cat sub/large4
273 $ cat sub/large4
274 large22
274 large22
275
275
276 Commit corner case: specify files to commit.
276 Commit corner case: specify files to commit.
277
277
278 $ cd ../a
278 $ cd ../a
279 $ echo normal3 > normal3
279 $ echo normal3 > normal3
280 $ echo large3 > large3
280 $ echo large3 > large3
281 $ echo normal4 > sub/normal4
281 $ echo normal4 > sub/normal4
282 $ echo large4 > sub/large4
282 $ echo large4 > sub/large4
283 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
283 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
284 Invoking status precommit hook
284 Invoking status precommit hook
285 M large3
285 M large3
286 M normal3
286 M normal3
287 M sub/large4
287 M sub/large4
288 M sub/normal4
288 M sub/normal4
289 $ cat normal3
289 $ cat normal3
290 normal3
290 normal3
291 $ cat large3
291 $ cat large3
292 large3
292 large3
293 $ cat sub/normal4
293 $ cat sub/normal4
294 normal4
294 normal4
295 $ cat sub/large4
295 $ cat sub/large4
296 large4
296 large4
297
297
298 One more commit corner case: commit from a subdirectory.
298 One more commit corner case: commit from a subdirectory.
299
299
300 $ cd ../a
300 $ cd ../a
301 $ echo normal33 > normal3
301 $ echo normal33 > normal3
302 $ echo large33 > large3
302 $ echo large33 > large3
303 $ echo normal44 > sub/normal4
303 $ echo normal44 > sub/normal4
304 $ echo large44 > sub/large4
304 $ echo large44 > sub/large4
305 $ cd sub
305 $ cd sub
306 $ hg commit -m "edit files yet again"
306 $ hg commit -m "edit files yet again"
307 Invoking status precommit hook
307 Invoking status precommit hook
308 M large3
308 M large3
309 M normal3
309 M normal3
310 M sub/large4
310 M sub/large4
311 M sub/normal4
311 M sub/normal4
312 $ cat ../normal3
312 $ cat ../normal3
313 normal33
313 normal33
314 $ cat ../large3
314 $ cat ../large3
315 large33
315 large33
316 $ cat normal4
316 $ cat normal4
317 normal44
317 normal44
318 $ cat large4
318 $ cat large4
319 large44
319 large44
320
320
321 Committing standins is not allowed.
321 Committing standins is not allowed.
322
322
323 $ cd ..
323 $ cd ..
324 $ echo large3 > large3
324 $ echo large3 > large3
325 $ hg commit .hglf/large3 -m "try to commit standin"
325 $ hg commit .hglf/large3 -m "try to commit standin"
326 abort: file ".hglf/large3" is a largefile standin
326 abort: file ".hglf/large3" is a largefile standin
327 (commit the largefile itself instead)
327 (commit the largefile itself instead)
328 [255]
328 [255]
329
329
330 Corner cases for adding largefiles.
330 Corner cases for adding largefiles.
331
331
332 $ echo large5 > large5
332 $ echo large5 > large5
333 $ hg add --large large5
333 $ hg add --large large5
334 $ hg add --large large5
334 $ hg add --large large5
335 large5 already a largefile
335 large5 already a largefile
336 $ mkdir sub2
336 $ mkdir sub2
337 $ echo large6 > sub2/large6
337 $ echo large6 > sub2/large6
338 $ echo large7 > sub2/large7
338 $ echo large7 > sub2/large7
339 $ hg add --large sub2
339 $ hg add --large sub2
340 adding sub2/large6 as a largefile (glob)
340 adding sub2/large6 as a largefile (glob)
341 adding sub2/large7 as a largefile (glob)
341 adding sub2/large7 as a largefile (glob)
342 $ hg st
342 $ hg st
343 M large3
343 M large3
344 A large5
344 A large5
345 A sub2/large6
345 A sub2/large6
346 A sub2/large7
346 A sub2/large7
347
347
348 Test "hg status" with combination of 'file pattern' and 'directory
348 Test "hg status" with combination of 'file pattern' and 'directory
349 pattern' for largefiles:
349 pattern' for largefiles:
350
350
351 $ hg status sub2/large6 sub2
351 $ hg status sub2/large6 sub2
352 A sub2/large6
352 A sub2/large6
353 A sub2/large7
353 A sub2/large7
354
354
355 Config settings (pattern **.dat, minsize 2 MB) are respected.
355 Config settings (pattern **.dat, minsize 2 MB) are respected.
356
356
357 $ echo testdata > test.dat
357 $ echo testdata > test.dat
358 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
358 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
359 $ hg add
359 $ hg add
360 adding reallylarge as a largefile
360 adding reallylarge as a largefile
361 adding test.dat as a largefile
361 adding test.dat as a largefile
362
362
363 Test that minsize and --lfsize handle float values;
363 Test that minsize and --lfsize handle float values;
364 also tests that --lfsize overrides largefiles.minsize.
364 also tests that --lfsize overrides largefiles.minsize.
365 (0.250 MB = 256 kB = 262144 B)
365 (0.250 MB = 256 kB = 262144 B)
366
366
367 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
367 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
368 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
368 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
369 $ hg --config largefiles.minsize=.25 add
369 $ hg --config largefiles.minsize=.25 add
370 adding ratherlarge as a largefile
370 adding ratherlarge as a largefile
371 adding medium
371 adding medium
372 $ hg forget medium
372 $ hg forget medium
373 $ hg --config largefiles.minsize=.25 add --lfsize=.125
373 $ hg --config largefiles.minsize=.25 add --lfsize=.125
374 adding medium as a largefile
374 adding medium as a largefile
375 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
375 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
376 $ hg --config largefiles.minsize=.25 add --lfsize=.125
376 $ hg --config largefiles.minsize=.25 add --lfsize=.125
377 adding notlarge
377 adding notlarge
378 $ hg forget notlarge
378 $ hg forget notlarge
379
379
380 Test forget on largefiles.
380 Test forget on largefiles.
381
381
382 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
382 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
383 $ hg commit -m "add/edit more largefiles"
383 $ hg commit -m "add/edit more largefiles"
384 Invoking status precommit hook
384 Invoking status precommit hook
385 A sub2/large6
385 A sub2/large6
386 A sub2/large7
386 A sub2/large7
387 R large3
387 R large3
388 ? large5
388 ? large5
389 ? medium
389 ? medium
390 ? notlarge
390 ? notlarge
391 ? ratherlarge
391 ? ratherlarge
392 ? reallylarge
392 ? reallylarge
393 ? test.dat
393 ? test.dat
394 $ hg st
394 $ hg st
395 ? large3
395 ? large3
396 ? large5
396 ? large5
397 ? medium
397 ? medium
398 ? notlarge
398 ? notlarge
399 ? ratherlarge
399 ? ratherlarge
400 ? reallylarge
400 ? reallylarge
401 ? test.dat
401 ? test.dat
402
402
403 Purge with largefiles: verify that largefiles are still in the working
403 Purge with largefiles: verify that largefiles are still in the working
404 dir after a purge.
404 dir after a purge.
405
405
406 $ hg purge --all
406 $ hg purge --all
407 $ cat sub/large4
407 $ cat sub/large4
408 large44
408 large44
409 $ cat sub2/large6
409 $ cat sub2/large6
410 large6
410 large6
411 $ cat sub2/large7
411 $ cat sub2/large7
412 large7
412 large7
413
413
414 Test addremove: verify that files that should be added as largfiles are added as
414 Test addremove: verify that files that should be added as largfiles are added as
415 such and that already-existing largfiles are not added as normal files by
415 such and that already-existing largfiles are not added as normal files by
416 accident.
416 accident.
417
417
418 $ rm normal3
418 $ rm normal3
419 $ rm sub/large4
419 $ rm sub/large4
420 $ echo "testing addremove with patterns" > testaddremove.dat
420 $ echo "testing addremove with patterns" > testaddremove.dat
421 $ echo "normaladdremove" > normaladdremove
421 $ echo "normaladdremove" > normaladdremove
422 $ hg addremove
422 $ hg addremove
423 removing sub/large4
423 removing sub/large4
424 adding testaddremove.dat as a largefile
424 adding testaddremove.dat as a largefile
425 removing normal3
425 removing normal3
426 adding normaladdremove
426 adding normaladdremove
427
427
428 Test addremove with -R
428 Test addremove with -R
429
429
430 $ hg up -C
430 $ hg up -C
431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
432 getting changed largefiles
432 getting changed largefiles
433 1 largefiles updated, 0 removed
433 1 largefiles updated, 0 removed
434 $ rm normal3
434 $ rm normal3
435 $ rm sub/large4
435 $ rm sub/large4
436 $ echo "testing addremove with patterns" > testaddremove.dat
436 $ echo "testing addremove with patterns" > testaddremove.dat
437 $ echo "normaladdremove" > normaladdremove
437 $ echo "normaladdremove" > normaladdremove
438 $ cd ..
438 $ cd ..
439 $ hg -R a addremove
439 $ hg -R a addremove
440 removing sub/large4
440 removing sub/large4
441 adding a/testaddremove.dat as a largefile (glob)
441 adding a/testaddremove.dat as a largefile (glob)
442 removing normal3
442 removing normal3
443 adding normaladdremove
443 adding normaladdremove
444 $ cd a
444 $ cd a
445
445
446 Test 3364
446 Test 3364
447 $ hg clone . ../addrm
447 $ hg clone . ../addrm
448 updating to branch default
448 updating to branch default
449 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
449 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
450 getting changed largefiles
450 getting changed largefiles
451 3 largefiles updated, 0 removed
451 3 largefiles updated, 0 removed
452 $ cd ../addrm
452 $ cd ../addrm
453 $ cat >> .hg/hgrc <<EOF
453 $ cat >> .hg/hgrc <<EOF
454 > [hooks]
454 > [hooks]
455 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
455 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
456 > EOF
456 > EOF
457 $ touch foo
457 $ touch foo
458 $ hg add --large foo
458 $ hg add --large foo
459 $ hg ci -m "add foo"
459 $ hg ci -m "add foo"
460 Invoking status precommit hook
460 Invoking status precommit hook
461 A foo
461 A foo
462 Invoking status postcommit hook
462 Invoking status postcommit hook
463 C foo
463 C foo
464 C normal3
464 C normal3
465 C sub/large4
465 C sub/large4
466 C sub/normal4
466 C sub/normal4
467 C sub2/large6
467 C sub2/large6
468 C sub2/large7
468 C sub2/large7
469 $ rm foo
469 $ rm foo
470 $ hg st
470 $ hg st
471 ! foo
471 ! foo
472 hmm.. no precommit invoked, but there is a postcommit??
472 hmm.. no precommit invoked, but there is a postcommit??
473 $ hg ci -m "will not checkin"
473 $ hg ci -m "will not checkin"
474 nothing changed
474 nothing changed
475 Invoking status postcommit hook
475 Invoking status postcommit hook
476 ! foo
476 ! foo
477 C normal3
477 C normal3
478 C sub/large4
478 C sub/large4
479 C sub/normal4
479 C sub/normal4
480 C sub2/large6
480 C sub2/large6
481 C sub2/large7
481 C sub2/large7
482 [1]
482 [1]
483 $ hg addremove
483 $ hg addremove
484 removing foo
484 removing foo
485 $ hg st
485 $ hg st
486 R foo
486 R foo
487 $ hg ci -m "used to say nothing changed"
487 $ hg ci -m "used to say nothing changed"
488 Invoking status precommit hook
488 Invoking status precommit hook
489 R foo
489 R foo
490 Invoking status postcommit hook
490 Invoking status postcommit hook
491 C normal3
491 C normal3
492 C sub/large4
492 C sub/large4
493 C sub/normal4
493 C sub/normal4
494 C sub2/large6
494 C sub2/large6
495 C sub2/large7
495 C sub2/large7
496 $ hg st
496 $ hg st
497
497
498 Test 3507 (both normal files and largefiles were a problem)
498 Test 3507 (both normal files and largefiles were a problem)
499
499
500 $ touch normal
500 $ touch normal
501 $ touch large
501 $ touch large
502 $ hg add normal
502 $ hg add normal
503 $ hg add --large large
503 $ hg add --large large
504 $ hg ci -m "added"
504 $ hg ci -m "added"
505 Invoking status precommit hook
505 Invoking status precommit hook
506 A large
506 A large
507 A normal
507 A normal
508 Invoking status postcommit hook
508 Invoking status postcommit hook
509 C large
509 C large
510 C normal
510 C normal
511 C normal3
511 C normal3
512 C sub/large4
512 C sub/large4
513 C sub/normal4
513 C sub/normal4
514 C sub2/large6
514 C sub2/large6
515 C sub2/large7
515 C sub2/large7
516 $ hg remove normal
516 $ hg remove normal
517 $ hg addremove --traceback
517 $ hg addremove --traceback
518 $ hg ci -m "addremoved normal"
518 $ hg ci -m "addremoved normal"
519 Invoking status precommit hook
519 Invoking status precommit hook
520 R normal
520 R normal
521 Invoking status postcommit hook
521 Invoking status postcommit hook
522 C large
522 C large
523 C normal3
523 C normal3
524 C sub/large4
524 C sub/large4
525 C sub/normal4
525 C sub/normal4
526 C sub2/large6
526 C sub2/large6
527 C sub2/large7
527 C sub2/large7
528 $ hg up -C '.^'
528 $ hg up -C '.^'
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 getting changed largefiles
530 getting changed largefiles
531 0 largefiles updated, 0 removed
531 0 largefiles updated, 0 removed
532 $ hg remove large
532 $ hg remove large
533 $ hg addremove --traceback
533 $ hg addremove --traceback
534 $ hg ci -m "removed large"
534 $ hg ci -m "removed large"
535 Invoking status precommit hook
535 Invoking status precommit hook
536 R large
536 R large
537 created new head
537 created new head
538 Invoking status postcommit hook
538 Invoking status postcommit hook
539 C normal
539 C normal
540 C normal3
540 C normal3
541 C sub/large4
541 C sub/large4
542 C sub/normal4
542 C sub/normal4
543 C sub2/large6
543 C sub2/large6
544 C sub2/large7
544 C sub2/large7
545
545
546 Test that a standin can't be added as a large file
546 Test that a standin can't be added as a large file
547
547
548 $ touch large
548 $ touch large
549 $ hg add --large large
549 $ hg add --large large
550 $ hg ci -m "add"
550 $ hg ci -m "add"
551 Invoking status precommit hook
551 Invoking status precommit hook
552 A large
552 A large
553 Invoking status postcommit hook
553 Invoking status postcommit hook
554 C large
554 C large
555 C normal
555 C normal
556 C normal3
556 C normal3
557 C sub/large4
557 C sub/large4
558 C sub/normal4
558 C sub/normal4
559 C sub2/large6
559 C sub2/large6
560 C sub2/large7
560 C sub2/large7
561 $ hg remove large
561 $ hg remove large
562 $ touch large
562 $ touch large
563 $ hg addremove --config largefiles.patterns=**large --traceback
563 $ hg addremove --config largefiles.patterns=**large --traceback
564 adding large as a largefile
564 adding large as a largefile
565
565
566 Test that outgoing --large works (with revsets too)
566 Test that outgoing --large works (with revsets too)
567 $ hg outgoing --rev '.^' --large
567 $ hg outgoing --rev '.^' --large
568 comparing with $TESTTMP/a (glob)
568 comparing with $TESTTMP/a (glob)
569 searching for changes
569 searching for changes
570 changeset: 8:c02fd3b77ec4
570 changeset: 8:c02fd3b77ec4
571 user: test
571 user: test
572 date: Thu Jan 01 00:00:00 1970 +0000
572 date: Thu Jan 01 00:00:00 1970 +0000
573 summary: add foo
573 summary: add foo
574
574
575 changeset: 9:289dd08c9bbb
575 changeset: 9:289dd08c9bbb
576 user: test
576 user: test
577 date: Thu Jan 01 00:00:00 1970 +0000
577 date: Thu Jan 01 00:00:00 1970 +0000
578 summary: used to say nothing changed
578 summary: used to say nothing changed
579
579
580 changeset: 10:34f23ac6ac12
580 changeset: 10:34f23ac6ac12
581 user: test
581 user: test
582 date: Thu Jan 01 00:00:00 1970 +0000
582 date: Thu Jan 01 00:00:00 1970 +0000
583 summary: added
583 summary: added
584
584
585 changeset: 12:710c1b2f523c
585 changeset: 12:710c1b2f523c
586 parent: 10:34f23ac6ac12
586 parent: 10:34f23ac6ac12
587 user: test
587 user: test
588 date: Thu Jan 01 00:00:00 1970 +0000
588 date: Thu Jan 01 00:00:00 1970 +0000
589 summary: removed large
589 summary: removed large
590
590
591 searching for changes
591 searching for changes
592 largefiles to upload:
592 largefiles to upload:
593 large
593 large
594 foo
594 foo
595
595
596 $ cd ../a
596 $ cd ../a
597
597
598 Clone a largefiles repo.
598 Clone a largefiles repo.
599
599
600 $ hg clone . ../b
600 $ hg clone . ../b
601 updating to branch default
601 updating to branch default
602 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
602 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
603 getting changed largefiles
603 getting changed largefiles
604 3 largefiles updated, 0 removed
604 3 largefiles updated, 0 removed
605 $ cd ../b
605 $ cd ../b
606 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
606 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
607 7:daea875e9014 add/edit more largefiles
607 7:daea875e9014 add/edit more largefiles
608 6:4355d653f84f edit files yet again
608 6:4355d653f84f edit files yet again
609 5:9d5af5072dbd edit files again
609 5:9d5af5072dbd edit files again
610 4:74c02385b94c move files
610 4:74c02385b94c move files
611 3:9e8fbc4bce62 copy files
611 3:9e8fbc4bce62 copy files
612 2:51a0ae4d5864 remove files
612 2:51a0ae4d5864 remove files
613 1:ce8896473775 edit files
613 1:ce8896473775 edit files
614 0:30d30fe6a5be add files
614 0:30d30fe6a5be add files
615 $ cat normal3
615 $ cat normal3
616 normal33
616 normal33
617 $ cat sub/normal4
617 $ cat sub/normal4
618 normal44
618 normal44
619 $ cat sub/large4
619 $ cat sub/large4
620 large44
620 large44
621 $ cat sub2/large6
621 $ cat sub2/large6
622 large6
622 large6
623 $ cat sub2/large7
623 $ cat sub2/large7
624 large7
624 large7
625 $ cd ..
625 $ cd ..
626 $ hg clone a -r 3 c
626 $ hg clone a -r 3 c
627 adding changesets
627 adding changesets
628 adding manifests
628 adding manifests
629 adding file changes
629 adding file changes
630 added 4 changesets with 10 changes to 4 files
630 added 4 changesets with 10 changes to 4 files
631 updating to branch default
631 updating to branch default
632 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
632 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
633 getting changed largefiles
633 getting changed largefiles
634 2 largefiles updated, 0 removed
634 2 largefiles updated, 0 removed
635 $ cd c
635 $ cd c
636 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
636 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
637 3:9e8fbc4bce62 copy files
637 3:9e8fbc4bce62 copy files
638 2:51a0ae4d5864 remove files
638 2:51a0ae4d5864 remove files
639 1:ce8896473775 edit files
639 1:ce8896473775 edit files
640 0:30d30fe6a5be add files
640 0:30d30fe6a5be add files
641 $ cat normal1
641 $ cat normal1
642 normal22
642 normal22
643 $ cat large1
643 $ cat large1
644 large22
644 large22
645 $ cat sub/normal2
645 $ cat sub/normal2
646 normal22
646 normal22
647 $ cat sub/large2
647 $ cat sub/large2
648 large22
648 large22
649
649
650 Old revisions of a clone have correct largefiles content (this also
650 Old revisions of a clone have correct largefiles content (this also
651 tests update).
651 tests update).
652
652
653 $ hg update -r 1
653 $ hg update -r 1
654 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
654 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
655 getting changed largefiles
655 getting changed largefiles
656 1 largefiles updated, 0 removed
656 1 largefiles updated, 0 removed
657 $ cat large1
657 $ cat large1
658 large11
658 large11
659 $ cat sub/large2
659 $ cat sub/large2
660 large22
660 large22
661 $ cd ..
661 $ cd ..
662
662
663 Test cloning with --all-largefiles flag
663 Test cloning with --all-largefiles flag
664
664
665 $ rm "${USERCACHE}"/*
665 $ rm "${USERCACHE}"/*
666 $ hg clone --all-largefiles a a-backup
666 $ hg clone --all-largefiles a a-backup
667 updating to branch default
667 updating to branch default
668 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
668 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
669 getting changed largefiles
669 getting changed largefiles
670 3 largefiles updated, 0 removed
670 3 largefiles updated, 0 removed
671 8 additional largefiles cached
671 8 additional largefiles cached
672
672
673 $ rm "${USERCACHE}"/*
673 $ rm "${USERCACHE}"/*
674 $ hg clone --all-largefiles -u 0 a a-clone0
674 $ hg clone --all-largefiles -u 0 a a-clone0
675 updating to branch default
675 updating to branch default
676 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
676 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
677 getting changed largefiles
677 getting changed largefiles
678 2 largefiles updated, 0 removed
678 2 largefiles updated, 0 removed
679 9 additional largefiles cached
679 9 additional largefiles cached
680 $ hg -R a-clone0 sum
680 $ hg -R a-clone0 sum
681 parent: 0:30d30fe6a5be
681 parent: 0:30d30fe6a5be
682 add files
682 add files
683 branch: default
683 branch: default
684 commit: (clean)
684 commit: (clean)
685 update: 7 new changesets (update)
685 update: 7 new changesets (update)
686
686
687 $ rm "${USERCACHE}"/*
687 $ rm "${USERCACHE}"/*
688 $ hg clone --all-largefiles -u 1 a a-clone1
688 $ hg clone --all-largefiles -u 1 a a-clone1
689 updating to branch default
689 updating to branch default
690 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
690 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
691 getting changed largefiles
691 getting changed largefiles
692 2 largefiles updated, 0 removed
692 2 largefiles updated, 0 removed
693 8 additional largefiles cached
693 8 additional largefiles cached
694 $ hg -R a-clone1 sum
694 $ hg -R a-clone1 sum
695 parent: 1:ce8896473775
695 parent: 1:ce8896473775
696 edit files
696 edit files
697 branch: default
697 branch: default
698 commit: (clean)
698 commit: (clean)
699 update: 6 new changesets (update)
699 update: 6 new changesets (update)
700
700
701 $ rm "${USERCACHE}"/*
701 $ rm "${USERCACHE}"/*
702 $ hg clone --all-largefiles -U a a-clone-u
702 $ hg clone --all-largefiles -U a a-clone-u
703 11 additional largefiles cached
703 11 additional largefiles cached
704 $ hg -R a-clone-u sum
704 $ hg -R a-clone-u sum
705 parent: -1:000000000000 (no revision checked out)
705 parent: -1:000000000000 (no revision checked out)
706 branch: default
706 branch: default
707 commit: (clean)
707 commit: (clean)
708 update: 8 new changesets (update)
708 update: 8 new changesets (update)
709
709
710 $ mkdir xyz
711 $ cd xyz
712 $ hg clone ../a
713 destination directory: a
714 updating to branch default
715 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
716 getting changed largefiles
717 3 largefiles updated, 0 removed
718 $ cd ..
719
710 $ hg clone --all-largefiles a ssh://localhost/a
720 $ hg clone --all-largefiles a ssh://localhost/a
711 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
721 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
712 [255]
722 [255]
713
723
714 Test pulling with --all-largefiles flag
724 Test pulling with --all-largefiles flag
715
725
716 $ rm -Rf a-backup
726 $ rm -Rf a-backup
717 $ hg clone -r 1 a a-backup
727 $ hg clone -r 1 a a-backup
718 adding changesets
728 adding changesets
719 adding manifests
729 adding manifests
720 adding file changes
730 adding file changes
721 added 2 changesets with 8 changes to 4 files
731 added 2 changesets with 8 changes to 4 files
722 updating to branch default
732 updating to branch default
723 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
733 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
724 getting changed largefiles
734 getting changed largefiles
725 2 largefiles updated, 0 removed
735 2 largefiles updated, 0 removed
726 $ rm "${USERCACHE}"/*
736 $ rm "${USERCACHE}"/*
727 $ cd a-backup
737 $ cd a-backup
728 $ hg pull --all-largefiles
738 $ hg pull --all-largefiles
729 pulling from $TESTTMP/a (glob)
739 pulling from $TESTTMP/a (glob)
730 searching for changes
740 searching for changes
731 adding changesets
741 adding changesets
732 adding manifests
742 adding manifests
733 adding file changes
743 adding file changes
734 added 6 changesets with 16 changes to 8 files
744 added 6 changesets with 16 changes to 8 files
735 (run 'hg update' to get a working copy)
745 (run 'hg update' to get a working copy)
736 caching new largefiles
746 caching new largefiles
737 3 largefiles cached
747 3 largefiles cached
738 3 additional largefiles cached
748 3 additional largefiles cached
739 $ cd ..
749 $ cd ..
740
750
741 Rebasing between two repositories does not revert largefiles to old
751 Rebasing between two repositories does not revert largefiles to old
742 revisions (this was a very bad bug that took a lot of work to fix).
752 revisions (this was a very bad bug that took a lot of work to fix).
743
753
744 $ hg clone a d
754 $ hg clone a d
745 updating to branch default
755 updating to branch default
746 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
756 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
747 getting changed largefiles
757 getting changed largefiles
748 3 largefiles updated, 0 removed
758 3 largefiles updated, 0 removed
749 $ cd b
759 $ cd b
750 $ echo large4-modified > sub/large4
760 $ echo large4-modified > sub/large4
751 $ echo normal3-modified > normal3
761 $ echo normal3-modified > normal3
752 $ hg commit -m "modify normal file and largefile in repo b"
762 $ hg commit -m "modify normal file and largefile in repo b"
753 Invoking status precommit hook
763 Invoking status precommit hook
754 M normal3
764 M normal3
755 M sub/large4
765 M sub/large4
756 $ cd ../d
766 $ cd ../d
757 $ echo large6-modified > sub2/large6
767 $ echo large6-modified > sub2/large6
758 $ echo normal4-modified > sub/normal4
768 $ echo normal4-modified > sub/normal4
759 $ hg commit -m "modify normal file largefile in repo d"
769 $ hg commit -m "modify normal file largefile in repo d"
760 Invoking status precommit hook
770 Invoking status precommit hook
761 M sub/normal4
771 M sub/normal4
762 M sub2/large6
772 M sub2/large6
763 $ cd ..
773 $ cd ..
764 $ hg clone d e
774 $ hg clone d e
765 updating to branch default
775 updating to branch default
766 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
776 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
767 getting changed largefiles
777 getting changed largefiles
768 3 largefiles updated, 0 removed
778 3 largefiles updated, 0 removed
769 $ cd d
779 $ cd d
770 $ hg pull --rebase ../b
780 $ hg pull --rebase ../b
771 pulling from ../b
781 pulling from ../b
772 searching for changes
782 searching for changes
773 adding changesets
783 adding changesets
774 adding manifests
784 adding manifests
775 adding file changes
785 adding file changes
776 added 1 changesets with 2 changes to 2 files (+1 heads)
786 added 1 changesets with 2 changes to 2 files (+1 heads)
777 Invoking status precommit hook
787 Invoking status precommit hook
778 M sub/normal4
788 M sub/normal4
779 M sub2/large6
789 M sub2/large6
780 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
790 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
781 nothing to rebase
791 nothing to rebase
782 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
792 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
783 9:598410d3eb9a modify normal file largefile in repo d
793 9:598410d3eb9a modify normal file largefile in repo d
784 8:a381d2c8c80e modify normal file and largefile in repo b
794 8:a381d2c8c80e modify normal file and largefile in repo b
785 7:daea875e9014 add/edit more largefiles
795 7:daea875e9014 add/edit more largefiles
786 6:4355d653f84f edit files yet again
796 6:4355d653f84f edit files yet again
787 5:9d5af5072dbd edit files again
797 5:9d5af5072dbd edit files again
788 4:74c02385b94c move files
798 4:74c02385b94c move files
789 3:9e8fbc4bce62 copy files
799 3:9e8fbc4bce62 copy files
790 2:51a0ae4d5864 remove files
800 2:51a0ae4d5864 remove files
791 1:ce8896473775 edit files
801 1:ce8896473775 edit files
792 0:30d30fe6a5be add files
802 0:30d30fe6a5be add files
793 $ cat normal3
803 $ cat normal3
794 normal3-modified
804 normal3-modified
795 $ cat sub/normal4
805 $ cat sub/normal4
796 normal4-modified
806 normal4-modified
797 $ cat sub/large4
807 $ cat sub/large4
798 large4-modified
808 large4-modified
799 $ cat sub2/large6
809 $ cat sub2/large6
800 large6-modified
810 large6-modified
801 $ cat sub2/large7
811 $ cat sub2/large7
802 large7
812 large7
803 $ cd ../e
813 $ cd ../e
804 $ hg pull ../b
814 $ hg pull ../b
805 pulling from ../b
815 pulling from ../b
806 searching for changes
816 searching for changes
807 adding changesets
817 adding changesets
808 adding manifests
818 adding manifests
809 adding file changes
819 adding file changes
810 added 1 changesets with 2 changes to 2 files (+1 heads)
820 added 1 changesets with 2 changes to 2 files (+1 heads)
811 (run 'hg heads' to see heads, 'hg merge' to merge)
821 (run 'hg heads' to see heads, 'hg merge' to merge)
812 caching new largefiles
822 caching new largefiles
813 0 largefiles cached
823 0 largefiles cached
814 $ hg rebase
824 $ hg rebase
815 Invoking status precommit hook
825 Invoking status precommit hook
816 M sub/normal4
826 M sub/normal4
817 M sub2/large6
827 M sub2/large6
818 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
828 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
819 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
829 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
820 9:598410d3eb9a modify normal file largefile in repo d
830 9:598410d3eb9a modify normal file largefile in repo d
821 8:a381d2c8c80e modify normal file and largefile in repo b
831 8:a381d2c8c80e modify normal file and largefile in repo b
822 7:daea875e9014 add/edit more largefiles
832 7:daea875e9014 add/edit more largefiles
823 6:4355d653f84f edit files yet again
833 6:4355d653f84f edit files yet again
824 5:9d5af5072dbd edit files again
834 5:9d5af5072dbd edit files again
825 4:74c02385b94c move files
835 4:74c02385b94c move files
826 3:9e8fbc4bce62 copy files
836 3:9e8fbc4bce62 copy files
827 2:51a0ae4d5864 remove files
837 2:51a0ae4d5864 remove files
828 1:ce8896473775 edit files
838 1:ce8896473775 edit files
829 0:30d30fe6a5be add files
839 0:30d30fe6a5be add files
830 $ cat normal3
840 $ cat normal3
831 normal3-modified
841 normal3-modified
832 $ cat sub/normal4
842 $ cat sub/normal4
833 normal4-modified
843 normal4-modified
834 $ cat sub/large4
844 $ cat sub/large4
835 large4-modified
845 large4-modified
836 $ cat sub2/large6
846 $ cat sub2/large6
837 large6-modified
847 large6-modified
838 $ cat sub2/large7
848 $ cat sub2/large7
839 large7
849 large7
840
850
841 Rollback on largefiles.
851 Rollback on largefiles.
842
852
843 $ echo large4-modified-again > sub/large4
853 $ echo large4-modified-again > sub/large4
844 $ hg commit -m "Modify large4 again"
854 $ hg commit -m "Modify large4 again"
845 Invoking status precommit hook
855 Invoking status precommit hook
846 M sub/large4
856 M sub/large4
847 $ hg rollback
857 $ hg rollback
848 repository tip rolled back to revision 9 (undo commit)
858 repository tip rolled back to revision 9 (undo commit)
849 working directory now based on revision 9
859 working directory now based on revision 9
850 $ hg st
860 $ hg st
851 M sub/large4
861 M sub/large4
852 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
862 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
853 9:598410d3eb9a modify normal file largefile in repo d
863 9:598410d3eb9a modify normal file largefile in repo d
854 8:a381d2c8c80e modify normal file and largefile in repo b
864 8:a381d2c8c80e modify normal file and largefile in repo b
855 7:daea875e9014 add/edit more largefiles
865 7:daea875e9014 add/edit more largefiles
856 6:4355d653f84f edit files yet again
866 6:4355d653f84f edit files yet again
857 5:9d5af5072dbd edit files again
867 5:9d5af5072dbd edit files again
858 4:74c02385b94c move files
868 4:74c02385b94c move files
859 3:9e8fbc4bce62 copy files
869 3:9e8fbc4bce62 copy files
860 2:51a0ae4d5864 remove files
870 2:51a0ae4d5864 remove files
861 1:ce8896473775 edit files
871 1:ce8896473775 edit files
862 0:30d30fe6a5be add files
872 0:30d30fe6a5be add files
863 $ cat sub/large4
873 $ cat sub/large4
864 large4-modified-again
874 large4-modified-again
865
875
866 "update --check" refuses to update with uncommitted changes.
876 "update --check" refuses to update with uncommitted changes.
867 $ hg update --check 8
877 $ hg update --check 8
868 abort: uncommitted local changes
878 abort: uncommitted local changes
869 [255]
879 [255]
870
880
871 "update --clean" leaves correct largefiles in working copy.
881 "update --clean" leaves correct largefiles in working copy.
872
882
873 $ hg update --clean
883 $ hg update --clean
874 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
884 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
875 getting changed largefiles
885 getting changed largefiles
876 1 largefiles updated, 0 removed
886 1 largefiles updated, 0 removed
877 $ cat normal3
887 $ cat normal3
878 normal3-modified
888 normal3-modified
879 $ cat sub/normal4
889 $ cat sub/normal4
880 normal4-modified
890 normal4-modified
881 $ cat sub/large4
891 $ cat sub/large4
882 large4-modified
892 large4-modified
883 $ cat sub2/large6
893 $ cat sub2/large6
884 large6-modified
894 large6-modified
885 $ cat sub2/large7
895 $ cat sub2/large7
886 large7
896 large7
887
897
888 Now "update check" is happy.
898 Now "update check" is happy.
889 $ hg update --check 8
899 $ hg update --check 8
890 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
900 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
891 getting changed largefiles
901 getting changed largefiles
892 1 largefiles updated, 0 removed
902 1 largefiles updated, 0 removed
893 $ hg update --check
903 $ hg update --check
894 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
904 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
895 getting changed largefiles
905 getting changed largefiles
896 1 largefiles updated, 0 removed
906 1 largefiles updated, 0 removed
897
907
898 Test removing empty largefiles directories on update
908 Test removing empty largefiles directories on update
899 $ test -d sub2 && echo "sub2 exists"
909 $ test -d sub2 && echo "sub2 exists"
900 sub2 exists
910 sub2 exists
901 $ hg update -q null
911 $ hg update -q null
902 $ test -d sub2 && echo "error: sub2 should not exist anymore"
912 $ test -d sub2 && echo "error: sub2 should not exist anymore"
903 [1]
913 [1]
904 $ hg update -q
914 $ hg update -q
905
915
906 Test hg remove removes empty largefiles directories
916 Test hg remove removes empty largefiles directories
907 $ test -d sub2 && echo "sub2 exists"
917 $ test -d sub2 && echo "sub2 exists"
908 sub2 exists
918 sub2 exists
909 $ hg remove sub2/*
919 $ hg remove sub2/*
910 $ test -d sub2 && echo "error: sub2 should not exist anymore"
920 $ test -d sub2 && echo "error: sub2 should not exist anymore"
911 [1]
921 [1]
912 $ hg revert sub2/large6 sub2/large7
922 $ hg revert sub2/large6 sub2/large7
913
923
914 "revert" works on largefiles (and normal files too).
924 "revert" works on largefiles (and normal files too).
915 $ echo hack3 >> normal3
925 $ echo hack3 >> normal3
916 $ echo hack4 >> sub/normal4
926 $ echo hack4 >> sub/normal4
917 $ echo hack4 >> sub/large4
927 $ echo hack4 >> sub/large4
918 $ rm sub2/large6
928 $ rm sub2/large6
919 $ hg revert sub2/large6
929 $ hg revert sub2/large6
920 $ hg rm sub2/large6
930 $ hg rm sub2/large6
921 $ echo new >> sub2/large8
931 $ echo new >> sub2/large8
922 $ hg add --large sub2/large8
932 $ hg add --large sub2/large8
923 # XXX we don't really want to report that we're reverting the standin;
933 # XXX we don't really want to report that we're reverting the standin;
924 # that's just an implementation detail. But I don't see an obvious fix. ;-(
934 # that's just an implementation detail. But I don't see an obvious fix. ;-(
925 $ hg revert sub
935 $ hg revert sub
926 reverting .hglf/sub/large4 (glob)
936 reverting .hglf/sub/large4 (glob)
927 reverting sub/normal4 (glob)
937 reverting sub/normal4 (glob)
928 $ hg status
938 $ hg status
929 M normal3
939 M normal3
930 A sub2/large8
940 A sub2/large8
931 R sub2/large6
941 R sub2/large6
932 ? sub/large4.orig
942 ? sub/large4.orig
933 ? sub/normal4.orig
943 ? sub/normal4.orig
934 $ cat sub/normal4
944 $ cat sub/normal4
935 normal4-modified
945 normal4-modified
936 $ cat sub/large4
946 $ cat sub/large4
937 large4-modified
947 large4-modified
938 $ hg revert -a --no-backup
948 $ hg revert -a --no-backup
939 undeleting .hglf/sub2/large6 (glob)
949 undeleting .hglf/sub2/large6 (glob)
940 forgetting .hglf/sub2/large8 (glob)
950 forgetting .hglf/sub2/large8 (glob)
941 reverting normal3
951 reverting normal3
942 $ hg status
952 $ hg status
943 ? sub/large4.orig
953 ? sub/large4.orig
944 ? sub/normal4.orig
954 ? sub/normal4.orig
945 ? sub2/large8
955 ? sub2/large8
946 $ cat normal3
956 $ cat normal3
947 normal3-modified
957 normal3-modified
948 $ cat sub2/large6
958 $ cat sub2/large6
949 large6-modified
959 large6-modified
950 $ rm sub/*.orig sub2/large8
960 $ rm sub/*.orig sub2/large8
951
961
952 revert some files to an older revision
962 revert some files to an older revision
953 $ hg revert --no-backup -r 8 sub2
963 $ hg revert --no-backup -r 8 sub2
954 reverting .hglf/sub2/large6 (glob)
964 reverting .hglf/sub2/large6 (glob)
955 $ cat sub2/large6
965 $ cat sub2/large6
956 large6
966 large6
957 $ hg revert --no-backup -C -r '.^' sub2
967 $ hg revert --no-backup -C -r '.^' sub2
958 reverting .hglf/sub2/large6 (glob)
968 reverting .hglf/sub2/large6 (glob)
959 $ hg revert --no-backup sub2
969 $ hg revert --no-backup sub2
960 reverting .hglf/sub2/large6 (glob)
970 reverting .hglf/sub2/large6 (glob)
961 $ hg status
971 $ hg status
962
972
963 "verify --large" actually verifies largefiles
973 "verify --large" actually verifies largefiles
964
974
965 $ hg verify --large
975 $ hg verify --large
966 checking changesets
976 checking changesets
967 checking manifests
977 checking manifests
968 crosschecking files in changesets and manifests
978 crosschecking files in changesets and manifests
969 checking files
979 checking files
970 10 files, 10 changesets, 28 total revisions
980 10 files, 10 changesets, 28 total revisions
971 searching 1 changesets for largefiles
981 searching 1 changesets for largefiles
972 verified existence of 3 revisions of 3 largefiles
982 verified existence of 3 revisions of 3 largefiles
973
983
974 Merging does not revert to old versions of largefiles and also check
984 Merging does not revert to old versions of largefiles and also check
975 that merging after having pulled from a non-default remote works
985 that merging after having pulled from a non-default remote works
976 correctly.
986 correctly.
977
987
978 $ cd ..
988 $ cd ..
979 $ hg clone -r 7 e temp
989 $ hg clone -r 7 e temp
980 adding changesets
990 adding changesets
981 adding manifests
991 adding manifests
982 adding file changes
992 adding file changes
983 added 8 changesets with 24 changes to 10 files
993 added 8 changesets with 24 changes to 10 files
984 updating to branch default
994 updating to branch default
985 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
995 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
986 getting changed largefiles
996 getting changed largefiles
987 3 largefiles updated, 0 removed
997 3 largefiles updated, 0 removed
988 $ hg clone temp f
998 $ hg clone temp f
989 updating to branch default
999 updating to branch default
990 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1000 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
991 getting changed largefiles
1001 getting changed largefiles
992 3 largefiles updated, 0 removed
1002 3 largefiles updated, 0 removed
993 # Delete the largefiles in the largefiles system cache so that we have an
1003 # Delete the largefiles in the largefiles system cache so that we have an
994 # opportunity to test that caching after a pull works.
1004 # opportunity to test that caching after a pull works.
995 $ rm "${USERCACHE}"/*
1005 $ rm "${USERCACHE}"/*
996 $ cd f
1006 $ cd f
997 $ echo "large4-merge-test" > sub/large4
1007 $ echo "large4-merge-test" > sub/large4
998 $ hg commit -m "Modify large4 to test merge"
1008 $ hg commit -m "Modify large4 to test merge"
999 Invoking status precommit hook
1009 Invoking status precommit hook
1000 M sub/large4
1010 M sub/large4
1001 $ hg pull ../e
1011 $ hg pull ../e
1002 pulling from ../e
1012 pulling from ../e
1003 searching for changes
1013 searching for changes
1004 adding changesets
1014 adding changesets
1005 adding manifests
1015 adding manifests
1006 adding file changes
1016 adding file changes
1007 added 2 changesets with 4 changes to 4 files (+1 heads)
1017 added 2 changesets with 4 changes to 4 files (+1 heads)
1008 (run 'hg heads' to see heads, 'hg merge' to merge)
1018 (run 'hg heads' to see heads, 'hg merge' to merge)
1009 caching new largefiles
1019 caching new largefiles
1010 2 largefiles cached
1020 2 largefiles cached
1011 $ hg merge
1021 $ hg merge
1012 merging sub/large4
1022 merging sub/large4
1013 largefile sub/large4 has a merge conflict
1023 largefile sub/large4 has a merge conflict
1014 keep (l)ocal or take (o)ther? l
1024 keep (l)ocal or take (o)ther? l
1015 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1025 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1016 (branch merge, don't forget to commit)
1026 (branch merge, don't forget to commit)
1017 getting changed largefiles
1027 getting changed largefiles
1018 1 largefiles updated, 0 removed
1028 1 largefiles updated, 0 removed
1019 $ hg commit -m "Merge repos e and f"
1029 $ hg commit -m "Merge repos e and f"
1020 Invoking status precommit hook
1030 Invoking status precommit hook
1021 M normal3
1031 M normal3
1022 M sub/normal4
1032 M sub/normal4
1023 M sub2/large6
1033 M sub2/large6
1024 $ cat normal3
1034 $ cat normal3
1025 normal3-modified
1035 normal3-modified
1026 $ cat sub/normal4
1036 $ cat sub/normal4
1027 normal4-modified
1037 normal4-modified
1028 $ cat sub/large4
1038 $ cat sub/large4
1029 large4-merge-test
1039 large4-merge-test
1030 $ cat sub2/large6
1040 $ cat sub2/large6
1031 large6-modified
1041 large6-modified
1032 $ cat sub2/large7
1042 $ cat sub2/large7
1033 large7
1043 large7
1034
1044
1035 Test status after merging with a branch that introduces a new largefile:
1045 Test status after merging with a branch that introduces a new largefile:
1036
1046
1037 $ echo large > large
1047 $ echo large > large
1038 $ hg add --large large
1048 $ hg add --large large
1039 $ hg commit -m 'add largefile'
1049 $ hg commit -m 'add largefile'
1040 Invoking status precommit hook
1050 Invoking status precommit hook
1041 A large
1051 A large
1042 $ hg update -q ".^"
1052 $ hg update -q ".^"
1043 $ echo change >> normal3
1053 $ echo change >> normal3
1044 $ hg commit -m 'some change'
1054 $ hg commit -m 'some change'
1045 Invoking status precommit hook
1055 Invoking status precommit hook
1046 M normal3
1056 M normal3
1047 created new head
1057 created new head
1048 $ hg merge
1058 $ hg merge
1049 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1059 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1050 (branch merge, don't forget to commit)
1060 (branch merge, don't forget to commit)
1051 getting changed largefiles
1061 getting changed largefiles
1052 1 largefiles updated, 0 removed
1062 1 largefiles updated, 0 removed
1053 $ hg status
1063 $ hg status
1054 M large
1064 M large
1055
1065
1056 Test that a normal file and a largefile with the same name and path cannot
1066 Test that a normal file and a largefile with the same name and path cannot
1057 coexist.
1067 coexist.
1058
1068
1059 $ rm sub2/large7
1069 $ rm sub2/large7
1060 $ echo "largeasnormal" > sub2/large7
1070 $ echo "largeasnormal" > sub2/large7
1061 $ hg add sub2/large7
1071 $ hg add sub2/large7
1062 sub2/large7 already a largefile
1072 sub2/large7 already a largefile
1063
1073
1064 Test that transplanting a largefile change works correctly.
1074 Test that transplanting a largefile change works correctly.
1065
1075
1066 $ cd ..
1076 $ cd ..
1067 $ hg clone -r 8 d g
1077 $ hg clone -r 8 d g
1068 adding changesets
1078 adding changesets
1069 adding manifests
1079 adding manifests
1070 adding file changes
1080 adding file changes
1071 added 9 changesets with 26 changes to 10 files
1081 added 9 changesets with 26 changes to 10 files
1072 updating to branch default
1082 updating to branch default
1073 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1083 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1074 getting changed largefiles
1084 getting changed largefiles
1075 3 largefiles updated, 0 removed
1085 3 largefiles updated, 0 removed
1076 $ cd g
1086 $ cd g
1077 $ hg transplant -s ../d 598410d3eb9a
1087 $ hg transplant -s ../d 598410d3eb9a
1078 searching for changes
1088 searching for changes
1079 searching for changes
1089 searching for changes
1080 adding changesets
1090 adding changesets
1081 adding manifests
1091 adding manifests
1082 adding file changes
1092 adding file changes
1083 added 1 changesets with 2 changes to 2 files
1093 added 1 changesets with 2 changes to 2 files
1084 getting changed largefiles
1094 getting changed largefiles
1085 1 largefiles updated, 0 removed
1095 1 largefiles updated, 0 removed
1086 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1096 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1087 9:598410d3eb9a modify normal file largefile in repo d
1097 9:598410d3eb9a modify normal file largefile in repo d
1088 8:a381d2c8c80e modify normal file and largefile in repo b
1098 8:a381d2c8c80e modify normal file and largefile in repo b
1089 7:daea875e9014 add/edit more largefiles
1099 7:daea875e9014 add/edit more largefiles
1090 6:4355d653f84f edit files yet again
1100 6:4355d653f84f edit files yet again
1091 5:9d5af5072dbd edit files again
1101 5:9d5af5072dbd edit files again
1092 4:74c02385b94c move files
1102 4:74c02385b94c move files
1093 3:9e8fbc4bce62 copy files
1103 3:9e8fbc4bce62 copy files
1094 2:51a0ae4d5864 remove files
1104 2:51a0ae4d5864 remove files
1095 1:ce8896473775 edit files
1105 1:ce8896473775 edit files
1096 0:30d30fe6a5be add files
1106 0:30d30fe6a5be add files
1097 $ cat normal3
1107 $ cat normal3
1098 normal3-modified
1108 normal3-modified
1099 $ cat sub/normal4
1109 $ cat sub/normal4
1100 normal4-modified
1110 normal4-modified
1101 $ cat sub/large4
1111 $ cat sub/large4
1102 large4-modified
1112 large4-modified
1103 $ cat sub2/large6
1113 $ cat sub2/large6
1104 large6-modified
1114 large6-modified
1105 $ cat sub2/large7
1115 $ cat sub2/large7
1106 large7
1116 large7
1107
1117
1108 Cat a largefile
1118 Cat a largefile
1109 $ hg cat normal3
1119 $ hg cat normal3
1110 normal3-modified
1120 normal3-modified
1111 $ hg cat sub/large4
1121 $ hg cat sub/large4
1112 large4-modified
1122 large4-modified
1113 $ rm "${USERCACHE}"/*
1123 $ rm "${USERCACHE}"/*
1114 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1124 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1115 $ cat cat.out
1125 $ cat cat.out
1116 large4-modified
1126 large4-modified
1117 $ rm cat.out
1127 $ rm cat.out
1118 $ hg cat -r a381d2c8c80e normal3
1128 $ hg cat -r a381d2c8c80e normal3
1119 normal3-modified
1129 normal3-modified
1120 $ hg cat -r '.^' normal3
1130 $ hg cat -r '.^' normal3
1121 normal3-modified
1131 normal3-modified
1122 $ hg cat -r '.^' sub/large4
1132 $ hg cat -r '.^' sub/large4
1123 large4-modified
1133 large4-modified
1124
1134
1125 Test that renaming a largefile results in correct output for status
1135 Test that renaming a largefile results in correct output for status
1126
1136
1127 $ hg rename sub/large4 large4-renamed
1137 $ hg rename sub/large4 large4-renamed
1128 $ hg commit -m "test rename output"
1138 $ hg commit -m "test rename output"
1129 Invoking status precommit hook
1139 Invoking status precommit hook
1130 A large4-renamed
1140 A large4-renamed
1131 R sub/large4
1141 R sub/large4
1132 $ cat large4-renamed
1142 $ cat large4-renamed
1133 large4-modified
1143 large4-modified
1134 $ cd sub2
1144 $ cd sub2
1135 $ hg rename large6 large6-renamed
1145 $ hg rename large6 large6-renamed
1136 $ hg st
1146 $ hg st
1137 A sub2/large6-renamed
1147 A sub2/large6-renamed
1138 R sub2/large6
1148 R sub2/large6
1139 $ cd ..
1149 $ cd ..
1140
1150
1141 Test --normal flag
1151 Test --normal flag
1142
1152
1143 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1153 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1144 $ hg add --normal --large new-largefile
1154 $ hg add --normal --large new-largefile
1145 abort: --normal cannot be used with --large
1155 abort: --normal cannot be used with --large
1146 [255]
1156 [255]
1147 $ hg add --normal new-largefile
1157 $ hg add --normal new-largefile
1148 new-largefile: up to 69 MB of RAM may be required to manage this file
1158 new-largefile: up to 69 MB of RAM may be required to manage this file
1149 (use 'hg revert new-largefile' to cancel the pending addition)
1159 (use 'hg revert new-largefile' to cancel the pending addition)
1150 $ cd ..
1160 $ cd ..
1151
1161
1152 #if serve
1162 #if serve
1153 vanilla clients not locked out from largefiles servers on vanilla repos
1163 vanilla clients not locked out from largefiles servers on vanilla repos
1154 $ mkdir r1
1164 $ mkdir r1
1155 $ cd r1
1165 $ cd r1
1156 $ hg init
1166 $ hg init
1157 $ echo c1 > f1
1167 $ echo c1 > f1
1158 $ hg add f1
1168 $ hg add f1
1159 $ hg commit -m "m1"
1169 $ hg commit -m "m1"
1160 Invoking status precommit hook
1170 Invoking status precommit hook
1161 A f1
1171 A f1
1162 $ cd ..
1172 $ cd ..
1163 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1173 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1164 $ cat hg.pid >> $DAEMON_PIDS
1174 $ cat hg.pid >> $DAEMON_PIDS
1165 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1175 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1166 requesting all changes
1176 requesting all changes
1167 adding changesets
1177 adding changesets
1168 adding manifests
1178 adding manifests
1169 adding file changes
1179 adding file changes
1170 added 1 changesets with 1 changes to 1 files
1180 added 1 changesets with 1 changes to 1 files
1171 updating to branch default
1181 updating to branch default
1172 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1173
1183
1174 largefiles clients still work with vanilla servers
1184 largefiles clients still work with vanilla servers
1175 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1185 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1176 $ cat hg.pid >> $DAEMON_PIDS
1186 $ cat hg.pid >> $DAEMON_PIDS
1177 $ hg clone http://localhost:$HGPORT1 r3
1187 $ hg clone http://localhost:$HGPORT1 r3
1178 requesting all changes
1188 requesting all changes
1179 adding changesets
1189 adding changesets
1180 adding manifests
1190 adding manifests
1181 adding file changes
1191 adding file changes
1182 added 1 changesets with 1 changes to 1 files
1192 added 1 changesets with 1 changes to 1 files
1183 updating to branch default
1193 updating to branch default
1184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1194 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1185 #endif
1195 #endif
1186
1196
1187
1197
1188 vanilla clients locked out from largefiles http repos
1198 vanilla clients locked out from largefiles http repos
1189 $ mkdir r4
1199 $ mkdir r4
1190 $ cd r4
1200 $ cd r4
1191 $ hg init
1201 $ hg init
1192 $ echo c1 > f1
1202 $ echo c1 > f1
1193 $ hg add --large f1
1203 $ hg add --large f1
1194 $ hg commit -m "m1"
1204 $ hg commit -m "m1"
1195 Invoking status precommit hook
1205 Invoking status precommit hook
1196 A f1
1206 A f1
1197 $ cd ..
1207 $ cd ..
1198
1208
1199 largefiles can be pushed locally (issue3583)
1209 largefiles can be pushed locally (issue3583)
1200 $ hg init dest
1210 $ hg init dest
1201 $ cd r4
1211 $ cd r4
1202 $ hg outgoing ../dest
1212 $ hg outgoing ../dest
1203 comparing with ../dest
1213 comparing with ../dest
1204 searching for changes
1214 searching for changes
1205 changeset: 0:639881c12b4c
1215 changeset: 0:639881c12b4c
1206 tag: tip
1216 tag: tip
1207 user: test
1217 user: test
1208 date: Thu Jan 01 00:00:00 1970 +0000
1218 date: Thu Jan 01 00:00:00 1970 +0000
1209 summary: m1
1219 summary: m1
1210
1220
1211 $ hg push ../dest
1221 $ hg push ../dest
1212 pushing to ../dest
1222 pushing to ../dest
1213 searching for changes
1223 searching for changes
1214 searching for changes
1224 searching for changes
1215 adding changesets
1225 adding changesets
1216 adding manifests
1226 adding manifests
1217 adding file changes
1227 adding file changes
1218 added 1 changesets with 1 changes to 1 files
1228 added 1 changesets with 1 changes to 1 files
1219
1229
1220 exit code with nothing outgoing (issue3611)
1230 exit code with nothing outgoing (issue3611)
1221 $ hg outgoing ../dest
1231 $ hg outgoing ../dest
1222 comparing with ../dest
1232 comparing with ../dest
1223 searching for changes
1233 searching for changes
1224 no changes found
1234 no changes found
1225 [1]
1235 [1]
1226 $ cd ..
1236 $ cd ..
1227
1237
1228 #if serve
1238 #if serve
1229 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1239 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1230 $ cat hg.pid >> $DAEMON_PIDS
1240 $ cat hg.pid >> $DAEMON_PIDS
1231 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1241 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1232 abort: remote error:
1242 abort: remote error:
1233
1243
1234 This repository uses the largefiles extension.
1244 This repository uses the largefiles extension.
1235
1245
1236 Please enable it in your Mercurial config file.
1246 Please enable it in your Mercurial config file.
1237 [255]
1247 [255]
1238
1248
1239 used all HGPORTs, kill all daemons
1249 used all HGPORTs, kill all daemons
1240 $ "$TESTDIR/killdaemons.py"
1250 $ "$TESTDIR/killdaemons.py"
1241 #endif
1251 #endif
1242
1252
1243 vanilla clients locked out from largefiles ssh repos
1253 vanilla clients locked out from largefiles ssh repos
1244 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1254 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1245 abort: remote error:
1255 abort: remote error:
1246
1256
1247 This repository uses the largefiles extension.
1257 This repository uses the largefiles extension.
1248
1258
1249 Please enable it in your Mercurial config file.
1259 Please enable it in your Mercurial config file.
1250 [255]
1260 [255]
1251
1261
1252 #if serve
1262 #if serve
1253
1263
1254 largefiles clients refuse to push largefiles repos to vanilla servers
1264 largefiles clients refuse to push largefiles repos to vanilla servers
1255 $ mkdir r6
1265 $ mkdir r6
1256 $ cd r6
1266 $ cd r6
1257 $ hg init
1267 $ hg init
1258 $ echo c1 > f1
1268 $ echo c1 > f1
1259 $ hg add f1
1269 $ hg add f1
1260 $ hg commit -m "m1"
1270 $ hg commit -m "m1"
1261 Invoking status precommit hook
1271 Invoking status precommit hook
1262 A f1
1272 A f1
1263 $ cat >> .hg/hgrc <<!
1273 $ cat >> .hg/hgrc <<!
1264 > [web]
1274 > [web]
1265 > push_ssl = false
1275 > push_ssl = false
1266 > allow_push = *
1276 > allow_push = *
1267 > !
1277 > !
1268 $ cd ..
1278 $ cd ..
1269 $ hg clone r6 r7
1279 $ hg clone r6 r7
1270 updating to branch default
1280 updating to branch default
1271 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1272 $ cd r7
1282 $ cd r7
1273 $ echo c2 > f2
1283 $ echo c2 > f2
1274 $ hg add --large f2
1284 $ hg add --large f2
1275 $ hg commit -m "m2"
1285 $ hg commit -m "m2"
1276 Invoking status precommit hook
1286 Invoking status precommit hook
1277 A f2
1287 A f2
1278 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1288 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1279 $ cat ../hg.pid >> $DAEMON_PIDS
1289 $ cat ../hg.pid >> $DAEMON_PIDS
1280 $ hg push http://localhost:$HGPORT
1290 $ hg push http://localhost:$HGPORT
1281 pushing to http://localhost:$HGPORT/
1291 pushing to http://localhost:$HGPORT/
1282 searching for changes
1292 searching for changes
1283 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1293 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1284 [255]
1294 [255]
1285 $ cd ..
1295 $ cd ..
1286
1296
1287 putlfile errors are shown (issue3123)
1297 putlfile errors are shown (issue3123)
1288 Corrupt the cached largefile in r7 and in the usercache (required for testing on vfat)
1298 Corrupt the cached largefile in r7 and in the usercache (required for testing on vfat)
1289 $ echo corruption > "$TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8"
1299 $ echo corruption > "$TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8"
1290 $ echo corruption > "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1300 $ echo corruption > "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1291 $ hg init empty
1301 $ hg init empty
1292 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1302 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1293 > --config 'web.allow_push=*' --config web.push_ssl=False
1303 > --config 'web.allow_push=*' --config web.push_ssl=False
1294 $ cat hg.pid >> $DAEMON_PIDS
1304 $ cat hg.pid >> $DAEMON_PIDS
1295 $ hg push -R r7 http://localhost:$HGPORT1
1305 $ hg push -R r7 http://localhost:$HGPORT1
1296 pushing to http://localhost:$HGPORT1/
1306 pushing to http://localhost:$HGPORT1/
1297 searching for changes
1307 searching for changes
1298 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1308 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1299 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1309 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1300 [255]
1310 [255]
1301 $ rm -rf empty
1311 $ rm -rf empty
1302
1312
1303 Push a largefiles repository to a served empty repository
1313 Push a largefiles repository to a served empty repository
1304 $ hg init r8
1314 $ hg init r8
1305 $ echo c3 > r8/f1
1315 $ echo c3 > r8/f1
1306 $ hg add --large r8/f1 -R r8
1316 $ hg add --large r8/f1 -R r8
1307 $ hg commit -m "m1" -R r8
1317 $ hg commit -m "m1" -R r8
1308 Invoking status precommit hook
1318 Invoking status precommit hook
1309 A f1
1319 A f1
1310 $ hg init empty
1320 $ hg init empty
1311 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1321 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1312 > --config 'web.allow_push=*' --config web.push_ssl=False
1322 > --config 'web.allow_push=*' --config web.push_ssl=False
1313 $ cat hg.pid >> $DAEMON_PIDS
1323 $ cat hg.pid >> $DAEMON_PIDS
1314 $ rm "${USERCACHE}"/*
1324 $ rm "${USERCACHE}"/*
1315 $ hg push -R r8 http://localhost:$HGPORT2
1325 $ hg push -R r8 http://localhost:$HGPORT2
1316 pushing to http://localhost:$HGPORT2/
1326 pushing to http://localhost:$HGPORT2/
1317 searching for changes
1327 searching for changes
1318 searching for changes
1328 searching for changes
1319 remote: adding changesets
1329 remote: adding changesets
1320 remote: adding manifests
1330 remote: adding manifests
1321 remote: adding file changes
1331 remote: adding file changes
1322 remote: added 1 changesets with 1 changes to 1 files
1332 remote: added 1 changesets with 1 changes to 1 files
1323 $ rm -rf empty
1333 $ rm -rf empty
1324
1334
1325 used all HGPORTs, kill all daemons
1335 used all HGPORTs, kill all daemons
1326 $ "$TESTDIR/killdaemons.py"
1336 $ "$TESTDIR/killdaemons.py"
1327
1337
1328 #endif
1338 #endif
1329
1339
1330
1340
1331 #if unix-permissions
1341 #if unix-permissions
1332
1342
1333 Clone a local repository owned by another user
1343 Clone a local repository owned by another user
1334 We have to simulate that here by setting $HOME and removing write permissions
1344 We have to simulate that here by setting $HOME and removing write permissions
1335 $ ORIGHOME="$HOME"
1345 $ ORIGHOME="$HOME"
1336 $ mkdir alice
1346 $ mkdir alice
1337 $ HOME="`pwd`/alice"
1347 $ HOME="`pwd`/alice"
1338 $ cd alice
1348 $ cd alice
1339 $ hg init pubrepo
1349 $ hg init pubrepo
1340 $ cd pubrepo
1350 $ cd pubrepo
1341 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1351 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1342 $ hg add --large a-large-file
1352 $ hg add --large a-large-file
1343 $ hg commit -m "Add a large file"
1353 $ hg commit -m "Add a large file"
1344 Invoking status precommit hook
1354 Invoking status precommit hook
1345 A a-large-file
1355 A a-large-file
1346 $ cd ..
1356 $ cd ..
1347 $ chmod -R a-w pubrepo
1357 $ chmod -R a-w pubrepo
1348 $ cd ..
1358 $ cd ..
1349 $ mkdir bob
1359 $ mkdir bob
1350 $ HOME="`pwd`/bob"
1360 $ HOME="`pwd`/bob"
1351 $ cd bob
1361 $ cd bob
1352 $ hg clone --pull ../alice/pubrepo pubrepo
1362 $ hg clone --pull ../alice/pubrepo pubrepo
1353 requesting all changes
1363 requesting all changes
1354 adding changesets
1364 adding changesets
1355 adding manifests
1365 adding manifests
1356 adding file changes
1366 adding file changes
1357 added 1 changesets with 1 changes to 1 files
1367 added 1 changesets with 1 changes to 1 files
1358 updating to branch default
1368 updating to branch default
1359 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1360 getting changed largefiles
1370 getting changed largefiles
1361 1 largefiles updated, 0 removed
1371 1 largefiles updated, 0 removed
1362 $ cd ..
1372 $ cd ..
1363 $ chmod -R u+w alice/pubrepo
1373 $ chmod -R u+w alice/pubrepo
1364 $ HOME="$ORIGHOME"
1374 $ HOME="$ORIGHOME"
1365
1375
1366 #endif
1376 #endif
1367
1377
1368 #if symlink
1378 #if symlink
1369
1379
1370 Symlink to a large largefile should behave the same as a symlink to a normal file
1380 Symlink to a large largefile should behave the same as a symlink to a normal file
1371 $ hg init largesymlink
1381 $ hg init largesymlink
1372 $ cd largesymlink
1382 $ cd largesymlink
1373 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1383 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1374 $ hg add --large largefile
1384 $ hg add --large largefile
1375 $ hg commit -m "commit a large file"
1385 $ hg commit -m "commit a large file"
1376 Invoking status precommit hook
1386 Invoking status precommit hook
1377 A largefile
1387 A largefile
1378 $ ln -s largefile largelink
1388 $ ln -s largefile largelink
1379 $ hg add largelink
1389 $ hg add largelink
1380 $ hg commit -m "commit a large symlink"
1390 $ hg commit -m "commit a large symlink"
1381 Invoking status precommit hook
1391 Invoking status precommit hook
1382 A largelink
1392 A largelink
1383 $ rm -f largelink
1393 $ rm -f largelink
1384 $ hg up >/dev/null
1394 $ hg up >/dev/null
1385 $ test -f largelink
1395 $ test -f largelink
1386 [1]
1396 [1]
1387 $ test -L largelink
1397 $ test -L largelink
1388 [1]
1398 [1]
1389 $ rm -f largelink # make next part of the test independent of the previous
1399 $ rm -f largelink # make next part of the test independent of the previous
1390 $ hg up -C >/dev/null
1400 $ hg up -C >/dev/null
1391 $ test -f largelink
1401 $ test -f largelink
1392 $ test -L largelink
1402 $ test -L largelink
1393 $ cd ..
1403 $ cd ..
1394
1404
1395 #endif
1405 #endif
1396
1406
1397 test for pattern matching on 'hg status':
1407 test for pattern matching on 'hg status':
1398 to boost performance, largefiles checks whether specified patterns are
1408 to boost performance, largefiles checks whether specified patterns are
1399 related to largefiles in working directory (NOT to STANDIN) or not.
1409 related to largefiles in working directory (NOT to STANDIN) or not.
1400
1410
1401 $ hg init statusmatch
1411 $ hg init statusmatch
1402 $ cd statusmatch
1412 $ cd statusmatch
1403
1413
1404 $ mkdir -p a/b/c/d
1414 $ mkdir -p a/b/c/d
1405 $ echo normal > a/b/c/d/e.normal.txt
1415 $ echo normal > a/b/c/d/e.normal.txt
1406 $ hg add a/b/c/d/e.normal.txt
1416 $ hg add a/b/c/d/e.normal.txt
1407 $ echo large > a/b/c/d/e.large.txt
1417 $ echo large > a/b/c/d/e.large.txt
1408 $ hg add --large a/b/c/d/e.large.txt
1418 $ hg add --large a/b/c/d/e.large.txt
1409 $ mkdir -p a/b/c/x
1419 $ mkdir -p a/b/c/x
1410 $ echo normal > a/b/c/x/y.normal.txt
1420 $ echo normal > a/b/c/x/y.normal.txt
1411 $ hg add a/b/c/x/y.normal.txt
1421 $ hg add a/b/c/x/y.normal.txt
1412 $ hg commit -m 'add files'
1422 $ hg commit -m 'add files'
1413 Invoking status precommit hook
1423 Invoking status precommit hook
1414 A a/b/c/d/e.large.txt
1424 A a/b/c/d/e.large.txt
1415 A a/b/c/d/e.normal.txt
1425 A a/b/c/d/e.normal.txt
1416 A a/b/c/x/y.normal.txt
1426 A a/b/c/x/y.normal.txt
1417
1427
1418 (1) no pattern: no performance boost
1428 (1) no pattern: no performance boost
1419 $ hg status -A
1429 $ hg status -A
1420 C a/b/c/d/e.large.txt
1430 C a/b/c/d/e.large.txt
1421 C a/b/c/d/e.normal.txt
1431 C a/b/c/d/e.normal.txt
1422 C a/b/c/x/y.normal.txt
1432 C a/b/c/x/y.normal.txt
1423
1433
1424 (2) pattern not related to largefiles: performance boost
1434 (2) pattern not related to largefiles: performance boost
1425 $ hg status -A a/b/c/x
1435 $ hg status -A a/b/c/x
1426 C a/b/c/x/y.normal.txt
1436 C a/b/c/x/y.normal.txt
1427
1437
1428 (3) pattern related to largefiles: no performance boost
1438 (3) pattern related to largefiles: no performance boost
1429 $ hg status -A a/b/c/d
1439 $ hg status -A a/b/c/d
1430 C a/b/c/d/e.large.txt
1440 C a/b/c/d/e.large.txt
1431 C a/b/c/d/e.normal.txt
1441 C a/b/c/d/e.normal.txt
1432
1442
1433 (4) pattern related to STANDIN (not to largefiles): performance boost
1443 (4) pattern related to STANDIN (not to largefiles): performance boost
1434 $ hg status -A .hglf/a
1444 $ hg status -A .hglf/a
1435 C .hglf/a/b/c/d/e.large.txt
1445 C .hglf/a/b/c/d/e.large.txt
1436
1446
1437 (5) mixed case: no performance boost
1447 (5) mixed case: no performance boost
1438 $ hg status -A a/b/c/x a/b/c/d
1448 $ hg status -A a/b/c/x a/b/c/d
1439 C a/b/c/d/e.large.txt
1449 C a/b/c/d/e.large.txt
1440 C a/b/c/d/e.normal.txt
1450 C a/b/c/d/e.normal.txt
1441 C a/b/c/x/y.normal.txt
1451 C a/b/c/x/y.normal.txt
1442
1452
1443 verify that largefiles doesn't break filesets
1453 verify that largefiles doesn't break filesets
1444
1454
1445 $ hg log --rev . --exclude "set:binary()"
1455 $ hg log --rev . --exclude "set:binary()"
1446 changeset: 0:41bd42f10efa
1456 changeset: 0:41bd42f10efa
1447 tag: tip
1457 tag: tip
1448 user: test
1458 user: test
1449 date: Thu Jan 01 00:00:00 1970 +0000
1459 date: Thu Jan 01 00:00:00 1970 +0000
1450 summary: add files
1460 summary: add files
1451
1461
1452 verify that large files in subrepos handled properly
1462 verify that large files in subrepos handled properly
1453 $ hg init subrepo
1463 $ hg init subrepo
1454 $ echo "subrepo = subrepo" > .hgsub
1464 $ echo "subrepo = subrepo" > .hgsub
1455 $ hg add .hgsub
1465 $ hg add .hgsub
1456 $ hg ci -m "add subrepo"
1466 $ hg ci -m "add subrepo"
1457 Invoking status precommit hook
1467 Invoking status precommit hook
1458 A .hgsub
1468 A .hgsub
1459 ? .hgsubstate
1469 ? .hgsubstate
1460 $ echo "rev 1" > subrepo/large.txt
1470 $ echo "rev 1" > subrepo/large.txt
1461 $ hg -R subrepo add --large subrepo/large.txt
1471 $ hg -R subrepo add --large subrepo/large.txt
1462 $ hg sum
1472 $ hg sum
1463 parent: 1:8ee150ea2e9c tip
1473 parent: 1:8ee150ea2e9c tip
1464 add subrepo
1474 add subrepo
1465 branch: default
1475 branch: default
1466 commit: 1 subrepos
1476 commit: 1 subrepos
1467 update: (current)
1477 update: (current)
1468 $ hg st
1478 $ hg st
1469 $ hg st -S
1479 $ hg st -S
1470 A subrepo/large.txt
1480 A subrepo/large.txt
1471 $ hg ci -S -m "commit top repo"
1481 $ hg ci -S -m "commit top repo"
1472 committing subrepository subrepo
1482 committing subrepository subrepo
1473 Invoking status precommit hook
1483 Invoking status precommit hook
1474 A large.txt
1484 A large.txt
1475 Invoking status precommit hook
1485 Invoking status precommit hook
1476 M .hgsubstate
1486 M .hgsubstate
1477 # No differences
1487 # No differences
1478 $ hg st -S
1488 $ hg st -S
1479 $ hg sum
1489 $ hg sum
1480 parent: 2:ce4cd0c527a6 tip
1490 parent: 2:ce4cd0c527a6 tip
1481 commit top repo
1491 commit top repo
1482 branch: default
1492 branch: default
1483 commit: (clean)
1493 commit: (clean)
1484 update: (current)
1494 update: (current)
1485 $ echo "rev 2" > subrepo/large.txt
1495 $ echo "rev 2" > subrepo/large.txt
1486 $ hg st -S
1496 $ hg st -S
1487 M subrepo/large.txt
1497 M subrepo/large.txt
1488 $ hg sum
1498 $ hg sum
1489 parent: 2:ce4cd0c527a6 tip
1499 parent: 2:ce4cd0c527a6 tip
1490 commit top repo
1500 commit top repo
1491 branch: default
1501 branch: default
1492 commit: 1 subrepos
1502 commit: 1 subrepos
1493 update: (current)
1503 update: (current)
1494 $ hg ci -m "this commit should fail without -S"
1504 $ hg ci -m "this commit should fail without -S"
1495 abort: uncommitted changes in subrepo subrepo
1505 abort: uncommitted changes in subrepo subrepo
1496 (use --subrepos for recursive commit)
1506 (use --subrepos for recursive commit)
1497 [255]
1507 [255]
1498
1508
1499 Add a normal file to the subrepo, then test archiving
1509 Add a normal file to the subrepo, then test archiving
1500
1510
1501 $ echo 'normal file' > subrepo/normal.txt
1511 $ echo 'normal file' > subrepo/normal.txt
1502 $ hg -R subrepo add subrepo/normal.txt
1512 $ hg -R subrepo add subrepo/normal.txt
1503
1513
1504 Lock in subrepo, otherwise the change isn't archived
1514 Lock in subrepo, otherwise the change isn't archived
1505
1515
1506 $ hg ci -S -m "add normal file to top level"
1516 $ hg ci -S -m "add normal file to top level"
1507 committing subrepository subrepo
1517 committing subrepository subrepo
1508 Invoking status precommit hook
1518 Invoking status precommit hook
1509 M large.txt
1519 M large.txt
1510 A normal.txt
1520 A normal.txt
1511 Invoking status precommit hook
1521 Invoking status precommit hook
1512 M .hgsubstate
1522 M .hgsubstate
1513 $ hg archive -S lf_subrepo_archive
1523 $ hg archive -S lf_subrepo_archive
1514 $ find lf_subrepo_archive | sort
1524 $ find lf_subrepo_archive | sort
1515 lf_subrepo_archive
1525 lf_subrepo_archive
1516 lf_subrepo_archive/.hg_archival.txt
1526 lf_subrepo_archive/.hg_archival.txt
1517 lf_subrepo_archive/.hgsub
1527 lf_subrepo_archive/.hgsub
1518 lf_subrepo_archive/.hgsubstate
1528 lf_subrepo_archive/.hgsubstate
1519 lf_subrepo_archive/a
1529 lf_subrepo_archive/a
1520 lf_subrepo_archive/a/b
1530 lf_subrepo_archive/a/b
1521 lf_subrepo_archive/a/b/c
1531 lf_subrepo_archive/a/b/c
1522 lf_subrepo_archive/a/b/c/d
1532 lf_subrepo_archive/a/b/c/d
1523 lf_subrepo_archive/a/b/c/d/e.large.txt
1533 lf_subrepo_archive/a/b/c/d/e.large.txt
1524 lf_subrepo_archive/a/b/c/d/e.normal.txt
1534 lf_subrepo_archive/a/b/c/d/e.normal.txt
1525 lf_subrepo_archive/a/b/c/x
1535 lf_subrepo_archive/a/b/c/x
1526 lf_subrepo_archive/a/b/c/x/y.normal.txt
1536 lf_subrepo_archive/a/b/c/x/y.normal.txt
1527 lf_subrepo_archive/subrepo
1537 lf_subrepo_archive/subrepo
1528 lf_subrepo_archive/subrepo/large.txt
1538 lf_subrepo_archive/subrepo/large.txt
1529 lf_subrepo_archive/subrepo/normal.txt
1539 lf_subrepo_archive/subrepo/normal.txt
1530
1540
1531 $ cd ..
1541 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now