##// END OF EJS Templates
largefiles: reuse "findcommonoutgoing()" result at "hg push"...
FUJIWARA Katsunori -
r21044:52a5eabf default
parent child Browse files
Show More
@@ -1,491 +1,490 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 '''setup for largefiles repositories: reposetup'''
9 '''setup for largefiles repositories: reposetup'''
10 import copy
10 import copy
11 import os
11 import os
12
12
13 from mercurial import error, manifest, match as match_, util, discovery
13 from mercurial import error, manifest, match as match_, util
14 from mercurial.i18n import _
14 from mercurial.i18n import _
15 from mercurial import localrepo
15 from mercurial import localrepo
16
16
17 import lfcommands
17 import lfcommands
18 import lfutil
18 import lfutil
19
19
20 def reposetup(ui, repo):
20 def reposetup(ui, repo):
21 # wire repositories should be given new wireproto functions
21 # wire repositories should be given new wireproto functions
22 # by "proto.wirereposetup()" via "hg.wirepeersetupfuncs"
22 # by "proto.wirereposetup()" via "hg.wirepeersetupfuncs"
23 if not repo.local():
23 if not repo.local():
24 return
24 return
25
25
26 class lfilesrepo(repo.__class__):
26 class lfilesrepo(repo.__class__):
27 lfstatus = False
27 lfstatus = False
28 def status_nolfiles(self, *args, **kwargs):
28 def status_nolfiles(self, *args, **kwargs):
29 return super(lfilesrepo, self).status(*args, **kwargs)
29 return super(lfilesrepo, self).status(*args, **kwargs)
30
30
31 # When lfstatus is set, return a context that gives the names
31 # When lfstatus is set, return a context that gives the names
32 # of largefiles instead of their corresponding standins and
32 # of largefiles instead of their corresponding standins and
33 # identifies the largefiles as always binary, regardless of
33 # identifies the largefiles as always binary, regardless of
34 # their actual contents.
34 # their actual contents.
35 def __getitem__(self, changeid):
35 def __getitem__(self, changeid):
36 ctx = super(lfilesrepo, self).__getitem__(changeid)
36 ctx = super(lfilesrepo, self).__getitem__(changeid)
37 if self.lfstatus:
37 if self.lfstatus:
38 class lfilesmanifestdict(manifest.manifestdict):
38 class lfilesmanifestdict(manifest.manifestdict):
39 def __contains__(self, filename):
39 def __contains__(self, filename):
40 if super(lfilesmanifestdict,
40 if super(lfilesmanifestdict,
41 self).__contains__(filename):
41 self).__contains__(filename):
42 return True
42 return True
43 return super(lfilesmanifestdict,
43 return super(lfilesmanifestdict,
44 self).__contains__(lfutil.standin(filename))
44 self).__contains__(lfutil.standin(filename))
45 class lfilesctx(ctx.__class__):
45 class lfilesctx(ctx.__class__):
46 def files(self):
46 def files(self):
47 filenames = super(lfilesctx, self).files()
47 filenames = super(lfilesctx, self).files()
48 return [lfutil.splitstandin(f) or f for f in filenames]
48 return [lfutil.splitstandin(f) or f for f in filenames]
49 def manifest(self):
49 def manifest(self):
50 man1 = super(lfilesctx, self).manifest()
50 man1 = super(lfilesctx, self).manifest()
51 man1.__class__ = lfilesmanifestdict
51 man1.__class__ = lfilesmanifestdict
52 return man1
52 return man1
53 def filectx(self, path, fileid=None, filelog=None):
53 def filectx(self, path, fileid=None, filelog=None):
54 try:
54 try:
55 if filelog is not None:
55 if filelog is not None:
56 result = super(lfilesctx, self).filectx(
56 result = super(lfilesctx, self).filectx(
57 path, fileid, filelog)
57 path, fileid, filelog)
58 else:
58 else:
59 result = super(lfilesctx, self).filectx(
59 result = super(lfilesctx, self).filectx(
60 path, fileid)
60 path, fileid)
61 except error.LookupError:
61 except error.LookupError:
62 # Adding a null character will cause Mercurial to
62 # Adding a null character will cause Mercurial to
63 # identify this as a binary file.
63 # identify this as a binary file.
64 if filelog is not None:
64 if filelog is not None:
65 result = super(lfilesctx, self).filectx(
65 result = super(lfilesctx, self).filectx(
66 lfutil.standin(path), fileid, filelog)
66 lfutil.standin(path), fileid, filelog)
67 else:
67 else:
68 result = super(lfilesctx, self).filectx(
68 result = super(lfilesctx, self).filectx(
69 lfutil.standin(path), fileid)
69 lfutil.standin(path), fileid)
70 olddata = result.data
70 olddata = result.data
71 result.data = lambda: olddata() + '\0'
71 result.data = lambda: olddata() + '\0'
72 return result
72 return result
73 ctx.__class__ = lfilesctx
73 ctx.__class__ = lfilesctx
74 return ctx
74 return ctx
75
75
76 # Figure out the status of big files and insert them into the
76 # Figure out the status of big files and insert them into the
77 # appropriate list in the result. Also removes standin files
77 # appropriate list in the result. Also removes standin files
78 # from the listing. Revert to the original status if
78 # from the listing. Revert to the original status if
79 # self.lfstatus is False.
79 # self.lfstatus is False.
80 # XXX large file status is buggy when used on repo proxy.
80 # XXX large file status is buggy when used on repo proxy.
81 # XXX this needs to be investigated.
81 # XXX this needs to be investigated.
82 @localrepo.unfilteredmethod
82 @localrepo.unfilteredmethod
83 def status(self, node1='.', node2=None, match=None, ignored=False,
83 def status(self, node1='.', node2=None, match=None, ignored=False,
84 clean=False, unknown=False, listsubrepos=False):
84 clean=False, unknown=False, listsubrepos=False):
85 listignored, listclean, listunknown = ignored, clean, unknown
85 listignored, listclean, listunknown = ignored, clean, unknown
86 if not self.lfstatus:
86 if not self.lfstatus:
87 return super(lfilesrepo, self).status(node1, node2, match,
87 return super(lfilesrepo, self).status(node1, node2, match,
88 listignored, listclean, listunknown, listsubrepos)
88 listignored, listclean, listunknown, listsubrepos)
89 else:
89 else:
90 # some calls in this function rely on the old version of status
90 # some calls in this function rely on the old version of status
91 self.lfstatus = False
91 self.lfstatus = False
92 ctx1 = self[node1]
92 ctx1 = self[node1]
93 ctx2 = self[node2]
93 ctx2 = self[node2]
94 working = ctx2.rev() is None
94 working = ctx2.rev() is None
95 parentworking = working and ctx1 == self['.']
95 parentworking = working and ctx1 == self['.']
96
96
97 def inctx(file, ctx):
97 def inctx(file, ctx):
98 try:
98 try:
99 if ctx.rev() is None:
99 if ctx.rev() is None:
100 return file in ctx.manifest()
100 return file in ctx.manifest()
101 ctx[file]
101 ctx[file]
102 return True
102 return True
103 except KeyError:
103 except KeyError:
104 return False
104 return False
105
105
106 if match is None:
106 if match is None:
107 match = match_.always(self.root, self.getcwd())
107 match = match_.always(self.root, self.getcwd())
108
108
109 wlock = None
109 wlock = None
110 try:
110 try:
111 try:
111 try:
112 # updating the dirstate is optional
112 # updating the dirstate is optional
113 # so we don't wait on the lock
113 # so we don't wait on the lock
114 wlock = self.wlock(False)
114 wlock = self.wlock(False)
115 except error.LockError:
115 except error.LockError:
116 pass
116 pass
117
117
118 # First check if there were files specified on the
118 # First check if there were files specified on the
119 # command line. If there were, and none of them were
119 # command line. If there were, and none of them were
120 # largefiles, we should just bail here and let super
120 # largefiles, we should just bail here and let super
121 # handle it -- thus gaining a big performance boost.
121 # handle it -- thus gaining a big performance boost.
122 lfdirstate = lfutil.openlfdirstate(ui, self)
122 lfdirstate = lfutil.openlfdirstate(ui, self)
123 if match.files() and not match.anypats():
123 if match.files() and not match.anypats():
124 for f in lfdirstate:
124 for f in lfdirstate:
125 if match(f):
125 if match(f):
126 break
126 break
127 else:
127 else:
128 return super(lfilesrepo, self).status(node1, node2,
128 return super(lfilesrepo, self).status(node1, node2,
129 match, listignored, listclean,
129 match, listignored, listclean,
130 listunknown, listsubrepos)
130 listunknown, listsubrepos)
131
131
132 # Create a copy of match that matches standins instead
132 # Create a copy of match that matches standins instead
133 # of largefiles.
133 # of largefiles.
134 def tostandins(files):
134 def tostandins(files):
135 if not working:
135 if not working:
136 return files
136 return files
137 newfiles = []
137 newfiles = []
138 dirstate = self.dirstate
138 dirstate = self.dirstate
139 for f in files:
139 for f in files:
140 sf = lfutil.standin(f)
140 sf = lfutil.standin(f)
141 if sf in dirstate:
141 if sf in dirstate:
142 newfiles.append(sf)
142 newfiles.append(sf)
143 elif sf in dirstate.dirs():
143 elif sf in dirstate.dirs():
144 # Directory entries could be regular or
144 # Directory entries could be regular or
145 # standin, check both
145 # standin, check both
146 newfiles.extend((f, sf))
146 newfiles.extend((f, sf))
147 else:
147 else:
148 newfiles.append(f)
148 newfiles.append(f)
149 return newfiles
149 return newfiles
150
150
151 m = copy.copy(match)
151 m = copy.copy(match)
152 m._files = tostandins(m._files)
152 m._files = tostandins(m._files)
153
153
154 result = super(lfilesrepo, self).status(node1, node2, m,
154 result = super(lfilesrepo, self).status(node1, node2, m,
155 ignored, clean, unknown, listsubrepos)
155 ignored, clean, unknown, listsubrepos)
156 if working:
156 if working:
157
157
158 def sfindirstate(f):
158 def sfindirstate(f):
159 sf = lfutil.standin(f)
159 sf = lfutil.standin(f)
160 dirstate = self.dirstate
160 dirstate = self.dirstate
161 return sf in dirstate or sf in dirstate.dirs()
161 return sf in dirstate or sf in dirstate.dirs()
162
162
163 match._files = [f for f in match._files
163 match._files = [f for f in match._files
164 if sfindirstate(f)]
164 if sfindirstate(f)]
165 # Don't waste time getting the ignored and unknown
165 # Don't waste time getting the ignored and unknown
166 # files from lfdirstate
166 # files from lfdirstate
167 s = lfdirstate.status(match, [], False,
167 s = lfdirstate.status(match, [], False,
168 listclean, False)
168 listclean, False)
169 (unsure, modified, added, removed, missing, _unknown,
169 (unsure, modified, added, removed, missing, _unknown,
170 _ignored, clean) = s
170 _ignored, clean) = s
171 if parentworking:
171 if parentworking:
172 for lfile in unsure:
172 for lfile in unsure:
173 standin = lfutil.standin(lfile)
173 standin = lfutil.standin(lfile)
174 if standin not in ctx1:
174 if standin not in ctx1:
175 # from second parent
175 # from second parent
176 modified.append(lfile)
176 modified.append(lfile)
177 elif ctx1[standin].data().strip() \
177 elif ctx1[standin].data().strip() \
178 != lfutil.hashfile(self.wjoin(lfile)):
178 != lfutil.hashfile(self.wjoin(lfile)):
179 modified.append(lfile)
179 modified.append(lfile)
180 else:
180 else:
181 clean.append(lfile)
181 clean.append(lfile)
182 lfdirstate.normal(lfile)
182 lfdirstate.normal(lfile)
183 else:
183 else:
184 tocheck = unsure + modified + added + clean
184 tocheck = unsure + modified + added + clean
185 modified, added, clean = [], [], []
185 modified, added, clean = [], [], []
186
186
187 for lfile in tocheck:
187 for lfile in tocheck:
188 standin = lfutil.standin(lfile)
188 standin = lfutil.standin(lfile)
189 if inctx(standin, ctx1):
189 if inctx(standin, ctx1):
190 if ctx1[standin].data().strip() != \
190 if ctx1[standin].data().strip() != \
191 lfutil.hashfile(self.wjoin(lfile)):
191 lfutil.hashfile(self.wjoin(lfile)):
192 modified.append(lfile)
192 modified.append(lfile)
193 else:
193 else:
194 clean.append(lfile)
194 clean.append(lfile)
195 else:
195 else:
196 added.append(lfile)
196 added.append(lfile)
197
197
198 # Standins no longer found in lfdirstate has been
198 # Standins no longer found in lfdirstate has been
199 # removed
199 # removed
200 for standin in ctx1.manifest():
200 for standin in ctx1.manifest():
201 if not lfutil.isstandin(standin):
201 if not lfutil.isstandin(standin):
202 continue
202 continue
203 lfile = lfutil.splitstandin(standin)
203 lfile = lfutil.splitstandin(standin)
204 if not match(lfile):
204 if not match(lfile):
205 continue
205 continue
206 if lfile not in lfdirstate:
206 if lfile not in lfdirstate:
207 removed.append(lfile)
207 removed.append(lfile)
208
208
209 # Filter result lists
209 # Filter result lists
210 result = list(result)
210 result = list(result)
211
211
212 # Largefiles are not really removed when they're
212 # Largefiles are not really removed when they're
213 # still in the normal dirstate. Likewise, normal
213 # still in the normal dirstate. Likewise, normal
214 # files are not really removed if they are still in
214 # files are not really removed if they are still in
215 # lfdirstate. This happens in merges where files
215 # lfdirstate. This happens in merges where files
216 # change type.
216 # change type.
217 removed = [f for f in removed
217 removed = [f for f in removed
218 if f not in self.dirstate]
218 if f not in self.dirstate]
219 result[2] = [f for f in result[2]
219 result[2] = [f for f in result[2]
220 if f not in lfdirstate]
220 if f not in lfdirstate]
221
221
222 lfiles = set(lfdirstate._map)
222 lfiles = set(lfdirstate._map)
223 # Unknown files
223 # Unknown files
224 result[4] = set(result[4]).difference(lfiles)
224 result[4] = set(result[4]).difference(lfiles)
225 # Ignored files
225 # Ignored files
226 result[5] = set(result[5]).difference(lfiles)
226 result[5] = set(result[5]).difference(lfiles)
227 # combine normal files and largefiles
227 # combine normal files and largefiles
228 normals = [[fn for fn in filelist
228 normals = [[fn for fn in filelist
229 if not lfutil.isstandin(fn)]
229 if not lfutil.isstandin(fn)]
230 for filelist in result]
230 for filelist in result]
231 lfiles = (modified, added, removed, missing, [], [],
231 lfiles = (modified, added, removed, missing, [], [],
232 clean)
232 clean)
233 result = [sorted(list1 + list2)
233 result = [sorted(list1 + list2)
234 for (list1, list2) in zip(normals, lfiles)]
234 for (list1, list2) in zip(normals, lfiles)]
235 else:
235 else:
236 def toname(f):
236 def toname(f):
237 if lfutil.isstandin(f):
237 if lfutil.isstandin(f):
238 return lfutil.splitstandin(f)
238 return lfutil.splitstandin(f)
239 return f
239 return f
240 result = [[toname(f) for f in items]
240 result = [[toname(f) for f in items]
241 for items in result]
241 for items in result]
242
242
243 if wlock:
243 if wlock:
244 lfdirstate.write()
244 lfdirstate.write()
245
245
246 finally:
246 finally:
247 if wlock:
247 if wlock:
248 wlock.release()
248 wlock.release()
249
249
250 if not listunknown:
250 if not listunknown:
251 result[4] = []
251 result[4] = []
252 if not listignored:
252 if not listignored:
253 result[5] = []
253 result[5] = []
254 if not listclean:
254 if not listclean:
255 result[6] = []
255 result[6] = []
256 self.lfstatus = True
256 self.lfstatus = True
257 return result
257 return result
258
258
259 # As part of committing, copy all of the largefiles into the
259 # As part of committing, copy all of the largefiles into the
260 # cache.
260 # cache.
261 def commitctx(self, *args, **kwargs):
261 def commitctx(self, *args, **kwargs):
262 node = super(lfilesrepo, self).commitctx(*args, **kwargs)
262 node = super(lfilesrepo, self).commitctx(*args, **kwargs)
263 lfutil.copyalltostore(self, node)
263 lfutil.copyalltostore(self, node)
264 return node
264 return node
265
265
266 # Before commit, largefile standins have not had their
266 # Before commit, largefile standins have not had their
267 # contents updated to reflect the hash of their largefile.
267 # contents updated to reflect the hash of their largefile.
268 # Do that here.
268 # Do that here.
269 def commit(self, text="", user=None, date=None, match=None,
269 def commit(self, text="", user=None, date=None, match=None,
270 force=False, editor=False, extra={}):
270 force=False, editor=False, extra={}):
271 orig = super(lfilesrepo, self).commit
271 orig = super(lfilesrepo, self).commit
272
272
273 wlock = self.wlock()
273 wlock = self.wlock()
274 try:
274 try:
275 # Case 0: Rebase or Transplant
275 # Case 0: Rebase or Transplant
276 # We have to take the time to pull down the new largefiles now.
276 # We have to take the time to pull down the new largefiles now.
277 # Otherwise, any largefiles that were modified in the
277 # Otherwise, any largefiles that were modified in the
278 # destination changesets get overwritten, either by the rebase
278 # destination changesets get overwritten, either by the rebase
279 # or in the first commit after the rebase or transplant.
279 # or in the first commit after the rebase or transplant.
280 # updatelfiles will update the dirstate to mark any pulled
280 # updatelfiles will update the dirstate to mark any pulled
281 # largefiles as modified
281 # largefiles as modified
282 if getattr(self, "_isrebasing", False) or \
282 if getattr(self, "_isrebasing", False) or \
283 getattr(self, "_istransplanting", False):
283 getattr(self, "_istransplanting", False):
284 lfcommands.updatelfiles(self.ui, self, filelist=None,
284 lfcommands.updatelfiles(self.ui, self, filelist=None,
285 printmessage=False)
285 printmessage=False)
286 result = orig(text=text, user=user, date=date, match=match,
286 result = orig(text=text, user=user, date=date, match=match,
287 force=force, editor=editor, extra=extra)
287 force=force, editor=editor, extra=extra)
288 return result
288 return result
289 # Case 1: user calls commit with no specific files or
289 # Case 1: user calls commit with no specific files or
290 # include/exclude patterns: refresh and commit all files that
290 # include/exclude patterns: refresh and commit all files that
291 # are "dirty".
291 # are "dirty".
292 if ((match is None) or
292 if ((match is None) or
293 (not match.anypats() and not match.files())):
293 (not match.anypats() and not match.files())):
294 # Spend a bit of time here to get a list of files we know
294 # Spend a bit of time here to get a list of files we know
295 # are modified so we can compare only against those.
295 # are modified so we can compare only against those.
296 # It can cost a lot of time (several seconds)
296 # It can cost a lot of time (several seconds)
297 # otherwise to update all standins if the largefiles are
297 # otherwise to update all standins if the largefiles are
298 # large.
298 # large.
299 lfdirstate = lfutil.openlfdirstate(ui, self)
299 lfdirstate = lfutil.openlfdirstate(ui, self)
300 dirtymatch = match_.always(self.root, self.getcwd())
300 dirtymatch = match_.always(self.root, self.getcwd())
301 s = lfdirstate.status(dirtymatch, [], False, False, False)
301 s = lfdirstate.status(dirtymatch, [], False, False, False)
302 (unsure, modified, added, removed, _missing, _unknown,
302 (unsure, modified, added, removed, _missing, _unknown,
303 _ignored, _clean) = s
303 _ignored, _clean) = s
304 modifiedfiles = unsure + modified + added + removed
304 modifiedfiles = unsure + modified + added + removed
305 lfiles = lfutil.listlfiles(self)
305 lfiles = lfutil.listlfiles(self)
306 # this only loops through largefiles that exist (not
306 # this only loops through largefiles that exist (not
307 # removed/renamed)
307 # removed/renamed)
308 for lfile in lfiles:
308 for lfile in lfiles:
309 if lfile in modifiedfiles:
309 if lfile in modifiedfiles:
310 if os.path.exists(
310 if os.path.exists(
311 self.wjoin(lfutil.standin(lfile))):
311 self.wjoin(lfutil.standin(lfile))):
312 # this handles the case where a rebase is being
312 # this handles the case where a rebase is being
313 # performed and the working copy is not updated
313 # performed and the working copy is not updated
314 # yet.
314 # yet.
315 if os.path.exists(self.wjoin(lfile)):
315 if os.path.exists(self.wjoin(lfile)):
316 lfutil.updatestandin(self,
316 lfutil.updatestandin(self,
317 lfutil.standin(lfile))
317 lfutil.standin(lfile))
318 lfdirstate.normal(lfile)
318 lfdirstate.normal(lfile)
319
319
320 result = orig(text=text, user=user, date=date, match=match,
320 result = orig(text=text, user=user, date=date, match=match,
321 force=force, editor=editor, extra=extra)
321 force=force, editor=editor, extra=extra)
322
322
323 if result is not None:
323 if result is not None:
324 for lfile in lfdirstate:
324 for lfile in lfdirstate:
325 if lfile in modifiedfiles:
325 if lfile in modifiedfiles:
326 if (not os.path.exists(self.wjoin(
326 if (not os.path.exists(self.wjoin(
327 lfutil.standin(lfile)))) or \
327 lfutil.standin(lfile)))) or \
328 (not os.path.exists(self.wjoin(lfile))):
328 (not os.path.exists(self.wjoin(lfile))):
329 lfdirstate.drop(lfile)
329 lfdirstate.drop(lfile)
330
330
331 # This needs to be after commit; otherwise precommit hooks
331 # This needs to be after commit; otherwise precommit hooks
332 # get the wrong status
332 # get the wrong status
333 lfdirstate.write()
333 lfdirstate.write()
334 return result
334 return result
335
335
336 lfiles = lfutil.listlfiles(self)
336 lfiles = lfutil.listlfiles(self)
337 match._files = self._subdirlfs(match.files(), lfiles)
337 match._files = self._subdirlfs(match.files(), lfiles)
338
338
339 # Case 2: user calls commit with specified patterns: refresh
339 # Case 2: user calls commit with specified patterns: refresh
340 # any matching big files.
340 # any matching big files.
341 smatcher = lfutil.composestandinmatcher(self, match)
341 smatcher = lfutil.composestandinmatcher(self, match)
342 standins = self.dirstate.walk(smatcher, [], False, False)
342 standins = self.dirstate.walk(smatcher, [], False, False)
343
343
344 # No matching big files: get out of the way and pass control to
344 # No matching big files: get out of the way and pass control to
345 # the usual commit() method.
345 # the usual commit() method.
346 if not standins:
346 if not standins:
347 return orig(text=text, user=user, date=date, match=match,
347 return orig(text=text, user=user, date=date, match=match,
348 force=force, editor=editor, extra=extra)
348 force=force, editor=editor, extra=extra)
349
349
350 # Refresh all matching big files. It's possible that the
350 # Refresh all matching big files. It's possible that the
351 # commit will end up failing, in which case the big files will
351 # commit will end up failing, in which case the big files will
352 # stay refreshed. No harm done: the user modified them and
352 # stay refreshed. No harm done: the user modified them and
353 # asked to commit them, so sooner or later we're going to
353 # asked to commit them, so sooner or later we're going to
354 # refresh the standins. Might as well leave them refreshed.
354 # refresh the standins. Might as well leave them refreshed.
355 lfdirstate = lfutil.openlfdirstate(ui, self)
355 lfdirstate = lfutil.openlfdirstate(ui, self)
356 for standin in standins:
356 for standin in standins:
357 lfile = lfutil.splitstandin(standin)
357 lfile = lfutil.splitstandin(standin)
358 if lfdirstate[lfile] != 'r':
358 if lfdirstate[lfile] != 'r':
359 lfutil.updatestandin(self, standin)
359 lfutil.updatestandin(self, standin)
360 lfdirstate.normal(lfile)
360 lfdirstate.normal(lfile)
361 else:
361 else:
362 lfdirstate.drop(lfile)
362 lfdirstate.drop(lfile)
363
363
364 # Cook up a new matcher that only matches regular files or
364 # Cook up a new matcher that only matches regular files or
365 # standins corresponding to the big files requested by the
365 # standins corresponding to the big files requested by the
366 # user. Have to modify _files to prevent commit() from
366 # user. Have to modify _files to prevent commit() from
367 # complaining "not tracked" for big files.
367 # complaining "not tracked" for big files.
368 match = copy.copy(match)
368 match = copy.copy(match)
369 origmatchfn = match.matchfn
369 origmatchfn = match.matchfn
370
370
371 # Check both the list of largefiles and the list of
371 # Check both the list of largefiles and the list of
372 # standins because if a largefile was removed, it
372 # standins because if a largefile was removed, it
373 # won't be in the list of largefiles at this point
373 # won't be in the list of largefiles at this point
374 match._files += sorted(standins)
374 match._files += sorted(standins)
375
375
376 actualfiles = []
376 actualfiles = []
377 for f in match._files:
377 for f in match._files:
378 fstandin = lfutil.standin(f)
378 fstandin = lfutil.standin(f)
379
379
380 # ignore known largefiles and standins
380 # ignore known largefiles and standins
381 if f in lfiles or fstandin in standins:
381 if f in lfiles or fstandin in standins:
382 continue
382 continue
383
383
384 # append directory separator to avoid collisions
384 # append directory separator to avoid collisions
385 if not fstandin.endswith(os.sep):
385 if not fstandin.endswith(os.sep):
386 fstandin += os.sep
386 fstandin += os.sep
387
387
388 actualfiles.append(f)
388 actualfiles.append(f)
389 match._files = actualfiles
389 match._files = actualfiles
390
390
391 def matchfn(f):
391 def matchfn(f):
392 if origmatchfn(f):
392 if origmatchfn(f):
393 return f not in lfiles
393 return f not in lfiles
394 else:
394 else:
395 return f in standins
395 return f in standins
396
396
397 match.matchfn = matchfn
397 match.matchfn = matchfn
398 result = orig(text=text, user=user, date=date, match=match,
398 result = orig(text=text, user=user, date=date, match=match,
399 force=force, editor=editor, extra=extra)
399 force=force, editor=editor, extra=extra)
400 # This needs to be after commit; otherwise precommit hooks
400 # This needs to be after commit; otherwise precommit hooks
401 # get the wrong status
401 # get the wrong status
402 lfdirstate.write()
402 lfdirstate.write()
403 return result
403 return result
404 finally:
404 finally:
405 wlock.release()
405 wlock.release()
406
406
407 def push(self, remote, force=False, revs=None, newbranch=False):
407 def push(self, remote, force=False, revs=None, newbranch=False):
408 if remote.local():
408 if remote.local():
409 missing = set(self.requirements) - remote.local().supported
409 missing = set(self.requirements) - remote.local().supported
410 if missing:
410 if missing:
411 msg = _("required features are not"
411 msg = _("required features are not"
412 " supported in the destination:"
412 " supported in the destination:"
413 " %s") % (', '.join(sorted(missing)))
413 " %s") % (', '.join(sorted(missing)))
414 raise util.Abort(msg)
414 raise util.Abort(msg)
415
416 outgoing = discovery.findcommonoutgoing(repo, remote.peer(),
417 force=force)
418 if outgoing.missing:
419 toupload = set()
420 o = self.changelog.nodesbetween(outgoing.missing, revs)[0]
421 addfunc = lambda fn, lfhash: toupload.add(lfhash)
422 lfutil.getlfilestoupload(self, o, addfunc)
423 lfcommands.uploadlfiles(ui, self, remote, toupload)
424 return super(lfilesrepo, self).push(remote, force=force, revs=revs,
415 return super(lfilesrepo, self).push(remote, force=force, revs=revs,
425 newbranch=newbranch)
416 newbranch=newbranch)
426
417
427 def _subdirlfs(self, files, lfiles):
418 def _subdirlfs(self, files, lfiles):
428 '''
419 '''
429 Adjust matched file list
420 Adjust matched file list
430 If we pass a directory to commit whose only commitable files
421 If we pass a directory to commit whose only commitable files
431 are largefiles, the core commit code aborts before finding
422 are largefiles, the core commit code aborts before finding
432 the largefiles.
423 the largefiles.
433 So we do the following:
424 So we do the following:
434 For directories that only have largefiles as matches,
425 For directories that only have largefiles as matches,
435 we explicitly add the largefiles to the match list and remove
426 we explicitly add the largefiles to the match list and remove
436 the directory.
427 the directory.
437 In other cases, we leave the match list unmodified.
428 In other cases, we leave the match list unmodified.
438 '''
429 '''
439 actualfiles = []
430 actualfiles = []
440 dirs = []
431 dirs = []
441 regulars = []
432 regulars = []
442
433
443 for f in files:
434 for f in files:
444 if lfutil.isstandin(f + '/'):
435 if lfutil.isstandin(f + '/'):
445 raise util.Abort(
436 raise util.Abort(
446 _('file "%s" is a largefile standin') % f,
437 _('file "%s" is a largefile standin') % f,
447 hint=('commit the largefile itself instead'))
438 hint=('commit the largefile itself instead'))
448 # Scan directories
439 # Scan directories
449 if os.path.isdir(self.wjoin(f)):
440 if os.path.isdir(self.wjoin(f)):
450 dirs.append(f)
441 dirs.append(f)
451 else:
442 else:
452 regulars.append(f)
443 regulars.append(f)
453
444
454 for f in dirs:
445 for f in dirs:
455 matcheddir = False
446 matcheddir = False
456 d = self.dirstate.normalize(f) + '/'
447 d = self.dirstate.normalize(f) + '/'
457 # Check for matched normal files
448 # Check for matched normal files
458 for mf in regulars:
449 for mf in regulars:
459 if self.dirstate.normalize(mf).startswith(d):
450 if self.dirstate.normalize(mf).startswith(d):
460 actualfiles.append(f)
451 actualfiles.append(f)
461 matcheddir = True
452 matcheddir = True
462 break
453 break
463 if not matcheddir:
454 if not matcheddir:
464 # If no normal match, manually append
455 # If no normal match, manually append
465 # any matching largefiles
456 # any matching largefiles
466 for lf in lfiles:
457 for lf in lfiles:
467 if self.dirstate.normalize(lf).startswith(d):
458 if self.dirstate.normalize(lf).startswith(d):
468 actualfiles.append(lf)
459 actualfiles.append(lf)
469 if not matcheddir:
460 if not matcheddir:
470 actualfiles.append(lfutil.standin(f))
461 actualfiles.append(lfutil.standin(f))
471 matcheddir = True
462 matcheddir = True
472 # Nothing in dir, so readd it
463 # Nothing in dir, so readd it
473 # and let commit reject it
464 # and let commit reject it
474 if not matcheddir:
465 if not matcheddir:
475 actualfiles.append(f)
466 actualfiles.append(f)
476
467
477 # Always add normal files
468 # Always add normal files
478 actualfiles += regulars
469 actualfiles += regulars
479 return actualfiles
470 return actualfiles
480
471
481 repo.__class__ = lfilesrepo
472 repo.__class__ = lfilesrepo
482
473
474 def prepushoutgoinghook(local, remote, outgoing):
475 if outgoing.missing:
476 toupload = set()
477 addfunc = lambda fn, lfhash: toupload.add(lfhash)
478 lfutil.getlfilestoupload(local, outgoing.missing, addfunc)
479 lfcommands.uploadlfiles(ui, local, remote, toupload)
480 repo.prepushoutgoinghooks.add("largefiles", prepushoutgoinghook)
481
483 def checkrequireslfiles(ui, repo, **kwargs):
482 def checkrequireslfiles(ui, repo, **kwargs):
484 if 'largefiles' not in repo.requirements and util.any(
483 if 'largefiles' not in repo.requirements and util.any(
485 lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()):
484 lfutil.shortname+'/' in f[0] for f in repo.store.datafiles()):
486 repo.requirements.add('largefiles')
485 repo.requirements.add('largefiles')
487 repo._writerequirements()
486 repo._writerequirements()
488
487
489 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles,
488 ui.setconfig('hooks', 'changegroup.lfiles', checkrequireslfiles,
490 'largefiles')
489 'largefiles')
491 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles')
490 ui.setconfig('hooks', 'commit.lfiles', checkrequireslfiles, 'largefiles')
@@ -1,2389 +1,2386 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.
20 files.
21 Test status and dirstate of largefiles and that summary output is correct.
21 Test status and dirstate of largefiles and that summary output 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 $ touch large1 sub/large2
38 $ touch large1 sub/large2
39 $ sleep 1
39 $ sleep 1
40 $ hg st
40 $ hg st
41 $ hg debugstate --nodates
41 $ hg debugstate --nodates
42 n 644 41 .hglf/large1
42 n 644 41 .hglf/large1
43 n 644 41 .hglf/sub/large2
43 n 644 41 .hglf/sub/large2
44 n 644 8 normal1
44 n 644 8 normal1
45 n 644 8 sub/normal2
45 n 644 8 sub/normal2
46 $ hg debugstate --large
46 $ hg debugstate --large
47 n 644 7 large1
47 n 644 7 large1
48 n 644 7 sub/large2
48 n 644 7 sub/large2
49 $ echo normal11 > normal1
49 $ echo normal11 > normal1
50 $ echo normal22 > sub/normal2
50 $ echo normal22 > sub/normal2
51 $ echo large11 > large1
51 $ echo large11 > large1
52 $ echo large22 > sub/large2
52 $ echo large22 > sub/large2
53 $ hg commit -m "edit files"
53 $ hg commit -m "edit files"
54 Invoking status precommit hook
54 Invoking status precommit hook
55 M large1
55 M large1
56 M normal1
56 M normal1
57 M sub/large2
57 M sub/large2
58 M sub/normal2
58 M sub/normal2
59 $ hg sum --large
59 $ hg sum --large
60 parent: 1:ce8896473775 tip
60 parent: 1:ce8896473775 tip
61 edit files
61 edit files
62 branch: default
62 branch: default
63 commit: (clean)
63 commit: (clean)
64 update: (current)
64 update: (current)
65 largefiles: (no remote repo)
65 largefiles: (no remote repo)
66
66
67 Commit preserved largefile contents.
67 Commit preserved largefile contents.
68
68
69 $ cat normal1
69 $ cat normal1
70 normal11
70 normal11
71 $ cat large1
71 $ cat large1
72 large11
72 large11
73 $ cat sub/normal2
73 $ cat sub/normal2
74 normal22
74 normal22
75 $ cat sub/large2
75 $ cat sub/large2
76 large22
76 large22
77
77
78 Test status, subdir and unknown files
78 Test status, subdir and unknown files
79
79
80 $ echo unknown > sub/unknown
80 $ echo unknown > sub/unknown
81 $ hg st --all
81 $ hg st --all
82 ? sub/unknown
82 ? sub/unknown
83 C large1
83 C large1
84 C normal1
84 C normal1
85 C sub/large2
85 C sub/large2
86 C sub/normal2
86 C sub/normal2
87 $ hg st --all sub
87 $ hg st --all sub
88 ? sub/unknown
88 ? sub/unknown
89 C sub/large2
89 C sub/large2
90 C sub/normal2
90 C sub/normal2
91 $ rm sub/unknown
91 $ rm sub/unknown
92
92
93 Test messages and exit codes for remove warning cases
93 Test messages and exit codes for remove warning cases
94
94
95 $ hg remove -A large1
95 $ hg remove -A large1
96 not removing large1: file still exists
96 not removing large1: file still exists
97 [1]
97 [1]
98 $ echo 'modified' > large1
98 $ echo 'modified' > large1
99 $ hg remove large1
99 $ hg remove large1
100 not removing large1: file is modified (use -f to force removal)
100 not removing large1: file is modified (use -f to force removal)
101 [1]
101 [1]
102 $ echo 'new' > normalnew
102 $ echo 'new' > normalnew
103 $ hg add normalnew
103 $ hg add normalnew
104 $ echo 'new' > largenew
104 $ echo 'new' > largenew
105 $ hg add --large normalnew
105 $ hg add --large normalnew
106 normalnew already tracked!
106 normalnew already tracked!
107 $ hg remove normalnew largenew
107 $ hg remove normalnew largenew
108 not removing largenew: file is untracked
108 not removing largenew: file is untracked
109 not removing normalnew: file has been marked for add (use forget to undo)
109 not removing normalnew: file has been marked for add (use forget to undo)
110 [1]
110 [1]
111 $ rm normalnew largenew
111 $ rm normalnew largenew
112 $ hg up -Cq
112 $ hg up -Cq
113
113
114 Remove both largefiles and normal files.
114 Remove both largefiles and normal files.
115
115
116 $ hg remove normal1 large1
116 $ hg remove normal1 large1
117 $ hg status large1
117 $ hg status large1
118 R large1
118 R large1
119 $ hg commit -m "remove files"
119 $ hg commit -m "remove files"
120 Invoking status precommit hook
120 Invoking status precommit hook
121 R large1
121 R large1
122 R normal1
122 R normal1
123 $ ls
123 $ ls
124 sub
124 sub
125 $ echo "testlargefile" > large1-test
125 $ echo "testlargefile" > large1-test
126 $ hg add --large large1-test
126 $ hg add --large large1-test
127 $ hg st
127 $ hg st
128 A large1-test
128 A large1-test
129 $ hg rm large1-test
129 $ hg rm large1-test
130 not removing large1-test: file has been marked for add (use forget to undo)
130 not removing large1-test: file has been marked for add (use forget to undo)
131 [1]
131 [1]
132 $ hg st
132 $ hg st
133 A large1-test
133 A large1-test
134 $ hg forget large1-test
134 $ hg forget large1-test
135 $ hg st
135 $ hg st
136 ? large1-test
136 ? large1-test
137 $ hg remove large1-test
137 $ hg remove large1-test
138 not removing large1-test: file is untracked
138 not removing large1-test: file is untracked
139 [1]
139 [1]
140 $ hg forget large1-test
140 $ hg forget large1-test
141 not removing large1-test: file is already untracked
141 not removing large1-test: file is already untracked
142 [1]
142 [1]
143 $ rm large1-test
143 $ rm large1-test
144
144
145 Copy both largefiles and normal files (testing that status output is correct).
145 Copy both largefiles and normal files (testing that status output is correct).
146
146
147 $ hg cp sub/normal2 normal1
147 $ hg cp sub/normal2 normal1
148 $ hg cp sub/large2 large1
148 $ hg cp sub/large2 large1
149 $ hg commit -m "copy files"
149 $ hg commit -m "copy files"
150 Invoking status precommit hook
150 Invoking status precommit hook
151 A large1
151 A large1
152 A normal1
152 A normal1
153 $ cat normal1
153 $ cat normal1
154 normal22
154 normal22
155 $ cat large1
155 $ cat large1
156 large22
156 large22
157
157
158 Test moving largefiles and verify that normal files are also unaffected.
158 Test moving largefiles and verify that normal files are also unaffected.
159
159
160 $ hg mv normal1 normal3
160 $ hg mv normal1 normal3
161 $ hg mv large1 large3
161 $ hg mv large1 large3
162 $ hg mv sub/normal2 sub/normal4
162 $ hg mv sub/normal2 sub/normal4
163 $ hg mv sub/large2 sub/large4
163 $ hg mv sub/large2 sub/large4
164 $ hg commit -m "move files"
164 $ hg commit -m "move files"
165 Invoking status precommit hook
165 Invoking status precommit hook
166 A large3
166 A large3
167 A normal3
167 A normal3
168 A sub/large4
168 A sub/large4
169 A sub/normal4
169 A sub/normal4
170 R large1
170 R large1
171 R normal1
171 R normal1
172 R sub/large2
172 R sub/large2
173 R sub/normal2
173 R sub/normal2
174 $ cat normal3
174 $ cat normal3
175 normal22
175 normal22
176 $ cat large3
176 $ cat large3
177 large22
177 large22
178 $ cat sub/normal4
178 $ cat sub/normal4
179 normal22
179 normal22
180 $ cat sub/large4
180 $ cat sub/large4
181 large22
181 large22
182
182
183 Test copies and moves from a directory other than root (issue3516)
183 Test copies and moves from a directory other than root (issue3516)
184
184
185 $ cd ..
185 $ cd ..
186 $ hg init lf_cpmv
186 $ hg init lf_cpmv
187 $ cd lf_cpmv
187 $ cd lf_cpmv
188 $ mkdir dira
188 $ mkdir dira
189 $ mkdir dira/dirb
189 $ mkdir dira/dirb
190 $ touch dira/dirb/largefile
190 $ touch dira/dirb/largefile
191 $ hg add --large dira/dirb/largefile
191 $ hg add --large dira/dirb/largefile
192 $ hg commit -m "added"
192 $ hg commit -m "added"
193 Invoking status precommit hook
193 Invoking status precommit hook
194 A dira/dirb/largefile
194 A dira/dirb/largefile
195 $ cd dira
195 $ cd dira
196 $ hg cp dirb/largefile foo/largefile
196 $ hg cp dirb/largefile foo/largefile
197 $ hg ci -m "deep copy"
197 $ hg ci -m "deep copy"
198 Invoking status precommit hook
198 Invoking status precommit hook
199 A dira/foo/largefile
199 A dira/foo/largefile
200 $ find . | sort
200 $ find . | sort
201 .
201 .
202 ./dirb
202 ./dirb
203 ./dirb/largefile
203 ./dirb/largefile
204 ./foo
204 ./foo
205 ./foo/largefile
205 ./foo/largefile
206 $ hg mv foo/largefile baz/largefile
206 $ hg mv foo/largefile baz/largefile
207 $ hg ci -m "moved"
207 $ hg ci -m "moved"
208 Invoking status precommit hook
208 Invoking status precommit hook
209 A dira/baz/largefile
209 A dira/baz/largefile
210 R dira/foo/largefile
210 R dira/foo/largefile
211 $ find . | sort
211 $ find . | sort
212 .
212 .
213 ./baz
213 ./baz
214 ./baz/largefile
214 ./baz/largefile
215 ./dirb
215 ./dirb
216 ./dirb/largefile
216 ./dirb/largefile
217 ./foo
217 ./foo
218 $ cd ../../a
218 $ cd ../../a
219
219
220 #if serve
220 #if serve
221 Test display of largefiles in hgweb
221 Test display of largefiles in hgweb
222
222
223 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
223 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
224 $ cat ../hg.pid >> $DAEMON_PIDS
224 $ cat ../hg.pid >> $DAEMON_PIDS
225 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
225 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
226 200 Script output follows
226 200 Script output follows
227
227
228
228
229 drwxr-xr-x sub
229 drwxr-xr-x sub
230 -rw-r--r-- 41 large3
230 -rw-r--r-- 41 large3
231 -rw-r--r-- 9 normal3
231 -rw-r--r-- 9 normal3
232
232
233
233
234 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
234 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
235 200 Script output follows
235 200 Script output follows
236
236
237
237
238 -rw-r--r-- 41 large4
238 -rw-r--r-- 41 large4
239 -rw-r--r-- 9 normal4
239 -rw-r--r-- 9 normal4
240
240
241
241
242 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
242 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
243 #endif
243 #endif
244
244
245 Test archiving the various revisions. These hit corner cases known with
245 Test archiving the various revisions. These hit corner cases known with
246 archiving.
246 archiving.
247
247
248 $ hg archive -r 0 ../archive0
248 $ hg archive -r 0 ../archive0
249 $ hg archive -r 1 ../archive1
249 $ hg archive -r 1 ../archive1
250 $ hg archive -r 2 ../archive2
250 $ hg archive -r 2 ../archive2
251 $ hg archive -r 3 ../archive3
251 $ hg archive -r 3 ../archive3
252 $ hg archive -r 4 ../archive4
252 $ hg archive -r 4 ../archive4
253 $ cd ../archive0
253 $ cd ../archive0
254 $ cat normal1
254 $ cat normal1
255 normal1
255 normal1
256 $ cat large1
256 $ cat large1
257 large1
257 large1
258 $ cat sub/normal2
258 $ cat sub/normal2
259 normal2
259 normal2
260 $ cat sub/large2
260 $ cat sub/large2
261 large2
261 large2
262 $ cd ../archive1
262 $ cd ../archive1
263 $ cat normal1
263 $ cat normal1
264 normal11
264 normal11
265 $ cat large1
265 $ cat large1
266 large11
266 large11
267 $ cat sub/normal2
267 $ cat sub/normal2
268 normal22
268 normal22
269 $ cat sub/large2
269 $ cat sub/large2
270 large22
270 large22
271 $ cd ../archive2
271 $ cd ../archive2
272 $ ls
272 $ ls
273 sub
273 sub
274 $ cat sub/normal2
274 $ cat sub/normal2
275 normal22
275 normal22
276 $ cat sub/large2
276 $ cat sub/large2
277 large22
277 large22
278 $ cd ../archive3
278 $ cd ../archive3
279 $ cat normal1
279 $ cat normal1
280 normal22
280 normal22
281 $ cat large1
281 $ cat large1
282 large22
282 large22
283 $ cat sub/normal2
283 $ cat sub/normal2
284 normal22
284 normal22
285 $ cat sub/large2
285 $ cat sub/large2
286 large22
286 large22
287 $ cd ../archive4
287 $ cd ../archive4
288 $ cat normal3
288 $ cat normal3
289 normal22
289 normal22
290 $ cat large3
290 $ cat large3
291 large22
291 large22
292 $ cat sub/normal4
292 $ cat sub/normal4
293 normal22
293 normal22
294 $ cat sub/large4
294 $ cat sub/large4
295 large22
295 large22
296
296
297 Commit corner case: specify files to commit.
297 Commit corner case: specify files to commit.
298
298
299 $ cd ../a
299 $ cd ../a
300 $ echo normal3 > normal3
300 $ echo normal3 > normal3
301 $ echo large3 > large3
301 $ echo large3 > large3
302 $ echo normal4 > sub/normal4
302 $ echo normal4 > sub/normal4
303 $ echo large4 > sub/large4
303 $ echo large4 > sub/large4
304 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
304 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
305 Invoking status precommit hook
305 Invoking status precommit hook
306 M large3
306 M large3
307 M normal3
307 M normal3
308 M sub/large4
308 M sub/large4
309 M sub/normal4
309 M sub/normal4
310 $ cat normal3
310 $ cat normal3
311 normal3
311 normal3
312 $ cat large3
312 $ cat large3
313 large3
313 large3
314 $ cat sub/normal4
314 $ cat sub/normal4
315 normal4
315 normal4
316 $ cat sub/large4
316 $ cat sub/large4
317 large4
317 large4
318
318
319 One more commit corner case: commit from a subdirectory.
319 One more commit corner case: commit from a subdirectory.
320
320
321 $ cd ../a
321 $ cd ../a
322 $ echo normal33 > normal3
322 $ echo normal33 > normal3
323 $ echo large33 > large3
323 $ echo large33 > large3
324 $ echo normal44 > sub/normal4
324 $ echo normal44 > sub/normal4
325 $ echo large44 > sub/large4
325 $ echo large44 > sub/large4
326 $ cd sub
326 $ cd sub
327 $ hg commit -m "edit files yet again"
327 $ hg commit -m "edit files yet again"
328 Invoking status precommit hook
328 Invoking status precommit hook
329 M large3
329 M large3
330 M normal3
330 M normal3
331 M sub/large4
331 M sub/large4
332 M sub/normal4
332 M sub/normal4
333 $ cat ../normal3
333 $ cat ../normal3
334 normal33
334 normal33
335 $ cat ../large3
335 $ cat ../large3
336 large33
336 large33
337 $ cat normal4
337 $ cat normal4
338 normal44
338 normal44
339 $ cat large4
339 $ cat large4
340 large44
340 large44
341
341
342 Committing standins is not allowed.
342 Committing standins is not allowed.
343
343
344 $ cd ..
344 $ cd ..
345 $ echo large3 > large3
345 $ echo large3 > large3
346 $ hg commit .hglf/large3 -m "try to commit standin"
346 $ hg commit .hglf/large3 -m "try to commit standin"
347 abort: file ".hglf/large3" is a largefile standin
347 abort: file ".hglf/large3" is a largefile standin
348 (commit the largefile itself instead)
348 (commit the largefile itself instead)
349 [255]
349 [255]
350
350
351 Corner cases for adding largefiles.
351 Corner cases for adding largefiles.
352
352
353 $ echo large5 > large5
353 $ echo large5 > large5
354 $ hg add --large large5
354 $ hg add --large large5
355 $ hg add --large large5
355 $ hg add --large large5
356 large5 already a largefile
356 large5 already a largefile
357 $ mkdir sub2
357 $ mkdir sub2
358 $ echo large6 > sub2/large6
358 $ echo large6 > sub2/large6
359 $ echo large7 > sub2/large7
359 $ echo large7 > sub2/large7
360 $ hg add --large sub2
360 $ hg add --large sub2
361 adding sub2/large6 as a largefile (glob)
361 adding sub2/large6 as a largefile (glob)
362 adding sub2/large7 as a largefile (glob)
362 adding sub2/large7 as a largefile (glob)
363 $ hg st
363 $ hg st
364 M large3
364 M large3
365 A large5
365 A large5
366 A sub2/large6
366 A sub2/large6
367 A sub2/large7
367 A sub2/large7
368
368
369 Committing directories containing only largefiles.
369 Committing directories containing only largefiles.
370
370
371 $ mkdir -p z/y/x/m
371 $ mkdir -p z/y/x/m
372 $ touch z/y/x/m/large1
372 $ touch z/y/x/m/large1
373 $ touch z/y/x/large2
373 $ touch z/y/x/large2
374 $ hg add --large z/y/x/m/large1 z/y/x/large2
374 $ hg add --large z/y/x/m/large1 z/y/x/large2
375 $ hg commit -m "Subdir with directory only containing largefiles" z
375 $ hg commit -m "Subdir with directory only containing largefiles" z
376 Invoking status precommit hook
376 Invoking status precommit hook
377 M large3
377 M large3
378 A large5
378 A large5
379 A sub2/large6
379 A sub2/large6
380 A sub2/large7
380 A sub2/large7
381 A z/y/x/large2
381 A z/y/x/large2
382 A z/y/x/m/large1
382 A z/y/x/m/large1
383 $ hg rollback --quiet
383 $ hg rollback --quiet
384 $ touch z/y/x/m/normal
384 $ touch z/y/x/m/normal
385 $ hg add z/y/x/m/normal
385 $ hg add z/y/x/m/normal
386 $ hg commit -m "Subdir with mixed contents" z
386 $ hg commit -m "Subdir with mixed contents" z
387 Invoking status precommit hook
387 Invoking status precommit hook
388 M large3
388 M large3
389 A large5
389 A large5
390 A sub2/large6
390 A sub2/large6
391 A sub2/large7
391 A sub2/large7
392 A z/y/x/large2
392 A z/y/x/large2
393 A z/y/x/m/large1
393 A z/y/x/m/large1
394 A z/y/x/m/normal
394 A z/y/x/m/normal
395 $ hg st
395 $ hg st
396 M large3
396 M large3
397 A large5
397 A large5
398 A sub2/large6
398 A sub2/large6
399 A sub2/large7
399 A sub2/large7
400 $ hg rollback --quiet
400 $ hg rollback --quiet
401 $ hg revert z/y/x/large2 z/y/x/m/large1
401 $ hg revert z/y/x/large2 z/y/x/m/large1
402 $ rm z/y/x/large2 z/y/x/m/large1
402 $ rm z/y/x/large2 z/y/x/m/large1
403 $ hg commit -m "Subdir with normal contents" z
403 $ hg commit -m "Subdir with normal contents" z
404 Invoking status precommit hook
404 Invoking status precommit hook
405 M large3
405 M large3
406 A large5
406 A large5
407 A sub2/large6
407 A sub2/large6
408 A sub2/large7
408 A sub2/large7
409 A z/y/x/m/normal
409 A z/y/x/m/normal
410 $ hg st
410 $ hg st
411 M large3
411 M large3
412 A large5
412 A large5
413 A sub2/large6
413 A sub2/large6
414 A sub2/large7
414 A sub2/large7
415 $ hg rollback --quiet
415 $ hg rollback --quiet
416 $ hg revert --quiet z
416 $ hg revert --quiet z
417 $ hg commit -m "Empty subdir" z
417 $ hg commit -m "Empty subdir" z
418 abort: z: no match under directory!
418 abort: z: no match under directory!
419 [255]
419 [255]
420 $ rm -rf z
420 $ rm -rf z
421 $ hg ci -m "standin" .hglf
421 $ hg ci -m "standin" .hglf
422 abort: file ".hglf" is a largefile standin
422 abort: file ".hglf" is a largefile standin
423 (commit the largefile itself instead)
423 (commit the largefile itself instead)
424 [255]
424 [255]
425
425
426 Test "hg status" with combination of 'file pattern' and 'directory
426 Test "hg status" with combination of 'file pattern' and 'directory
427 pattern' for largefiles:
427 pattern' for largefiles:
428
428
429 $ hg status sub2/large6 sub2
429 $ hg status sub2/large6 sub2
430 A sub2/large6
430 A sub2/large6
431 A sub2/large7
431 A sub2/large7
432
432
433 Config settings (pattern **.dat, minsize 2 MB) are respected.
433 Config settings (pattern **.dat, minsize 2 MB) are respected.
434
434
435 $ echo testdata > test.dat
435 $ echo testdata > test.dat
436 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
436 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
437 $ hg add
437 $ hg add
438 adding reallylarge as a largefile
438 adding reallylarge as a largefile
439 adding test.dat as a largefile
439 adding test.dat as a largefile
440
440
441 Test that minsize and --lfsize handle float values;
441 Test that minsize and --lfsize handle float values;
442 also tests that --lfsize overrides largefiles.minsize.
442 also tests that --lfsize overrides largefiles.minsize.
443 (0.250 MB = 256 kB = 262144 B)
443 (0.250 MB = 256 kB = 262144 B)
444
444
445 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
445 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
446 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
446 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
447 $ hg --config largefiles.minsize=.25 add
447 $ hg --config largefiles.minsize=.25 add
448 adding ratherlarge as a largefile
448 adding ratherlarge as a largefile
449 adding medium
449 adding medium
450 $ hg forget medium
450 $ hg forget medium
451 $ hg --config largefiles.minsize=.25 add --lfsize=.125
451 $ hg --config largefiles.minsize=.25 add --lfsize=.125
452 adding medium as a largefile
452 adding medium as a largefile
453 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
453 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
454 $ hg --config largefiles.minsize=.25 add --lfsize=.125
454 $ hg --config largefiles.minsize=.25 add --lfsize=.125
455 adding notlarge
455 adding notlarge
456 $ hg forget notlarge
456 $ hg forget notlarge
457
457
458 Test forget on largefiles.
458 Test forget on largefiles.
459
459
460 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
460 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
461 $ hg commit -m "add/edit more largefiles"
461 $ hg commit -m "add/edit more largefiles"
462 Invoking status precommit hook
462 Invoking status precommit hook
463 A sub2/large6
463 A sub2/large6
464 A sub2/large7
464 A sub2/large7
465 R large3
465 R large3
466 ? large5
466 ? large5
467 ? medium
467 ? medium
468 ? notlarge
468 ? notlarge
469 ? ratherlarge
469 ? ratherlarge
470 ? reallylarge
470 ? reallylarge
471 ? test.dat
471 ? test.dat
472 $ hg st
472 $ hg st
473 ? large3
473 ? large3
474 ? large5
474 ? large5
475 ? medium
475 ? medium
476 ? notlarge
476 ? notlarge
477 ? ratherlarge
477 ? ratherlarge
478 ? reallylarge
478 ? reallylarge
479 ? test.dat
479 ? test.dat
480
480
481 Purge with largefiles: verify that largefiles are still in the working
481 Purge with largefiles: verify that largefiles are still in the working
482 dir after a purge.
482 dir after a purge.
483
483
484 $ hg purge --all
484 $ hg purge --all
485 $ cat sub/large4
485 $ cat sub/large4
486 large44
486 large44
487 $ cat sub2/large6
487 $ cat sub2/large6
488 large6
488 large6
489 $ cat sub2/large7
489 $ cat sub2/large7
490 large7
490 large7
491
491
492 Test addremove: verify that files that should be added as largefiles are added as
492 Test addremove: verify that files that should be added as largefiles are added as
493 such and that already-existing largefiles are not added as normal files by
493 such and that already-existing largefiles are not added as normal files by
494 accident.
494 accident.
495
495
496 $ rm normal3
496 $ rm normal3
497 $ rm sub/large4
497 $ rm sub/large4
498 $ echo "testing addremove with patterns" > testaddremove.dat
498 $ echo "testing addremove with patterns" > testaddremove.dat
499 $ echo "normaladdremove" > normaladdremove
499 $ echo "normaladdremove" > normaladdremove
500 $ hg addremove
500 $ hg addremove
501 removing sub/large4
501 removing sub/large4
502 adding testaddremove.dat as a largefile
502 adding testaddremove.dat as a largefile
503 removing normal3
503 removing normal3
504 adding normaladdremove
504 adding normaladdremove
505
505
506 Test addremove with -R
506 Test addremove with -R
507
507
508 $ hg up -C
508 $ hg up -C
509 getting changed largefiles
509 getting changed largefiles
510 1 largefiles updated, 0 removed
510 1 largefiles updated, 0 removed
511 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
511 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
512 $ rm normal3
512 $ rm normal3
513 $ rm sub/large4
513 $ rm sub/large4
514 $ echo "testing addremove with patterns" > testaddremove.dat
514 $ echo "testing addremove with patterns" > testaddremove.dat
515 $ echo "normaladdremove" > normaladdremove
515 $ echo "normaladdremove" > normaladdremove
516 $ cd ..
516 $ cd ..
517 $ hg -R a addremove
517 $ hg -R a addremove
518 removing sub/large4
518 removing sub/large4
519 adding a/testaddremove.dat as a largefile (glob)
519 adding a/testaddremove.dat as a largefile (glob)
520 removing normal3
520 removing normal3
521 adding normaladdremove
521 adding normaladdremove
522 $ cd a
522 $ cd a
523
523
524 Test 3364
524 Test 3364
525 $ hg clone . ../addrm
525 $ hg clone . ../addrm
526 updating to branch default
526 updating to branch default
527 getting changed largefiles
527 getting changed largefiles
528 3 largefiles updated, 0 removed
528 3 largefiles updated, 0 removed
529 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
529 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 $ cd ../addrm
530 $ cd ../addrm
531 $ cat >> .hg/hgrc <<EOF
531 $ cat >> .hg/hgrc <<EOF
532 > [hooks]
532 > [hooks]
533 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
533 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
534 > EOF
534 > EOF
535 $ touch foo
535 $ touch foo
536 $ hg add --large foo
536 $ hg add --large foo
537 $ hg ci -m "add foo"
537 $ hg ci -m "add foo"
538 Invoking status precommit hook
538 Invoking status precommit hook
539 A foo
539 A foo
540 Invoking status postcommit hook
540 Invoking status postcommit hook
541 C foo
541 C foo
542 C normal3
542 C normal3
543 C sub/large4
543 C sub/large4
544 C sub/normal4
544 C sub/normal4
545 C sub2/large6
545 C sub2/large6
546 C sub2/large7
546 C sub2/large7
547 $ rm foo
547 $ rm foo
548 $ hg st
548 $ hg st
549 ! foo
549 ! foo
550 hmm.. no precommit invoked, but there is a postcommit??
550 hmm.. no precommit invoked, but there is a postcommit??
551 $ hg ci -m "will not checkin"
551 $ hg ci -m "will not checkin"
552 nothing changed
552 nothing changed
553 Invoking status postcommit hook
553 Invoking status postcommit hook
554 ! foo
554 ! foo
555 C normal3
555 C normal3
556 C sub/large4
556 C sub/large4
557 C sub/normal4
557 C sub/normal4
558 C sub2/large6
558 C sub2/large6
559 C sub2/large7
559 C sub2/large7
560 [1]
560 [1]
561 $ hg addremove
561 $ hg addremove
562 removing foo
562 removing foo
563 $ hg st
563 $ hg st
564 R foo
564 R foo
565 $ hg ci -m "used to say nothing changed"
565 $ hg ci -m "used to say nothing changed"
566 Invoking status precommit hook
566 Invoking status precommit hook
567 R foo
567 R foo
568 Invoking status postcommit hook
568 Invoking status postcommit hook
569 C normal3
569 C normal3
570 C sub/large4
570 C sub/large4
571 C sub/normal4
571 C sub/normal4
572 C sub2/large6
572 C sub2/large6
573 C sub2/large7
573 C sub2/large7
574 $ hg st
574 $ hg st
575
575
576 Test 3507 (both normal files and largefiles were a problem)
576 Test 3507 (both normal files and largefiles were a problem)
577
577
578 $ touch normal
578 $ touch normal
579 $ touch large
579 $ touch large
580 $ hg add normal
580 $ hg add normal
581 $ hg add --large large
581 $ hg add --large large
582 $ hg ci -m "added"
582 $ hg ci -m "added"
583 Invoking status precommit hook
583 Invoking status precommit hook
584 A large
584 A large
585 A normal
585 A normal
586 Invoking status postcommit hook
586 Invoking status postcommit hook
587 C large
587 C large
588 C normal
588 C normal
589 C normal3
589 C normal3
590 C sub/large4
590 C sub/large4
591 C sub/normal4
591 C sub/normal4
592 C sub2/large6
592 C sub2/large6
593 C sub2/large7
593 C sub2/large7
594 $ hg remove normal
594 $ hg remove normal
595 $ hg addremove --traceback
595 $ hg addremove --traceback
596 $ hg ci -m "addremoved normal"
596 $ hg ci -m "addremoved normal"
597 Invoking status precommit hook
597 Invoking status precommit hook
598 R normal
598 R normal
599 Invoking status postcommit hook
599 Invoking status postcommit hook
600 C large
600 C large
601 C normal3
601 C normal3
602 C sub/large4
602 C sub/large4
603 C sub/normal4
603 C sub/normal4
604 C sub2/large6
604 C sub2/large6
605 C sub2/large7
605 C sub2/large7
606 $ hg up -C '.^'
606 $ hg up -C '.^'
607 getting changed largefiles
607 getting changed largefiles
608 0 largefiles updated, 0 removed
608 0 largefiles updated, 0 removed
609 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
609 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
610 $ hg remove large
610 $ hg remove large
611 $ hg addremove --traceback
611 $ hg addremove --traceback
612 $ hg ci -m "removed large"
612 $ hg ci -m "removed large"
613 Invoking status precommit hook
613 Invoking status precommit hook
614 R large
614 R large
615 created new head
615 created new head
616 Invoking status postcommit hook
616 Invoking status postcommit hook
617 C normal
617 C normal
618 C normal3
618 C normal3
619 C sub/large4
619 C sub/large4
620 C sub/normal4
620 C sub/normal4
621 C sub2/large6
621 C sub2/large6
622 C sub2/large7
622 C sub2/large7
623
623
624 Test commit -A (issue 3542)
624 Test commit -A (issue 3542)
625 $ echo large8 > large8
625 $ echo large8 > large8
626 $ hg add --large large8
626 $ hg add --large large8
627 $ hg ci -Am 'this used to add large8 as normal and commit both'
627 $ hg ci -Am 'this used to add large8 as normal and commit both'
628 Invoking status precommit hook
628 Invoking status precommit hook
629 A large8
629 A large8
630 Invoking status postcommit hook
630 Invoking status postcommit hook
631 C large8
631 C large8
632 C normal
632 C normal
633 C normal3
633 C normal3
634 C sub/large4
634 C sub/large4
635 C sub/normal4
635 C sub/normal4
636 C sub2/large6
636 C sub2/large6
637 C sub2/large7
637 C sub2/large7
638 $ rm large8
638 $ rm large8
639 $ hg ci -Am 'this used to not notice the rm'
639 $ hg ci -Am 'this used to not notice the rm'
640 removing large8
640 removing large8
641 Invoking status precommit hook
641 Invoking status precommit hook
642 R large8
642 R large8
643 Invoking status postcommit hook
643 Invoking status postcommit hook
644 C normal
644 C normal
645 C normal3
645 C normal3
646 C sub/large4
646 C sub/large4
647 C sub/normal4
647 C sub/normal4
648 C sub2/large6
648 C sub2/large6
649 C sub2/large7
649 C sub2/large7
650
650
651 Test that a standin can't be added as a large file
651 Test that a standin can't be added as a large file
652
652
653 $ touch large
653 $ touch large
654 $ hg add --large large
654 $ hg add --large large
655 $ hg ci -m "add"
655 $ hg ci -m "add"
656 Invoking status precommit hook
656 Invoking status precommit hook
657 A large
657 A large
658 Invoking status postcommit hook
658 Invoking status postcommit hook
659 C large
659 C large
660 C normal
660 C normal
661 C normal3
661 C normal3
662 C sub/large4
662 C sub/large4
663 C sub/normal4
663 C sub/normal4
664 C sub2/large6
664 C sub2/large6
665 C sub2/large7
665 C sub2/large7
666 $ hg remove large
666 $ hg remove large
667 $ touch large
667 $ touch large
668 $ hg addremove --config largefiles.patterns=**large --traceback
668 $ hg addremove --config largefiles.patterns=**large --traceback
669 adding large as a largefile
669 adding large as a largefile
670
670
671 Test that outgoing --large works (with revsets too)
671 Test that outgoing --large works (with revsets too)
672 $ hg outgoing --rev '.^' --large
672 $ hg outgoing --rev '.^' --large
673 comparing with $TESTTMP/a (glob)
673 comparing with $TESTTMP/a (glob)
674 searching for changes
674 searching for changes
675 changeset: 8:c02fd3b77ec4
675 changeset: 8:c02fd3b77ec4
676 user: test
676 user: test
677 date: Thu Jan 01 00:00:00 1970 +0000
677 date: Thu Jan 01 00:00:00 1970 +0000
678 summary: add foo
678 summary: add foo
679
679
680 changeset: 9:289dd08c9bbb
680 changeset: 9:289dd08c9bbb
681 user: test
681 user: test
682 date: Thu Jan 01 00:00:00 1970 +0000
682 date: Thu Jan 01 00:00:00 1970 +0000
683 summary: used to say nothing changed
683 summary: used to say nothing changed
684
684
685 changeset: 10:34f23ac6ac12
685 changeset: 10:34f23ac6ac12
686 user: test
686 user: test
687 date: Thu Jan 01 00:00:00 1970 +0000
687 date: Thu Jan 01 00:00:00 1970 +0000
688 summary: added
688 summary: added
689
689
690 changeset: 12:710c1b2f523c
690 changeset: 12:710c1b2f523c
691 parent: 10:34f23ac6ac12
691 parent: 10:34f23ac6ac12
692 user: test
692 user: test
693 date: Thu Jan 01 00:00:00 1970 +0000
693 date: Thu Jan 01 00:00:00 1970 +0000
694 summary: removed large
694 summary: removed large
695
695
696 changeset: 13:0a3e75774479
696 changeset: 13:0a3e75774479
697 user: test
697 user: test
698 date: Thu Jan 01 00:00:00 1970 +0000
698 date: Thu Jan 01 00:00:00 1970 +0000
699 summary: this used to add large8 as normal and commit both
699 summary: this used to add large8 as normal and commit both
700
700
701 changeset: 14:84f3d378175c
701 changeset: 14:84f3d378175c
702 user: test
702 user: test
703 date: Thu Jan 01 00:00:00 1970 +0000
703 date: Thu Jan 01 00:00:00 1970 +0000
704 summary: this used to not notice the rm
704 summary: this used to not notice the rm
705
705
706 searching for changes
706 searching for changes
707 largefiles to upload:
707 largefiles to upload:
708 foo
708 foo
709 large
709 large
710 large8
710 large8
711
711
712 $ cd ../a
712 $ cd ../a
713
713
714 Clone a largefiles repo.
714 Clone a largefiles repo.
715
715
716 $ hg clone . ../b
716 $ hg clone . ../b
717 updating to branch default
717 updating to branch default
718 getting changed largefiles
718 getting changed largefiles
719 3 largefiles updated, 0 removed
719 3 largefiles updated, 0 removed
720 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
720 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
721 $ cd ../b
721 $ cd ../b
722 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
722 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
723 7:daea875e9014 add/edit more largefiles
723 7:daea875e9014 add/edit more largefiles
724 6:4355d653f84f edit files yet again
724 6:4355d653f84f edit files yet again
725 5:9d5af5072dbd edit files again
725 5:9d5af5072dbd edit files again
726 4:74c02385b94c move files
726 4:74c02385b94c move files
727 3:9e8fbc4bce62 copy files
727 3:9e8fbc4bce62 copy files
728 2:51a0ae4d5864 remove files
728 2:51a0ae4d5864 remove files
729 1:ce8896473775 edit files
729 1:ce8896473775 edit files
730 0:30d30fe6a5be add files
730 0:30d30fe6a5be add files
731 $ cat normal3
731 $ cat normal3
732 normal33
732 normal33
733 $ cat sub/normal4
733 $ cat sub/normal4
734 normal44
734 normal44
735 $ cat sub/large4
735 $ cat sub/large4
736 large44
736 large44
737 $ cat sub2/large6
737 $ cat sub2/large6
738 large6
738 large6
739 $ cat sub2/large7
739 $ cat sub2/large7
740 large7
740 large7
741 $ hg log -qf sub2/large7
741 $ hg log -qf sub2/large7
742 7:daea875e9014
742 7:daea875e9014
743 $ cd ..
743 $ cd ..
744 $ hg clone a -r 3 c
744 $ hg clone a -r 3 c
745 adding changesets
745 adding changesets
746 adding manifests
746 adding manifests
747 adding file changes
747 adding file changes
748 added 4 changesets with 10 changes to 4 files
748 added 4 changesets with 10 changes to 4 files
749 updating to branch default
749 updating to branch default
750 getting changed largefiles
750 getting changed largefiles
751 2 largefiles updated, 0 removed
751 2 largefiles updated, 0 removed
752 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
752 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
753 $ cd c
753 $ cd c
754 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
754 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
755 3:9e8fbc4bce62 copy files
755 3:9e8fbc4bce62 copy files
756 2:51a0ae4d5864 remove files
756 2:51a0ae4d5864 remove files
757 1:ce8896473775 edit files
757 1:ce8896473775 edit files
758 0:30d30fe6a5be add files
758 0:30d30fe6a5be add files
759 $ cat normal1
759 $ cat normal1
760 normal22
760 normal22
761 $ cat large1
761 $ cat large1
762 large22
762 large22
763 $ cat sub/normal2
763 $ cat sub/normal2
764 normal22
764 normal22
765 $ cat sub/large2
765 $ cat sub/large2
766 large22
766 large22
767
767
768 Old revisions of a clone have correct largefiles content (this also
768 Old revisions of a clone have correct largefiles content (this also
769 tests update).
769 tests update).
770
770
771 $ hg update -r 1
771 $ hg update -r 1
772 getting changed largefiles
772 getting changed largefiles
773 1 largefiles updated, 0 removed
773 1 largefiles updated, 0 removed
774 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
774 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
775 $ cat large1
775 $ cat large1
776 large11
776 large11
777 $ cat sub/large2
777 $ cat sub/large2
778 large22
778 large22
779 $ cd ..
779 $ cd ..
780
780
781 Test cloning with --all-largefiles flag
781 Test cloning with --all-largefiles flag
782
782
783 $ rm "${USERCACHE}"/*
783 $ rm "${USERCACHE}"/*
784 $ hg clone --all-largefiles a a-backup
784 $ hg clone --all-largefiles a a-backup
785 updating to branch default
785 updating to branch default
786 getting changed largefiles
786 getting changed largefiles
787 3 largefiles updated, 0 removed
787 3 largefiles updated, 0 removed
788 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
788 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
789 8 additional largefiles cached
789 8 additional largefiles cached
790
790
791 $ rm "${USERCACHE}"/*
791 $ rm "${USERCACHE}"/*
792 $ hg clone --all-largefiles -u 0 a a-clone0
792 $ hg clone --all-largefiles -u 0 a a-clone0
793 updating to branch default
793 updating to branch default
794 getting changed largefiles
794 getting changed largefiles
795 2 largefiles updated, 0 removed
795 2 largefiles updated, 0 removed
796 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
796 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
797 9 additional largefiles cached
797 9 additional largefiles cached
798 $ hg -R a-clone0 sum
798 $ hg -R a-clone0 sum
799 parent: 0:30d30fe6a5be
799 parent: 0:30d30fe6a5be
800 add files
800 add files
801 branch: default
801 branch: default
802 commit: (clean)
802 commit: (clean)
803 update: 7 new changesets (update)
803 update: 7 new changesets (update)
804
804
805 $ rm "${USERCACHE}"/*
805 $ rm "${USERCACHE}"/*
806 $ hg clone --all-largefiles -u 1 a a-clone1
806 $ hg clone --all-largefiles -u 1 a a-clone1
807 updating to branch default
807 updating to branch default
808 getting changed largefiles
808 getting changed largefiles
809 2 largefiles updated, 0 removed
809 2 largefiles updated, 0 removed
810 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
810 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
811 8 additional largefiles cached
811 8 additional largefiles cached
812 $ hg -R a-clone1 verify --large --lfa --lfc
812 $ hg -R a-clone1 verify --large --lfa --lfc
813 checking changesets
813 checking changesets
814 checking manifests
814 checking manifests
815 crosschecking files in changesets and manifests
815 crosschecking files in changesets and manifests
816 checking files
816 checking files
817 10 files, 8 changesets, 24 total revisions
817 10 files, 8 changesets, 24 total revisions
818 searching 8 changesets for largefiles
818 searching 8 changesets for largefiles
819 verified contents of 13 revisions of 6 largefiles
819 verified contents of 13 revisions of 6 largefiles
820 $ hg -R a-clone1 sum
820 $ hg -R a-clone1 sum
821 parent: 1:ce8896473775
821 parent: 1:ce8896473775
822 edit files
822 edit files
823 branch: default
823 branch: default
824 commit: (clean)
824 commit: (clean)
825 update: 6 new changesets (update)
825 update: 6 new changesets (update)
826
826
827 $ rm "${USERCACHE}"/*
827 $ rm "${USERCACHE}"/*
828 $ hg clone --all-largefiles -U a a-clone-u
828 $ hg clone --all-largefiles -U a a-clone-u
829 11 additional largefiles cached
829 11 additional largefiles cached
830 $ hg -R a-clone-u sum
830 $ hg -R a-clone-u sum
831 parent: -1:000000000000 (no revision checked out)
831 parent: -1:000000000000 (no revision checked out)
832 branch: default
832 branch: default
833 commit: (clean)
833 commit: (clean)
834 update: 8 new changesets (update)
834 update: 8 new changesets (update)
835
835
836 Show computed destination directory:
836 Show computed destination directory:
837
837
838 $ mkdir xyz
838 $ mkdir xyz
839 $ cd xyz
839 $ cd xyz
840 $ hg clone ../a
840 $ hg clone ../a
841 destination directory: a
841 destination directory: a
842 updating to branch default
842 updating to branch default
843 getting changed largefiles
843 getting changed largefiles
844 3 largefiles updated, 0 removed
844 3 largefiles updated, 0 removed
845 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
845 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
846 $ cd ..
846 $ cd ..
847
847
848 Clone URL without path:
848 Clone URL without path:
849
849
850 $ hg clone file://
850 $ hg clone file://
851 abort: repository / not found!
851 abort: repository / not found!
852 [255]
852 [255]
853
853
854 Ensure base clone command argument validation
854 Ensure base clone command argument validation
855
855
856 $ hg clone -U -u 0 a a-clone-failure
856 $ hg clone -U -u 0 a a-clone-failure
857 abort: cannot specify both --noupdate and --updaterev
857 abort: cannot specify both --noupdate and --updaterev
858 [255]
858 [255]
859
859
860 $ hg clone --all-largefiles a ssh://localhost/a
860 $ hg clone --all-largefiles a ssh://localhost/a
861 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
861 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
862 [255]
862 [255]
863
863
864 Test pulling with --all-largefiles flag. Also test that the largefiles are
864 Test pulling with --all-largefiles flag. Also test that the largefiles are
865 downloaded from 'default' instead of 'default-push' when no source is specified
865 downloaded from 'default' instead of 'default-push' when no source is specified
866 (issue3584)
866 (issue3584)
867
867
868 $ rm -Rf a-backup
868 $ rm -Rf a-backup
869 $ hg clone -r 1 a a-backup
869 $ hg clone -r 1 a a-backup
870 adding changesets
870 adding changesets
871 adding manifests
871 adding manifests
872 adding file changes
872 adding file changes
873 added 2 changesets with 8 changes to 4 files
873 added 2 changesets with 8 changes to 4 files
874 updating to branch default
874 updating to branch default
875 getting changed largefiles
875 getting changed largefiles
876 2 largefiles updated, 0 removed
876 2 largefiles updated, 0 removed
877 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
877 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
878 $ rm "${USERCACHE}"/*
878 $ rm "${USERCACHE}"/*
879 $ cd a-backup
879 $ cd a-backup
880 $ hg pull --all-largefiles --config paths.default-push=bogus/path
880 $ hg pull --all-largefiles --config paths.default-push=bogus/path
881 pulling from $TESTTMP/a (glob)
881 pulling from $TESTTMP/a (glob)
882 searching for changes
882 searching for changes
883 adding changesets
883 adding changesets
884 adding manifests
884 adding manifests
885 adding file changes
885 adding file changes
886 added 6 changesets with 16 changes to 8 files
886 added 6 changesets with 16 changes to 8 files
887 (run 'hg update' to get a working copy)
887 (run 'hg update' to get a working copy)
888 6 largefiles cached
888 6 largefiles cached
889
889
890 redo pull with --lfrev and check it pulls largefiles for the right revs
890 redo pull with --lfrev and check it pulls largefiles for the right revs
891
891
892 $ hg rollback
892 $ hg rollback
893 repository tip rolled back to revision 1 (undo pull)
893 repository tip rolled back to revision 1 (undo pull)
894 $ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
894 $ hg pull -v --lfrev 'heads(pulled())+min(pulled())'
895 pulling from $TESTTMP/a (glob)
895 pulling from $TESTTMP/a (glob)
896 searching for changes
896 searching for changes
897 all local heads known remotely
897 all local heads known remotely
898 6 changesets found
898 6 changesets found
899 adding changesets
899 adding changesets
900 adding manifests
900 adding manifests
901 adding file changes
901 adding file changes
902 added 6 changesets with 16 changes to 8 files
902 added 6 changesets with 16 changes to 8 files
903 calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
903 calling hook changegroup.lfiles: hgext.largefiles.reposetup.checkrequireslfiles
904 (run 'hg update' to get a working copy)
904 (run 'hg update' to get a working copy)
905 pulling largefiles for revision 7
905 pulling largefiles for revision 7
906 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store
906 found 971fb41e78fea4f8e0ba5244784239371cb00591 in store
907 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store
907 found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store
908 found bb3151689acb10f0c3125c560d5e63df914bc1af in store
908 found bb3151689acb10f0c3125c560d5e63df914bc1af in store
909 pulling largefiles for revision 2
909 pulling largefiles for revision 2
910 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
910 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
911 0 largefiles cached
911 0 largefiles cached
912
912
913 lfpull
913 lfpull
914
914
915 $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull
915 $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull
916 2 largefiles cached
916 2 largefiles cached
917 $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull
917 $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull
918 pulling largefiles for revision 4
918 pulling largefiles for revision 4
919 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
919 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
920 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
920 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
921 pulling largefiles for revision 2
921 pulling largefiles for revision 2
922 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
922 found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store
923 0 largefiles cached
923 0 largefiles cached
924
924
925 $ ls usercache-lfpull/* | sort
925 $ ls usercache-lfpull/* | sort
926 usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d
926 usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d
927 usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64
927 usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64
928
928
929 $ cd ..
929 $ cd ..
930
930
931 Rebasing between two repositories does not revert largefiles to old
931 Rebasing between two repositories does not revert largefiles to old
932 revisions (this was a very bad bug that took a lot of work to fix).
932 revisions (this was a very bad bug that took a lot of work to fix).
933
933
934 $ hg clone a d
934 $ hg clone a d
935 updating to branch default
935 updating to branch default
936 getting changed largefiles
936 getting changed largefiles
937 3 largefiles updated, 0 removed
937 3 largefiles updated, 0 removed
938 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
938 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
939 $ cd b
939 $ cd b
940 $ echo large4-modified > sub/large4
940 $ echo large4-modified > sub/large4
941 $ echo normal3-modified > normal3
941 $ echo normal3-modified > normal3
942 $ hg commit -m "modify normal file and largefile in repo b"
942 $ hg commit -m "modify normal file and largefile in repo b"
943 Invoking status precommit hook
943 Invoking status precommit hook
944 M normal3
944 M normal3
945 M sub/large4
945 M sub/large4
946 $ cd ../d
946 $ cd ../d
947 $ echo large6-modified > sub2/large6
947 $ echo large6-modified > sub2/large6
948 $ echo normal4-modified > sub/normal4
948 $ echo normal4-modified > sub/normal4
949 $ hg commit -m "modify normal file largefile in repo d"
949 $ hg commit -m "modify normal file largefile in repo d"
950 Invoking status precommit hook
950 Invoking status precommit hook
951 M sub/normal4
951 M sub/normal4
952 M sub2/large6
952 M sub2/large6
953 $ cd ..
953 $ cd ..
954 $ hg clone d e
954 $ hg clone d e
955 updating to branch default
955 updating to branch default
956 getting changed largefiles
956 getting changed largefiles
957 3 largefiles updated, 0 removed
957 3 largefiles updated, 0 removed
958 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
958 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
959 $ cd d
959 $ cd d
960
960
961 More rebase testing, but also test that the largefiles are downloaded from
961 More rebase testing, but also test that the largefiles are downloaded from
962 'default-push' when no source is specified (issue3584). (The largefile from the
962 'default-push' when no source is specified (issue3584). (The largefile from the
963 pulled revision is however not downloaded but found in the local cache.)
963 pulled revision is however not downloaded but found in the local cache.)
964 Largefiles are fetched for the new pulled revision, not for existing revisions,
964 Largefiles are fetched for the new pulled revision, not for existing revisions,
965 rebased or not.
965 rebased or not.
966
966
967 $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
967 $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
968 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
968 $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b
969 pulling from $TESTTMP/b (glob)
969 pulling from $TESTTMP/b (glob)
970 searching for changes
970 searching for changes
971 adding changesets
971 adding changesets
972 adding manifests
972 adding manifests
973 adding file changes
973 adding file changes
974 added 1 changesets with 2 changes to 2 files (+1 heads)
974 added 1 changesets with 2 changes to 2 files (+1 heads)
975 Invoking status precommit hook
975 Invoking status precommit hook
976 M sub/normal4
976 M sub/normal4
977 M sub2/large6
977 M sub2/large6
978 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
978 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
979 0 largefiles cached
979 0 largefiles cached
980 nothing to rebase - working directory parent is also destination
980 nothing to rebase - working directory parent is also destination
981 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
981 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
982 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
982 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
983 9:598410d3eb9a modify normal file largefile in repo d
983 9:598410d3eb9a modify normal file largefile in repo d
984 8:a381d2c8c80e modify normal file and largefile in repo b
984 8:a381d2c8c80e modify normal file and largefile in repo b
985 7:daea875e9014 add/edit more largefiles
985 7:daea875e9014 add/edit more largefiles
986 6:4355d653f84f edit files yet again
986 6:4355d653f84f edit files yet again
987 5:9d5af5072dbd edit files again
987 5:9d5af5072dbd edit files again
988 4:74c02385b94c move files
988 4:74c02385b94c move files
989 3:9e8fbc4bce62 copy files
989 3:9e8fbc4bce62 copy files
990 2:51a0ae4d5864 remove files
990 2:51a0ae4d5864 remove files
991 1:ce8896473775 edit files
991 1:ce8896473775 edit files
992 0:30d30fe6a5be add files
992 0:30d30fe6a5be add files
993 $ cat normal3
993 $ cat normal3
994 normal3-modified
994 normal3-modified
995 $ cat sub/normal4
995 $ cat sub/normal4
996 normal4-modified
996 normal4-modified
997 $ cat sub/large4
997 $ cat sub/large4
998 large4-modified
998 large4-modified
999 $ cat sub2/large6
999 $ cat sub2/large6
1000 large6-modified
1000 large6-modified
1001 $ cat sub2/large7
1001 $ cat sub2/large7
1002 large7
1002 large7
1003 $ cd ../e
1003 $ cd ../e
1004 $ hg pull ../b
1004 $ hg pull ../b
1005 pulling from ../b
1005 pulling from ../b
1006 searching for changes
1006 searching for changes
1007 adding changesets
1007 adding changesets
1008 adding manifests
1008 adding manifests
1009 adding file changes
1009 adding file changes
1010 added 1 changesets with 2 changes to 2 files (+1 heads)
1010 added 1 changesets with 2 changes to 2 files (+1 heads)
1011 (run 'hg heads' to see heads, 'hg merge' to merge)
1011 (run 'hg heads' to see heads, 'hg merge' to merge)
1012 $ hg rebase
1012 $ hg rebase
1013 Invoking status precommit hook
1013 Invoking status precommit hook
1014 M sub/normal4
1014 M sub/normal4
1015 M sub2/large6
1015 M sub2/large6
1016 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
1016 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
1017 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1017 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1018 9:598410d3eb9a modify normal file largefile in repo d
1018 9:598410d3eb9a modify normal file largefile in repo d
1019 8:a381d2c8c80e modify normal file and largefile in repo b
1019 8:a381d2c8c80e modify normal file and largefile in repo b
1020 7:daea875e9014 add/edit more largefiles
1020 7:daea875e9014 add/edit more largefiles
1021 6:4355d653f84f edit files yet again
1021 6:4355d653f84f edit files yet again
1022 5:9d5af5072dbd edit files again
1022 5:9d5af5072dbd edit files again
1023 4:74c02385b94c move files
1023 4:74c02385b94c move files
1024 3:9e8fbc4bce62 copy files
1024 3:9e8fbc4bce62 copy files
1025 2:51a0ae4d5864 remove files
1025 2:51a0ae4d5864 remove files
1026 1:ce8896473775 edit files
1026 1:ce8896473775 edit files
1027 0:30d30fe6a5be add files
1027 0:30d30fe6a5be add files
1028 $ cat normal3
1028 $ cat normal3
1029 normal3-modified
1029 normal3-modified
1030 $ cat sub/normal4
1030 $ cat sub/normal4
1031 normal4-modified
1031 normal4-modified
1032 $ cat sub/large4
1032 $ cat sub/large4
1033 large4-modified
1033 large4-modified
1034 $ cat sub2/large6
1034 $ cat sub2/large6
1035 large6-modified
1035 large6-modified
1036 $ cat sub2/large7
1036 $ cat sub2/large7
1037 large7
1037 large7
1038
1038
1039 Log on largefiles
1039 Log on largefiles
1040
1040
1041 - same output
1041 - same output
1042 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
1042 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4
1043 8:a381d2c8c80e modify normal file and largefile in repo b
1043 8:a381d2c8c80e modify normal file and largefile in repo b
1044 6:4355d653f84f edit files yet again
1044 6:4355d653f84f edit files yet again
1045 5:9d5af5072dbd edit files again
1045 5:9d5af5072dbd edit files again
1046 4:74c02385b94c move files
1046 4:74c02385b94c move files
1047 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4
1047 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4
1048 8:a381d2c8c80e modify normal file and largefile in repo b
1048 8:a381d2c8c80e modify normal file and largefile in repo b
1049 6:4355d653f84f edit files yet again
1049 6:4355d653f84f edit files yet again
1050 5:9d5af5072dbd edit files again
1050 5:9d5af5072dbd edit files again
1051 4:74c02385b94c move files
1051 4:74c02385b94c move files
1052
1052
1053 - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal
1053 - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal
1054 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub
1054 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub
1055 8:a381d2c8c80e modify normal file and largefile in repo b
1055 8:a381d2c8c80e modify normal file and largefile in repo b
1056 6:4355d653f84f edit files yet again
1056 6:4355d653f84f edit files yet again
1057 5:9d5af5072dbd edit files again
1057 5:9d5af5072dbd edit files again
1058 4:74c02385b94c move files
1058 4:74c02385b94c move files
1059 1:ce8896473775 edit files
1059 1:ce8896473775 edit files
1060 0:30d30fe6a5be add files
1060 0:30d30fe6a5be add files
1061 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub
1061 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub
1062 9:598410d3eb9a modify normal file largefile in repo d
1062 9:598410d3eb9a modify normal file largefile in repo d
1063 8:a381d2c8c80e modify normal file and largefile in repo b
1063 8:a381d2c8c80e modify normal file and largefile in repo b
1064 6:4355d653f84f edit files yet again
1064 6:4355d653f84f edit files yet again
1065 5:9d5af5072dbd edit files again
1065 5:9d5af5072dbd edit files again
1066 4:74c02385b94c move files
1066 4:74c02385b94c move files
1067 1:ce8896473775 edit files
1067 1:ce8896473775 edit files
1068 0:30d30fe6a5be add files
1068 0:30d30fe6a5be add files
1069
1069
1070 - globbing gives same result
1070 - globbing gives same result
1071 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*'
1071 $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*'
1072 9:598410d3eb9a modify normal file largefile in repo d
1072 9:598410d3eb9a modify normal file largefile in repo d
1073 8:a381d2c8c80e modify normal file and largefile in repo b
1073 8:a381d2c8c80e modify normal file and largefile in repo b
1074 6:4355d653f84f edit files yet again
1074 6:4355d653f84f edit files yet again
1075 5:9d5af5072dbd edit files again
1075 5:9d5af5072dbd edit files again
1076 4:74c02385b94c move files
1076 4:74c02385b94c move files
1077 1:ce8896473775 edit files
1077 1:ce8896473775 edit files
1078 0:30d30fe6a5be add files
1078 0:30d30fe6a5be add files
1079
1079
1080 Rollback on largefiles.
1080 Rollback on largefiles.
1081
1081
1082 $ echo large4-modified-again > sub/large4
1082 $ echo large4-modified-again > sub/large4
1083 $ hg commit -m "Modify large4 again"
1083 $ hg commit -m "Modify large4 again"
1084 Invoking status precommit hook
1084 Invoking status precommit hook
1085 M sub/large4
1085 M sub/large4
1086 $ hg rollback
1086 $ hg rollback
1087 repository tip rolled back to revision 9 (undo commit)
1087 repository tip rolled back to revision 9 (undo commit)
1088 working directory now based on revision 9
1088 working directory now based on revision 9
1089 $ hg st
1089 $ hg st
1090 M sub/large4
1090 M sub/large4
1091 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1091 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1092 9:598410d3eb9a modify normal file largefile in repo d
1092 9:598410d3eb9a modify normal file largefile in repo d
1093 8:a381d2c8c80e modify normal file and largefile in repo b
1093 8:a381d2c8c80e modify normal file and largefile in repo b
1094 7:daea875e9014 add/edit more largefiles
1094 7:daea875e9014 add/edit more largefiles
1095 6:4355d653f84f edit files yet again
1095 6:4355d653f84f edit files yet again
1096 5:9d5af5072dbd edit files again
1096 5:9d5af5072dbd edit files again
1097 4:74c02385b94c move files
1097 4:74c02385b94c move files
1098 3:9e8fbc4bce62 copy files
1098 3:9e8fbc4bce62 copy files
1099 2:51a0ae4d5864 remove files
1099 2:51a0ae4d5864 remove files
1100 1:ce8896473775 edit files
1100 1:ce8896473775 edit files
1101 0:30d30fe6a5be add files
1101 0:30d30fe6a5be add files
1102 $ cat sub/large4
1102 $ cat sub/large4
1103 large4-modified-again
1103 large4-modified-again
1104
1104
1105 "update --check" refuses to update with uncommitted changes.
1105 "update --check" refuses to update with uncommitted changes.
1106 $ hg update --check 8
1106 $ hg update --check 8
1107 abort: uncommitted changes
1107 abort: uncommitted changes
1108 [255]
1108 [255]
1109
1109
1110 "update --clean" leaves correct largefiles in working copy, even when there is
1110 "update --clean" leaves correct largefiles in working copy, even when there is
1111 .orig files from revert in .hglf.
1111 .orig files from revert in .hglf.
1112
1112
1113 $ echo mistake > sub2/large7
1113 $ echo mistake > sub2/large7
1114 $ hg revert sub2/large7
1114 $ hg revert sub2/large7
1115 $ hg -q update --clean -r null
1115 $ hg -q update --clean -r null
1116 $ hg update --clean
1116 $ hg update --clean
1117 getting changed largefiles
1117 getting changed largefiles
1118 3 largefiles updated, 0 removed
1118 3 largefiles updated, 0 removed
1119 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1119 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1120 $ cat normal3
1120 $ cat normal3
1121 normal3-modified
1121 normal3-modified
1122 $ cat sub/normal4
1122 $ cat sub/normal4
1123 normal4-modified
1123 normal4-modified
1124 $ cat sub/large4
1124 $ cat sub/large4
1125 large4-modified
1125 large4-modified
1126 $ cat sub2/large6
1126 $ cat sub2/large6
1127 large6-modified
1127 large6-modified
1128 $ cat sub2/large7
1128 $ cat sub2/large7
1129 large7
1129 large7
1130 $ cat sub2/large7.orig
1130 $ cat sub2/large7.orig
1131 mistake
1131 mistake
1132 $ cat .hglf/sub2/large7.orig
1132 $ cat .hglf/sub2/large7.orig
1133 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31
1133 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31
1134
1134
1135 demonstrate misfeature: .orig file is overwritten on every update -C,
1135 demonstrate misfeature: .orig file is overwritten on every update -C,
1136 also when clean:
1136 also when clean:
1137 $ hg update --clean
1137 $ hg update --clean
1138 getting changed largefiles
1138 getting changed largefiles
1139 0 largefiles updated, 0 removed
1139 0 largefiles updated, 0 removed
1140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1140 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1141 $ cat sub2/large7.orig
1141 $ cat sub2/large7.orig
1142 large7
1142 large7
1143 $ rm sub2/large7.orig .hglf/sub2/large7.orig
1143 $ rm sub2/large7.orig .hglf/sub2/large7.orig
1144
1144
1145 Now "update check" is happy.
1145 Now "update check" is happy.
1146 $ hg update --check 8
1146 $ hg update --check 8
1147 getting changed largefiles
1147 getting changed largefiles
1148 1 largefiles updated, 0 removed
1148 1 largefiles updated, 0 removed
1149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1150 $ hg update --check
1150 $ hg update --check
1151 getting changed largefiles
1151 getting changed largefiles
1152 1 largefiles updated, 0 removed
1152 1 largefiles updated, 0 removed
1153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1154
1154
1155 Test removing empty largefiles directories on update
1155 Test removing empty largefiles directories on update
1156 $ test -d sub2 && echo "sub2 exists"
1156 $ test -d sub2 && echo "sub2 exists"
1157 sub2 exists
1157 sub2 exists
1158 $ hg update -q null
1158 $ hg update -q null
1159 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1159 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1160 [1]
1160 [1]
1161 $ hg update -q
1161 $ hg update -q
1162
1162
1163 Test hg remove removes empty largefiles directories
1163 Test hg remove removes empty largefiles directories
1164 $ test -d sub2 && echo "sub2 exists"
1164 $ test -d sub2 && echo "sub2 exists"
1165 sub2 exists
1165 sub2 exists
1166 $ hg remove sub2/*
1166 $ hg remove sub2/*
1167 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1167 $ test -d sub2 && echo "error: sub2 should not exist anymore"
1168 [1]
1168 [1]
1169 $ hg revert sub2/large6 sub2/large7
1169 $ hg revert sub2/large6 sub2/large7
1170
1170
1171 "revert" works on largefiles (and normal files too).
1171 "revert" works on largefiles (and normal files too).
1172 $ echo hack3 >> normal3
1172 $ echo hack3 >> normal3
1173 $ echo hack4 >> sub/normal4
1173 $ echo hack4 >> sub/normal4
1174 $ echo hack4 >> sub/large4
1174 $ echo hack4 >> sub/large4
1175 $ rm sub2/large6
1175 $ rm sub2/large6
1176 $ hg revert sub2/large6
1176 $ hg revert sub2/large6
1177 $ hg rm sub2/large6
1177 $ hg rm sub2/large6
1178 $ echo new >> sub2/large8
1178 $ echo new >> sub2/large8
1179 $ hg add --large sub2/large8
1179 $ hg add --large sub2/large8
1180 # XXX we don't really want to report that we're reverting the standin;
1180 # XXX we don't really want to report that we're reverting the standin;
1181 # that's just an implementation detail. But I don't see an obvious fix. ;-(
1181 # that's just an implementation detail. But I don't see an obvious fix. ;-(
1182 $ hg revert sub
1182 $ hg revert sub
1183 reverting .hglf/sub/large4 (glob)
1183 reverting .hglf/sub/large4 (glob)
1184 reverting sub/normal4 (glob)
1184 reverting sub/normal4 (glob)
1185 $ hg status
1185 $ hg status
1186 M normal3
1186 M normal3
1187 A sub2/large8
1187 A sub2/large8
1188 R sub2/large6
1188 R sub2/large6
1189 ? sub/large4.orig
1189 ? sub/large4.orig
1190 ? sub/normal4.orig
1190 ? sub/normal4.orig
1191 $ cat sub/normal4
1191 $ cat sub/normal4
1192 normal4-modified
1192 normal4-modified
1193 $ cat sub/large4
1193 $ cat sub/large4
1194 large4-modified
1194 large4-modified
1195 $ hg revert -a --no-backup
1195 $ hg revert -a --no-backup
1196 undeleting .hglf/sub2/large6 (glob)
1196 undeleting .hglf/sub2/large6 (glob)
1197 forgetting .hglf/sub2/large8 (glob)
1197 forgetting .hglf/sub2/large8 (glob)
1198 reverting normal3
1198 reverting normal3
1199 $ hg status
1199 $ hg status
1200 ? sub/large4.orig
1200 ? sub/large4.orig
1201 ? sub/normal4.orig
1201 ? sub/normal4.orig
1202 ? sub2/large8
1202 ? sub2/large8
1203 $ cat normal3
1203 $ cat normal3
1204 normal3-modified
1204 normal3-modified
1205 $ cat sub2/large6
1205 $ cat sub2/large6
1206 large6-modified
1206 large6-modified
1207 $ rm sub/*.orig sub2/large8
1207 $ rm sub/*.orig sub2/large8
1208
1208
1209 revert some files to an older revision
1209 revert some files to an older revision
1210 $ hg revert --no-backup -r 8 sub2
1210 $ hg revert --no-backup -r 8 sub2
1211 reverting .hglf/sub2/large6 (glob)
1211 reverting .hglf/sub2/large6 (glob)
1212 $ cat sub2/large6
1212 $ cat sub2/large6
1213 large6
1213 large6
1214 $ hg revert --no-backup -C -r '.^' sub2
1214 $ hg revert --no-backup -C -r '.^' sub2
1215 reverting .hglf/sub2/large6 (glob)
1215 reverting .hglf/sub2/large6 (glob)
1216 $ hg revert --no-backup sub2
1216 $ hg revert --no-backup sub2
1217 reverting .hglf/sub2/large6 (glob)
1217 reverting .hglf/sub2/large6 (glob)
1218 $ hg status
1218 $ hg status
1219
1219
1220 "verify --large" actually verifies largefiles
1220 "verify --large" actually verifies largefiles
1221
1221
1222 - Where Do We Come From? What Are We? Where Are We Going?
1222 - Where Do We Come From? What Are We? Where Are We Going?
1223 $ pwd
1223 $ pwd
1224 $TESTTMP/e
1224 $TESTTMP/e
1225 $ hg paths
1225 $ hg paths
1226 default = $TESTTMP/d (glob)
1226 default = $TESTTMP/d (glob)
1227
1227
1228 $ hg verify --large
1228 $ hg verify --large
1229 checking changesets
1229 checking changesets
1230 checking manifests
1230 checking manifests
1231 crosschecking files in changesets and manifests
1231 crosschecking files in changesets and manifests
1232 checking files
1232 checking files
1233 10 files, 10 changesets, 28 total revisions
1233 10 files, 10 changesets, 28 total revisions
1234 searching 1 changesets for largefiles
1234 searching 1 changesets for largefiles
1235 verified existence of 3 revisions of 3 largefiles
1235 verified existence of 3 revisions of 3 largefiles
1236
1236
1237 - introduce missing blob in local store repo and make sure that this is caught:
1237 - introduce missing blob in local store repo and make sure that this is caught:
1238 $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 .
1238 $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 .
1239 $ hg verify --large
1239 $ hg verify --large
1240 checking changesets
1240 checking changesets
1241 checking manifests
1241 checking manifests
1242 crosschecking files in changesets and manifests
1242 crosschecking files in changesets and manifests
1243 checking files
1243 checking files
1244 10 files, 10 changesets, 28 total revisions
1244 10 files, 10 changesets, 28 total revisions
1245 searching 1 changesets for largefiles
1245 searching 1 changesets for largefiles
1246 changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1246 changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1247 verified existence of 3 revisions of 3 largefiles
1247 verified existence of 3 revisions of 3 largefiles
1248 [1]
1248 [1]
1249
1249
1250 - introduce corruption and make sure that it is caught when checking content:
1250 - introduce corruption and make sure that it is caught when checking content:
1251 $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
1251 $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928
1252 $ hg verify -q --large --lfc
1252 $ hg verify -q --large --lfc
1253 changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1253 changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
1254 [1]
1254 [1]
1255
1255
1256 - cleanup
1256 - cleanup
1257 $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/
1257 $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/
1258
1258
1259 - verifying all revisions will fail because we didn't clone all largefiles to d:
1259 - verifying all revisions will fail because we didn't clone all largefiles to d:
1260 $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1260 $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1261 $ hg verify -q --lfa --lfc
1261 $ hg verify -q --lfa --lfc
1262 changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
1262 changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob)
1263 changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
1263 changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob)
1264 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
1264 changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob)
1265 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1265 changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1266 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1266 changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1267 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1267 changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1268 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1268 changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob)
1269 changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob)
1269 changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob)
1270 changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob)
1270 changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob)
1271 changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob)
1271 changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob)
1272 [1]
1272 [1]
1273
1273
1274 - cleanup
1274 - cleanup
1275 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1275 $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4
1276 $ rm -f .hglf/sub/*.orig
1276 $ rm -f .hglf/sub/*.orig
1277
1277
1278 Update to revision with missing largefile - and make sure it really is missing
1278 Update to revision with missing largefile - and make sure it really is missing
1279
1279
1280 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
1280 $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
1281 $ hg up -r 6
1281 $ hg up -r 6
1282 getting changed largefiles
1282 getting changed largefiles
1283 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
1283 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
1284 1 largefiles updated, 2 removed
1284 1 largefiles updated, 2 removed
1285 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
1285 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
1286 $ rm normal3
1286 $ rm normal3
1287 $ echo >> sub/normal4
1287 $ echo >> sub/normal4
1288 $ hg ci -m 'commit with missing files'
1288 $ hg ci -m 'commit with missing files'
1289 Invoking status precommit hook
1289 Invoking status precommit hook
1290 M sub/normal4
1290 M sub/normal4
1291 ! large3
1291 ! large3
1292 ! normal3
1292 ! normal3
1293 created new head
1293 created new head
1294 $ hg st
1294 $ hg st
1295 ! large3
1295 ! large3
1296 ! normal3
1296 ! normal3
1297 $ hg up -r.
1297 $ hg up -r.
1298 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1298 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1299 $ hg st
1299 $ hg st
1300 ! large3
1300 ! large3
1301 ! normal3
1301 ! normal3
1302 $ hg up -Cr.
1302 $ hg up -Cr.
1303 getting changed largefiles
1303 getting changed largefiles
1304 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
1304 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
1305 0 largefiles updated, 0 removed
1305 0 largefiles updated, 0 removed
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1306 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1307 $ hg st
1307 $ hg st
1308 ! large3
1308 ! large3
1309 $ hg rollback
1309 $ hg rollback
1310 repository tip rolled back to revision 9 (undo commit)
1310 repository tip rolled back to revision 9 (undo commit)
1311 working directory now based on revision 6
1311 working directory now based on revision 6
1312
1312
1313 Merge with revision with missing largefile - and make sure it tries to fetch it.
1313 Merge with revision with missing largefile - and make sure it tries to fetch it.
1314
1314
1315 $ hg up -Cqr null
1315 $ hg up -Cqr null
1316 $ echo f > f
1316 $ echo f > f
1317 $ hg ci -Am branch
1317 $ hg ci -Am branch
1318 adding f
1318 adding f
1319 Invoking status precommit hook
1319 Invoking status precommit hook
1320 A f
1320 A f
1321 created new head
1321 created new head
1322 $ hg merge -r 6
1322 $ hg merge -r 6
1323 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1323 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
1324 (branch merge, don't forget to commit)
1324 (branch merge, don't forget to commit)
1325 getting changed largefiles
1325 getting changed largefiles
1326 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
1326 large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob)
1327 1 largefiles updated, 0 removed
1327 1 largefiles updated, 0 removed
1328
1328
1329 $ hg rollback -q
1329 $ hg rollback -q
1330 $ hg up -Cq
1330 $ hg up -Cq
1331
1331
1332 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1332 Pulling 0 revisions with --all-largefiles should not fetch for all revisions
1333
1333
1334 $ hg pull --all-largefiles
1334 $ hg pull --all-largefiles
1335 pulling from $TESTTMP/d (glob)
1335 pulling from $TESTTMP/d (glob)
1336 searching for changes
1336 searching for changes
1337 no changes found
1337 no changes found
1338
1338
1339 Merging does not revert to old versions of largefiles and also check
1339 Merging does not revert to old versions of largefiles and also check
1340 that merging after having pulled from a non-default remote works
1340 that merging after having pulled from a non-default remote works
1341 correctly.
1341 correctly.
1342
1342
1343 $ cd ..
1343 $ cd ..
1344 $ hg clone -r 7 e temp
1344 $ hg clone -r 7 e temp
1345 adding changesets
1345 adding changesets
1346 adding manifests
1346 adding manifests
1347 adding file changes
1347 adding file changes
1348 added 8 changesets with 24 changes to 10 files
1348 added 8 changesets with 24 changes to 10 files
1349 updating to branch default
1349 updating to branch default
1350 getting changed largefiles
1350 getting changed largefiles
1351 3 largefiles updated, 0 removed
1351 3 largefiles updated, 0 removed
1352 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1352 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1353 $ hg clone temp f
1353 $ hg clone temp f
1354 updating to branch default
1354 updating to branch default
1355 getting changed largefiles
1355 getting changed largefiles
1356 3 largefiles updated, 0 removed
1356 3 largefiles updated, 0 removed
1357 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1357 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1358 # Delete the largefiles in the largefiles system cache so that we have an
1358 # Delete the largefiles in the largefiles system cache so that we have an
1359 # opportunity to test that caching after a pull works.
1359 # opportunity to test that caching after a pull works.
1360 $ rm "${USERCACHE}"/*
1360 $ rm "${USERCACHE}"/*
1361 $ cd f
1361 $ cd f
1362 $ echo "large4-merge-test" > sub/large4
1362 $ echo "large4-merge-test" > sub/large4
1363 $ hg commit -m "Modify large4 to test merge"
1363 $ hg commit -m "Modify large4 to test merge"
1364 Invoking status precommit hook
1364 Invoking status precommit hook
1365 M sub/large4
1365 M sub/large4
1366 # Test --cache-largefiles flag
1366 # Test --cache-largefiles flag
1367 $ hg pull --lfrev 'heads(pulled())' ../e
1367 $ hg pull --lfrev 'heads(pulled())' ../e
1368 pulling from ../e
1368 pulling from ../e
1369 searching for changes
1369 searching for changes
1370 adding changesets
1370 adding changesets
1371 adding manifests
1371 adding manifests
1372 adding file changes
1372 adding file changes
1373 added 2 changesets with 4 changes to 4 files (+1 heads)
1373 added 2 changesets with 4 changes to 4 files (+1 heads)
1374 (run 'hg heads' to see heads, 'hg merge' to merge)
1374 (run 'hg heads' to see heads, 'hg merge' to merge)
1375 2 largefiles cached
1375 2 largefiles cached
1376 $ hg merge
1376 $ hg merge
1377 largefile sub/large4 has a merge conflict
1377 largefile sub/large4 has a merge conflict
1378 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
1378 ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591
1379 keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or
1379 keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or
1380 take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l
1380 take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l
1381 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1381 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1382 (branch merge, don't forget to commit)
1382 (branch merge, don't forget to commit)
1383 getting changed largefiles
1383 getting changed largefiles
1384 1 largefiles updated, 0 removed
1384 1 largefiles updated, 0 removed
1385 $ hg commit -m "Merge repos e and f"
1385 $ hg commit -m "Merge repos e and f"
1386 Invoking status precommit hook
1386 Invoking status precommit hook
1387 M normal3
1387 M normal3
1388 M sub/normal4
1388 M sub/normal4
1389 M sub2/large6
1389 M sub2/large6
1390 $ cat normal3
1390 $ cat normal3
1391 normal3-modified
1391 normal3-modified
1392 $ cat sub/normal4
1392 $ cat sub/normal4
1393 normal4-modified
1393 normal4-modified
1394 $ cat sub/large4
1394 $ cat sub/large4
1395 large4-merge-test
1395 large4-merge-test
1396 $ cat sub2/large6
1396 $ cat sub2/large6
1397 large6-modified
1397 large6-modified
1398 $ cat sub2/large7
1398 $ cat sub2/large7
1399 large7
1399 large7
1400
1400
1401 Test status after merging with a branch that introduces a new largefile:
1401 Test status after merging with a branch that introduces a new largefile:
1402
1402
1403 $ echo large > large
1403 $ echo large > large
1404 $ hg add --large large
1404 $ hg add --large large
1405 $ hg commit -m 'add largefile'
1405 $ hg commit -m 'add largefile'
1406 Invoking status precommit hook
1406 Invoking status precommit hook
1407 A large
1407 A large
1408 $ hg update -q ".^"
1408 $ hg update -q ".^"
1409 $ echo change >> normal3
1409 $ echo change >> normal3
1410 $ hg commit -m 'some change'
1410 $ hg commit -m 'some change'
1411 Invoking status precommit hook
1411 Invoking status precommit hook
1412 M normal3
1412 M normal3
1413 created new head
1413 created new head
1414 $ hg merge
1414 $ hg merge
1415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1416 (branch merge, don't forget to commit)
1416 (branch merge, don't forget to commit)
1417 getting changed largefiles
1417 getting changed largefiles
1418 1 largefiles updated, 0 removed
1418 1 largefiles updated, 0 removed
1419 $ hg status
1419 $ hg status
1420 M large
1420 M large
1421
1421
1422 - make sure update of merge with removed largefiles fails as expected
1422 - make sure update of merge with removed largefiles fails as expected
1423 $ hg rm sub2/large6
1423 $ hg rm sub2/large6
1424 $ hg up -r.
1424 $ hg up -r.
1425 abort: outstanding uncommitted merges
1425 abort: outstanding uncommitted merges
1426 [255]
1426 [255]
1427
1427
1428 - revert should be able to revert files introduced in a pending merge
1428 - revert should be able to revert files introduced in a pending merge
1429 $ hg revert --all -r .
1429 $ hg revert --all -r .
1430 removing .hglf/large (glob)
1430 removing .hglf/large (glob)
1431 undeleting .hglf/sub2/large6 (glob)
1431 undeleting .hglf/sub2/large6 (glob)
1432
1432
1433 Test that a normal file and a largefile with the same name and path cannot
1433 Test that a normal file and a largefile with the same name and path cannot
1434 coexist.
1434 coexist.
1435
1435
1436 $ rm sub2/large7
1436 $ rm sub2/large7
1437 $ echo "largeasnormal" > sub2/large7
1437 $ echo "largeasnormal" > sub2/large7
1438 $ hg add sub2/large7
1438 $ hg add sub2/large7
1439 sub2/large7 already a largefile
1439 sub2/large7 already a largefile
1440
1440
1441 Test that transplanting a largefile change works correctly.
1441 Test that transplanting a largefile change works correctly.
1442
1442
1443 $ cd ..
1443 $ cd ..
1444 $ hg clone -r 8 d g
1444 $ hg clone -r 8 d g
1445 adding changesets
1445 adding changesets
1446 adding manifests
1446 adding manifests
1447 adding file changes
1447 adding file changes
1448 added 9 changesets with 26 changes to 10 files
1448 added 9 changesets with 26 changes to 10 files
1449 updating to branch default
1449 updating to branch default
1450 getting changed largefiles
1450 getting changed largefiles
1451 3 largefiles updated, 0 removed
1451 3 largefiles updated, 0 removed
1452 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1452 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1453 $ cd g
1453 $ cd g
1454 $ hg transplant -s ../d 598410d3eb9a
1454 $ hg transplant -s ../d 598410d3eb9a
1455 searching for changes
1455 searching for changes
1456 searching for changes
1456 searching for changes
1457 adding changesets
1457 adding changesets
1458 adding manifests
1458 adding manifests
1459 adding file changes
1459 adding file changes
1460 added 1 changesets with 2 changes to 2 files
1460 added 1 changesets with 2 changes to 2 files
1461 getting changed largefiles
1461 getting changed largefiles
1462 1 largefiles updated, 0 removed
1462 1 largefiles updated, 0 removed
1463 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1463 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1464 9:598410d3eb9a modify normal file largefile in repo d
1464 9:598410d3eb9a modify normal file largefile in repo d
1465 8:a381d2c8c80e modify normal file and largefile in repo b
1465 8:a381d2c8c80e modify normal file and largefile in repo b
1466 7:daea875e9014 add/edit more largefiles
1466 7:daea875e9014 add/edit more largefiles
1467 6:4355d653f84f edit files yet again
1467 6:4355d653f84f edit files yet again
1468 5:9d5af5072dbd edit files again
1468 5:9d5af5072dbd edit files again
1469 4:74c02385b94c move files
1469 4:74c02385b94c move files
1470 3:9e8fbc4bce62 copy files
1470 3:9e8fbc4bce62 copy files
1471 2:51a0ae4d5864 remove files
1471 2:51a0ae4d5864 remove files
1472 1:ce8896473775 edit files
1472 1:ce8896473775 edit files
1473 0:30d30fe6a5be add files
1473 0:30d30fe6a5be add files
1474 $ cat normal3
1474 $ cat normal3
1475 normal3-modified
1475 normal3-modified
1476 $ cat sub/normal4
1476 $ cat sub/normal4
1477 normal4-modified
1477 normal4-modified
1478 $ cat sub/large4
1478 $ cat sub/large4
1479 large4-modified
1479 large4-modified
1480 $ cat sub2/large6
1480 $ cat sub2/large6
1481 large6-modified
1481 large6-modified
1482 $ cat sub2/large7
1482 $ cat sub2/large7
1483 large7
1483 large7
1484
1484
1485 Cat a largefile
1485 Cat a largefile
1486 $ hg cat normal3
1486 $ hg cat normal3
1487 normal3-modified
1487 normal3-modified
1488 $ hg cat sub/large4
1488 $ hg cat sub/large4
1489 large4-modified
1489 large4-modified
1490 $ rm "${USERCACHE}"/*
1490 $ rm "${USERCACHE}"/*
1491 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1491 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1492 $ cat cat.out
1492 $ cat cat.out
1493 large4-modified
1493 large4-modified
1494 $ rm cat.out
1494 $ rm cat.out
1495 $ hg cat -r a381d2c8c80e normal3
1495 $ hg cat -r a381d2c8c80e normal3
1496 normal3-modified
1496 normal3-modified
1497 $ hg cat -r '.^' normal3
1497 $ hg cat -r '.^' normal3
1498 normal3-modified
1498 normal3-modified
1499 $ hg cat -r '.^' sub/large4 doesntexist
1499 $ hg cat -r '.^' sub/large4 doesntexist
1500 large4-modified
1500 large4-modified
1501 doesntexist: no such file in rev a381d2c8c80e
1501 doesntexist: no such file in rev a381d2c8c80e
1502 $ hg --cwd sub cat -r '.^' large4
1502 $ hg --cwd sub cat -r '.^' large4
1503 large4-modified
1503 large4-modified
1504 $ hg --cwd sub cat -r '.^' ../normal3
1504 $ hg --cwd sub cat -r '.^' ../normal3
1505 normal3-modified
1505 normal3-modified
1506
1506
1507 Test that renaming a largefile results in correct output for status
1507 Test that renaming a largefile results in correct output for status
1508
1508
1509 $ hg rename sub/large4 large4-renamed
1509 $ hg rename sub/large4 large4-renamed
1510 $ hg commit -m "test rename output"
1510 $ hg commit -m "test rename output"
1511 Invoking status precommit hook
1511 Invoking status precommit hook
1512 A large4-renamed
1512 A large4-renamed
1513 R sub/large4
1513 R sub/large4
1514 $ cat large4-renamed
1514 $ cat large4-renamed
1515 large4-modified
1515 large4-modified
1516 $ cd sub2
1516 $ cd sub2
1517 $ hg rename large6 large6-renamed
1517 $ hg rename large6 large6-renamed
1518 $ hg st
1518 $ hg st
1519 A sub2/large6-renamed
1519 A sub2/large6-renamed
1520 R sub2/large6
1520 R sub2/large6
1521 $ cd ..
1521 $ cd ..
1522
1522
1523 Test --normal flag
1523 Test --normal flag
1524
1524
1525 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1525 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1526 $ hg add --normal --large new-largefile
1526 $ hg add --normal --large new-largefile
1527 abort: --normal cannot be used with --large
1527 abort: --normal cannot be used with --large
1528 [255]
1528 [255]
1529 $ hg add --normal new-largefile
1529 $ hg add --normal new-largefile
1530 new-largefile: up to 69 MB of RAM may be required to manage this file
1530 new-largefile: up to 69 MB of RAM may be required to manage this file
1531 (use 'hg revert new-largefile' to cancel the pending addition)
1531 (use 'hg revert new-largefile' to cancel the pending addition)
1532 $ cd ..
1532 $ cd ..
1533
1533
1534 #if serve
1534 #if serve
1535 vanilla clients not locked out from largefiles servers on vanilla repos
1535 vanilla clients not locked out from largefiles servers on vanilla repos
1536 $ mkdir r1
1536 $ mkdir r1
1537 $ cd r1
1537 $ cd r1
1538 $ hg init
1538 $ hg init
1539 $ echo c1 > f1
1539 $ echo c1 > f1
1540 $ hg add f1
1540 $ hg add f1
1541 $ hg commit -m "m1"
1541 $ hg commit -m "m1"
1542 Invoking status precommit hook
1542 Invoking status precommit hook
1543 A f1
1543 A f1
1544 $ cd ..
1544 $ cd ..
1545 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1545 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1546 $ cat hg.pid >> $DAEMON_PIDS
1546 $ cat hg.pid >> $DAEMON_PIDS
1547 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1547 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1548 requesting all changes
1548 requesting all changes
1549 adding changesets
1549 adding changesets
1550 adding manifests
1550 adding manifests
1551 adding file changes
1551 adding file changes
1552 added 1 changesets with 1 changes to 1 files
1552 added 1 changesets with 1 changes to 1 files
1553 updating to branch default
1553 updating to branch default
1554 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1554 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1555
1555
1556 largefiles clients still work with vanilla servers
1556 largefiles clients still work with vanilla servers
1557 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1557 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1558 $ cat hg.pid >> $DAEMON_PIDS
1558 $ cat hg.pid >> $DAEMON_PIDS
1559 $ hg clone http://localhost:$HGPORT1 r3
1559 $ hg clone http://localhost:$HGPORT1 r3
1560 requesting all changes
1560 requesting all changes
1561 adding changesets
1561 adding changesets
1562 adding manifests
1562 adding manifests
1563 adding file changes
1563 adding file changes
1564 added 1 changesets with 1 changes to 1 files
1564 added 1 changesets with 1 changes to 1 files
1565 updating to branch default
1565 updating to branch default
1566 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1566 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1567 #endif
1567 #endif
1568
1568
1569
1569
1570 vanilla clients locked out from largefiles http repos
1570 vanilla clients locked out from largefiles http repos
1571 $ mkdir r4
1571 $ mkdir r4
1572 $ cd r4
1572 $ cd r4
1573 $ hg init
1573 $ hg init
1574 $ echo c1 > f1
1574 $ echo c1 > f1
1575 $ hg add --large f1
1575 $ hg add --large f1
1576 $ hg commit -m "m1"
1576 $ hg commit -m "m1"
1577 Invoking status precommit hook
1577 Invoking status precommit hook
1578 A f1
1578 A f1
1579 $ cd ..
1579 $ cd ..
1580
1580
1581 largefiles can be pushed locally (issue3583)
1581 largefiles can be pushed locally (issue3583)
1582 $ hg init dest
1582 $ hg init dest
1583 $ cd r4
1583 $ cd r4
1584 $ hg outgoing ../dest
1584 $ hg outgoing ../dest
1585 comparing with ../dest
1585 comparing with ../dest
1586 searching for changes
1586 searching for changes
1587 changeset: 0:639881c12b4c
1587 changeset: 0:639881c12b4c
1588 tag: tip
1588 tag: tip
1589 user: test
1589 user: test
1590 date: Thu Jan 01 00:00:00 1970 +0000
1590 date: Thu Jan 01 00:00:00 1970 +0000
1591 summary: m1
1591 summary: m1
1592
1592
1593 $ hg push ../dest
1593 $ hg push ../dest
1594 pushing to ../dest
1594 pushing to ../dest
1595 searching for changes
1595 searching for changes
1596 searching for changes
1597 adding changesets
1596 adding changesets
1598 adding manifests
1597 adding manifests
1599 adding file changes
1598 adding file changes
1600 added 1 changesets with 1 changes to 1 files
1599 added 1 changesets with 1 changes to 1 files
1601
1600
1602 exit code with nothing outgoing (issue3611)
1601 exit code with nothing outgoing (issue3611)
1603 $ hg outgoing ../dest
1602 $ hg outgoing ../dest
1604 comparing with ../dest
1603 comparing with ../dest
1605 searching for changes
1604 searching for changes
1606 no changes found
1605 no changes found
1607 [1]
1606 [1]
1608 $ cd ..
1607 $ cd ..
1609
1608
1610 #if serve
1609 #if serve
1611 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1610 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1612 $ cat hg.pid >> $DAEMON_PIDS
1611 $ cat hg.pid >> $DAEMON_PIDS
1613 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1612 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1614 abort: remote error:
1613 abort: remote error:
1615
1614
1616 This repository uses the largefiles extension.
1615 This repository uses the largefiles extension.
1617
1616
1618 Please enable it in your Mercurial config file.
1617 Please enable it in your Mercurial config file.
1619 [255]
1618 [255]
1620
1619
1621 used all HGPORTs, kill all daemons
1620 used all HGPORTs, kill all daemons
1622 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1621 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1623 #endif
1622 #endif
1624
1623
1625 vanilla clients locked out from largefiles ssh repos
1624 vanilla clients locked out from largefiles ssh repos
1626 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1625 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1627 abort: remote error:
1626 abort: remote error:
1628
1627
1629 This repository uses the largefiles extension.
1628 This repository uses the largefiles extension.
1630
1629
1631 Please enable it in your Mercurial config file.
1630 Please enable it in your Mercurial config file.
1632 [255]
1631 [255]
1633
1632
1634 #if serve
1633 #if serve
1635
1634
1636 largefiles clients refuse to push largefiles repos to vanilla servers
1635 largefiles clients refuse to push largefiles repos to vanilla servers
1637 $ mkdir r6
1636 $ mkdir r6
1638 $ cd r6
1637 $ cd r6
1639 $ hg init
1638 $ hg init
1640 $ echo c1 > f1
1639 $ echo c1 > f1
1641 $ hg add f1
1640 $ hg add f1
1642 $ hg commit -m "m1"
1641 $ hg commit -m "m1"
1643 Invoking status precommit hook
1642 Invoking status precommit hook
1644 A f1
1643 A f1
1645 $ cat >> .hg/hgrc <<!
1644 $ cat >> .hg/hgrc <<!
1646 > [web]
1645 > [web]
1647 > push_ssl = false
1646 > push_ssl = false
1648 > allow_push = *
1647 > allow_push = *
1649 > !
1648 > !
1650 $ cd ..
1649 $ cd ..
1651 $ hg clone r6 r7
1650 $ hg clone r6 r7
1652 updating to branch default
1651 updating to branch default
1653 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1652 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1654 $ cd r7
1653 $ cd r7
1655 $ echo c2 > f2
1654 $ echo c2 > f2
1656 $ hg add --large f2
1655 $ hg add --large f2
1657 $ hg commit -m "m2"
1656 $ hg commit -m "m2"
1658 Invoking status precommit hook
1657 Invoking status precommit hook
1659 A f2
1658 A f2
1660 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1659 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1661 $ cat ../hg.pid >> $DAEMON_PIDS
1660 $ cat ../hg.pid >> $DAEMON_PIDS
1662 $ hg push http://localhost:$HGPORT
1661 $ hg push http://localhost:$HGPORT
1663 pushing to http://localhost:$HGPORT/
1662 pushing to http://localhost:$HGPORT/
1664 searching for changes
1663 searching for changes
1665 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1664 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1666 [255]
1665 [255]
1667 $ cd ..
1666 $ cd ..
1668
1667
1669 putlfile errors are shown (issue3123)
1668 putlfile errors are shown (issue3123)
1670 Corrupt the cached largefile in r7 and move it out of the servers usercache
1669 Corrupt the cached largefile in r7 and move it out of the servers usercache
1671 $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 .
1670 $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 .
1672 $ echo 'client side corruption' > r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1671 $ echo 'client side corruption' > r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1673 $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1672 $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1674 $ hg init empty
1673 $ hg init empty
1675 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1674 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1676 > --config 'web.allow_push=*' --config web.push_ssl=False
1675 > --config 'web.allow_push=*' --config web.push_ssl=False
1677 $ cat hg.pid >> $DAEMON_PIDS
1676 $ cat hg.pid >> $DAEMON_PIDS
1678 $ hg push -R r7 http://localhost:$HGPORT1
1677 $ hg push -R r7 http://localhost:$HGPORT1
1679 pushing to http://localhost:$HGPORT1/
1678 pushing to http://localhost:$HGPORT1/
1680 searching for changes
1679 searching for changes
1681 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1680 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1682 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1681 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1683 [255]
1682 [255]
1684 $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1683 $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1685 Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
1684 Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic
1686 $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1685 $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1687 $ hg push -R r7 http://localhost:$HGPORT1
1686 $ hg push -R r7 http://localhost:$HGPORT1
1688 pushing to http://localhost:$HGPORT1/
1687 pushing to http://localhost:$HGPORT1/
1689 searching for changes
1688 searching for changes
1690 searching for changes
1691 remote: adding changesets
1689 remote: adding changesets
1692 remote: adding manifests
1690 remote: adding manifests
1693 remote: adding file changes
1691 remote: adding file changes
1694 remote: added 2 changesets with 2 changes to 2 files
1692 remote: added 2 changesets with 2 changes to 2 files
1695 $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1693 $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8
1696 server side corruption
1694 server side corruption
1697 $ rm -rf empty
1695 $ rm -rf empty
1698
1696
1699 Push a largefiles repository to a served empty repository
1697 Push a largefiles repository to a served empty repository
1700 $ hg init r8
1698 $ hg init r8
1701 $ echo c3 > r8/f1
1699 $ echo c3 > r8/f1
1702 $ hg add --large r8/f1 -R r8
1700 $ hg add --large r8/f1 -R r8
1703 $ hg commit -m "m1" -R r8
1701 $ hg commit -m "m1" -R r8
1704 Invoking status precommit hook
1702 Invoking status precommit hook
1705 A f1
1703 A f1
1706 $ hg init empty
1704 $ hg init empty
1707 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1705 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1708 > --config 'web.allow_push=*' --config web.push_ssl=False
1706 > --config 'web.allow_push=*' --config web.push_ssl=False
1709 $ cat hg.pid >> $DAEMON_PIDS
1707 $ cat hg.pid >> $DAEMON_PIDS
1710 $ rm "${USERCACHE}"/*
1708 $ rm "${USERCACHE}"/*
1711 $ hg push -R r8 http://localhost:$HGPORT2/#default
1709 $ hg push -R r8 http://localhost:$HGPORT2/#default
1712 pushing to http://localhost:$HGPORT2/
1710 pushing to http://localhost:$HGPORT2/
1713 searching for changes
1711 searching for changes
1714 searching for changes
1715 remote: adding changesets
1712 remote: adding changesets
1716 remote: adding manifests
1713 remote: adding manifests
1717 remote: adding file changes
1714 remote: adding file changes
1718 remote: added 1 changesets with 1 changes to 1 files
1715 remote: added 1 changesets with 1 changes to 1 files
1719 $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1716 $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1720 $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1717 $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1721
1718
1722 Clone over http, no largefiles pulled on clone.
1719 Clone over http, no largefiles pulled on clone.
1723
1720
1724 $ hg clone http://localhost:$HGPORT2/#default http-clone -U
1721 $ hg clone http://localhost:$HGPORT2/#default http-clone -U
1725 adding changesets
1722 adding changesets
1726 adding manifests
1723 adding manifests
1727 adding file changes
1724 adding file changes
1728 added 1 changesets with 1 changes to 1 files
1725 added 1 changesets with 1 changes to 1 files
1729
1726
1730 test 'verify' with remotestore:
1727 test 'verify' with remotestore:
1731
1728
1732 $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90
1729 $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90
1733 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1730 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1734 $ hg -R http-clone verify --large --lfa
1731 $ hg -R http-clone verify --large --lfa
1735 checking changesets
1732 checking changesets
1736 checking manifests
1733 checking manifests
1737 crosschecking files in changesets and manifests
1734 crosschecking files in changesets and manifests
1738 checking files
1735 checking files
1739 1 files, 1 changesets, 1 total revisions
1736 1 files, 1 changesets, 1 total revisions
1740 searching 1 changesets for largefiles
1737 searching 1 changesets for largefiles
1741 changeset 0:cf03e5bb9936: f1 missing
1738 changeset 0:cf03e5bb9936: f1 missing
1742 verified existence of 1 revisions of 1 largefiles
1739 verified existence of 1 revisions of 1 largefiles
1743 [1]
1740 [1]
1744 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1741 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1745 $ hg -R http-clone -q verify --large --lfa
1742 $ hg -R http-clone -q verify --large --lfa
1746
1743
1747 largefiles pulled on update - a largefile missing on the server:
1744 largefiles pulled on update - a largefile missing on the server:
1748 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1745 $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 .
1749 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1746 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1750 getting changed largefiles
1747 getting changed largefiles
1751 f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/
1748 f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/
1752 0 largefiles updated, 0 removed
1749 0 largefiles updated, 0 removed
1753 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1750 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1754 $ hg -R http-clone st
1751 $ hg -R http-clone st
1755 ! f1
1752 ! f1
1756 $ hg -R http-clone up -Cqr null
1753 $ hg -R http-clone up -Cqr null
1757
1754
1758 largefiles pulled on update - a largefile corrupted on the server:
1755 largefiles pulled on update - a largefile corrupted on the server:
1759 $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90
1756 $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90
1760 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1757 $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache
1761 getting changed largefiles
1758 getting changed largefiles
1762 f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27)
1759 f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27)
1763 0 largefiles updated, 0 removed
1760 0 largefiles updated, 0 removed
1764 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1761 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1765 $ hg -R http-clone st
1762 $ hg -R http-clone st
1766 ! f1
1763 ! f1
1767 $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1764 $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ]
1768 $ [ ! -f http-clone/f1 ]
1765 $ [ ! -f http-clone/f1 ]
1769 $ [ ! -f http-clone-usercache ]
1766 $ [ ! -f http-clone-usercache ]
1770 $ hg -R http-clone verify --large --lfc
1767 $ hg -R http-clone verify --large --lfc
1771 checking changesets
1768 checking changesets
1772 checking manifests
1769 checking manifests
1773 crosschecking files in changesets and manifests
1770 crosschecking files in changesets and manifests
1774 checking files
1771 checking files
1775 1 files, 1 changesets, 1 total revisions
1772 1 files, 1 changesets, 1 total revisions
1776 searching 1 changesets for largefiles
1773 searching 1 changesets for largefiles
1777 verified contents of 1 revisions of 1 largefiles
1774 verified contents of 1 revisions of 1 largefiles
1778 $ hg -R http-clone up -Cqr null
1775 $ hg -R http-clone up -Cqr null
1779
1776
1780 largefiles pulled on update - no server side problems:
1777 largefiles pulled on update - no server side problems:
1781 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1778 $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/
1782 $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache
1779 $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache
1783 resolving manifests
1780 resolving manifests
1784 branchmerge: False, force: False, partial: False
1781 branchmerge: False, force: False, partial: False
1785 ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
1782 ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
1786 .hglf/f1: remote created -> g
1783 .hglf/f1: remote created -> g
1787 getting .hglf/f1
1784 getting .hglf/f1
1788 updating: .hglf/f1 1/1 files (100.00%)
1785 updating: .hglf/f1 1/1 files (100.00%)
1789 getting changed largefiles
1786 getting changed largefiles
1790 using http://localhost:$HGPORT2/
1787 using http://localhost:$HGPORT2/
1791 sending capabilities command
1788 sending capabilities command
1792 sending batch command
1789 sending batch command
1793 getting largefiles: 0/1 lfile (0.00%)
1790 getting largefiles: 0/1 lfile (0.00%)
1794 getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90
1791 getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90
1795 sending getlfile command
1792 sending getlfile command
1796 found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store
1793 found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store
1797 1 largefiles updated, 0 removed
1794 1 largefiles updated, 0 removed
1798 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1795 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1799
1796
1800 $ ls http-clone-usercache/*
1797 $ ls http-clone-usercache/*
1801 http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90
1798 http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90
1802
1799
1803 $ rm -rf empty http-clone*
1800 $ rm -rf empty http-clone*
1804
1801
1805 used all HGPORTs, kill all daemons
1802 used all HGPORTs, kill all daemons
1806 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1803 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
1807
1804
1808 #endif
1805 #endif
1809
1806
1810
1807
1811 #if unix-permissions
1808 #if unix-permissions
1812
1809
1813 Clone a local repository owned by another user
1810 Clone a local repository owned by another user
1814 We have to simulate that here by setting $HOME and removing write permissions
1811 We have to simulate that here by setting $HOME and removing write permissions
1815 $ ORIGHOME="$HOME"
1812 $ ORIGHOME="$HOME"
1816 $ mkdir alice
1813 $ mkdir alice
1817 $ HOME="`pwd`/alice"
1814 $ HOME="`pwd`/alice"
1818 $ cd alice
1815 $ cd alice
1819 $ hg init pubrepo
1816 $ hg init pubrepo
1820 $ cd pubrepo
1817 $ cd pubrepo
1821 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1818 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1822 $ hg add --large a-large-file
1819 $ hg add --large a-large-file
1823 $ hg commit -m "Add a large file"
1820 $ hg commit -m "Add a large file"
1824 Invoking status precommit hook
1821 Invoking status precommit hook
1825 A a-large-file
1822 A a-large-file
1826 $ cd ..
1823 $ cd ..
1827 $ chmod -R a-w pubrepo
1824 $ chmod -R a-w pubrepo
1828 $ cd ..
1825 $ cd ..
1829 $ mkdir bob
1826 $ mkdir bob
1830 $ HOME="`pwd`/bob"
1827 $ HOME="`pwd`/bob"
1831 $ cd bob
1828 $ cd bob
1832 $ hg clone --pull ../alice/pubrepo pubrepo
1829 $ hg clone --pull ../alice/pubrepo pubrepo
1833 requesting all changes
1830 requesting all changes
1834 adding changesets
1831 adding changesets
1835 adding manifests
1832 adding manifests
1836 adding file changes
1833 adding file changes
1837 added 1 changesets with 1 changes to 1 files
1834 added 1 changesets with 1 changes to 1 files
1838 updating to branch default
1835 updating to branch default
1839 getting changed largefiles
1836 getting changed largefiles
1840 1 largefiles updated, 0 removed
1837 1 largefiles updated, 0 removed
1841 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1838 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1842 $ cd ..
1839 $ cd ..
1843 $ chmod -R u+w alice/pubrepo
1840 $ chmod -R u+w alice/pubrepo
1844 $ HOME="$ORIGHOME"
1841 $ HOME="$ORIGHOME"
1845
1842
1846 #endif
1843 #endif
1847
1844
1848 #if symlink
1845 #if symlink
1849
1846
1850 Symlink to a large largefile should behave the same as a symlink to a normal file
1847 Symlink to a large largefile should behave the same as a symlink to a normal file
1851 $ hg init largesymlink
1848 $ hg init largesymlink
1852 $ cd largesymlink
1849 $ cd largesymlink
1853 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1850 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1854 $ hg add --large largefile
1851 $ hg add --large largefile
1855 $ hg commit -m "commit a large file"
1852 $ hg commit -m "commit a large file"
1856 Invoking status precommit hook
1853 Invoking status precommit hook
1857 A largefile
1854 A largefile
1858 $ ln -s largefile largelink
1855 $ ln -s largefile largelink
1859 $ hg add largelink
1856 $ hg add largelink
1860 $ hg commit -m "commit a large symlink"
1857 $ hg commit -m "commit a large symlink"
1861 Invoking status precommit hook
1858 Invoking status precommit hook
1862 A largelink
1859 A largelink
1863 $ rm -f largelink
1860 $ rm -f largelink
1864 $ hg up >/dev/null
1861 $ hg up >/dev/null
1865 $ test -f largelink
1862 $ test -f largelink
1866 [1]
1863 [1]
1867 $ test -L largelink
1864 $ test -L largelink
1868 [1]
1865 [1]
1869 $ rm -f largelink # make next part of the test independent of the previous
1866 $ rm -f largelink # make next part of the test independent of the previous
1870 $ hg up -C >/dev/null
1867 $ hg up -C >/dev/null
1871 $ test -f largelink
1868 $ test -f largelink
1872 $ test -L largelink
1869 $ test -L largelink
1873 $ cd ..
1870 $ cd ..
1874
1871
1875 #endif
1872 #endif
1876
1873
1877 test for pattern matching on 'hg status':
1874 test for pattern matching on 'hg status':
1878 to boost performance, largefiles checks whether specified patterns are
1875 to boost performance, largefiles checks whether specified patterns are
1879 related to largefiles in working directory (NOT to STANDIN) or not.
1876 related to largefiles in working directory (NOT to STANDIN) or not.
1880
1877
1881 $ hg init statusmatch
1878 $ hg init statusmatch
1882 $ cd statusmatch
1879 $ cd statusmatch
1883
1880
1884 $ mkdir -p a/b/c/d
1881 $ mkdir -p a/b/c/d
1885 $ echo normal > a/b/c/d/e.normal.txt
1882 $ echo normal > a/b/c/d/e.normal.txt
1886 $ hg add a/b/c/d/e.normal.txt
1883 $ hg add a/b/c/d/e.normal.txt
1887 $ echo large > a/b/c/d/e.large.txt
1884 $ echo large > a/b/c/d/e.large.txt
1888 $ hg add --large a/b/c/d/e.large.txt
1885 $ hg add --large a/b/c/d/e.large.txt
1889 $ mkdir -p a/b/c/x
1886 $ mkdir -p a/b/c/x
1890 $ echo normal > a/b/c/x/y.normal.txt
1887 $ echo normal > a/b/c/x/y.normal.txt
1891 $ hg add a/b/c/x/y.normal.txt
1888 $ hg add a/b/c/x/y.normal.txt
1892 $ hg commit -m 'add files'
1889 $ hg commit -m 'add files'
1893 Invoking status precommit hook
1890 Invoking status precommit hook
1894 A a/b/c/d/e.large.txt
1891 A a/b/c/d/e.large.txt
1895 A a/b/c/d/e.normal.txt
1892 A a/b/c/d/e.normal.txt
1896 A a/b/c/x/y.normal.txt
1893 A a/b/c/x/y.normal.txt
1897
1894
1898 (1) no pattern: no performance boost
1895 (1) no pattern: no performance boost
1899 $ hg status -A
1896 $ hg status -A
1900 C a/b/c/d/e.large.txt
1897 C a/b/c/d/e.large.txt
1901 C a/b/c/d/e.normal.txt
1898 C a/b/c/d/e.normal.txt
1902 C a/b/c/x/y.normal.txt
1899 C a/b/c/x/y.normal.txt
1903
1900
1904 (2) pattern not related to largefiles: performance boost
1901 (2) pattern not related to largefiles: performance boost
1905 $ hg status -A a/b/c/x
1902 $ hg status -A a/b/c/x
1906 C a/b/c/x/y.normal.txt
1903 C a/b/c/x/y.normal.txt
1907
1904
1908 (3) pattern related to largefiles: no performance boost
1905 (3) pattern related to largefiles: no performance boost
1909 $ hg status -A a/b/c/d
1906 $ hg status -A a/b/c/d
1910 C a/b/c/d/e.large.txt
1907 C a/b/c/d/e.large.txt
1911 C a/b/c/d/e.normal.txt
1908 C a/b/c/d/e.normal.txt
1912
1909
1913 (4) pattern related to STANDIN (not to largefiles): performance boost
1910 (4) pattern related to STANDIN (not to largefiles): performance boost
1914 $ hg status -A .hglf/a
1911 $ hg status -A .hglf/a
1915 C .hglf/a/b/c/d/e.large.txt
1912 C .hglf/a/b/c/d/e.large.txt
1916
1913
1917 (5) mixed case: no performance boost
1914 (5) mixed case: no performance boost
1918 $ hg status -A a/b/c/x a/b/c/d
1915 $ hg status -A a/b/c/x a/b/c/d
1919 C a/b/c/d/e.large.txt
1916 C a/b/c/d/e.large.txt
1920 C a/b/c/d/e.normal.txt
1917 C a/b/c/d/e.normal.txt
1921 C a/b/c/x/y.normal.txt
1918 C a/b/c/x/y.normal.txt
1922
1919
1923 verify that largefiles doesn't break filesets
1920 verify that largefiles doesn't break filesets
1924
1921
1925 $ hg log --rev . --exclude "set:binary()"
1922 $ hg log --rev . --exclude "set:binary()"
1926 changeset: 0:41bd42f10efa
1923 changeset: 0:41bd42f10efa
1927 tag: tip
1924 tag: tip
1928 user: test
1925 user: test
1929 date: Thu Jan 01 00:00:00 1970 +0000
1926 date: Thu Jan 01 00:00:00 1970 +0000
1930 summary: add files
1927 summary: add files
1931
1928
1932 verify that large files in subrepos handled properly
1929 verify that large files in subrepos handled properly
1933 $ hg init subrepo
1930 $ hg init subrepo
1934 $ echo "subrepo = subrepo" > .hgsub
1931 $ echo "subrepo = subrepo" > .hgsub
1935 $ hg add .hgsub
1932 $ hg add .hgsub
1936 $ hg ci -m "add subrepo"
1933 $ hg ci -m "add subrepo"
1937 Invoking status precommit hook
1934 Invoking status precommit hook
1938 A .hgsub
1935 A .hgsub
1939 ? .hgsubstate
1936 ? .hgsubstate
1940 $ echo "rev 1" > subrepo/large.txt
1937 $ echo "rev 1" > subrepo/large.txt
1941 $ hg -R subrepo add --large subrepo/large.txt
1938 $ hg -R subrepo add --large subrepo/large.txt
1942 $ hg sum
1939 $ hg sum
1943 parent: 1:8ee150ea2e9c tip
1940 parent: 1:8ee150ea2e9c tip
1944 add subrepo
1941 add subrepo
1945 branch: default
1942 branch: default
1946 commit: 1 subrepos
1943 commit: 1 subrepos
1947 update: (current)
1944 update: (current)
1948 $ hg st
1945 $ hg st
1949 $ hg st -S
1946 $ hg st -S
1950 A subrepo/large.txt
1947 A subrepo/large.txt
1951 $ hg ci -S -m "commit top repo"
1948 $ hg ci -S -m "commit top repo"
1952 committing subrepository subrepo
1949 committing subrepository subrepo
1953 Invoking status precommit hook
1950 Invoking status precommit hook
1954 A large.txt
1951 A large.txt
1955 Invoking status precommit hook
1952 Invoking status precommit hook
1956 M .hgsubstate
1953 M .hgsubstate
1957 # No differences
1954 # No differences
1958 $ hg st -S
1955 $ hg st -S
1959 $ hg sum
1956 $ hg sum
1960 parent: 2:ce4cd0c527a6 tip
1957 parent: 2:ce4cd0c527a6 tip
1961 commit top repo
1958 commit top repo
1962 branch: default
1959 branch: default
1963 commit: (clean)
1960 commit: (clean)
1964 update: (current)
1961 update: (current)
1965 $ echo "rev 2" > subrepo/large.txt
1962 $ echo "rev 2" > subrepo/large.txt
1966 $ hg st -S
1963 $ hg st -S
1967 M subrepo/large.txt
1964 M subrepo/large.txt
1968 $ hg sum
1965 $ hg sum
1969 parent: 2:ce4cd0c527a6 tip
1966 parent: 2:ce4cd0c527a6 tip
1970 commit top repo
1967 commit top repo
1971 branch: default
1968 branch: default
1972 commit: 1 subrepos
1969 commit: 1 subrepos
1973 update: (current)
1970 update: (current)
1974 $ hg ci -m "this commit should fail without -S"
1971 $ hg ci -m "this commit should fail without -S"
1975 abort: uncommitted changes in subrepo subrepo
1972 abort: uncommitted changes in subrepo subrepo
1976 (use --subrepos for recursive commit)
1973 (use --subrepos for recursive commit)
1977 [255]
1974 [255]
1978
1975
1979 Add a normal file to the subrepo, then test archiving
1976 Add a normal file to the subrepo, then test archiving
1980
1977
1981 $ echo 'normal file' > subrepo/normal.txt
1978 $ echo 'normal file' > subrepo/normal.txt
1982 $ hg -R subrepo add subrepo/normal.txt
1979 $ hg -R subrepo add subrepo/normal.txt
1983
1980
1984 Lock in subrepo, otherwise the change isn't archived
1981 Lock in subrepo, otherwise the change isn't archived
1985
1982
1986 $ hg ci -S -m "add normal file to top level"
1983 $ hg ci -S -m "add normal file to top level"
1987 committing subrepository subrepo
1984 committing subrepository subrepo
1988 Invoking status precommit hook
1985 Invoking status precommit hook
1989 M large.txt
1986 M large.txt
1990 A normal.txt
1987 A normal.txt
1991 Invoking status precommit hook
1988 Invoking status precommit hook
1992 M .hgsubstate
1989 M .hgsubstate
1993 $ hg archive -S ../lf_subrepo_archive
1990 $ hg archive -S ../lf_subrepo_archive
1994 $ find ../lf_subrepo_archive | sort
1991 $ find ../lf_subrepo_archive | sort
1995 ../lf_subrepo_archive
1992 ../lf_subrepo_archive
1996 ../lf_subrepo_archive/.hg_archival.txt
1993 ../lf_subrepo_archive/.hg_archival.txt
1997 ../lf_subrepo_archive/.hgsub
1994 ../lf_subrepo_archive/.hgsub
1998 ../lf_subrepo_archive/.hgsubstate
1995 ../lf_subrepo_archive/.hgsubstate
1999 ../lf_subrepo_archive/a
1996 ../lf_subrepo_archive/a
2000 ../lf_subrepo_archive/a/b
1997 ../lf_subrepo_archive/a/b
2001 ../lf_subrepo_archive/a/b/c
1998 ../lf_subrepo_archive/a/b/c
2002 ../lf_subrepo_archive/a/b/c/d
1999 ../lf_subrepo_archive/a/b/c/d
2003 ../lf_subrepo_archive/a/b/c/d/e.large.txt
2000 ../lf_subrepo_archive/a/b/c/d/e.large.txt
2004 ../lf_subrepo_archive/a/b/c/d/e.normal.txt
2001 ../lf_subrepo_archive/a/b/c/d/e.normal.txt
2005 ../lf_subrepo_archive/a/b/c/x
2002 ../lf_subrepo_archive/a/b/c/x
2006 ../lf_subrepo_archive/a/b/c/x/y.normal.txt
2003 ../lf_subrepo_archive/a/b/c/x/y.normal.txt
2007 ../lf_subrepo_archive/subrepo
2004 ../lf_subrepo_archive/subrepo
2008 ../lf_subrepo_archive/subrepo/large.txt
2005 ../lf_subrepo_archive/subrepo/large.txt
2009 ../lf_subrepo_archive/subrepo/normal.txt
2006 ../lf_subrepo_archive/subrepo/normal.txt
2010
2007
2011 Test update with subrepos.
2008 Test update with subrepos.
2012
2009
2013 $ hg update 0
2010 $ hg update 0
2014 getting changed largefiles
2011 getting changed largefiles
2015 0 largefiles updated, 1 removed
2012 0 largefiles updated, 1 removed
2016 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2013 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2017 $ hg status -S
2014 $ hg status -S
2018 $ hg update tip
2015 $ hg update tip
2019 getting changed largefiles
2016 getting changed largefiles
2020 1 largefiles updated, 0 removed
2017 1 largefiles updated, 0 removed
2021 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2018 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2022 $ hg status -S
2019 $ hg status -S
2023 # modify a large file
2020 # modify a large file
2024 $ echo "modified" > subrepo/large.txt
2021 $ echo "modified" > subrepo/large.txt
2025 $ hg st -S
2022 $ hg st -S
2026 M subrepo/large.txt
2023 M subrepo/large.txt
2027 # update -C should revert the change.
2024 # update -C should revert the change.
2028 $ hg update -C
2025 $ hg update -C
2029 getting changed largefiles
2026 getting changed largefiles
2030 1 largefiles updated, 0 removed
2027 1 largefiles updated, 0 removed
2031 getting changed largefiles
2028 getting changed largefiles
2032 0 largefiles updated, 0 removed
2029 0 largefiles updated, 0 removed
2033 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2030 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2034 $ hg status -S
2031 $ hg status -S
2035
2032
2036 Test archiving a revision that references a subrepo that is not yet
2033 Test archiving a revision that references a subrepo that is not yet
2037 cloned (see test-subrepo-recursion.t):
2034 cloned (see test-subrepo-recursion.t):
2038
2035
2039 $ hg clone -U . ../empty
2036 $ hg clone -U . ../empty
2040 $ cd ../empty
2037 $ cd ../empty
2041 $ hg archive --subrepos -r tip ../archive.tar.gz
2038 $ hg archive --subrepos -r tip ../archive.tar.gz
2042 cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
2039 cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo
2043 $ cd ..
2040 $ cd ..
2044
2041
2045 Test that addremove picks up largefiles prior to the initial commit (issue3541)
2042 Test that addremove picks up largefiles prior to the initial commit (issue3541)
2046
2043
2047 $ hg init addrm2
2044 $ hg init addrm2
2048 $ cd addrm2
2045 $ cd addrm2
2049 $ touch large.dat
2046 $ touch large.dat
2050 $ touch large2.dat
2047 $ touch large2.dat
2051 $ touch normal
2048 $ touch normal
2052 $ hg add --large large.dat
2049 $ hg add --large large.dat
2053 $ hg addremove -v
2050 $ hg addremove -v
2054 adding large2.dat as a largefile
2051 adding large2.dat as a largefile
2055 adding normal
2052 adding normal
2056
2053
2057 Test that forgetting all largefiles reverts to islfilesrepo() == False
2054 Test that forgetting all largefiles reverts to islfilesrepo() == False
2058 (addremove will add *.dat as normal files now)
2055 (addremove will add *.dat as normal files now)
2059 $ hg forget large.dat
2056 $ hg forget large.dat
2060 $ hg forget large2.dat
2057 $ hg forget large2.dat
2061 $ hg addremove -v
2058 $ hg addremove -v
2062 adding large.dat
2059 adding large.dat
2063 adding large2.dat
2060 adding large2.dat
2064
2061
2065 Test commit's addremove option prior to the first commit
2062 Test commit's addremove option prior to the first commit
2066 $ hg forget large.dat
2063 $ hg forget large.dat
2067 $ hg forget large2.dat
2064 $ hg forget large2.dat
2068 $ hg add --large large.dat
2065 $ hg add --large large.dat
2069 $ hg ci -Am "commit"
2066 $ hg ci -Am "commit"
2070 adding large2.dat as a largefile
2067 adding large2.dat as a largefile
2071 Invoking status precommit hook
2068 Invoking status precommit hook
2072 A large.dat
2069 A large.dat
2073 A large2.dat
2070 A large2.dat
2074 A normal
2071 A normal
2075 $ find .hglf | sort
2072 $ find .hglf | sort
2076 .hglf
2073 .hglf
2077 .hglf/large.dat
2074 .hglf/large.dat
2078 .hglf/large2.dat
2075 .hglf/large2.dat
2079
2076
2080 Test actions on largefiles using relative paths from subdir
2077 Test actions on largefiles using relative paths from subdir
2081
2078
2082 $ mkdir sub
2079 $ mkdir sub
2083 $ cd sub
2080 $ cd sub
2084 $ echo anotherlarge > anotherlarge
2081 $ echo anotherlarge > anotherlarge
2085 $ hg add --large anotherlarge
2082 $ hg add --large anotherlarge
2086 $ hg st
2083 $ hg st
2087 A sub/anotherlarge
2084 A sub/anotherlarge
2088 $ hg st anotherlarge
2085 $ hg st anotherlarge
2089 A anotherlarge
2086 A anotherlarge
2090 $ hg commit -m anotherlarge anotherlarge
2087 $ hg commit -m anotherlarge anotherlarge
2091 Invoking status precommit hook
2088 Invoking status precommit hook
2092 A sub/anotherlarge
2089 A sub/anotherlarge
2093 $ hg log anotherlarge
2090 $ hg log anotherlarge
2094 changeset: 1:9627a577c5e9
2091 changeset: 1:9627a577c5e9
2095 tag: tip
2092 tag: tip
2096 user: test
2093 user: test
2097 date: Thu Jan 01 00:00:00 1970 +0000
2094 date: Thu Jan 01 00:00:00 1970 +0000
2098 summary: anotherlarge
2095 summary: anotherlarge
2099
2096
2100 $ echo more >> anotherlarge
2097 $ echo more >> anotherlarge
2101 $ hg st .
2098 $ hg st .
2102 M anotherlarge
2099 M anotherlarge
2103 $ hg cat anotherlarge
2100 $ hg cat anotherlarge
2104 anotherlarge
2101 anotherlarge
2105 $ hg revert anotherlarge
2102 $ hg revert anotherlarge
2106 $ hg st
2103 $ hg st
2107 ? sub/anotherlarge.orig
2104 ? sub/anotherlarge.orig
2108 $ cd ..
2105 $ cd ..
2109
2106
2110 $ cd ..
2107 $ cd ..
2111
2108
2112 issue3651: summary/outgoing with largefiles shows "no remote repo"
2109 issue3651: summary/outgoing with largefiles shows "no remote repo"
2113 unexpectedly
2110 unexpectedly
2114
2111
2115 $ mkdir issue3651
2112 $ mkdir issue3651
2116 $ cd issue3651
2113 $ cd issue3651
2117
2114
2118 $ hg init src
2115 $ hg init src
2119 $ echo a > src/a
2116 $ echo a > src/a
2120 $ hg -R src add --large src/a
2117 $ hg -R src add --large src/a
2121 $ hg -R src commit -m '#0'
2118 $ hg -R src commit -m '#0'
2122 Invoking status precommit hook
2119 Invoking status precommit hook
2123 A a
2120 A a
2124
2121
2125 check messages when no remote repository is specified:
2122 check messages when no remote repository is specified:
2126 "no remote repo" route for "hg outgoing --large" is not tested here,
2123 "no remote repo" route for "hg outgoing --large" is not tested here,
2127 because it can't be reproduced easily.
2124 because it can't be reproduced easily.
2128
2125
2129 $ hg init clone1
2126 $ hg init clone1
2130 $ hg -R clone1 -q pull src
2127 $ hg -R clone1 -q pull src
2131 $ hg -R clone1 -q update
2128 $ hg -R clone1 -q update
2132 $ hg -R clone1 paths | grep default
2129 $ hg -R clone1 paths | grep default
2133 [1]
2130 [1]
2134
2131
2135 $ hg -R clone1 summary --large
2132 $ hg -R clone1 summary --large
2136 parent: 0:fc0bd45326d3 tip
2133 parent: 0:fc0bd45326d3 tip
2137 #0
2134 #0
2138 branch: default
2135 branch: default
2139 commit: (clean)
2136 commit: (clean)
2140 update: (current)
2137 update: (current)
2141 largefiles: (no remote repo)
2138 largefiles: (no remote repo)
2142
2139
2143 check messages when there is no files to upload:
2140 check messages when there is no files to upload:
2144
2141
2145 $ hg -q clone src clone2
2142 $ hg -q clone src clone2
2146 $ hg -R clone2 paths | grep default
2143 $ hg -R clone2 paths | grep default
2147 default = $TESTTMP/issue3651/src (glob)
2144 default = $TESTTMP/issue3651/src (glob)
2148
2145
2149 $ hg -R clone2 summary --large
2146 $ hg -R clone2 summary --large
2150 parent: 0:fc0bd45326d3 tip
2147 parent: 0:fc0bd45326d3 tip
2151 #0
2148 #0
2152 branch: default
2149 branch: default
2153 commit: (clean)
2150 commit: (clean)
2154 update: (current)
2151 update: (current)
2155 searching for changes
2152 searching for changes
2156 largefiles: (no files to upload)
2153 largefiles: (no files to upload)
2157 $ hg -R clone2 outgoing --large
2154 $ hg -R clone2 outgoing --large
2158 comparing with $TESTTMP/issue3651/src (glob)
2155 comparing with $TESTTMP/issue3651/src (glob)
2159 searching for changes
2156 searching for changes
2160 no changes found
2157 no changes found
2161 searching for changes
2158 searching for changes
2162 largefiles: no files to upload
2159 largefiles: no files to upload
2163 [1]
2160 [1]
2164
2161
2165 check messages when there are files to upload:
2162 check messages when there are files to upload:
2166
2163
2167 $ echo b > clone2/b
2164 $ echo b > clone2/b
2168 $ hg -R clone2 add --large clone2/b
2165 $ hg -R clone2 add --large clone2/b
2169 $ hg -R clone2 commit -m '#1'
2166 $ hg -R clone2 commit -m '#1'
2170 Invoking status precommit hook
2167 Invoking status precommit hook
2171 A b
2168 A b
2172 $ hg -R clone2 summary --large
2169 $ hg -R clone2 summary --large
2173 parent: 1:1acbe71ce432 tip
2170 parent: 1:1acbe71ce432 tip
2174 #1
2171 #1
2175 branch: default
2172 branch: default
2176 commit: (clean)
2173 commit: (clean)
2177 update: (current)
2174 update: (current)
2178 searching for changes
2175 searching for changes
2179 largefiles: 1 to upload
2176 largefiles: 1 to upload
2180 $ hg -R clone2 outgoing --large
2177 $ hg -R clone2 outgoing --large
2181 comparing with $TESTTMP/issue3651/src (glob)
2178 comparing with $TESTTMP/issue3651/src (glob)
2182 searching for changes
2179 searching for changes
2183 changeset: 1:1acbe71ce432
2180 changeset: 1:1acbe71ce432
2184 tag: tip
2181 tag: tip
2185 user: test
2182 user: test
2186 date: Thu Jan 01 00:00:00 1970 +0000
2183 date: Thu Jan 01 00:00:00 1970 +0000
2187 summary: #1
2184 summary: #1
2188
2185
2189 searching for changes
2186 searching for changes
2190 largefiles to upload:
2187 largefiles to upload:
2191 b
2188 b
2192
2189
2193
2190
2194 $ cd ..
2191 $ cd ..
2195
2192
2196 merge action 'd' for 'local renamed directory to d2/g' which has no filename
2193 merge action 'd' for 'local renamed directory to d2/g' which has no filename
2197
2194
2198 $ hg init merge-action
2195 $ hg init merge-action
2199 $ cd merge-action
2196 $ cd merge-action
2200 $ touch l
2197 $ touch l
2201 $ hg add --large l
2198 $ hg add --large l
2202 $ mkdir d1
2199 $ mkdir d1
2203 $ touch d1/f
2200 $ touch d1/f
2204 $ hg ci -Aqm0
2201 $ hg ci -Aqm0
2205 Invoking status precommit hook
2202 Invoking status precommit hook
2206 A d1/f
2203 A d1/f
2207 A l
2204 A l
2208 $ echo > d1/f
2205 $ echo > d1/f
2209 $ touch d1/g
2206 $ touch d1/g
2210 $ hg ci -Aqm1
2207 $ hg ci -Aqm1
2211 Invoking status precommit hook
2208 Invoking status precommit hook
2212 M d1/f
2209 M d1/f
2213 A d1/g
2210 A d1/g
2214 $ hg up -qr0
2211 $ hg up -qr0
2215 $ hg mv d1 d2
2212 $ hg mv d1 d2
2216 moving d1/f to d2/f (glob)
2213 moving d1/f to d2/f (glob)
2217 $ hg ci -qm2
2214 $ hg ci -qm2
2218 Invoking status precommit hook
2215 Invoking status precommit hook
2219 A d2/f
2216 A d2/f
2220 R d1/f
2217 R d1/f
2221 $ hg merge
2218 $ hg merge
2222 merging d2/f and d1/f to d2/f
2219 merging d2/f and d1/f to d2/f
2223 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
2220 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
2224 (branch merge, don't forget to commit)
2221 (branch merge, don't forget to commit)
2225 getting changed largefiles
2222 getting changed largefiles
2226 0 largefiles updated, 0 removed
2223 0 largefiles updated, 0 removed
2227 $ cd ..
2224 $ cd ..
2228
2225
2229
2226
2230 Merge conflicts:
2227 Merge conflicts:
2231
2228
2232 $ hg init merge
2229 $ hg init merge
2233 $ cd merge
2230 $ cd merge
2234 $ echo 0 > f-different
2231 $ echo 0 > f-different
2235 $ echo 0 > f-same
2232 $ echo 0 > f-same
2236 $ echo 0 > f-unchanged-1
2233 $ echo 0 > f-unchanged-1
2237 $ echo 0 > f-unchanged-2
2234 $ echo 0 > f-unchanged-2
2238 $ hg add --large *
2235 $ hg add --large *
2239 $ hg ci -m0
2236 $ hg ci -m0
2240 Invoking status precommit hook
2237 Invoking status precommit hook
2241 A f-different
2238 A f-different
2242 A f-same
2239 A f-same
2243 A f-unchanged-1
2240 A f-unchanged-1
2244 A f-unchanged-2
2241 A f-unchanged-2
2245 $ echo tmp1 > f-unchanged-1
2242 $ echo tmp1 > f-unchanged-1
2246 $ echo tmp1 > f-unchanged-2
2243 $ echo tmp1 > f-unchanged-2
2247 $ echo tmp1 > f-same
2244 $ echo tmp1 > f-same
2248 $ hg ci -m1
2245 $ hg ci -m1
2249 Invoking status precommit hook
2246 Invoking status precommit hook
2250 M f-same
2247 M f-same
2251 M f-unchanged-1
2248 M f-unchanged-1
2252 M f-unchanged-2
2249 M f-unchanged-2
2253 $ echo 2 > f-different
2250 $ echo 2 > f-different
2254 $ echo 0 > f-unchanged-1
2251 $ echo 0 > f-unchanged-1
2255 $ echo 1 > f-unchanged-2
2252 $ echo 1 > f-unchanged-2
2256 $ echo 1 > f-same
2253 $ echo 1 > f-same
2257 $ hg ci -m2
2254 $ hg ci -m2
2258 Invoking status precommit hook
2255 Invoking status precommit hook
2259 M f-different
2256 M f-different
2260 M f-same
2257 M f-same
2261 M f-unchanged-1
2258 M f-unchanged-1
2262 M f-unchanged-2
2259 M f-unchanged-2
2263 $ hg up -qr0
2260 $ hg up -qr0
2264 $ echo tmp2 > f-unchanged-1
2261 $ echo tmp2 > f-unchanged-1
2265 $ echo tmp2 > f-unchanged-2
2262 $ echo tmp2 > f-unchanged-2
2266 $ echo tmp2 > f-same
2263 $ echo tmp2 > f-same
2267 $ hg ci -m3
2264 $ hg ci -m3
2268 Invoking status precommit hook
2265 Invoking status precommit hook
2269 M f-same
2266 M f-same
2270 M f-unchanged-1
2267 M f-unchanged-1
2271 M f-unchanged-2
2268 M f-unchanged-2
2272 created new head
2269 created new head
2273 $ echo 1 > f-different
2270 $ echo 1 > f-different
2274 $ echo 1 > f-unchanged-1
2271 $ echo 1 > f-unchanged-1
2275 $ echo 0 > f-unchanged-2
2272 $ echo 0 > f-unchanged-2
2276 $ echo 1 > f-same
2273 $ echo 1 > f-same
2277 $ hg ci -m4
2274 $ hg ci -m4
2278 Invoking status precommit hook
2275 Invoking status precommit hook
2279 M f-different
2276 M f-different
2280 M f-same
2277 M f-same
2281 M f-unchanged-1
2278 M f-unchanged-1
2282 M f-unchanged-2
2279 M f-unchanged-2
2283 $ hg merge
2280 $ hg merge
2284 largefile f-different has a merge conflict
2281 largefile f-different has a merge conflict
2285 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
2282 ancestor was 09d2af8dd22201dd8d48e5dcfcaed281ff9422c7
2286 keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or
2283 keep (l)ocal e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e or
2287 take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a? l
2284 take (o)ther 7448d8798a4380162d4b56f9b452e2f6f9e24e7a? l
2288 0 files updated, 4 files merged, 0 files removed, 0 files unresolved
2285 0 files updated, 4 files merged, 0 files removed, 0 files unresolved
2289 (branch merge, don't forget to commit)
2286 (branch merge, don't forget to commit)
2290 getting changed largefiles
2287 getting changed largefiles
2291 1 largefiles updated, 0 removed
2288 1 largefiles updated, 0 removed
2292 $ cat f-different
2289 $ cat f-different
2293 1
2290 1
2294 $ cat f-same
2291 $ cat f-same
2295 1
2292 1
2296 $ cat f-unchanged-1
2293 $ cat f-unchanged-1
2297 1
2294 1
2298 $ cat f-unchanged-2
2295 $ cat f-unchanged-2
2299 1
2296 1
2300 $ cd ..
2297 $ cd ..
2301
2298
2302 Check whether "largefiles" feature is supported only in repositories
2299 Check whether "largefiles" feature is supported only in repositories
2303 enabling largefiles extension.
2300 enabling largefiles extension.
2304
2301
2305 $ mkdir individualenabling
2302 $ mkdir individualenabling
2306 $ cd individualenabling
2303 $ cd individualenabling
2307
2304
2308 $ hg init enabledlocally
2305 $ hg init enabledlocally
2309 $ echo large > enabledlocally/large
2306 $ echo large > enabledlocally/large
2310 $ hg -R enabledlocally add --large enabledlocally/large
2307 $ hg -R enabledlocally add --large enabledlocally/large
2311 $ hg -R enabledlocally commit -m '#0'
2308 $ hg -R enabledlocally commit -m '#0'
2312 Invoking status precommit hook
2309 Invoking status precommit hook
2313 A large
2310 A large
2314
2311
2315 $ hg init notenabledlocally
2312 $ hg init notenabledlocally
2316 $ echo large > notenabledlocally/large
2313 $ echo large > notenabledlocally/large
2317 $ hg -R notenabledlocally add --large notenabledlocally/large
2314 $ hg -R notenabledlocally add --large notenabledlocally/large
2318 $ hg -R notenabledlocally commit -m '#0'
2315 $ hg -R notenabledlocally commit -m '#0'
2319 Invoking status precommit hook
2316 Invoking status precommit hook
2320 A large
2317 A large
2321
2318
2322 $ cat >> $HGRCPATH <<EOF
2319 $ cat >> $HGRCPATH <<EOF
2323 > [extensions]
2320 > [extensions]
2324 > # disable globally
2321 > # disable globally
2325 > largefiles=!
2322 > largefiles=!
2326 > EOF
2323 > EOF
2327 $ cat >> enabledlocally/.hg/hgrc <<EOF
2324 $ cat >> enabledlocally/.hg/hgrc <<EOF
2328 > [extensions]
2325 > [extensions]
2329 > # enable locally
2326 > # enable locally
2330 > largefiles=
2327 > largefiles=
2331 > EOF
2328 > EOF
2332 $ hg -R enabledlocally root
2329 $ hg -R enabledlocally root
2333 $TESTTMP/individualenabling/enabledlocally (glob)
2330 $TESTTMP/individualenabling/enabledlocally (glob)
2334 $ hg -R notenabledlocally root
2331 $ hg -R notenabledlocally root
2335 abort: repository requires features unknown to this Mercurial: largefiles!
2332 abort: repository requires features unknown to this Mercurial: largefiles!
2336 (see http://mercurial.selenic.com/wiki/MissingRequirement for more information)
2333 (see http://mercurial.selenic.com/wiki/MissingRequirement for more information)
2337 [255]
2334 [255]
2338
2335
2339 $ hg init push-dst
2336 $ hg init push-dst
2340 $ hg -R enabledlocally push push-dst
2337 $ hg -R enabledlocally push push-dst
2341 pushing to push-dst
2338 pushing to push-dst
2342 abort: required features are not supported in the destination: largefiles
2339 abort: required features are not supported in the destination: largefiles
2343 [255]
2340 [255]
2344
2341
2345 $ hg init pull-src
2342 $ hg init pull-src
2346 $ hg -R pull-src pull enabledlocally
2343 $ hg -R pull-src pull enabledlocally
2347 pulling from enabledlocally
2344 pulling from enabledlocally
2348 abort: required features are not supported in the destination: largefiles
2345 abort: required features are not supported in the destination: largefiles
2349 [255]
2346 [255]
2350
2347
2351 $ hg clone enabledlocally clone-dst
2348 $ hg clone enabledlocally clone-dst
2352 abort: repository requires features unknown to this Mercurial: largefiles!
2349 abort: repository requires features unknown to this Mercurial: largefiles!
2353 (see http://mercurial.selenic.com/wiki/MissingRequirement for more information)
2350 (see http://mercurial.selenic.com/wiki/MissingRequirement for more information)
2354 [255]
2351 [255]
2355 $ test -d clone-dst
2352 $ test -d clone-dst
2356 [1]
2353 [1]
2357 $ hg clone --pull enabledlocally clone-pull-dst
2354 $ hg clone --pull enabledlocally clone-pull-dst
2358 abort: required features are not supported in the destination: largefiles
2355 abort: required features are not supported in the destination: largefiles
2359 [255]
2356 [255]
2360 $ test -d clone-pull-dst
2357 $ test -d clone-pull-dst
2361 [1]
2358 [1]
2362
2359
2363 #if serve
2360 #if serve
2364
2361
2365 Test largefiles specific peer setup, when largefiles is enabled
2362 Test largefiles specific peer setup, when largefiles is enabled
2366 locally (issue4109)
2363 locally (issue4109)
2367
2364
2368 $ hg showconfig extensions | grep largefiles
2365 $ hg showconfig extensions | grep largefiles
2369 extensions.largefiles=!
2366 extensions.largefiles=!
2370 $ mkdir -p $TESTTMP/individualenabling/usercache
2367 $ mkdir -p $TESTTMP/individualenabling/usercache
2371
2368
2372 $ hg serve -R enabledlocally -d -p $HGPORT --pid-file hg.pid
2369 $ hg serve -R enabledlocally -d -p $HGPORT --pid-file hg.pid
2373 $ cat hg.pid >> $DAEMON_PIDS
2370 $ cat hg.pid >> $DAEMON_PIDS
2374
2371
2375 $ hg init pull-dst
2372 $ hg init pull-dst
2376 $ cat > pull-dst/.hg/hgrc <<EOF
2373 $ cat > pull-dst/.hg/hgrc <<EOF
2377 > [extensions]
2374 > [extensions]
2378 > # enable locally
2375 > # enable locally
2379 > largefiles=
2376 > largefiles=
2380 > [largefiles]
2377 > [largefiles]
2381 > # ignore system cache to force largefiles specific wire proto access
2378 > # ignore system cache to force largefiles specific wire proto access
2382 > usercache=$TESTTMP/individualenabling/usercache
2379 > usercache=$TESTTMP/individualenabling/usercache
2383 > EOF
2380 > EOF
2384 $ hg -R pull-dst -q pull -u http://localhost:$HGPORT
2381 $ hg -R pull-dst -q pull -u http://localhost:$HGPORT
2385
2382
2386 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
2383 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
2387 #endif
2384 #endif
2388
2385
2389 $ cd ..
2386 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now