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