Show More
@@ -1,556 +1,558 b'' | |||||
1 | #!/usr/bin/env python |
|
1 | #!/usr/bin/env python | |
2 | # |
|
2 | # | |
3 | # check-code - a style and portability checker for Mercurial |
|
3 | # check-code - a style and portability checker for Mercurial | |
4 | # |
|
4 | # | |
5 | # Copyright 2010 Matt Mackall <mpm@selenic.com> |
|
5 | # Copyright 2010 Matt Mackall <mpm@selenic.com> | |
6 | # |
|
6 | # | |
7 | # This software may be used and distributed according to the terms of the |
|
7 | # This software may be used and distributed according to the terms of the | |
8 | # GNU General Public License version 2 or any later version. |
|
8 | # GNU General Public License version 2 or any later version. | |
9 |
|
9 | |||
10 | """style and portability checker for Mercurial |
|
10 | """style and portability checker for Mercurial | |
11 |
|
11 | |||
12 | when a rule triggers wrong, do one of the following (prefer one from top): |
|
12 | when a rule triggers wrong, do one of the following (prefer one from top): | |
13 | * do the work-around the rule suggests |
|
13 | * do the work-around the rule suggests | |
14 | * doublecheck that it is a false match |
|
14 | * doublecheck that it is a false match | |
15 | * improve the rule pattern |
|
15 | * improve the rule pattern | |
16 | * add an ignore pattern to the rule (3rd arg) which matches your good line |
|
16 | * add an ignore pattern to the rule (3rd arg) which matches your good line | |
17 | (you can append a short comment and match this, like: #re-raises, # no-py24) |
|
17 | (you can append a short comment and match this, like: #re-raises, # no-py24) | |
18 | * change the pattern to a warning and list the exception in test-check-code-hg |
|
18 | * change the pattern to a warning and list the exception in test-check-code-hg | |
19 | * ONLY use no--check-code for skipping entire files from external sources |
|
19 | * ONLY use no--check-code for skipping entire files from external sources | |
20 | """ |
|
20 | """ | |
21 |
|
21 | |||
22 | import re, glob, os, sys |
|
22 | import re, glob, os, sys | |
23 | import keyword |
|
23 | import keyword | |
24 | import optparse |
|
24 | import optparse | |
25 | try: |
|
25 | try: | |
26 | import re2 |
|
26 | import re2 | |
27 | except ImportError: |
|
27 | except ImportError: | |
28 | re2 = None |
|
28 | re2 = None | |
29 |
|
29 | |||
30 | def compilere(pat, multiline=False): |
|
30 | def compilere(pat, multiline=False): | |
31 | if multiline: |
|
31 | if multiline: | |
32 | pat = '(?m)' + pat |
|
32 | pat = '(?m)' + pat | |
33 | if re2: |
|
33 | if re2: | |
34 | try: |
|
34 | try: | |
35 | return re2.compile(pat) |
|
35 | return re2.compile(pat) | |
36 | except re2.error: |
|
36 | except re2.error: | |
37 | pass |
|
37 | pass | |
38 | return re.compile(pat) |
|
38 | return re.compile(pat) | |
39 |
|
39 | |||
40 | def repquote(m): |
|
40 | def repquote(m): | |
41 | fromc = '.:' |
|
41 | fromc = '.:' | |
42 | tochr = 'pq' |
|
42 | tochr = 'pq' | |
43 | def encodechr(i): |
|
43 | def encodechr(i): | |
44 | if i > 255: |
|
44 | if i > 255: | |
45 | return 'u' |
|
45 | return 'u' | |
46 | c = chr(i) |
|
46 | c = chr(i) | |
47 | if c in ' \n': |
|
47 | if c in ' \n': | |
48 | return c |
|
48 | return c | |
49 | if c.isalpha(): |
|
49 | if c.isalpha(): | |
50 | return 'x' |
|
50 | return 'x' | |
51 | if c.isdigit(): |
|
51 | if c.isdigit(): | |
52 | return 'n' |
|
52 | return 'n' | |
53 | try: |
|
53 | try: | |
54 | return tochr[fromc.find(c)] |
|
54 | return tochr[fromc.find(c)] | |
55 | except (ValueError, IndexError): |
|
55 | except (ValueError, IndexError): | |
56 | return 'o' |
|
56 | return 'o' | |
57 | t = m.group('text') |
|
57 | t = m.group('text') | |
58 | tt = ''.join(encodechr(i) for i in xrange(256)) |
|
58 | tt = ''.join(encodechr(i) for i in xrange(256)) | |
59 | t = t.translate(tt) |
|
59 | t = t.translate(tt) | |
60 | return m.group('quote') + t + m.group('quote') |
|
60 | return m.group('quote') + t + m.group('quote') | |
61 |
|
61 | |||
62 | def reppython(m): |
|
62 | def reppython(m): | |
63 | comment = m.group('comment') |
|
63 | comment = m.group('comment') | |
64 | if comment: |
|
64 | if comment: | |
65 | l = len(comment.rstrip()) |
|
65 | l = len(comment.rstrip()) | |
66 | return "#" * l + comment[l:] |
|
66 | return "#" * l + comment[l:] | |
67 | return repquote(m) |
|
67 | return repquote(m) | |
68 |
|
68 | |||
69 | def repcomment(m): |
|
69 | def repcomment(m): | |
70 | return m.group(1) + "#" * len(m.group(2)) |
|
70 | return m.group(1) + "#" * len(m.group(2)) | |
71 |
|
71 | |||
72 | def repccomment(m): |
|
72 | def repccomment(m): | |
73 | t = re.sub(r"((?<=\n) )|\S", "x", m.group(2)) |
|
73 | t = re.sub(r"((?<=\n) )|\S", "x", m.group(2)) | |
74 | return m.group(1) + t + "*/" |
|
74 | return m.group(1) + t + "*/" | |
75 |
|
75 | |||
76 | def repcallspaces(m): |
|
76 | def repcallspaces(m): | |
77 | t = re.sub(r"\n\s+", "\n", m.group(2)) |
|
77 | t = re.sub(r"\n\s+", "\n", m.group(2)) | |
78 | return m.group(1) + t |
|
78 | return m.group(1) + t | |
79 |
|
79 | |||
80 | def repinclude(m): |
|
80 | def repinclude(m): | |
81 | return m.group(1) + "<foo>" |
|
81 | return m.group(1) + "<foo>" | |
82 |
|
82 | |||
83 | def rephere(m): |
|
83 | def rephere(m): | |
84 | t = re.sub(r"\S", "x", m.group(2)) |
|
84 | t = re.sub(r"\S", "x", m.group(2)) | |
85 | return m.group(1) + t |
|
85 | return m.group(1) + t | |
86 |
|
86 | |||
87 |
|
87 | |||
88 | testpats = [ |
|
88 | testpats = [ | |
89 | [ |
|
89 | [ | |
90 | (r'pushd|popd', "don't use 'pushd' or 'popd', use 'cd'"), |
|
90 | (r'pushd|popd', "don't use 'pushd' or 'popd', use 'cd'"), | |
91 | (r'\W\$?\(\([^\)\n]*\)\)', "don't use (()) or $(()), use 'expr'"), |
|
91 | (r'\W\$?\(\([^\)\n]*\)\)', "don't use (()) or $(()), use 'expr'"), | |
92 | (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"), |
|
92 | (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"), | |
93 | (r'(?<!hg )grep.*-a', "don't use 'grep -a', use in-line python"), |
|
93 | (r'(?<!hg )grep.*-a', "don't use 'grep -a', use in-line python"), | |
94 | (r'sed.*-i', "don't use 'sed -i', use a temporary file"), |
|
94 | (r'sed.*-i', "don't use 'sed -i', use a temporary file"), | |
95 | (r'\becho\b.*\\n', "don't use 'echo \\n', use printf"), |
|
95 | (r'\becho\b.*\\n', "don't use 'echo \\n', use printf"), | |
96 | (r'echo -n', "don't use 'echo -n', use printf"), |
|
96 | (r'echo -n', "don't use 'echo -n', use printf"), | |
97 | (r'(^| )wc[^|]*$\n(?!.*\(re\))', "filter wc output"), |
|
97 | (r'(^| )wc[^|]*$\n(?!.*\(re\))', "filter wc output"), | |
98 | (r'head -c', "don't use 'head -c', use 'dd'"), |
|
98 | (r'head -c', "don't use 'head -c', use 'dd'"), | |
99 | (r'tail -n', "don't use the '-n' option to tail, just use '-<num>'"), |
|
99 | (r'tail -n', "don't use the '-n' option to tail, just use '-<num>'"), | |
100 | (r'sha1sum', "don't use sha1sum, use $TESTDIR/md5sum.py"), |
|
100 | (r'sha1sum', "don't use sha1sum, use $TESTDIR/md5sum.py"), | |
101 | (r'ls.*-\w*R', "don't use 'ls -R', use 'find'"), |
|
101 | (r'ls.*-\w*R', "don't use 'ls -R', use 'find'"), | |
102 | (r'printf.*[^\\]\\([1-9]|0\d)', "don't use 'printf \NNN', use Python"), |
|
102 | (r'printf.*[^\\]\\([1-9]|0\d)', "don't use 'printf \NNN', use Python"), | |
103 | (r'printf.*[^\\]\\x', "don't use printf \\x, use Python"), |
|
103 | (r'printf.*[^\\]\\x', "don't use printf \\x, use Python"), | |
104 | (r'\$\(.*\)', "don't use $(expr), use `expr`"), |
|
104 | (r'\$\(.*\)', "don't use $(expr), use `expr`"), | |
105 | (r'rm -rf \*', "don't use naked rm -rf, target a directory"), |
|
105 | (r'rm -rf \*', "don't use naked rm -rf, target a directory"), | |
106 | (r'(^|\|\s*)grep (-\w\s+)*[^|]*[(|]\w', |
|
106 | (r'(^|\|\s*)grep (-\w\s+)*[^|]*[(|]\w', | |
107 | "use egrep for extended grep syntax"), |
|
107 | "use egrep for extended grep syntax"), | |
108 | (r'/bin/', "don't use explicit paths for tools"), |
|
108 | (r'/bin/', "don't use explicit paths for tools"), | |
109 | (r'[^\n]\Z', "no trailing newline"), |
|
109 | (r'[^\n]\Z', "no trailing newline"), | |
110 | (r'export.*=', "don't export and assign at once"), |
|
110 | (r'export.*=', "don't export and assign at once"), | |
111 | (r'^source\b', "don't use 'source', use '.'"), |
|
111 | (r'^source\b', "don't use 'source', use '.'"), | |
112 | (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"), |
|
112 | (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"), | |
113 | (r'ls +[^|\n-]+ +-', "options to 'ls' must come before filenames"), |
|
113 | (r'ls +[^|\n-]+ +-', "options to 'ls' must come before filenames"), | |
114 | (r'[^>\n]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"), |
|
114 | (r'[^>\n]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"), | |
115 | (r'^stop\(\)', "don't use 'stop' as a shell function name"), |
|
115 | (r'^stop\(\)', "don't use 'stop' as a shell function name"), | |
116 | (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"), |
|
116 | (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"), | |
117 | (r'^alias\b.*=', "don't use alias, use a function"), |
|
117 | (r'^alias\b.*=', "don't use alias, use a function"), | |
118 | (r'if\s*!', "don't use '!' to negate exit status"), |
|
118 | (r'if\s*!', "don't use '!' to negate exit status"), | |
119 | (r'/dev/u?random', "don't use entropy, use /dev/zero"), |
|
119 | (r'/dev/u?random', "don't use entropy, use /dev/zero"), | |
120 | (r'do\s*true;\s*done', "don't use true as loop body, use sleep 0"), |
|
120 | (r'do\s*true;\s*done', "don't use true as loop body, use sleep 0"), | |
121 | (r'^( *)\t', "don't use tabs to indent"), |
|
121 | (r'^( *)\t', "don't use tabs to indent"), | |
122 | (r'sed (-e )?\'(\d+|/[^/]*/)i(?!\\\n)', |
|
122 | (r'sed (-e )?\'(\d+|/[^/]*/)i(?!\\\n)', | |
123 | "put a backslash-escaped newline after sed 'i' command"), |
|
123 | "put a backslash-escaped newline after sed 'i' command"), | |
124 | ], |
|
124 | ], | |
125 | # warnings |
|
125 | # warnings | |
126 | [ |
|
126 | [ | |
127 | (r'^function', "don't use 'function', use old style"), |
|
127 | (r'^function', "don't use 'function', use old style"), | |
128 | (r'^diff.*-\w*N', "don't use 'diff -N'"), |
|
128 | (r'^diff.*-\w*N', "don't use 'diff -N'"), | |
129 | (r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`"), |
|
129 | (r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`"), | |
130 | (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"), |
|
130 | (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"), | |
131 | (r'kill (`|\$\()', "don't use kill, use killdaemons.py") |
|
131 | (r'kill (`|\$\()', "don't use kill, use killdaemons.py") | |
132 | ] |
|
132 | ] | |
133 | ] |
|
133 | ] | |
134 |
|
134 | |||
135 | testfilters = [ |
|
135 | testfilters = [ | |
136 | (r"( *)(#([^\n]*\S)?)", repcomment), |
|
136 | (r"( *)(#([^\n]*\S)?)", repcomment), | |
137 | (r"<<(\S+)((.|\n)*?\n\1)", rephere), |
|
137 | (r"<<(\S+)((.|\n)*?\n\1)", rephere), | |
138 | ] |
|
138 | ] | |
139 |
|
139 | |||
140 | winglobmsg = "use (glob) to match Windows paths too" |
|
140 | winglobmsg = "use (glob) to match Windows paths too" | |
141 | uprefix = r"^ \$ " |
|
141 | uprefix = r"^ \$ " | |
142 | utestpats = [ |
|
142 | utestpats = [ | |
143 | [ |
|
143 | [ | |
144 | (r'^(\S.*|| [$>] .*)[ \t]\n', "trailing whitespace on non-output"), |
|
144 | (r'^(\S.*|| [$>] .*)[ \t]\n', "trailing whitespace on non-output"), | |
145 | (uprefix + r'.*\|\s*sed[^|>\n]*\n', |
|
145 | (uprefix + r'.*\|\s*sed[^|>\n]*\n', | |
146 | "use regex test output patterns instead of sed"), |
|
146 | "use regex test output patterns instead of sed"), | |
147 | (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"), |
|
147 | (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"), | |
148 | (uprefix + r'.*(?<!\[)\$\?', "explicit exit code checks unnecessary"), |
|
148 | (uprefix + r'.*(?<!\[)\$\?', "explicit exit code checks unnecessary"), | |
149 | (uprefix + r'.*\|\| echo.*(fail|error)', |
|
149 | (uprefix + r'.*\|\| echo.*(fail|error)', | |
150 | "explicit exit code checks unnecessary"), |
|
150 | "explicit exit code checks unnecessary"), | |
151 | (uprefix + r'set -e', "don't use set -e"), |
|
151 | (uprefix + r'set -e', "don't use set -e"), | |
152 | (uprefix + r'(\s|fi\b|done\b)', "use > for continued lines"), |
|
152 | (uprefix + r'(\s|fi\b|done\b)', "use > for continued lines"), | |
153 | (uprefix + r'.*:\.\S*/', "x:.y in a path does not work on msys, rewrite " |
|
153 | (uprefix + r'.*:\.\S*/', "x:.y in a path does not work on msys, rewrite " | |
154 | "as x://.y, or see `hg log -k msys` for alternatives", r'-\S+:\.|' #-Rxxx |
|
154 | "as x://.y, or see `hg log -k msys` for alternatives", r'-\S+:\.|' #-Rxxx | |
155 | 'hg pull -q file:../test'), # in test-pull.t which is skipped on windows |
|
155 | 'hg pull -q file:../test'), # in test-pull.t which is skipped on windows | |
156 | (r'^ saved backup bundle to \$TESTTMP.*\.hg$', winglobmsg), |
|
156 | (r'^ saved backup bundle to \$TESTTMP.*\.hg$', winglobmsg), | |
157 | (r'^ changeset .* references (corrupted|missing) \$TESTTMP/.*[^)]$', |
|
157 | (r'^ changeset .* references (corrupted|missing) \$TESTTMP/.*[^)]$', | |
158 | winglobmsg), |
|
158 | winglobmsg), | |
159 | (r'^ pulling from \$TESTTMP/.*[^)]$', winglobmsg, |
|
159 | (r'^ pulling from \$TESTTMP/.*[^)]$', winglobmsg, | |
160 | '\$TESTTMP/unix-repo$'), # in test-issue1802.t which skipped on windows |
|
160 | '\$TESTTMP/unix-repo$'), # in test-issue1802.t which skipped on windows | |
161 | (r'^ reverting .*/.*[^)]$', winglobmsg), |
|
161 | (r'^ reverting .*/.*[^)]$', winglobmsg), | |
162 | (r'^ cloning subrepo \S+/.*[^)]$', winglobmsg), |
|
162 | (r'^ cloning subrepo \S+/.*[^)]$', winglobmsg), | |
163 | (r'^ pushing to \$TESTTMP/.*[^)]$', winglobmsg), |
|
163 | (r'^ pushing to \$TESTTMP/.*[^)]$', winglobmsg), | |
164 | (r'^ pushing subrepo \S+/\S+ to.*[^)]$', winglobmsg), |
|
164 | (r'^ pushing subrepo \S+/\S+ to.*[^)]$', winglobmsg), | |
165 | (r'^ moving \S+/.*[^)]$', winglobmsg), |
|
165 | (r'^ moving \S+/.*[^)]$', winglobmsg), | |
166 | (r'^ no changes made to subrepo since.*/.*[^)]$', winglobmsg), |
|
166 | (r'^ no changes made to subrepo since.*/.*[^)]$', winglobmsg), | |
167 | (r'^ .*: largefile \S+ not available from file:.*/.*[^)]$', winglobmsg), |
|
167 | (r'^ .*: largefile \S+ not available from file:.*/.*[^)]$', winglobmsg), | |
|
168 | (r'^ .*file://\$TESTTMP', | |||
|
169 | 'write "file:/*/$TESTTMP" + (glob) to match on windows too'), | |||
168 | ], |
|
170 | ], | |
169 | # warnings |
|
171 | # warnings | |
170 | [ |
|
172 | [ | |
171 | (r'^ [^*?/\n]* \(glob\)$', |
|
173 | (r'^ [^*?/\n]* \(glob\)$', | |
172 | "glob match with no glob character (?*/)"), |
|
174 | "glob match with no glob character (?*/)"), | |
173 | ] |
|
175 | ] | |
174 | ] |
|
176 | ] | |
175 |
|
177 | |||
176 | for i in [0, 1]: |
|
178 | for i in [0, 1]: | |
177 | for p, m in testpats[i]: |
|
179 | for p, m in testpats[i]: | |
178 | if p.startswith(r'^'): |
|
180 | if p.startswith(r'^'): | |
179 | p = r"^ [$>] (%s)" % p[1:] |
|
181 | p = r"^ [$>] (%s)" % p[1:] | |
180 | else: |
|
182 | else: | |
181 | p = r"^ [$>] .*(%s)" % p |
|
183 | p = r"^ [$>] .*(%s)" % p | |
182 | utestpats[i].append((p, m)) |
|
184 | utestpats[i].append((p, m)) | |
183 |
|
185 | |||
184 | utestfilters = [ |
|
186 | utestfilters = [ | |
185 | (r"<<(\S+)((.|\n)*?\n > \1)", rephere), |
|
187 | (r"<<(\S+)((.|\n)*?\n > \1)", rephere), | |
186 | (r"( *)(#([^\n]*\S)?)", repcomment), |
|
188 | (r"( *)(#([^\n]*\S)?)", repcomment), | |
187 | ] |
|
189 | ] | |
188 |
|
190 | |||
189 | pypats = [ |
|
191 | pypats = [ | |
190 | [ |
|
192 | [ | |
191 | (r'^\s*def\s*\w+\s*\(.*,\s*\(', |
|
193 | (r'^\s*def\s*\w+\s*\(.*,\s*\(', | |
192 | "tuple parameter unpacking not available in Python 3+"), |
|
194 | "tuple parameter unpacking not available in Python 3+"), | |
193 | (r'lambda\s*\(.*,.*\)', |
|
195 | (r'lambda\s*\(.*,.*\)', | |
194 | "tuple parameter unpacking not available in Python 3+"), |
|
196 | "tuple parameter unpacking not available in Python 3+"), | |
195 | (r'import (.+,[^.]+\.[^.]+|[^.]+\.[^.]+,)', |
|
197 | (r'import (.+,[^.]+\.[^.]+|[^.]+\.[^.]+,)', | |
196 | '2to3 can\'t always rewrite "import qux, foo.bar", ' |
|
198 | '2to3 can\'t always rewrite "import qux, foo.bar", ' | |
197 | 'use "import foo.bar" on its own line instead.'), |
|
199 | 'use "import foo.bar" on its own line instead.'), | |
198 | (r'(?<!def)\s+(cmp)\(', "cmp is not available in Python 3+"), |
|
200 | (r'(?<!def)\s+(cmp)\(', "cmp is not available in Python 3+"), | |
199 | (r'\breduce\s*\(.*', "reduce is not available in Python 3+"), |
|
201 | (r'\breduce\s*\(.*', "reduce is not available in Python 3+"), | |
200 | (r'\.has_key\b', "dict.has_key is not available in Python 3+"), |
|
202 | (r'\.has_key\b', "dict.has_key is not available in Python 3+"), | |
201 | (r'\s<>\s', '<> operator is not available in Python 3+, use !='), |
|
203 | (r'\s<>\s', '<> operator is not available in Python 3+, use !='), | |
202 | (r'^\s*\t', "don't use tabs"), |
|
204 | (r'^\s*\t', "don't use tabs"), | |
203 | (r'\S;\s*\n', "semicolon"), |
|
205 | (r'\S;\s*\n', "semicolon"), | |
204 | (r'[^_]_\("[^"]+"\s*%', "don't use % inside _()"), |
|
206 | (r'[^_]_\("[^"]+"\s*%', "don't use % inside _()"), | |
205 | (r"[^_]_\('[^']+'\s*%", "don't use % inside _()"), |
|
207 | (r"[^_]_\('[^']+'\s*%", "don't use % inside _()"), | |
206 | (r'(\w|\)),\w', "missing whitespace after ,"), |
|
208 | (r'(\w|\)),\w', "missing whitespace after ,"), | |
207 | (r'(\w|\))[+/*\-<>]\w', "missing whitespace in expression"), |
|
209 | (r'(\w|\))[+/*\-<>]\w', "missing whitespace in expression"), | |
208 | (r'^\s+(\w|\.)+=\w[^,()\n]*$', "missing whitespace in assignment"), |
|
210 | (r'^\s+(\w|\.)+=\w[^,()\n]*$', "missing whitespace in assignment"), | |
209 | (r'(\s+)try:\n((?:\n|\1\s.*\n)+?)\1except.*?:\n' |
|
211 | (r'(\s+)try:\n((?:\n|\1\s.*\n)+?)\1except.*?:\n' | |
210 | r'((?:\n|\1\s.*\n)+?)\1finally:', 'no try/except/finally in Python 2.4'), |
|
212 | r'((?:\n|\1\s.*\n)+?)\1finally:', 'no try/except/finally in Python 2.4'), | |
211 | (r'(?<!def)(\s+|^|\()next\(.+\)', |
|
213 | (r'(?<!def)(\s+|^|\()next\(.+\)', | |
212 | 'no next(foo) in Python 2.4 and 2.5, use foo.next() instead'), |
|
214 | 'no next(foo) in Python 2.4 and 2.5, use foo.next() instead'), | |
213 | (r'(\s+)try:\n((?:\n|\1\s.*\n)*?)\1\s*yield\b.*?' |
|
215 | (r'(\s+)try:\n((?:\n|\1\s.*\n)*?)\1\s*yield\b.*?' | |
214 | r'((?:\n|\1\s.*\n)+?)\1finally:', |
|
216 | r'((?:\n|\1\s.*\n)+?)\1finally:', | |
215 | 'no yield inside try/finally in Python 2.4'), |
|
217 | 'no yield inside try/finally in Python 2.4'), | |
216 | (r'.{81}', "line too long"), |
|
218 | (r'.{81}', "line too long"), | |
217 | (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'), |
|
219 | (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'), | |
218 | (r'[^\n]\Z', "no trailing newline"), |
|
220 | (r'[^\n]\Z', "no trailing newline"), | |
219 | (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), |
|
221 | (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), | |
220 | # (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', |
|
222 | # (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', | |
221 | # "don't use underbars in identifiers"), |
|
223 | # "don't use underbars in identifiers"), | |
222 | (r'^\s+(self\.)?[A-za-z][a-z0-9]+[A-Z]\w* = ', |
|
224 | (r'^\s+(self\.)?[A-za-z][a-z0-9]+[A-Z]\w* = ', | |
223 | "don't use camelcase in identifiers"), |
|
225 | "don't use camelcase in identifiers"), | |
224 | (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+', |
|
226 | (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+', | |
225 | "linebreak after :"), |
|
227 | "linebreak after :"), | |
226 | (r'class\s[^( \n]+:', "old-style class, use class foo(object)"), |
|
228 | (r'class\s[^( \n]+:', "old-style class, use class foo(object)"), | |
227 | (r'class\s[^( \n]+\(\):', |
|
229 | (r'class\s[^( \n]+\(\):', | |
228 | "class foo() not available in Python 2.4, use class foo(object)"), |
|
230 | "class foo() not available in Python 2.4, use class foo(object)"), | |
229 | (r'\b(%s)\(' % '|'.join(keyword.kwlist), |
|
231 | (r'\b(%s)\(' % '|'.join(keyword.kwlist), | |
230 | "Python keyword is not a function"), |
|
232 | "Python keyword is not a function"), | |
231 | (r',]', "unneeded trailing ',' in list"), |
|
233 | (r',]', "unneeded trailing ',' in list"), | |
232 | # (r'class\s[A-Z][^\(]*\((?!Exception)', |
|
234 | # (r'class\s[A-Z][^\(]*\((?!Exception)', | |
233 | # "don't capitalize non-exception classes"), |
|
235 | # "don't capitalize non-exception classes"), | |
234 | # (r'in range\(', "use xrange"), |
|
236 | # (r'in range\(', "use xrange"), | |
235 | # (r'^\s*print\s+', "avoid using print in core and extensions"), |
|
237 | # (r'^\s*print\s+', "avoid using print in core and extensions"), | |
236 | (r'[\x80-\xff]', "non-ASCII character literal"), |
|
238 | (r'[\x80-\xff]', "non-ASCII character literal"), | |
237 | (r'("\')\.format\(', "str.format() not available in Python 2.4"), |
|
239 | (r'("\')\.format\(', "str.format() not available in Python 2.4"), | |
238 | (r'^\s*with\s+', "with not available in Python 2.4"), |
|
240 | (r'^\s*with\s+', "with not available in Python 2.4"), | |
239 | (r'\.isdisjoint\(', "set.isdisjoint not available in Python 2.4"), |
|
241 | (r'\.isdisjoint\(', "set.isdisjoint not available in Python 2.4"), | |
240 | (r'^\s*except.* as .*:', "except as not available in Python 2.4"), |
|
242 | (r'^\s*except.* as .*:', "except as not available in Python 2.4"), | |
241 | (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"), |
|
243 | (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"), | |
242 | (r'(?<!def)\s+(any|all|format)\(', |
|
244 | (r'(?<!def)\s+(any|all|format)\(', | |
243 | "any/all/format not available in Python 2.4", 'no-py24'), |
|
245 | "any/all/format not available in Python 2.4", 'no-py24'), | |
244 | (r'(?<!def)\s+(callable)\(', |
|
246 | (r'(?<!def)\s+(callable)\(', | |
245 | "callable not available in Python 3, use getattr(f, '__call__', None)"), |
|
247 | "callable not available in Python 3, use getattr(f, '__call__', None)"), | |
246 | (r'if\s.*\selse', "if ... else form not available in Python 2.4"), |
|
248 | (r'if\s.*\selse', "if ... else form not available in Python 2.4"), | |
247 | (r'^\s*(%s)\s\s' % '|'.join(keyword.kwlist), |
|
249 | (r'^\s*(%s)\s\s' % '|'.join(keyword.kwlist), | |
248 | "gratuitous whitespace after Python keyword"), |
|
250 | "gratuitous whitespace after Python keyword"), | |
249 | (r'([\(\[][ \t]\S)|(\S[ \t][\)\]])', "gratuitous whitespace in () or []"), |
|
251 | (r'([\(\[][ \t]\S)|(\S[ \t][\)\]])', "gratuitous whitespace in () or []"), | |
250 | # (r'\s\s=', "gratuitous whitespace before ="), |
|
252 | # (r'\s\s=', "gratuitous whitespace before ="), | |
251 | (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=|%=)\S', |
|
253 | (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=|%=)\S', | |
252 | "missing whitespace around operator"), |
|
254 | "missing whitespace around operator"), | |
253 | (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=|%=)\s', |
|
255 | (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=|%=)\s', | |
254 | "missing whitespace around operator"), |
|
256 | "missing whitespace around operator"), | |
255 | (r'\s(\+=|-=|!=|<>|<=|>=|<<=|>>=|%=)\S', |
|
257 | (r'\s(\+=|-=|!=|<>|<=|>=|<<=|>>=|%=)\S', | |
256 | "missing whitespace around operator"), |
|
258 | "missing whitespace around operator"), | |
257 | (r'[^^+=*/!<>&| %-](\s=|=\s)[^= ]', |
|
259 | (r'[^^+=*/!<>&| %-](\s=|=\s)[^= ]', | |
258 | "wrong whitespace around ="), |
|
260 | "wrong whitespace around ="), | |
259 | (r'\([^()]*( =[^=]|[^<>!=]= )', |
|
261 | (r'\([^()]*( =[^=]|[^<>!=]= )', | |
260 | "no whitespace around = for named parameters"), |
|
262 | "no whitespace around = for named parameters"), | |
261 | (r'raise Exception', "don't raise generic exceptions"), |
|
263 | (r'raise Exception', "don't raise generic exceptions"), | |
262 | (r'raise [^,(]+, (\([^\)]+\)|[^,\(\)]+)$', |
|
264 | (r'raise [^,(]+, (\([^\)]+\)|[^,\(\)]+)$', | |
263 | "don't use old-style two-argument raise, use Exception(message)"), |
|
265 | "don't use old-style two-argument raise, use Exception(message)"), | |
264 | (r' is\s+(not\s+)?["\'0-9-]', "object comparison with literal"), |
|
266 | (r' is\s+(not\s+)?["\'0-9-]', "object comparison with literal"), | |
265 | (r' [=!]=\s+(True|False|None)', |
|
267 | (r' [=!]=\s+(True|False|None)', | |
266 | "comparison with singleton, use 'is' or 'is not' instead"), |
|
268 | "comparison with singleton, use 'is' or 'is not' instead"), | |
267 | (r'^\s*(while|if) [01]:', |
|
269 | (r'^\s*(while|if) [01]:', | |
268 | "use True/False for constant Boolean expression"), |
|
270 | "use True/False for constant Boolean expression"), | |
269 | (r'(?:(?<!def)\s+|\()hasattr', |
|
271 | (r'(?:(?<!def)\s+|\()hasattr', | |
270 | 'hasattr(foo, bar) is broken, use util.safehasattr(foo, bar) instead'), |
|
272 | 'hasattr(foo, bar) is broken, use util.safehasattr(foo, bar) instead'), | |
271 | (r'opener\([^)]*\).read\(', |
|
273 | (r'opener\([^)]*\).read\(', | |
272 | "use opener.read() instead"), |
|
274 | "use opener.read() instead"), | |
273 | (r'BaseException', 'not in Python 2.4, use Exception'), |
|
275 | (r'BaseException', 'not in Python 2.4, use Exception'), | |
274 | (r'os\.path\.relpath', 'os.path.relpath is not in Python 2.5'), |
|
276 | (r'os\.path\.relpath', 'os.path.relpath is not in Python 2.5'), | |
275 | (r'opener\([^)]*\).write\(', |
|
277 | (r'opener\([^)]*\).write\(', | |
276 | "use opener.write() instead"), |
|
278 | "use opener.write() instead"), | |
277 | (r'[\s\(](open|file)\([^)]*\)\.read\(', |
|
279 | (r'[\s\(](open|file)\([^)]*\)\.read\(', | |
278 | "use util.readfile() instead"), |
|
280 | "use util.readfile() instead"), | |
279 | (r'[\s\(](open|file)\([^)]*\)\.write\(', |
|
281 | (r'[\s\(](open|file)\([^)]*\)\.write\(', | |
280 | "use util.writefile() instead"), |
|
282 | "use util.writefile() instead"), | |
281 | (r'^[\s\(]*(open(er)?|file)\([^)]*\)', |
|
283 | (r'^[\s\(]*(open(er)?|file)\([^)]*\)', | |
282 | "always assign an opened file to a variable, and close it afterwards"), |
|
284 | "always assign an opened file to a variable, and close it afterwards"), | |
283 | (r'[\s\(](open|file)\([^)]*\)\.', |
|
285 | (r'[\s\(](open|file)\([^)]*\)\.', | |
284 | "always assign an opened file to a variable, and close it afterwards"), |
|
286 | "always assign an opened file to a variable, and close it afterwards"), | |
285 | (r'(?i)descendent', "the proper spelling is descendAnt"), |
|
287 | (r'(?i)descendent', "the proper spelling is descendAnt"), | |
286 | (r'\.debug\(\_', "don't mark debug messages for translation"), |
|
288 | (r'\.debug\(\_', "don't mark debug messages for translation"), | |
287 | (r'\.strip\(\)\.split\(\)', "no need to strip before splitting"), |
|
289 | (r'\.strip\(\)\.split\(\)', "no need to strip before splitting"), | |
288 | (r'^\s*except\s*:', "naked except clause", r'#.*re-raises'), |
|
290 | (r'^\s*except\s*:', "naked except clause", r'#.*re-raises'), | |
289 | (r':\n( )*( ){1,3}[^ ]', "must indent 4 spaces"), |
|
291 | (r':\n( )*( ){1,3}[^ ]', "must indent 4 spaces"), | |
290 | (r'ui\.(status|progress|write|note|warn)\([\'\"]x', |
|
292 | (r'ui\.(status|progress|write|note|warn)\([\'\"]x', | |
291 | "missing _() in ui message (use () to hide false-positives)"), |
|
293 | "missing _() in ui message (use () to hide false-positives)"), | |
292 | (r'release\(.*wlock, .*lock\)', "wrong lock release order"), |
|
294 | (r'release\(.*wlock, .*lock\)', "wrong lock release order"), | |
293 | ], |
|
295 | ], | |
294 | # warnings |
|
296 | # warnings | |
295 | [ |
|
297 | [ | |
296 | (r'(^| )pp +xxxxqq[ \n][^\n]', "add two newlines after '.. note::'"), |
|
298 | (r'(^| )pp +xxxxqq[ \n][^\n]', "add two newlines after '.. note::'"), | |
297 | ] |
|
299 | ] | |
298 | ] |
|
300 | ] | |
299 |
|
301 | |||
300 | pyfilters = [ |
|
302 | pyfilters = [ | |
301 | (r"""(?msx)(?P<comment>\#.*?$)| |
|
303 | (r"""(?msx)(?P<comment>\#.*?$)| | |
302 | ((?P<quote>('''|\"\"\"|(?<!')'(?!')|(?<!")"(?!"))) |
|
304 | ((?P<quote>('''|\"\"\"|(?<!')'(?!')|(?<!")"(?!"))) | |
303 | (?P<text>(([^\\]|\\.)*?)) |
|
305 | (?P<text>(([^\\]|\\.)*?)) | |
304 | (?P=quote))""", reppython), |
|
306 | (?P=quote))""", reppython), | |
305 | ] |
|
307 | ] | |
306 |
|
308 | |||
307 | txtfilters = [] |
|
309 | txtfilters = [] | |
308 |
|
310 | |||
309 | txtpats = [ |
|
311 | txtpats = [ | |
310 | [ |
|
312 | [ | |
311 | ('\s$', 'trailing whitespace'), |
|
313 | ('\s$', 'trailing whitespace'), | |
312 | ], |
|
314 | ], | |
313 | [] |
|
315 | [] | |
314 | ] |
|
316 | ] | |
315 |
|
317 | |||
316 | cpats = [ |
|
318 | cpats = [ | |
317 | [ |
|
319 | [ | |
318 | (r'//', "don't use //-style comments"), |
|
320 | (r'//', "don't use //-style comments"), | |
319 | (r'^ ', "don't use spaces to indent"), |
|
321 | (r'^ ', "don't use spaces to indent"), | |
320 | (r'\S\t', "don't use tabs except for indent"), |
|
322 | (r'\S\t', "don't use tabs except for indent"), | |
321 | (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), |
|
323 | (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), | |
322 | (r'.{81}', "line too long"), |
|
324 | (r'.{81}', "line too long"), | |
323 | (r'(while|if|do|for)\(', "use space after while/if/do/for"), |
|
325 | (r'(while|if|do|for)\(', "use space after while/if/do/for"), | |
324 | (r'return\(', "return is not a function"), |
|
326 | (r'return\(', "return is not a function"), | |
325 | (r' ;', "no space before ;"), |
|
327 | (r' ;', "no space before ;"), | |
326 | (r'[)][{]', "space between ) and {"), |
|
328 | (r'[)][{]', "space between ) and {"), | |
327 | (r'\w+\* \w+', "use int *foo, not int* foo"), |
|
329 | (r'\w+\* \w+', "use int *foo, not int* foo"), | |
328 | (r'\W\([^\)]+\) \w+', "use (int)foo, not (int) foo"), |
|
330 | (r'\W\([^\)]+\) \w+', "use (int)foo, not (int) foo"), | |
329 | (r'\w+ (\+\+|--)', "use foo++, not foo ++"), |
|
331 | (r'\w+ (\+\+|--)', "use foo++, not foo ++"), | |
330 | (r'\w,\w', "missing whitespace after ,"), |
|
332 | (r'\w,\w', "missing whitespace after ,"), | |
331 | (r'^[^#]\w[+/*]\w', "missing whitespace in expression"), |
|
333 | (r'^[^#]\w[+/*]\w', "missing whitespace in expression"), | |
332 | (r'^#\s+\w', "use #foo, not # foo"), |
|
334 | (r'^#\s+\w', "use #foo, not # foo"), | |
333 | (r'[^\n]\Z', "no trailing newline"), |
|
335 | (r'[^\n]\Z', "no trailing newline"), | |
334 | (r'^\s*#import\b', "use only #include in standard C code"), |
|
336 | (r'^\s*#import\b', "use only #include in standard C code"), | |
335 | ], |
|
337 | ], | |
336 | # warnings |
|
338 | # warnings | |
337 | [] |
|
339 | [] | |
338 | ] |
|
340 | ] | |
339 |
|
341 | |||
340 | cfilters = [ |
|
342 | cfilters = [ | |
341 | (r'(/\*)(((\*(?!/))|[^*])*)\*/', repccomment), |
|
343 | (r'(/\*)(((\*(?!/))|[^*])*)\*/', repccomment), | |
342 | (r'''(?P<quote>(?<!")")(?P<text>([^"]|\\")+)"(?!")''', repquote), |
|
344 | (r'''(?P<quote>(?<!")")(?P<text>([^"]|\\")+)"(?!")''', repquote), | |
343 | (r'''(#\s*include\s+<)([^>]+)>''', repinclude), |
|
345 | (r'''(#\s*include\s+<)([^>]+)>''', repinclude), | |
344 | (r'(\()([^)]+\))', repcallspaces), |
|
346 | (r'(\()([^)]+\))', repcallspaces), | |
345 | ] |
|
347 | ] | |
346 |
|
348 | |||
347 | inutilpats = [ |
|
349 | inutilpats = [ | |
348 | [ |
|
350 | [ | |
349 | (r'\bui\.', "don't use ui in util"), |
|
351 | (r'\bui\.', "don't use ui in util"), | |
350 | ], |
|
352 | ], | |
351 | # warnings |
|
353 | # warnings | |
352 | [] |
|
354 | [] | |
353 | ] |
|
355 | ] | |
354 |
|
356 | |||
355 | inrevlogpats = [ |
|
357 | inrevlogpats = [ | |
356 | [ |
|
358 | [ | |
357 | (r'\brepo\.', "don't use repo in revlog"), |
|
359 | (r'\brepo\.', "don't use repo in revlog"), | |
358 | ], |
|
360 | ], | |
359 | # warnings |
|
361 | # warnings | |
360 | [] |
|
362 | [] | |
361 | ] |
|
363 | ] | |
362 |
|
364 | |||
363 | checks = [ |
|
365 | checks = [ | |
364 | ('python', r'.*\.(py|cgi)$', pyfilters, pypats), |
|
366 | ('python', r'.*\.(py|cgi)$', pyfilters, pypats), | |
365 | ('test script', r'(.*/)?test-[^.~]*$', testfilters, testpats), |
|
367 | ('test script', r'(.*/)?test-[^.~]*$', testfilters, testpats), | |
366 | ('c', r'.*\.[ch]$', cfilters, cpats), |
|
368 | ('c', r'.*\.[ch]$', cfilters, cpats), | |
367 | ('unified test', r'.*\.t$', utestfilters, utestpats), |
|
369 | ('unified test', r'.*\.t$', utestfilters, utestpats), | |
368 | ('layering violation repo in revlog', r'mercurial/revlog\.py', pyfilters, |
|
370 | ('layering violation repo in revlog', r'mercurial/revlog\.py', pyfilters, | |
369 | inrevlogpats), |
|
371 | inrevlogpats), | |
370 | ('layering violation ui in util', r'mercurial/util\.py', pyfilters, |
|
372 | ('layering violation ui in util', r'mercurial/util\.py', pyfilters, | |
371 | inutilpats), |
|
373 | inutilpats), | |
372 | ('txt', r'.*\.txt$', txtfilters, txtpats), |
|
374 | ('txt', r'.*\.txt$', txtfilters, txtpats), | |
373 | ] |
|
375 | ] | |
374 |
|
376 | |||
375 | def _preparepats(): |
|
377 | def _preparepats(): | |
376 | for c in checks: |
|
378 | for c in checks: | |
377 | failandwarn = c[-1] |
|
379 | failandwarn = c[-1] | |
378 | for pats in failandwarn: |
|
380 | for pats in failandwarn: | |
379 | for i, pseq in enumerate(pats): |
|
381 | for i, pseq in enumerate(pats): | |
380 | # fix-up regexes for multi-line searches |
|
382 | # fix-up regexes for multi-line searches | |
381 | p = pseq[0] |
|
383 | p = pseq[0] | |
382 | # \s doesn't match \n |
|
384 | # \s doesn't match \n | |
383 | p = re.sub(r'(?<!\\)\\s', r'[ \\t]', p) |
|
385 | p = re.sub(r'(?<!\\)\\s', r'[ \\t]', p) | |
384 | # [^...] doesn't match newline |
|
386 | # [^...] doesn't match newline | |
385 | p = re.sub(r'(?<!\\)\[\^', r'[^\\n', p) |
|
387 | p = re.sub(r'(?<!\\)\[\^', r'[^\\n', p) | |
386 |
|
388 | |||
387 | pats[i] = (re.compile(p, re.MULTILINE),) + pseq[1:] |
|
389 | pats[i] = (re.compile(p, re.MULTILINE),) + pseq[1:] | |
388 | filters = c[2] |
|
390 | filters = c[2] | |
389 | for i, flt in enumerate(filters): |
|
391 | for i, flt in enumerate(filters): | |
390 | filters[i] = re.compile(flt[0]), flt[1] |
|
392 | filters[i] = re.compile(flt[0]), flt[1] | |
391 | _preparepats() |
|
393 | _preparepats() | |
392 |
|
394 | |||
393 | class norepeatlogger(object): |
|
395 | class norepeatlogger(object): | |
394 | def __init__(self): |
|
396 | def __init__(self): | |
395 | self._lastseen = None |
|
397 | self._lastseen = None | |
396 |
|
398 | |||
397 | def log(self, fname, lineno, line, msg, blame): |
|
399 | def log(self, fname, lineno, line, msg, blame): | |
398 | """print error related a to given line of a given file. |
|
400 | """print error related a to given line of a given file. | |
399 |
|
401 | |||
400 | The faulty line will also be printed but only once in the case |
|
402 | The faulty line will also be printed but only once in the case | |
401 | of multiple errors. |
|
403 | of multiple errors. | |
402 |
|
404 | |||
403 | :fname: filename |
|
405 | :fname: filename | |
404 | :lineno: line number |
|
406 | :lineno: line number | |
405 | :line: actual content of the line |
|
407 | :line: actual content of the line | |
406 | :msg: error message |
|
408 | :msg: error message | |
407 | """ |
|
409 | """ | |
408 | msgid = fname, lineno, line |
|
410 | msgid = fname, lineno, line | |
409 | if msgid != self._lastseen: |
|
411 | if msgid != self._lastseen: | |
410 | if blame: |
|
412 | if blame: | |
411 | print "%s:%d (%s):" % (fname, lineno, blame) |
|
413 | print "%s:%d (%s):" % (fname, lineno, blame) | |
412 | else: |
|
414 | else: | |
413 | print "%s:%d:" % (fname, lineno) |
|
415 | print "%s:%d:" % (fname, lineno) | |
414 | print " > %s" % line |
|
416 | print " > %s" % line | |
415 | self._lastseen = msgid |
|
417 | self._lastseen = msgid | |
416 | print " " + msg |
|
418 | print " " + msg | |
417 |
|
419 | |||
418 | _defaultlogger = norepeatlogger() |
|
420 | _defaultlogger = norepeatlogger() | |
419 |
|
421 | |||
420 | def getblame(f): |
|
422 | def getblame(f): | |
421 | lines = [] |
|
423 | lines = [] | |
422 | for l in os.popen('hg annotate -un %s' % f): |
|
424 | for l in os.popen('hg annotate -un %s' % f): | |
423 | start, line = l.split(':', 1) |
|
425 | start, line = l.split(':', 1) | |
424 | user, rev = start.split() |
|
426 | user, rev = start.split() | |
425 | lines.append((line[1:-1], user, rev)) |
|
427 | lines.append((line[1:-1], user, rev)) | |
426 | return lines |
|
428 | return lines | |
427 |
|
429 | |||
428 | def checkfile(f, logfunc=_defaultlogger.log, maxerr=None, warnings=False, |
|
430 | def checkfile(f, logfunc=_defaultlogger.log, maxerr=None, warnings=False, | |
429 | blame=False, debug=False, lineno=True): |
|
431 | blame=False, debug=False, lineno=True): | |
430 | """checks style and portability of a given file |
|
432 | """checks style and portability of a given file | |
431 |
|
433 | |||
432 | :f: filepath |
|
434 | :f: filepath | |
433 | :logfunc: function used to report error |
|
435 | :logfunc: function used to report error | |
434 | logfunc(filename, linenumber, linecontent, errormessage) |
|
436 | logfunc(filename, linenumber, linecontent, errormessage) | |
435 | :maxerr: number of error to display before aborting. |
|
437 | :maxerr: number of error to display before aborting. | |
436 | Set to false (default) to report all errors |
|
438 | Set to false (default) to report all errors | |
437 |
|
439 | |||
438 | return True if no error is found, False otherwise. |
|
440 | return True if no error is found, False otherwise. | |
439 | """ |
|
441 | """ | |
440 | blamecache = None |
|
442 | blamecache = None | |
441 | result = True |
|
443 | result = True | |
442 | for name, match, filters, pats in checks: |
|
444 | for name, match, filters, pats in checks: | |
443 | if debug: |
|
445 | if debug: | |
444 | print name, f |
|
446 | print name, f | |
445 | fc = 0 |
|
447 | fc = 0 | |
446 | if not re.match(match, f): |
|
448 | if not re.match(match, f): | |
447 | if debug: |
|
449 | if debug: | |
448 | print "Skipping %s for %s it doesn't match %s" % ( |
|
450 | print "Skipping %s for %s it doesn't match %s" % ( | |
449 | name, match, f) |
|
451 | name, match, f) | |
450 | continue |
|
452 | continue | |
451 | try: |
|
453 | try: | |
452 | fp = open(f) |
|
454 | fp = open(f) | |
453 | except IOError, e: |
|
455 | except IOError, e: | |
454 | print "Skipping %s, %s" % (f, str(e).split(':', 1)[0]) |
|
456 | print "Skipping %s, %s" % (f, str(e).split(':', 1)[0]) | |
455 | continue |
|
457 | continue | |
456 | pre = post = fp.read() |
|
458 | pre = post = fp.read() | |
457 | fp.close() |
|
459 | fp.close() | |
458 | if "no-" "check-code" in pre: |
|
460 | if "no-" "check-code" in pre: | |
459 | print "Skipping %s it has no-" "check-code" % f |
|
461 | print "Skipping %s it has no-" "check-code" % f | |
460 | return "Skip" # skip checking this file |
|
462 | return "Skip" # skip checking this file | |
461 | for p, r in filters: |
|
463 | for p, r in filters: | |
462 | post = re.sub(p, r, post) |
|
464 | post = re.sub(p, r, post) | |
463 | nerrs = len(pats[0]) # nerr elements are errors |
|
465 | nerrs = len(pats[0]) # nerr elements are errors | |
464 | if warnings: |
|
466 | if warnings: | |
465 | pats = pats[0] + pats[1] |
|
467 | pats = pats[0] + pats[1] | |
466 | else: |
|
468 | else: | |
467 | pats = pats[0] |
|
469 | pats = pats[0] | |
468 | # print post # uncomment to show filtered version |
|
470 | # print post # uncomment to show filtered version | |
469 |
|
471 | |||
470 | if debug: |
|
472 | if debug: | |
471 | print "Checking %s for %s" % (name, f) |
|
473 | print "Checking %s for %s" % (name, f) | |
472 |
|
474 | |||
473 | prelines = None |
|
475 | prelines = None | |
474 | errors = [] |
|
476 | errors = [] | |
475 | for i, pat in enumerate(pats): |
|
477 | for i, pat in enumerate(pats): | |
476 | if len(pat) == 3: |
|
478 | if len(pat) == 3: | |
477 | p, msg, ignore = pat |
|
479 | p, msg, ignore = pat | |
478 | else: |
|
480 | else: | |
479 | p, msg = pat |
|
481 | p, msg = pat | |
480 | ignore = None |
|
482 | ignore = None | |
481 | if i >= nerrs: |
|
483 | if i >= nerrs: | |
482 | msg = "warning: " + msg |
|
484 | msg = "warning: " + msg | |
483 |
|
485 | |||
484 | pos = 0 |
|
486 | pos = 0 | |
485 | n = 0 |
|
487 | n = 0 | |
486 | for m in p.finditer(post): |
|
488 | for m in p.finditer(post): | |
487 | if prelines is None: |
|
489 | if prelines is None: | |
488 | prelines = pre.splitlines() |
|
490 | prelines = pre.splitlines() | |
489 | postlines = post.splitlines(True) |
|
491 | postlines = post.splitlines(True) | |
490 |
|
492 | |||
491 | start = m.start() |
|
493 | start = m.start() | |
492 | while n < len(postlines): |
|
494 | while n < len(postlines): | |
493 | step = len(postlines[n]) |
|
495 | step = len(postlines[n]) | |
494 | if pos + step > start: |
|
496 | if pos + step > start: | |
495 | break |
|
497 | break | |
496 | pos += step |
|
498 | pos += step | |
497 | n += 1 |
|
499 | n += 1 | |
498 | l = prelines[n] |
|
500 | l = prelines[n] | |
499 |
|
501 | |||
500 | if ignore and re.search(ignore, l, re.MULTILINE): |
|
502 | if ignore and re.search(ignore, l, re.MULTILINE): | |
501 | if debug: |
|
503 | if debug: | |
502 | print "Skipping %s for %s:%s (ignore pattern)" % ( |
|
504 | print "Skipping %s for %s:%s (ignore pattern)" % ( | |
503 | name, f, n) |
|
505 | name, f, n) | |
504 | continue |
|
506 | continue | |
505 | bd = "" |
|
507 | bd = "" | |
506 | if blame: |
|
508 | if blame: | |
507 | bd = 'working directory' |
|
509 | bd = 'working directory' | |
508 | if not blamecache: |
|
510 | if not blamecache: | |
509 | blamecache = getblame(f) |
|
511 | blamecache = getblame(f) | |
510 | if n < len(blamecache): |
|
512 | if n < len(blamecache): | |
511 | bl, bu, br = blamecache[n] |
|
513 | bl, bu, br = blamecache[n] | |
512 | if bl == l: |
|
514 | if bl == l: | |
513 | bd = '%s@%s' % (bu, br) |
|
515 | bd = '%s@%s' % (bu, br) | |
514 |
|
516 | |||
515 | errors.append((f, lineno and n + 1, l, msg, bd)) |
|
517 | errors.append((f, lineno and n + 1, l, msg, bd)) | |
516 | result = False |
|
518 | result = False | |
517 |
|
519 | |||
518 | errors.sort() |
|
520 | errors.sort() | |
519 | for e in errors: |
|
521 | for e in errors: | |
520 | logfunc(*e) |
|
522 | logfunc(*e) | |
521 | fc += 1 |
|
523 | fc += 1 | |
522 | if maxerr and fc >= maxerr: |
|
524 | if maxerr and fc >= maxerr: | |
523 | print " (too many errors, giving up)" |
|
525 | print " (too many errors, giving up)" | |
524 | break |
|
526 | break | |
525 |
|
527 | |||
526 | return result |
|
528 | return result | |
527 |
|
529 | |||
528 | if __name__ == "__main__": |
|
530 | if __name__ == "__main__": | |
529 | parser = optparse.OptionParser("%prog [options] [files]") |
|
531 | parser = optparse.OptionParser("%prog [options] [files]") | |
530 | parser.add_option("-w", "--warnings", action="store_true", |
|
532 | parser.add_option("-w", "--warnings", action="store_true", | |
531 | help="include warning-level checks") |
|
533 | help="include warning-level checks") | |
532 | parser.add_option("-p", "--per-file", type="int", |
|
534 | parser.add_option("-p", "--per-file", type="int", | |
533 | help="max warnings per file") |
|
535 | help="max warnings per file") | |
534 | parser.add_option("-b", "--blame", action="store_true", |
|
536 | parser.add_option("-b", "--blame", action="store_true", | |
535 | help="use annotate to generate blame info") |
|
537 | help="use annotate to generate blame info") | |
536 | parser.add_option("", "--debug", action="store_true", |
|
538 | parser.add_option("", "--debug", action="store_true", | |
537 | help="show debug information") |
|
539 | help="show debug information") | |
538 | parser.add_option("", "--nolineno", action="store_false", |
|
540 | parser.add_option("", "--nolineno", action="store_false", | |
539 | dest='lineno', help="don't show line numbers") |
|
541 | dest='lineno', help="don't show line numbers") | |
540 |
|
542 | |||
541 | parser.set_defaults(per_file=15, warnings=False, blame=False, debug=False, |
|
543 | parser.set_defaults(per_file=15, warnings=False, blame=False, debug=False, | |
542 | lineno=True) |
|
544 | lineno=True) | |
543 | (options, args) = parser.parse_args() |
|
545 | (options, args) = parser.parse_args() | |
544 |
|
546 | |||
545 | if len(args) == 0: |
|
547 | if len(args) == 0: | |
546 | check = glob.glob("*") |
|
548 | check = glob.glob("*") | |
547 | else: |
|
549 | else: | |
548 | check = args |
|
550 | check = args | |
549 |
|
551 | |||
550 | ret = 0 |
|
552 | ret = 0 | |
551 | for f in check: |
|
553 | for f in check: | |
552 | if not checkfile(f, maxerr=options.per_file, warnings=options.warnings, |
|
554 | if not checkfile(f, maxerr=options.per_file, warnings=options.warnings, | |
553 | blame=options.blame, debug=options.debug, |
|
555 | blame=options.blame, debug=options.debug, | |
554 | lineno=options.lineno): |
|
556 | lineno=options.lineno): | |
555 | ret = 1 |
|
557 | ret = 1 | |
556 | sys.exit(ret) |
|
558 | sys.exit(ret) |
@@ -1,136 +1,136 b'' | |||||
1 | Create user cache directory |
|
1 | Create user cache directory | |
2 |
|
2 | |||
3 | $ USERCACHE=`pwd`/cache; export USERCACHE |
|
3 | $ USERCACHE=`pwd`/cache; export USERCACHE | |
4 | $ cat <<EOF >> ${HGRCPATH} |
|
4 | $ cat <<EOF >> ${HGRCPATH} | |
5 | > [extensions] |
|
5 | > [extensions] | |
6 | > hgext.largefiles= |
|
6 | > hgext.largefiles= | |
7 | > [largefiles] |
|
7 | > [largefiles] | |
8 | > usercache=${USERCACHE} |
|
8 | > usercache=${USERCACHE} | |
9 | > EOF |
|
9 | > EOF | |
10 | $ mkdir -p ${USERCACHE} |
|
10 | $ mkdir -p ${USERCACHE} | |
11 |
|
11 | |||
12 | Create source repo, and commit adding largefile. |
|
12 | Create source repo, and commit adding largefile. | |
13 |
|
13 | |||
14 | $ hg init src |
|
14 | $ hg init src | |
15 | $ cd src |
|
15 | $ cd src | |
16 | $ echo large > large |
|
16 | $ echo large > large | |
17 | $ hg add --large large |
|
17 | $ hg add --large large | |
18 | $ hg commit -m 'add largefile' |
|
18 | $ hg commit -m 'add largefile' | |
19 | $ hg rm large |
|
19 | $ hg rm large | |
20 | $ hg commit -m 'branchhead without largefile' |
|
20 | $ hg commit -m 'branchhead without largefile' | |
21 | $ hg up -qr 0 |
|
21 | $ hg up -qr 0 | |
22 | $ cd .. |
|
22 | $ cd .. | |
23 |
|
23 | |||
24 | Discard all cached largefiles in USERCACHE |
|
24 | Discard all cached largefiles in USERCACHE | |
25 |
|
25 | |||
26 | $ rm -rf ${USERCACHE} |
|
26 | $ rm -rf ${USERCACHE} | |
27 |
|
27 | |||
28 | Create mirror repo, and pull from source without largefile: |
|
28 | Create mirror repo, and pull from source without largefile: | |
29 | "pull" is used instead of "clone" for suppression of (1) updating to |
|
29 | "pull" is used instead of "clone" for suppression of (1) updating to | |
30 | tip (= cahcing largefile from source repo), and (2) recording source |
|
30 | tip (= cahcing largefile from source repo), and (2) recording source | |
31 | repo as "default" path in .hg/hgrc. |
|
31 | repo as "default" path in .hg/hgrc. | |
32 |
|
32 | |||
33 | $ hg init mirror |
|
33 | $ hg init mirror | |
34 | $ cd mirror |
|
34 | $ cd mirror | |
35 | $ hg pull ../src |
|
35 | $ hg pull ../src | |
36 | pulling from ../src |
|
36 | pulling from ../src | |
37 | requesting all changes |
|
37 | requesting all changes | |
38 | adding changesets |
|
38 | adding changesets | |
39 | adding manifests |
|
39 | adding manifests | |
40 | adding file changes |
|
40 | adding file changes | |
41 | added 2 changesets with 1 changes to 1 files |
|
41 | added 2 changesets with 1 changes to 1 files | |
42 | (run 'hg update' to get a working copy) |
|
42 | (run 'hg update' to get a working copy) | |
43 |
|
43 | |||
44 | Update working directory to "tip", which requires largefile("large"), |
|
44 | Update working directory to "tip", which requires largefile("large"), | |
45 | but there is no cache file for it. So, hg must treat it as |
|
45 | but there is no cache file for it. So, hg must treat it as | |
46 | "missing"(!) file. |
|
46 | "missing"(!) file. | |
47 |
|
47 | |||
48 | $ hg update -r0 |
|
48 | $ hg update -r0 | |
49 | getting changed largefiles |
|
49 | getting changed largefiles | |
50 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file://$TESTTMP/mirror (glob) |
|
50 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:/*/$TESTTMP/mirror (glob) | |
51 | 0 largefiles updated, 0 removed |
|
51 | 0 largefiles updated, 0 removed | |
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
52 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
53 | $ hg status |
|
53 | $ hg status | |
54 | ! large |
|
54 | ! large | |
55 |
|
55 | |||
56 | Update working directory to null: this cleanup .hg/largefiles/dirstate |
|
56 | Update working directory to null: this cleanup .hg/largefiles/dirstate | |
57 |
|
57 | |||
58 | $ hg update null |
|
58 | $ hg update null | |
59 | getting changed largefiles |
|
59 | getting changed largefiles | |
60 | 0 largefiles updated, 0 removed |
|
60 | 0 largefiles updated, 0 removed | |
61 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
61 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
62 |
|
62 | |||
63 | Update working directory to tip, again. |
|
63 | Update working directory to tip, again. | |
64 |
|
64 | |||
65 | $ hg update -r0 |
|
65 | $ hg update -r0 | |
66 | getting changed largefiles |
|
66 | getting changed largefiles | |
67 |
|
|
67 | large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:/*/$TESTTMP/mirror (glob) | |
68 | 0 largefiles updated, 0 removed |
|
68 | 0 largefiles updated, 0 removed | |
69 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
69 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
70 | $ hg status |
|
70 | $ hg status | |
71 | ! large |
|
71 | ! large | |
72 | $ cd .. |
|
72 | $ cd .. | |
73 |
|
73 | |||
74 | Verify that largefiles from pulled branchheads are fetched, also to an empty repo |
|
74 | Verify that largefiles from pulled branchheads are fetched, also to an empty repo | |
75 |
|
75 | |||
76 | $ hg init mirror2 |
|
76 | $ hg init mirror2 | |
77 | $ hg -R mirror2 pull src -r0 |
|
77 | $ hg -R mirror2 pull src -r0 | |
78 | pulling from src |
|
78 | pulling from src | |
79 | adding changesets |
|
79 | adding changesets | |
80 | adding manifests |
|
80 | adding manifests | |
81 | adding file changes |
|
81 | adding file changes | |
82 | added 1 changesets with 1 changes to 1 files |
|
82 | added 1 changesets with 1 changes to 1 files | |
83 | (run 'hg update' to get a working copy) |
|
83 | (run 'hg update' to get a working copy) | |
84 |
|
84 | |||
85 | #if unix-permissions |
|
85 | #if unix-permissions | |
86 |
|
86 | |||
87 | Portable way to print file permissions: |
|
87 | Portable way to print file permissions: | |
88 |
|
88 | |||
89 | $ cat > ls-l.py <<EOF |
|
89 | $ cat > ls-l.py <<EOF | |
90 | > #!/usr/bin/env python |
|
90 | > #!/usr/bin/env python | |
91 | > import sys, os |
|
91 | > import sys, os | |
92 | > path = sys.argv[1] |
|
92 | > path = sys.argv[1] | |
93 | > print '%03o' % (os.lstat(path).st_mode & 0777) |
|
93 | > print '%03o' % (os.lstat(path).st_mode & 0777) | |
94 | > EOF |
|
94 | > EOF | |
95 | $ chmod +x ls-l.py |
|
95 | $ chmod +x ls-l.py | |
96 |
|
96 | |||
97 | Test that files in .hg/largefiles inherit mode from .hg/store, not |
|
97 | Test that files in .hg/largefiles inherit mode from .hg/store, not | |
98 | from file in working copy: |
|
98 | from file in working copy: | |
99 |
|
99 | |||
100 | $ cd src |
|
100 | $ cd src | |
101 | $ chmod 750 .hg/store |
|
101 | $ chmod 750 .hg/store | |
102 | $ chmod 660 large |
|
102 | $ chmod 660 large | |
103 | $ echo change >> large |
|
103 | $ echo change >> large | |
104 | $ hg commit -m change |
|
104 | $ hg commit -m change | |
105 | created new head |
|
105 | created new head | |
106 | $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea |
|
106 | $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea | |
107 | 640 |
|
107 | 640 | |
108 |
|
108 | |||
109 | Test permission of with files in .hg/largefiles created by update: |
|
109 | Test permission of with files in .hg/largefiles created by update: | |
110 |
|
110 | |||
111 | $ cd ../mirror |
|
111 | $ cd ../mirror | |
112 | $ rm -r "$USERCACHE" .hg/largefiles # avoid links |
|
112 | $ rm -r "$USERCACHE" .hg/largefiles # avoid links | |
113 | $ chmod 750 .hg/store |
|
113 | $ chmod 750 .hg/store | |
114 | $ hg pull ../src --update -q |
|
114 | $ hg pull ../src --update -q | |
115 | $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea |
|
115 | $ ../ls-l.py .hg/largefiles/e151b474069de4ca6898f67ce2f2a7263adf8fea | |
116 | 640 |
|
116 | 640 | |
117 |
|
117 | |||
118 | Test permission of files created by push: |
|
118 | Test permission of files created by push: | |
119 |
|
119 | |||
120 | $ hg serve -R ../src -d -p $HGPORT --pid-file hg.pid \ |
|
120 | $ hg serve -R ../src -d -p $HGPORT --pid-file hg.pid \ | |
121 | > --config "web.allow_push=*" --config web.push_ssl=no |
|
121 | > --config "web.allow_push=*" --config web.push_ssl=no | |
122 | $ cat hg.pid >> $DAEMON_PIDS |
|
122 | $ cat hg.pid >> $DAEMON_PIDS | |
123 |
|
123 | |||
124 | $ echo change >> large |
|
124 | $ echo change >> large | |
125 | $ hg commit -m change |
|
125 | $ hg commit -m change | |
126 |
|
126 | |||
127 | $ rm -r "$USERCACHE" |
|
127 | $ rm -r "$USERCACHE" | |
128 |
|
128 | |||
129 | $ hg push -q http://localhost:$HGPORT/ |
|
129 | $ hg push -q http://localhost:$HGPORT/ | |
130 |
|
130 | |||
131 | $ ../ls-l.py ../src/.hg/largefiles/b734e14a0971e370408ab9bce8d56d8485e368a9 |
|
131 | $ ../ls-l.py ../src/.hg/largefiles/b734e14a0971e370408ab9bce8d56d8485e368a9 | |
132 | 640 |
|
132 | 640 | |
133 |
|
133 | |||
134 | $ cd .. |
|
134 | $ cd .. | |
135 |
|
135 | |||
136 | #endif |
|
136 | #endif |
@@ -1,2288 +1,2288 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 | getting changed largefiles |
|
509 | getting changed largefiles | |
510 | 1 largefiles updated, 0 removed |
|
510 | 1 largefiles updated, 0 removed | |
511 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
511 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
512 | $ rm normal3 |
|
512 | $ rm normal3 | |
513 | $ rm sub/large4 |
|
513 | $ rm sub/large4 | |
514 | $ echo "testing addremove with patterns" > testaddremove.dat |
|
514 | $ echo "testing addremove with patterns" > testaddremove.dat | |
515 | $ echo "normaladdremove" > normaladdremove |
|
515 | $ echo "normaladdremove" > normaladdremove | |
516 | $ cd .. |
|
516 | $ cd .. | |
517 | $ hg -R a addremove |
|
517 | $ hg -R a addremove | |
518 | removing sub/large4 |
|
518 | removing sub/large4 | |
519 | adding a/testaddremove.dat as a largefile (glob) |
|
519 | adding a/testaddremove.dat as a largefile (glob) | |
520 | removing normal3 |
|
520 | removing normal3 | |
521 | adding normaladdremove |
|
521 | adding normaladdremove | |
522 | $ cd a |
|
522 | $ cd a | |
523 |
|
523 | |||
524 | Test 3364 |
|
524 | Test 3364 | |
525 | $ hg clone . ../addrm |
|
525 | $ hg clone . ../addrm | |
526 | updating to branch default |
|
526 | updating to branch default | |
527 | getting changed largefiles |
|
527 | getting changed largefiles | |
528 | 3 largefiles updated, 0 removed |
|
528 | 3 largefiles updated, 0 removed | |
529 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
529 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
530 | $ cd ../addrm |
|
530 | $ cd ../addrm | |
531 | $ cat >> .hg/hgrc <<EOF |
|
531 | $ cat >> .hg/hgrc <<EOF | |
532 | > [hooks] |
|
532 | > [hooks] | |
533 | > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A" |
|
533 | > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A" | |
534 | > EOF |
|
534 | > EOF | |
535 | $ touch foo |
|
535 | $ touch foo | |
536 | $ hg add --large foo |
|
536 | $ hg add --large foo | |
537 | $ hg ci -m "add foo" |
|
537 | $ hg ci -m "add foo" | |
538 | Invoking status precommit hook |
|
538 | Invoking status precommit hook | |
539 | A foo |
|
539 | A foo | |
540 | Invoking status postcommit hook |
|
540 | Invoking status postcommit hook | |
541 | C foo |
|
541 | C foo | |
542 | C normal3 |
|
542 | C normal3 | |
543 | C sub/large4 |
|
543 | C sub/large4 | |
544 | C sub/normal4 |
|
544 | C sub/normal4 | |
545 | C sub2/large6 |
|
545 | C sub2/large6 | |
546 | C sub2/large7 |
|
546 | C sub2/large7 | |
547 | $ rm foo |
|
547 | $ rm foo | |
548 | $ hg st |
|
548 | $ hg st | |
549 | ! foo |
|
549 | ! foo | |
550 | hmm.. no precommit invoked, but there is a postcommit?? |
|
550 | hmm.. no precommit invoked, but there is a postcommit?? | |
551 | $ hg ci -m "will not checkin" |
|
551 | $ hg ci -m "will not checkin" | |
552 | nothing changed |
|
552 | nothing changed | |
553 | Invoking status postcommit hook |
|
553 | Invoking status postcommit hook | |
554 | ! foo |
|
554 | ! foo | |
555 | C normal3 |
|
555 | C normal3 | |
556 | C sub/large4 |
|
556 | C sub/large4 | |
557 | C sub/normal4 |
|
557 | C sub/normal4 | |
558 | C sub2/large6 |
|
558 | C sub2/large6 | |
559 | C sub2/large7 |
|
559 | C sub2/large7 | |
560 | [1] |
|
560 | [1] | |
561 | $ hg addremove |
|
561 | $ hg addremove | |
562 | removing foo |
|
562 | removing foo | |
563 | $ hg st |
|
563 | $ hg st | |
564 | R foo |
|
564 | R foo | |
565 | $ hg ci -m "used to say nothing changed" |
|
565 | $ hg ci -m "used to say nothing changed" | |
566 | Invoking status precommit hook |
|
566 | Invoking status precommit hook | |
567 | R foo |
|
567 | R foo | |
568 | Invoking status postcommit hook |
|
568 | Invoking status postcommit hook | |
569 | C normal3 |
|
569 | C normal3 | |
570 | C sub/large4 |
|
570 | C sub/large4 | |
571 | C sub/normal4 |
|
571 | C sub/normal4 | |
572 | C sub2/large6 |
|
572 | C sub2/large6 | |
573 | C sub2/large7 |
|
573 | C sub2/large7 | |
574 | $ hg st |
|
574 | $ hg st | |
575 |
|
575 | |||
576 | Test 3507 (both normal files and largefiles were a problem) |
|
576 | Test 3507 (both normal files and largefiles were a problem) | |
577 |
|
577 | |||
578 | $ touch normal |
|
578 | $ touch normal | |
579 | $ touch large |
|
579 | $ touch large | |
580 | $ hg add normal |
|
580 | $ hg add normal | |
581 | $ hg add --large large |
|
581 | $ hg add --large large | |
582 | $ hg ci -m "added" |
|
582 | $ hg ci -m "added" | |
583 | Invoking status precommit hook |
|
583 | Invoking status precommit hook | |
584 | A large |
|
584 | A large | |
585 | A normal |
|
585 | A normal | |
586 | Invoking status postcommit hook |
|
586 | Invoking status postcommit hook | |
587 | C large |
|
587 | C large | |
588 | C normal |
|
588 | C normal | |
589 | C normal3 |
|
589 | C normal3 | |
590 | C sub/large4 |
|
590 | C sub/large4 | |
591 | C sub/normal4 |
|
591 | C sub/normal4 | |
592 | C sub2/large6 |
|
592 | C sub2/large6 | |
593 | C sub2/large7 |
|
593 | C sub2/large7 | |
594 | $ hg remove normal |
|
594 | $ hg remove normal | |
595 | $ hg addremove --traceback |
|
595 | $ hg addremove --traceback | |
596 | $ hg ci -m "addremoved normal" |
|
596 | $ hg ci -m "addremoved normal" | |
597 | Invoking status precommit hook |
|
597 | Invoking status precommit hook | |
598 | R normal |
|
598 | R normal | |
599 | Invoking status postcommit hook |
|
599 | Invoking status postcommit hook | |
600 | C large |
|
600 | C large | |
601 | C normal3 |
|
601 | C normal3 | |
602 | C sub/large4 |
|
602 | C sub/large4 | |
603 | C sub/normal4 |
|
603 | C sub/normal4 | |
604 | C sub2/large6 |
|
604 | C sub2/large6 | |
605 | C sub2/large7 |
|
605 | C sub2/large7 | |
606 | $ hg up -C '.^' |
|
606 | $ hg up -C '.^' | |
607 | getting changed largefiles |
|
607 | getting changed largefiles | |
608 | 0 largefiles updated, 0 removed |
|
608 | 0 largefiles updated, 0 removed | |
609 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
609 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
610 | $ hg remove large |
|
610 | $ hg remove large | |
611 | $ hg addremove --traceback |
|
611 | $ hg addremove --traceback | |
612 | $ hg ci -m "removed large" |
|
612 | $ hg ci -m "removed large" | |
613 | Invoking status precommit hook |
|
613 | Invoking status precommit hook | |
614 | R large |
|
614 | R large | |
615 | created new head |
|
615 | created new head | |
616 | Invoking status postcommit hook |
|
616 | Invoking status postcommit hook | |
617 | C normal |
|
617 | C normal | |
618 | C normal3 |
|
618 | C normal3 | |
619 | C sub/large4 |
|
619 | C sub/large4 | |
620 | C sub/normal4 |
|
620 | C sub/normal4 | |
621 | C sub2/large6 |
|
621 | C sub2/large6 | |
622 | C sub2/large7 |
|
622 | C sub2/large7 | |
623 |
|
623 | |||
624 | Test commit -A (issue 3542) |
|
624 | Test commit -A (issue 3542) | |
625 | $ echo large8 > large8 |
|
625 | $ echo large8 > large8 | |
626 | $ hg add --large large8 |
|
626 | $ hg add --large large8 | |
627 | $ hg ci -Am 'this used to add large8 as normal and commit both' |
|
627 | $ hg ci -Am 'this used to add large8 as normal and commit both' | |
628 | Invoking status precommit hook |
|
628 | Invoking status precommit hook | |
629 | A large8 |
|
629 | A large8 | |
630 | Invoking status postcommit hook |
|
630 | Invoking status postcommit hook | |
631 | C large8 |
|
631 | C large8 | |
632 | C normal |
|
632 | C normal | |
633 | C normal3 |
|
633 | C normal3 | |
634 | C sub/large4 |
|
634 | C sub/large4 | |
635 | C sub/normal4 |
|
635 | C sub/normal4 | |
636 | C sub2/large6 |
|
636 | C sub2/large6 | |
637 | C sub2/large7 |
|
637 | C sub2/large7 | |
638 | $ rm large8 |
|
638 | $ rm large8 | |
639 | $ hg ci -Am 'this used to not notice the rm' |
|
639 | $ hg ci -Am 'this used to not notice the rm' | |
640 | removing large8 |
|
640 | removing large8 | |
641 | Invoking status precommit hook |
|
641 | Invoking status precommit hook | |
642 | R large8 |
|
642 | R large8 | |
643 | Invoking status postcommit hook |
|
643 | Invoking status postcommit hook | |
644 | C normal |
|
644 | C normal | |
645 | C normal3 |
|
645 | C normal3 | |
646 | C sub/large4 |
|
646 | C sub/large4 | |
647 | C sub/normal4 |
|
647 | C sub/normal4 | |
648 | C sub2/large6 |
|
648 | C sub2/large6 | |
649 | C sub2/large7 |
|
649 | C sub2/large7 | |
650 |
|
650 | |||
651 | Test that a standin can't be added as a large file |
|
651 | Test that a standin can't be added as a large file | |
652 |
|
652 | |||
653 | $ touch large |
|
653 | $ touch large | |
654 | $ hg add --large large |
|
654 | $ hg add --large large | |
655 | $ hg ci -m "add" |
|
655 | $ hg ci -m "add" | |
656 | Invoking status precommit hook |
|
656 | Invoking status precommit hook | |
657 | A large |
|
657 | A large | |
658 | Invoking status postcommit hook |
|
658 | Invoking status postcommit hook | |
659 | C large |
|
659 | C large | |
660 | C normal |
|
660 | C normal | |
661 | C normal3 |
|
661 | C normal3 | |
662 | C sub/large4 |
|
662 | C sub/large4 | |
663 | C sub/normal4 |
|
663 | C sub/normal4 | |
664 | C sub2/large6 |
|
664 | C sub2/large6 | |
665 | C sub2/large7 |
|
665 | C sub2/large7 | |
666 | $ hg remove large |
|
666 | $ hg remove large | |
667 | $ touch large |
|
667 | $ touch large | |
668 | $ hg addremove --config largefiles.patterns=**large --traceback |
|
668 | $ hg addremove --config largefiles.patterns=**large --traceback | |
669 | adding large as a largefile |
|
669 | adding large as a largefile | |
670 |
|
670 | |||
671 | Test that outgoing --large works (with revsets too) |
|
671 | Test that outgoing --large works (with revsets too) | |
672 | $ hg outgoing --rev '.^' --large |
|
672 | $ hg outgoing --rev '.^' --large | |
673 | comparing with $TESTTMP/a (glob) |
|
673 | comparing with $TESTTMP/a (glob) | |
674 | searching for changes |
|
674 | searching for changes | |
675 | changeset: 8:c02fd3b77ec4 |
|
675 | changeset: 8:c02fd3b77ec4 | |
676 | user: test |
|
676 | user: test | |
677 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
677 | date: Thu Jan 01 00:00:00 1970 +0000 | |
678 | summary: add foo |
|
678 | summary: add foo | |
679 |
|
679 | |||
680 | changeset: 9:289dd08c9bbb |
|
680 | changeset: 9:289dd08c9bbb | |
681 | user: test |
|
681 | user: test | |
682 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
682 | date: Thu Jan 01 00:00:00 1970 +0000 | |
683 | summary: used to say nothing changed |
|
683 | summary: used to say nothing changed | |
684 |
|
684 | |||
685 | changeset: 10:34f23ac6ac12 |
|
685 | changeset: 10:34f23ac6ac12 | |
686 | user: test |
|
686 | user: test | |
687 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
687 | date: Thu Jan 01 00:00:00 1970 +0000 | |
688 | summary: added |
|
688 | summary: added | |
689 |
|
689 | |||
690 | changeset: 12:710c1b2f523c |
|
690 | changeset: 12:710c1b2f523c | |
691 | parent: 10:34f23ac6ac12 |
|
691 | parent: 10:34f23ac6ac12 | |
692 | user: test |
|
692 | user: test | |
693 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
693 | date: Thu Jan 01 00:00:00 1970 +0000 | |
694 | summary: removed large |
|
694 | summary: removed large | |
695 |
|
695 | |||
696 | changeset: 13:0a3e75774479 |
|
696 | changeset: 13:0a3e75774479 | |
697 | user: test |
|
697 | user: test | |
698 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
698 | date: Thu Jan 01 00:00:00 1970 +0000 | |
699 | summary: this used to add large8 as normal and commit both |
|
699 | summary: this used to add large8 as normal and commit both | |
700 |
|
700 | |||
701 | changeset: 14:84f3d378175c |
|
701 | changeset: 14:84f3d378175c | |
702 | user: test |
|
702 | user: test | |
703 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
703 | date: Thu Jan 01 00:00:00 1970 +0000 | |
704 | summary: this used to not notice the rm |
|
704 | summary: this used to not notice the rm | |
705 |
|
705 | |||
706 | searching for changes |
|
706 | searching for changes | |
707 | largefiles to upload: |
|
707 | largefiles to upload: | |
708 | foo |
|
708 | foo | |
709 | large |
|
709 | large | |
710 | large8 |
|
710 | large8 | |
711 |
|
711 | |||
712 | $ cd ../a |
|
712 | $ cd ../a | |
713 |
|
713 | |||
714 | Clone a largefiles repo. |
|
714 | Clone a largefiles repo. | |
715 |
|
715 | |||
716 | $ hg clone . ../b |
|
716 | $ hg clone . ../b | |
717 | updating to branch default |
|
717 | updating to branch default | |
718 | getting changed largefiles |
|
718 | getting changed largefiles | |
719 | 3 largefiles updated, 0 removed |
|
719 | 3 largefiles updated, 0 removed | |
720 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
720 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
721 | $ cd ../b |
|
721 | $ cd ../b | |
722 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
722 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
723 | 7:daea875e9014 add/edit more largefiles |
|
723 | 7:daea875e9014 add/edit more largefiles | |
724 | 6:4355d653f84f edit files yet again |
|
724 | 6:4355d653f84f edit files yet again | |
725 | 5:9d5af5072dbd edit files again |
|
725 | 5:9d5af5072dbd edit files again | |
726 | 4:74c02385b94c move files |
|
726 | 4:74c02385b94c move files | |
727 | 3:9e8fbc4bce62 copy files |
|
727 | 3:9e8fbc4bce62 copy files | |
728 | 2:51a0ae4d5864 remove files |
|
728 | 2:51a0ae4d5864 remove files | |
729 | 1:ce8896473775 edit files |
|
729 | 1:ce8896473775 edit files | |
730 | 0:30d30fe6a5be add files |
|
730 | 0:30d30fe6a5be add files | |
731 | $ cat normal3 |
|
731 | $ cat normal3 | |
732 | normal33 |
|
732 | normal33 | |
733 | $ cat sub/normal4 |
|
733 | $ cat sub/normal4 | |
734 | normal44 |
|
734 | normal44 | |
735 | $ cat sub/large4 |
|
735 | $ cat sub/large4 | |
736 | large44 |
|
736 | large44 | |
737 | $ cat sub2/large6 |
|
737 | $ cat sub2/large6 | |
738 | large6 |
|
738 | large6 | |
739 | $ cat sub2/large7 |
|
739 | $ cat sub2/large7 | |
740 | large7 |
|
740 | large7 | |
741 | $ hg log -qf sub2/large7 |
|
741 | $ hg log -qf sub2/large7 | |
742 | 7:daea875e9014 |
|
742 | 7:daea875e9014 | |
743 | $ cd .. |
|
743 | $ cd .. | |
744 | $ hg clone a -r 3 c |
|
744 | $ hg clone a -r 3 c | |
745 | adding changesets |
|
745 | adding changesets | |
746 | adding manifests |
|
746 | adding manifests | |
747 | adding file changes |
|
747 | adding file changes | |
748 | added 4 changesets with 10 changes to 4 files |
|
748 | added 4 changesets with 10 changes to 4 files | |
749 | updating to branch default |
|
749 | updating to branch default | |
750 | getting changed largefiles |
|
750 | getting changed largefiles | |
751 | 2 largefiles updated, 0 removed |
|
751 | 2 largefiles updated, 0 removed | |
752 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
752 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
753 | $ cd c |
|
753 | $ cd c | |
754 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
754 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
755 | 3:9e8fbc4bce62 copy files |
|
755 | 3:9e8fbc4bce62 copy files | |
756 | 2:51a0ae4d5864 remove files |
|
756 | 2:51a0ae4d5864 remove files | |
757 | 1:ce8896473775 edit files |
|
757 | 1:ce8896473775 edit files | |
758 | 0:30d30fe6a5be add files |
|
758 | 0:30d30fe6a5be add files | |
759 | $ cat normal1 |
|
759 | $ cat normal1 | |
760 | normal22 |
|
760 | normal22 | |
761 | $ cat large1 |
|
761 | $ cat large1 | |
762 | large22 |
|
762 | large22 | |
763 | $ cat sub/normal2 |
|
763 | $ cat sub/normal2 | |
764 | normal22 |
|
764 | normal22 | |
765 | $ cat sub/large2 |
|
765 | $ cat sub/large2 | |
766 | large22 |
|
766 | large22 | |
767 |
|
767 | |||
768 | Old revisions of a clone have correct largefiles content (this also |
|
768 | Old revisions of a clone have correct largefiles content (this also | |
769 | tests update). |
|
769 | tests update). | |
770 |
|
770 | |||
771 | $ hg update -r 1 |
|
771 | $ hg update -r 1 | |
772 | getting changed largefiles |
|
772 | getting changed largefiles | |
773 | 1 largefiles updated, 0 removed |
|
773 | 1 largefiles updated, 0 removed | |
774 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
774 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
775 | $ cat large1 |
|
775 | $ cat large1 | |
776 | large11 |
|
776 | large11 | |
777 | $ cat sub/large2 |
|
777 | $ cat sub/large2 | |
778 | large22 |
|
778 | large22 | |
779 | $ cd .. |
|
779 | $ cd .. | |
780 |
|
780 | |||
781 | Test cloning with --all-largefiles flag |
|
781 | Test cloning with --all-largefiles flag | |
782 |
|
782 | |||
783 | $ rm "${USERCACHE}"/* |
|
783 | $ rm "${USERCACHE}"/* | |
784 | $ hg clone --all-largefiles a a-backup |
|
784 | $ hg clone --all-largefiles a a-backup | |
785 | updating to branch default |
|
785 | updating to branch default | |
786 | getting changed largefiles |
|
786 | getting changed largefiles | |
787 | 3 largefiles updated, 0 removed |
|
787 | 3 largefiles updated, 0 removed | |
788 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
788 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
789 | 8 additional largefiles cached |
|
789 | 8 additional largefiles cached | |
790 |
|
790 | |||
791 | $ rm "${USERCACHE}"/* |
|
791 | $ rm "${USERCACHE}"/* | |
792 | $ hg clone --all-largefiles -u 0 a a-clone0 |
|
792 | $ hg clone --all-largefiles -u 0 a a-clone0 | |
793 | updating to branch default |
|
793 | updating to branch default | |
794 | getting changed largefiles |
|
794 | getting changed largefiles | |
795 | 2 largefiles updated, 0 removed |
|
795 | 2 largefiles updated, 0 removed | |
796 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
796 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
797 | 9 additional largefiles cached |
|
797 | 9 additional largefiles cached | |
798 | $ hg -R a-clone0 sum |
|
798 | $ hg -R a-clone0 sum | |
799 | parent: 0:30d30fe6a5be |
|
799 | parent: 0:30d30fe6a5be | |
800 | add files |
|
800 | add files | |
801 | branch: default |
|
801 | branch: default | |
802 | commit: (clean) |
|
802 | commit: (clean) | |
803 | update: 7 new changesets (update) |
|
803 | update: 7 new changesets (update) | |
804 |
|
804 | |||
805 | $ rm "${USERCACHE}"/* |
|
805 | $ rm "${USERCACHE}"/* | |
806 | $ hg clone --all-largefiles -u 1 a a-clone1 |
|
806 | $ hg clone --all-largefiles -u 1 a a-clone1 | |
807 | updating to branch default |
|
807 | updating to branch default | |
808 | getting changed largefiles |
|
808 | getting changed largefiles | |
809 | 2 largefiles updated, 0 removed |
|
809 | 2 largefiles updated, 0 removed | |
810 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
810 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
811 | 8 additional largefiles cached |
|
811 | 8 additional largefiles cached | |
812 | $ hg -R a-clone1 verify --large --lfa --lfc |
|
812 | $ hg -R a-clone1 verify --large --lfa --lfc | |
813 | checking changesets |
|
813 | checking changesets | |
814 | checking manifests |
|
814 | checking manifests | |
815 | crosschecking files in changesets and manifests |
|
815 | crosschecking files in changesets and manifests | |
816 | checking files |
|
816 | checking files | |
817 | 10 files, 8 changesets, 24 total revisions |
|
817 | 10 files, 8 changesets, 24 total revisions | |
818 | searching 8 changesets for largefiles |
|
818 | searching 8 changesets for largefiles | |
819 | verified contents of 13 revisions of 6 largefiles |
|
819 | verified contents of 13 revisions of 6 largefiles | |
820 | $ hg -R a-clone1 sum |
|
820 | $ hg -R a-clone1 sum | |
821 | parent: 1:ce8896473775 |
|
821 | parent: 1:ce8896473775 | |
822 | edit files |
|
822 | edit files | |
823 | branch: default |
|
823 | branch: default | |
824 | commit: (clean) |
|
824 | commit: (clean) | |
825 | update: 6 new changesets (update) |
|
825 | update: 6 new changesets (update) | |
826 |
|
826 | |||
827 | $ rm "${USERCACHE}"/* |
|
827 | $ rm "${USERCACHE}"/* | |
828 | $ hg clone --all-largefiles -U a a-clone-u |
|
828 | $ hg clone --all-largefiles -U a a-clone-u | |
829 | 11 additional largefiles cached |
|
829 | 11 additional largefiles cached | |
830 | $ hg -R a-clone-u sum |
|
830 | $ hg -R a-clone-u sum | |
831 | parent: -1:000000000000 (no revision checked out) |
|
831 | parent: -1:000000000000 (no revision checked out) | |
832 | branch: default |
|
832 | branch: default | |
833 | commit: (clean) |
|
833 | commit: (clean) | |
834 | update: 8 new changesets (update) |
|
834 | update: 8 new changesets (update) | |
835 |
|
835 | |||
836 | Show computed destination directory: |
|
836 | Show computed destination directory: | |
837 |
|
837 | |||
838 | $ mkdir xyz |
|
838 | $ mkdir xyz | |
839 | $ cd xyz |
|
839 | $ cd xyz | |
840 | $ hg clone ../a |
|
840 | $ hg clone ../a | |
841 | destination directory: a |
|
841 | destination directory: a | |
842 | updating to branch default |
|
842 | updating to branch default | |
843 | getting changed largefiles |
|
843 | getting changed largefiles | |
844 | 3 largefiles updated, 0 removed |
|
844 | 3 largefiles updated, 0 removed | |
845 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
845 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
846 | $ cd .. |
|
846 | $ cd .. | |
847 |
|
847 | |||
848 | Clone URL without path: |
|
848 | Clone URL without path: | |
849 |
|
849 | |||
850 | $ hg clone file:// |
|
850 | $ hg clone file:// | |
851 | abort: repository / not found! |
|
851 | abort: repository / not found! | |
852 | [255] |
|
852 | [255] | |
853 |
|
853 | |||
854 | Ensure base clone command argument validation |
|
854 | Ensure base clone command argument validation | |
855 |
|
855 | |||
856 | $ hg clone -U -u 0 a a-clone-failure |
|
856 | $ hg clone -U -u 0 a a-clone-failure | |
857 | abort: cannot specify both --noupdate and --updaterev |
|
857 | abort: cannot specify both --noupdate and --updaterev | |
858 | [255] |
|
858 | [255] | |
859 |
|
859 | |||
860 | $ hg clone --all-largefiles a ssh://localhost/a |
|
860 | $ hg clone --all-largefiles a ssh://localhost/a | |
861 | abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a |
|
861 | abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a | |
862 | [255] |
|
862 | [255] | |
863 |
|
863 | |||
864 | Test pulling with --all-largefiles flag. Also test that the largefiles are |
|
864 | Test pulling with --all-largefiles flag. Also test that the largefiles are | |
865 | downloaded from 'default' instead of 'default-push' when no source is specified |
|
865 | downloaded from 'default' instead of 'default-push' when no source is specified | |
866 | (issue3584) |
|
866 | (issue3584) | |
867 |
|
867 | |||
868 | $ rm -Rf a-backup |
|
868 | $ rm -Rf a-backup | |
869 | $ hg clone -r 1 a a-backup |
|
869 | $ hg clone -r 1 a a-backup | |
870 | adding changesets |
|
870 | adding changesets | |
871 | adding manifests |
|
871 | adding manifests | |
872 | adding file changes |
|
872 | adding file changes | |
873 | added 2 changesets with 8 changes to 4 files |
|
873 | added 2 changesets with 8 changes to 4 files | |
874 | updating to branch default |
|
874 | updating to branch default | |
875 | getting changed largefiles |
|
875 | getting changed largefiles | |
876 | 2 largefiles updated, 0 removed |
|
876 | 2 largefiles updated, 0 removed | |
877 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
877 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
878 | $ rm "${USERCACHE}"/* |
|
878 | $ rm "${USERCACHE}"/* | |
879 | $ cd a-backup |
|
879 | $ cd a-backup | |
880 | $ hg pull --all-largefiles --config paths.default-push=bogus/path |
|
880 | $ hg pull --all-largefiles --config paths.default-push=bogus/path | |
881 | pulling from $TESTTMP/a (glob) |
|
881 | pulling from $TESTTMP/a (glob) | |
882 | searching for changes |
|
882 | searching for changes | |
883 | adding changesets |
|
883 | adding changesets | |
884 | adding manifests |
|
884 | adding manifests | |
885 | adding file changes |
|
885 | adding file changes | |
886 | added 6 changesets with 16 changes to 8 files |
|
886 | added 6 changesets with 16 changes to 8 files | |
887 | (run 'hg update' to get a working copy) |
|
887 | (run 'hg update' to get a working copy) | |
888 | 6 largefiles cached |
|
888 | 6 largefiles cached | |
889 |
|
889 | |||
890 | redo pull with --lfrev and check it pulls largefiles for the right revs |
|
890 | redo pull with --lfrev and check it pulls largefiles for the right revs | |
891 |
|
891 | |||
892 | $ hg rollback |
|
892 | $ hg rollback | |
893 | repository tip rolled back to revision 1 (undo pull) |
|
893 | repository tip rolled back to revision 1 (undo pull) | |
894 | $ hg pull -v --lfrev 'heads(pulled())+min(pulled())' |
|
894 | $ hg pull -v --lfrev 'heads(pulled())+min(pulled())' | |
895 | pulling from $TESTTMP/a (glob) |
|
895 | pulling from $TESTTMP/a (glob) | |
896 | searching for changes |
|
896 | searching for changes | |
897 | all local heads known remotely |
|
897 | all local heads known remotely | |
898 | 6 changesets found |
|
898 | 6 changesets found | |
899 | adding changesets |
|
899 | adding changesets | |
900 | adding manifests |
|
900 | adding manifests | |
901 | adding file changes |
|
901 | adding file changes | |
902 | added 6 changesets with 16 changes to 8 files |
|
902 | added 6 changesets with 16 changes to 8 files | |
903 | calling hook changegroup.lfiles: <function checkrequireslfiles at *> (glob) |
|
903 | calling hook changegroup.lfiles: <function checkrequireslfiles at *> (glob) | |
904 | (run 'hg update' to get a working copy) |
|
904 | (run 'hg update' to get a working copy) | |
905 | pulling largefiles for revision 7 |
|
905 | pulling largefiles for revision 7 | |
906 | found 971fb41e78fea4f8e0ba5244784239371cb00591 in store |
|
906 | found 971fb41e78fea4f8e0ba5244784239371cb00591 in store | |
907 | found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store |
|
907 | found 0d6d75887db61b2c7e6c74b5dd8fc6ad50c0cc30 in store | |
908 | found bb3151689acb10f0c3125c560d5e63df914bc1af in store |
|
908 | found bb3151689acb10f0c3125c560d5e63df914bc1af in store | |
909 | pulling largefiles for revision 2 |
|
909 | pulling largefiles for revision 2 | |
910 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
|
910 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store | |
911 | 0 largefiles cached |
|
911 | 0 largefiles cached | |
912 |
|
912 | |||
913 | lfpull |
|
913 | lfpull | |
914 |
|
914 | |||
915 | $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull |
|
915 | $ hg lfpull -r : --config largefiles.usercache=usercache-lfpull | |
916 | 2 largefiles cached |
|
916 | 2 largefiles cached | |
917 | $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull |
|
917 | $ hg lfpull -v -r 4+2 --config largefiles.usercache=usercache-lfpull | |
918 | pulling largefiles for revision 4 |
|
918 | pulling largefiles for revision 4 | |
919 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
|
919 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store | |
920 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
|
920 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store | |
921 | pulling largefiles for revision 2 |
|
921 | pulling largefiles for revision 2 | |
922 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store |
|
922 | found eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 in store | |
923 | 0 largefiles cached |
|
923 | 0 largefiles cached | |
924 |
|
924 | |||
925 | $ ls usercache-lfpull/* | sort |
|
925 | $ ls usercache-lfpull/* | sort | |
926 | usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d |
|
926 | usercache-lfpull/1deebade43c8c498a3c8daddac0244dc55d1331d | |
927 | usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64 |
|
927 | usercache-lfpull/4669e532d5b2c093a78eca010077e708a071bb64 | |
928 |
|
928 | |||
929 | $ cd .. |
|
929 | $ cd .. | |
930 |
|
930 | |||
931 | Rebasing between two repositories does not revert largefiles to old |
|
931 | Rebasing between two repositories does not revert largefiles to old | |
932 | revisions (this was a very bad bug that took a lot of work to fix). |
|
932 | revisions (this was a very bad bug that took a lot of work to fix). | |
933 |
|
933 | |||
934 | $ hg clone a d |
|
934 | $ hg clone a d | |
935 | updating to branch default |
|
935 | updating to branch default | |
936 | getting changed largefiles |
|
936 | getting changed largefiles | |
937 | 3 largefiles updated, 0 removed |
|
937 | 3 largefiles updated, 0 removed | |
938 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
938 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
939 | $ cd b |
|
939 | $ cd b | |
940 | $ echo large4-modified > sub/large4 |
|
940 | $ echo large4-modified > sub/large4 | |
941 | $ echo normal3-modified > normal3 |
|
941 | $ echo normal3-modified > normal3 | |
942 | $ hg commit -m "modify normal file and largefile in repo b" |
|
942 | $ hg commit -m "modify normal file and largefile in repo b" | |
943 | Invoking status precommit hook |
|
943 | Invoking status precommit hook | |
944 | M normal3 |
|
944 | M normal3 | |
945 | M sub/large4 |
|
945 | M sub/large4 | |
946 | $ cd ../d |
|
946 | $ cd ../d | |
947 | $ echo large6-modified > sub2/large6 |
|
947 | $ echo large6-modified > sub2/large6 | |
948 | $ echo normal4-modified > sub/normal4 |
|
948 | $ echo normal4-modified > sub/normal4 | |
949 | $ hg commit -m "modify normal file largefile in repo d" |
|
949 | $ hg commit -m "modify normal file largefile in repo d" | |
950 | Invoking status precommit hook |
|
950 | Invoking status precommit hook | |
951 | M sub/normal4 |
|
951 | M sub/normal4 | |
952 | M sub2/large6 |
|
952 | M sub2/large6 | |
953 | $ cd .. |
|
953 | $ cd .. | |
954 | $ hg clone d e |
|
954 | $ hg clone d e | |
955 | updating to branch default |
|
955 | updating to branch default | |
956 | getting changed largefiles |
|
956 | getting changed largefiles | |
957 | 3 largefiles updated, 0 removed |
|
957 | 3 largefiles updated, 0 removed | |
958 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
958 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
959 | $ cd d |
|
959 | $ cd d | |
960 |
|
960 | |||
961 | More rebase testing, but also test that the largefiles are downloaded from |
|
961 | More rebase testing, but also test that the largefiles are downloaded from | |
962 | 'default-push' when no source is specified (issue3584). (The largefile from the |
|
962 | 'default-push' when no source is specified (issue3584). (The largefile from the | |
963 | pulled revision is however not downloaded but found in the local cache.) |
|
963 | pulled revision is however not downloaded but found in the local cache.) | |
964 | Largefiles are fetched for the new pulled revision, not for existing revisions, |
|
964 | Largefiles are fetched for the new pulled revision, not for existing revisions, | |
965 | rebased or not. |
|
965 | rebased or not. | |
966 |
|
966 | |||
967 | $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
|
967 | $ [ ! -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] | |
968 | $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b |
|
968 | $ hg pull --rebase --all-largefiles --config paths.default-push=bogus/path --config paths.default=../b | |
969 | pulling from $TESTTMP/b (glob) |
|
969 | pulling from $TESTTMP/b (glob) | |
970 | searching for changes |
|
970 | searching for changes | |
971 | adding changesets |
|
971 | adding changesets | |
972 | adding manifests |
|
972 | adding manifests | |
973 | adding file changes |
|
973 | adding file changes | |
974 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
974 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
975 | Invoking status precommit hook |
|
975 | Invoking status precommit hook | |
976 | M sub/normal4 |
|
976 | M sub/normal4 | |
977 | M sub2/large6 |
|
977 | M sub2/large6 | |
978 | saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
|
978 | saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob) | |
979 | 0 largefiles cached |
|
979 | 0 largefiles cached | |
980 | nothing to rebase - working directory parent is also destination |
|
980 | nothing to rebase - working directory parent is also destination | |
981 | $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] |
|
981 | $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ] | |
982 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
982 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
983 | 9:598410d3eb9a modify normal file largefile in repo d |
|
983 | 9:598410d3eb9a modify normal file largefile in repo d | |
984 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
984 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
985 | 7:daea875e9014 add/edit more largefiles |
|
985 | 7:daea875e9014 add/edit more largefiles | |
986 | 6:4355d653f84f edit files yet again |
|
986 | 6:4355d653f84f edit files yet again | |
987 | 5:9d5af5072dbd edit files again |
|
987 | 5:9d5af5072dbd edit files again | |
988 | 4:74c02385b94c move files |
|
988 | 4:74c02385b94c move files | |
989 | 3:9e8fbc4bce62 copy files |
|
989 | 3:9e8fbc4bce62 copy files | |
990 | 2:51a0ae4d5864 remove files |
|
990 | 2:51a0ae4d5864 remove files | |
991 | 1:ce8896473775 edit files |
|
991 | 1:ce8896473775 edit files | |
992 | 0:30d30fe6a5be add files |
|
992 | 0:30d30fe6a5be add files | |
993 | $ cat normal3 |
|
993 | $ cat normal3 | |
994 | normal3-modified |
|
994 | normal3-modified | |
995 | $ cat sub/normal4 |
|
995 | $ cat sub/normal4 | |
996 | normal4-modified |
|
996 | normal4-modified | |
997 | $ cat sub/large4 |
|
997 | $ cat sub/large4 | |
998 | large4-modified |
|
998 | large4-modified | |
999 | $ cat sub2/large6 |
|
999 | $ cat sub2/large6 | |
1000 | large6-modified |
|
1000 | large6-modified | |
1001 | $ cat sub2/large7 |
|
1001 | $ cat sub2/large7 | |
1002 | large7 |
|
1002 | large7 | |
1003 | $ cd ../e |
|
1003 | $ cd ../e | |
1004 | $ hg pull ../b |
|
1004 | $ hg pull ../b | |
1005 | pulling from ../b |
|
1005 | pulling from ../b | |
1006 | searching for changes |
|
1006 | searching for changes | |
1007 | adding changesets |
|
1007 | adding changesets | |
1008 | adding manifests |
|
1008 | adding manifests | |
1009 | adding file changes |
|
1009 | adding file changes | |
1010 | added 1 changesets with 2 changes to 2 files (+1 heads) |
|
1010 | added 1 changesets with 2 changes to 2 files (+1 heads) | |
1011 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1011 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1012 | $ hg rebase |
|
1012 | $ hg rebase | |
1013 | Invoking status precommit hook |
|
1013 | Invoking status precommit hook | |
1014 | M sub/normal4 |
|
1014 | M sub/normal4 | |
1015 | M sub2/large6 |
|
1015 | M sub2/large6 | |
1016 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob) |
|
1016 | saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob) | |
1017 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
1017 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
1018 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1018 | 9:598410d3eb9a modify normal file largefile in repo d | |
1019 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1019 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1020 | 7:daea875e9014 add/edit more largefiles |
|
1020 | 7:daea875e9014 add/edit more largefiles | |
1021 | 6:4355d653f84f edit files yet again |
|
1021 | 6:4355d653f84f edit files yet again | |
1022 | 5:9d5af5072dbd edit files again |
|
1022 | 5:9d5af5072dbd edit files again | |
1023 | 4:74c02385b94c move files |
|
1023 | 4:74c02385b94c move files | |
1024 | 3:9e8fbc4bce62 copy files |
|
1024 | 3:9e8fbc4bce62 copy files | |
1025 | 2:51a0ae4d5864 remove files |
|
1025 | 2:51a0ae4d5864 remove files | |
1026 | 1:ce8896473775 edit files |
|
1026 | 1:ce8896473775 edit files | |
1027 | 0:30d30fe6a5be add files |
|
1027 | 0:30d30fe6a5be add files | |
1028 | $ cat normal3 |
|
1028 | $ cat normal3 | |
1029 | normal3-modified |
|
1029 | normal3-modified | |
1030 | $ cat sub/normal4 |
|
1030 | $ cat sub/normal4 | |
1031 | normal4-modified |
|
1031 | normal4-modified | |
1032 | $ cat sub/large4 |
|
1032 | $ cat sub/large4 | |
1033 | large4-modified |
|
1033 | large4-modified | |
1034 | $ cat sub2/large6 |
|
1034 | $ cat sub2/large6 | |
1035 | large6-modified |
|
1035 | large6-modified | |
1036 | $ cat sub2/large7 |
|
1036 | $ cat sub2/large7 | |
1037 | large7 |
|
1037 | large7 | |
1038 |
|
1038 | |||
1039 | Log on largefiles |
|
1039 | Log on largefiles | |
1040 |
|
1040 | |||
1041 | - same output |
|
1041 | - same output | |
1042 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4 |
|
1042 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub/large4 | |
1043 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1043 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1044 | 6:4355d653f84f edit files yet again |
|
1044 | 6:4355d653f84f edit files yet again | |
1045 | 5:9d5af5072dbd edit files again |
|
1045 | 5:9d5af5072dbd edit files again | |
1046 | 4:74c02385b94c move files |
|
1046 | 4:74c02385b94c move files | |
1047 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4 |
|
1047 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub/large4 | |
1048 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1048 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1049 | 6:4355d653f84f edit files yet again |
|
1049 | 6:4355d653f84f edit files yet again | |
1050 | 5:9d5af5072dbd edit files again |
|
1050 | 5:9d5af5072dbd edit files again | |
1051 | 4:74c02385b94c move files |
|
1051 | 4:74c02385b94c move files | |
1052 |
|
1052 | |||
1053 | - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal |
|
1053 | - .hglf only matches largefiles, without .hglf it matches 9 bco sub/normal | |
1054 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub |
|
1054 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' .hglf/sub | |
1055 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1055 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1056 | 6:4355d653f84f edit files yet again |
|
1056 | 6:4355d653f84f edit files yet again | |
1057 | 5:9d5af5072dbd edit files again |
|
1057 | 5:9d5af5072dbd edit files again | |
1058 | 4:74c02385b94c move files |
|
1058 | 4:74c02385b94c move files | |
1059 | 1:ce8896473775 edit files |
|
1059 | 1:ce8896473775 edit files | |
1060 | 0:30d30fe6a5be add files |
|
1060 | 0:30d30fe6a5be add files | |
1061 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub |
|
1061 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' sub | |
1062 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1062 | 9:598410d3eb9a modify normal file largefile in repo d | |
1063 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1063 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1064 | 6:4355d653f84f edit files yet again |
|
1064 | 6:4355d653f84f edit files yet again | |
1065 | 5:9d5af5072dbd edit files again |
|
1065 | 5:9d5af5072dbd edit files again | |
1066 | 4:74c02385b94c move files |
|
1066 | 4:74c02385b94c move files | |
1067 | 1:ce8896473775 edit files |
|
1067 | 1:ce8896473775 edit files | |
1068 | 0:30d30fe6a5be add files |
|
1068 | 0:30d30fe6a5be add files | |
1069 |
|
1069 | |||
1070 | - globbing gives same result |
|
1070 | - globbing gives same result | |
1071 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*' |
|
1071 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 'glob:sub/*' | |
1072 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1072 | 9:598410d3eb9a modify normal file largefile in repo d | |
1073 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1073 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1074 | 6:4355d653f84f edit files yet again |
|
1074 | 6:4355d653f84f edit files yet again | |
1075 | 5:9d5af5072dbd edit files again |
|
1075 | 5:9d5af5072dbd edit files again | |
1076 | 4:74c02385b94c move files |
|
1076 | 4:74c02385b94c move files | |
1077 | 1:ce8896473775 edit files |
|
1077 | 1:ce8896473775 edit files | |
1078 | 0:30d30fe6a5be add files |
|
1078 | 0:30d30fe6a5be add files | |
1079 |
|
1079 | |||
1080 | Rollback on largefiles. |
|
1080 | Rollback on largefiles. | |
1081 |
|
1081 | |||
1082 | $ echo large4-modified-again > sub/large4 |
|
1082 | $ echo large4-modified-again > sub/large4 | |
1083 | $ hg commit -m "Modify large4 again" |
|
1083 | $ hg commit -m "Modify large4 again" | |
1084 | Invoking status precommit hook |
|
1084 | Invoking status precommit hook | |
1085 | M sub/large4 |
|
1085 | M sub/large4 | |
1086 | $ hg rollback |
|
1086 | $ hg rollback | |
1087 | repository tip rolled back to revision 9 (undo commit) |
|
1087 | repository tip rolled back to revision 9 (undo commit) | |
1088 | working directory now based on revision 9 |
|
1088 | working directory now based on revision 9 | |
1089 | $ hg st |
|
1089 | $ hg st | |
1090 | M sub/large4 |
|
1090 | M sub/large4 | |
1091 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
1091 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
1092 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1092 | 9:598410d3eb9a modify normal file largefile in repo d | |
1093 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1093 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1094 | 7:daea875e9014 add/edit more largefiles |
|
1094 | 7:daea875e9014 add/edit more largefiles | |
1095 | 6:4355d653f84f edit files yet again |
|
1095 | 6:4355d653f84f edit files yet again | |
1096 | 5:9d5af5072dbd edit files again |
|
1096 | 5:9d5af5072dbd edit files again | |
1097 | 4:74c02385b94c move files |
|
1097 | 4:74c02385b94c move files | |
1098 | 3:9e8fbc4bce62 copy files |
|
1098 | 3:9e8fbc4bce62 copy files | |
1099 | 2:51a0ae4d5864 remove files |
|
1099 | 2:51a0ae4d5864 remove files | |
1100 | 1:ce8896473775 edit files |
|
1100 | 1:ce8896473775 edit files | |
1101 | 0:30d30fe6a5be add files |
|
1101 | 0:30d30fe6a5be add files | |
1102 | $ cat sub/large4 |
|
1102 | $ cat sub/large4 | |
1103 | large4-modified-again |
|
1103 | large4-modified-again | |
1104 |
|
1104 | |||
1105 | "update --check" refuses to update with uncommitted changes. |
|
1105 | "update --check" refuses to update with uncommitted changes. | |
1106 | $ hg update --check 8 |
|
1106 | $ hg update --check 8 | |
1107 | abort: uncommitted changes |
|
1107 | abort: uncommitted changes | |
1108 | [255] |
|
1108 | [255] | |
1109 |
|
1109 | |||
1110 | "update --clean" leaves correct largefiles in working copy, even when there is |
|
1110 | "update --clean" leaves correct largefiles in working copy, even when there is | |
1111 | .orig files from revert in .hglf. |
|
1111 | .orig files from revert in .hglf. | |
1112 |
|
1112 | |||
1113 | $ echo mistake > sub2/large7 |
|
1113 | $ echo mistake > sub2/large7 | |
1114 | $ hg revert sub2/large7 |
|
1114 | $ hg revert sub2/large7 | |
1115 | $ hg -q update --clean -r null |
|
1115 | $ hg -q update --clean -r null | |
1116 | $ hg update --clean |
|
1116 | $ hg update --clean | |
1117 | getting changed largefiles |
|
1117 | getting changed largefiles | |
1118 | 3 largefiles updated, 0 removed |
|
1118 | 3 largefiles updated, 0 removed | |
1119 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1119 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1120 | $ cat normal3 |
|
1120 | $ cat normal3 | |
1121 | normal3-modified |
|
1121 | normal3-modified | |
1122 | $ cat sub/normal4 |
|
1122 | $ cat sub/normal4 | |
1123 | normal4-modified |
|
1123 | normal4-modified | |
1124 | $ cat sub/large4 |
|
1124 | $ cat sub/large4 | |
1125 | large4-modified |
|
1125 | large4-modified | |
1126 | $ cat sub2/large6 |
|
1126 | $ cat sub2/large6 | |
1127 | large6-modified |
|
1127 | large6-modified | |
1128 | $ cat sub2/large7 |
|
1128 | $ cat sub2/large7 | |
1129 | large7 |
|
1129 | large7 | |
1130 | $ cat sub2/large7.orig |
|
1130 | $ cat sub2/large7.orig | |
1131 | mistake |
|
1131 | mistake | |
1132 | $ cat .hglf/sub2/large7.orig |
|
1132 | $ cat .hglf/sub2/large7.orig | |
1133 | 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31 |
|
1133 | 9dbfb2c79b1c40981b258c3efa1b10b03f18ad31 | |
1134 |
|
1134 | |||
1135 | demonstrate misfeature: .orig file is overwritten on every update -C, |
|
1135 | demonstrate misfeature: .orig file is overwritten on every update -C, | |
1136 | also when clean: |
|
1136 | also when clean: | |
1137 | $ hg update --clean |
|
1137 | $ hg update --clean | |
1138 | getting changed largefiles |
|
1138 | getting changed largefiles | |
1139 | 0 largefiles updated, 0 removed |
|
1139 | 0 largefiles updated, 0 removed | |
1140 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1140 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1141 | $ cat sub2/large7.orig |
|
1141 | $ cat sub2/large7.orig | |
1142 | large7 |
|
1142 | large7 | |
1143 | $ rm sub2/large7.orig .hglf/sub2/large7.orig |
|
1143 | $ rm sub2/large7.orig .hglf/sub2/large7.orig | |
1144 |
|
1144 | |||
1145 | Now "update check" is happy. |
|
1145 | Now "update check" is happy. | |
1146 | $ hg update --check 8 |
|
1146 | $ hg update --check 8 | |
1147 | getting changed largefiles |
|
1147 | getting changed largefiles | |
1148 | 1 largefiles updated, 0 removed |
|
1148 | 1 largefiles updated, 0 removed | |
1149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1149 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1150 | $ hg update --check |
|
1150 | $ hg update --check | |
1151 | getting changed largefiles |
|
1151 | getting changed largefiles | |
1152 | 1 largefiles updated, 0 removed |
|
1152 | 1 largefiles updated, 0 removed | |
1153 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1153 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1154 |
|
1154 | |||
1155 | Test removing empty largefiles directories on update |
|
1155 | Test removing empty largefiles directories on update | |
1156 | $ test -d sub2 && echo "sub2 exists" |
|
1156 | $ test -d sub2 && echo "sub2 exists" | |
1157 | sub2 exists |
|
1157 | sub2 exists | |
1158 | $ hg update -q null |
|
1158 | $ hg update -q null | |
1159 | $ test -d sub2 && echo "error: sub2 should not exist anymore" |
|
1159 | $ test -d sub2 && echo "error: sub2 should not exist anymore" | |
1160 | [1] |
|
1160 | [1] | |
1161 | $ hg update -q |
|
1161 | $ hg update -q | |
1162 |
|
1162 | |||
1163 | Test hg remove removes empty largefiles directories |
|
1163 | Test hg remove removes empty largefiles directories | |
1164 | $ test -d sub2 && echo "sub2 exists" |
|
1164 | $ test -d sub2 && echo "sub2 exists" | |
1165 | sub2 exists |
|
1165 | sub2 exists | |
1166 | $ hg remove sub2/* |
|
1166 | $ hg remove sub2/* | |
1167 | $ test -d sub2 && echo "error: sub2 should not exist anymore" |
|
1167 | $ test -d sub2 && echo "error: sub2 should not exist anymore" | |
1168 | [1] |
|
1168 | [1] | |
1169 | $ hg revert sub2/large6 sub2/large7 |
|
1169 | $ hg revert sub2/large6 sub2/large7 | |
1170 |
|
1170 | |||
1171 | "revert" works on largefiles (and normal files too). |
|
1171 | "revert" works on largefiles (and normal files too). | |
1172 | $ echo hack3 >> normal3 |
|
1172 | $ echo hack3 >> normal3 | |
1173 | $ echo hack4 >> sub/normal4 |
|
1173 | $ echo hack4 >> sub/normal4 | |
1174 | $ echo hack4 >> sub/large4 |
|
1174 | $ echo hack4 >> sub/large4 | |
1175 | $ rm sub2/large6 |
|
1175 | $ rm sub2/large6 | |
1176 | $ hg revert sub2/large6 |
|
1176 | $ hg revert sub2/large6 | |
1177 | $ hg rm sub2/large6 |
|
1177 | $ hg rm sub2/large6 | |
1178 | $ echo new >> sub2/large8 |
|
1178 | $ echo new >> sub2/large8 | |
1179 | $ hg add --large sub2/large8 |
|
1179 | $ hg add --large sub2/large8 | |
1180 | # XXX we don't really want to report that we're reverting the standin; |
|
1180 | # XXX we don't really want to report that we're reverting the standin; | |
1181 | # that's just an implementation detail. But I don't see an obvious fix. ;-( |
|
1181 | # that's just an implementation detail. But I don't see an obvious fix. ;-( | |
1182 | $ hg revert sub |
|
1182 | $ hg revert sub | |
1183 | reverting .hglf/sub/large4 (glob) |
|
1183 | reverting .hglf/sub/large4 (glob) | |
1184 | reverting sub/normal4 (glob) |
|
1184 | reverting sub/normal4 (glob) | |
1185 | $ hg status |
|
1185 | $ hg status | |
1186 | M normal3 |
|
1186 | M normal3 | |
1187 | A sub2/large8 |
|
1187 | A sub2/large8 | |
1188 | R sub2/large6 |
|
1188 | R sub2/large6 | |
1189 | ? sub/large4.orig |
|
1189 | ? sub/large4.orig | |
1190 | ? sub/normal4.orig |
|
1190 | ? sub/normal4.orig | |
1191 | $ cat sub/normal4 |
|
1191 | $ cat sub/normal4 | |
1192 | normal4-modified |
|
1192 | normal4-modified | |
1193 | $ cat sub/large4 |
|
1193 | $ cat sub/large4 | |
1194 | large4-modified |
|
1194 | large4-modified | |
1195 | $ hg revert -a --no-backup |
|
1195 | $ hg revert -a --no-backup | |
1196 | undeleting .hglf/sub2/large6 (glob) |
|
1196 | undeleting .hglf/sub2/large6 (glob) | |
1197 | forgetting .hglf/sub2/large8 (glob) |
|
1197 | forgetting .hglf/sub2/large8 (glob) | |
1198 | reverting normal3 |
|
1198 | reverting normal3 | |
1199 | $ hg status |
|
1199 | $ hg status | |
1200 | ? sub/large4.orig |
|
1200 | ? sub/large4.orig | |
1201 | ? sub/normal4.orig |
|
1201 | ? sub/normal4.orig | |
1202 | ? sub2/large8 |
|
1202 | ? sub2/large8 | |
1203 | $ cat normal3 |
|
1203 | $ cat normal3 | |
1204 | normal3-modified |
|
1204 | normal3-modified | |
1205 | $ cat sub2/large6 |
|
1205 | $ cat sub2/large6 | |
1206 | large6-modified |
|
1206 | large6-modified | |
1207 | $ rm sub/*.orig sub2/large8 |
|
1207 | $ rm sub/*.orig sub2/large8 | |
1208 |
|
1208 | |||
1209 | revert some files to an older revision |
|
1209 | revert some files to an older revision | |
1210 | $ hg revert --no-backup -r 8 sub2 |
|
1210 | $ hg revert --no-backup -r 8 sub2 | |
1211 | reverting .hglf/sub2/large6 (glob) |
|
1211 | reverting .hglf/sub2/large6 (glob) | |
1212 | $ cat sub2/large6 |
|
1212 | $ cat sub2/large6 | |
1213 | large6 |
|
1213 | large6 | |
1214 | $ hg revert --no-backup -C -r '.^' sub2 |
|
1214 | $ hg revert --no-backup -C -r '.^' sub2 | |
1215 | reverting .hglf/sub2/large6 (glob) |
|
1215 | reverting .hglf/sub2/large6 (glob) | |
1216 | $ hg revert --no-backup sub2 |
|
1216 | $ hg revert --no-backup sub2 | |
1217 | reverting .hglf/sub2/large6 (glob) |
|
1217 | reverting .hglf/sub2/large6 (glob) | |
1218 | $ hg status |
|
1218 | $ hg status | |
1219 |
|
1219 | |||
1220 | "verify --large" actually verifies largefiles |
|
1220 | "verify --large" actually verifies largefiles | |
1221 |
|
1221 | |||
1222 | - Where Do We Come From? What Are We? Where Are We Going? |
|
1222 | - Where Do We Come From? What Are We? Where Are We Going? | |
1223 | $ pwd |
|
1223 | $ pwd | |
1224 | $TESTTMP/e |
|
1224 | $TESTTMP/e | |
1225 | $ hg paths |
|
1225 | $ hg paths | |
1226 | default = $TESTTMP/d (glob) |
|
1226 | default = $TESTTMP/d (glob) | |
1227 |
|
1227 | |||
1228 | $ hg verify --large |
|
1228 | $ hg verify --large | |
1229 | checking changesets |
|
1229 | checking changesets | |
1230 | checking manifests |
|
1230 | checking manifests | |
1231 | crosschecking files in changesets and manifests |
|
1231 | crosschecking files in changesets and manifests | |
1232 | checking files |
|
1232 | checking files | |
1233 | 10 files, 10 changesets, 28 total revisions |
|
1233 | 10 files, 10 changesets, 28 total revisions | |
1234 | searching 1 changesets for largefiles |
|
1234 | searching 1 changesets for largefiles | |
1235 | verified existence of 3 revisions of 3 largefiles |
|
1235 | verified existence of 3 revisions of 3 largefiles | |
1236 |
|
1236 | |||
1237 | - introduce missing blob in local store repo and make sure that this is caught: |
|
1237 | - introduce missing blob in local store repo and make sure that this is caught: | |
1238 | $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 . |
|
1238 | $ mv $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 . | |
1239 | $ hg verify --large |
|
1239 | $ hg verify --large | |
1240 | checking changesets |
|
1240 | checking changesets | |
1241 | checking manifests |
|
1241 | checking manifests | |
1242 | crosschecking files in changesets and manifests |
|
1242 | crosschecking files in changesets and manifests | |
1243 | checking files |
|
1243 | checking files | |
1244 | 10 files, 10 changesets, 28 total revisions |
|
1244 | 10 files, 10 changesets, 28 total revisions | |
1245 | searching 1 changesets for largefiles |
|
1245 | searching 1 changesets for largefiles | |
1246 | changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) |
|
1246 | changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) | |
1247 | verified existence of 3 revisions of 3 largefiles |
|
1247 | verified existence of 3 revisions of 3 largefiles | |
1248 | [1] |
|
1248 | [1] | |
1249 |
|
1249 | |||
1250 | - introduce corruption and make sure that it is caught when checking content: |
|
1250 | - introduce corruption and make sure that it is caught when checking content: | |
1251 | $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 |
|
1251 | $ echo '5 cents' > $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 | |
1252 | $ hg verify -q --large --lfc |
|
1252 | $ hg verify -q --large --lfc | |
1253 | changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) |
|
1253 | changeset 9:598410d3eb9a: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob) | |
1254 | [1] |
|
1254 | [1] | |
1255 |
|
1255 | |||
1256 | - cleanup |
|
1256 | - cleanup | |
1257 | $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/ |
|
1257 | $ mv e166e74c7303192238d60af5a9c4ce9bef0b7928 $TESTTMP/d/.hg/largefiles/ | |
1258 |
|
1258 | |||
1259 | - verifying all revisions will fail because we didn't clone all largefiles to d: |
|
1259 | - verifying all revisions will fail because we didn't clone all largefiles to d: | |
1260 | $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
|
1260 | $ echo 'T-shirt' > $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 | |
1261 | $ hg verify -q --lfa --lfc |
|
1261 | $ hg verify -q --lfa --lfc | |
1262 | changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob) |
|
1262 | changeset 0:30d30fe6a5be: large1 references missing $TESTTMP/d/.hg/largefiles/4669e532d5b2c093a78eca010077e708a071bb64 (glob) | |
1263 | changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob) |
|
1263 | changeset 0:30d30fe6a5be: sub/large2 references missing $TESTTMP/d/.hg/largefiles/1deebade43c8c498a3c8daddac0244dc55d1331d (glob) | |
1264 | changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob) |
|
1264 | changeset 1:ce8896473775: large1 references missing $TESTTMP/d/.hg/largefiles/5f78770c0e77ba4287ad6ef3071c9bf9c379742f (glob) | |
1265 | changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
|
1265 | changeset 1:ce8896473775: sub/large2 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) | |
1266 | changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
|
1266 | changeset 3:9e8fbc4bce62: large1 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) | |
1267 | changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
|
1267 | changeset 4:74c02385b94c: large3 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) | |
1268 | changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) |
|
1268 | changeset 4:74c02385b94c: sub/large4 references corrupted $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 (glob) | |
1269 | changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob) |
|
1269 | changeset 5:9d5af5072dbd: large3 references missing $TESTTMP/d/.hg/largefiles/baaf12afde9d8d67f25dab6dced0d2bf77dba47c (glob) | |
1270 | changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob) |
|
1270 | changeset 5:9d5af5072dbd: sub/large4 references missing $TESTTMP/d/.hg/largefiles/aeb2210d19f02886dde00dac279729a48471e2f9 (glob) | |
1271 | changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob) |
|
1271 | changeset 6:4355d653f84f: large3 references missing $TESTTMP/d/.hg/largefiles/7838695e10da2bb75ac1156565f40a2595fa2fa0 (glob) | |
1272 | [1] |
|
1272 | [1] | |
1273 |
|
1273 | |||
1274 | - cleanup |
|
1274 | - cleanup | |
1275 | $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 |
|
1275 | $ rm $TESTTMP/d/.hg/largefiles/eb7338044dc27f9bc59b8dd5a246b065ead7a9c4 | |
1276 | $ rm -f .hglf/sub/*.orig |
|
1276 | $ rm -f .hglf/sub/*.orig | |
1277 |
|
1277 | |||
1278 | Update to revision with missing largefile - and make sure it really is missing |
|
1278 | Update to revision with missing largefile - and make sure it really is missing | |
1279 |
|
1279 | |||
1280 | $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 |
|
1280 | $ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0 | |
1281 | $ hg up -r 6 |
|
1281 | $ hg up -r 6 | |
1282 | getting changed largefiles |
|
1282 | getting changed largefiles | |
1283 |
|
|
1283 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob) | |
1284 | 1 largefiles updated, 2 removed |
|
1284 | 1 largefiles updated, 2 removed | |
1285 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1285 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1286 | $ rm normal3 |
|
1286 | $ rm normal3 | |
1287 | $ echo >> sub/normal4 |
|
1287 | $ echo >> sub/normal4 | |
1288 | $ hg ci -m 'commit with missing files' |
|
1288 | $ hg ci -m 'commit with missing files' | |
1289 | Invoking status precommit hook |
|
1289 | Invoking status precommit hook | |
1290 | M sub/normal4 |
|
1290 | M sub/normal4 | |
1291 | ! large3 |
|
1291 | ! large3 | |
1292 | ! normal3 |
|
1292 | ! normal3 | |
1293 | created new head |
|
1293 | created new head | |
1294 | $ hg st |
|
1294 | $ hg st | |
1295 | ! large3 |
|
1295 | ! large3 | |
1296 | ! normal3 |
|
1296 | ! normal3 | |
1297 | $ hg up -r. |
|
1297 | $ hg up -r. | |
1298 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1298 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1299 | $ hg st |
|
1299 | $ hg st | |
1300 | ! large3 |
|
1300 | ! large3 | |
1301 | ! normal3 |
|
1301 | ! normal3 | |
1302 | $ hg up -Cr. |
|
1302 | $ hg up -Cr. | |
1303 | getting changed largefiles |
|
1303 | getting changed largefiles | |
1304 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob) |
|
1304 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob) | |
1305 | 0 largefiles updated, 0 removed |
|
1305 | 0 largefiles updated, 0 removed | |
1306 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1306 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1307 | $ hg st |
|
1307 | $ hg st | |
1308 | ! large3 |
|
1308 | ! large3 | |
1309 | $ hg rollback |
|
1309 | $ hg rollback | |
1310 | repository tip rolled back to revision 9 (undo commit) |
|
1310 | repository tip rolled back to revision 9 (undo commit) | |
1311 | working directory now based on revision 6 |
|
1311 | working directory now based on revision 6 | |
1312 |
|
1312 | |||
1313 | Merge with revision with missing largefile - and make sure it tries to fetch it. |
|
1313 | Merge with revision with missing largefile - and make sure it tries to fetch it. | |
1314 |
|
1314 | |||
1315 | $ hg up -Cqr null |
|
1315 | $ hg up -Cqr null | |
1316 | $ echo f > f |
|
1316 | $ echo f > f | |
1317 | $ hg ci -Am branch |
|
1317 | $ hg ci -Am branch | |
1318 | adding f |
|
1318 | adding f | |
1319 | Invoking status precommit hook |
|
1319 | Invoking status precommit hook | |
1320 | A f |
|
1320 | A f | |
1321 | created new head |
|
1321 | created new head | |
1322 | $ hg merge -r 6 |
|
1322 | $ hg merge -r 6 | |
1323 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1323 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1324 | (branch merge, don't forget to commit) |
|
1324 | (branch merge, don't forget to commit) | |
1325 | getting changed largefiles |
|
1325 | getting changed largefiles | |
1326 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file://$TESTTMP/d (glob) |
|
1326 | large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:/*/$TESTTMP/d (glob) | |
1327 | 1 largefiles updated, 0 removed |
|
1327 | 1 largefiles updated, 0 removed | |
1328 |
|
1328 | |||
1329 | $ hg rollback -q |
|
1329 | $ hg rollback -q | |
1330 | $ hg up -Cq |
|
1330 | $ hg up -Cq | |
1331 |
|
1331 | |||
1332 | Pulling 0 revisions with --all-largefiles should not fetch for all revisions |
|
1332 | Pulling 0 revisions with --all-largefiles should not fetch for all revisions | |
1333 |
|
1333 | |||
1334 | $ hg pull --all-largefiles |
|
1334 | $ hg pull --all-largefiles | |
1335 | pulling from $TESTTMP/d (glob) |
|
1335 | pulling from $TESTTMP/d (glob) | |
1336 | searching for changes |
|
1336 | searching for changes | |
1337 | no changes found |
|
1337 | no changes found | |
1338 |
|
1338 | |||
1339 | Merging does not revert to old versions of largefiles and also check |
|
1339 | Merging does not revert to old versions of largefiles and also check | |
1340 | that merging after having pulled from a non-default remote works |
|
1340 | that merging after having pulled from a non-default remote works | |
1341 | correctly. |
|
1341 | correctly. | |
1342 |
|
1342 | |||
1343 | $ cd .. |
|
1343 | $ cd .. | |
1344 | $ hg clone -r 7 e temp |
|
1344 | $ hg clone -r 7 e temp | |
1345 | adding changesets |
|
1345 | adding changesets | |
1346 | adding manifests |
|
1346 | adding manifests | |
1347 | adding file changes |
|
1347 | adding file changes | |
1348 | added 8 changesets with 24 changes to 10 files |
|
1348 | added 8 changesets with 24 changes to 10 files | |
1349 | updating to branch default |
|
1349 | updating to branch default | |
1350 | getting changed largefiles |
|
1350 | getting changed largefiles | |
1351 | 3 largefiles updated, 0 removed |
|
1351 | 3 largefiles updated, 0 removed | |
1352 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1352 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1353 | $ hg clone temp f |
|
1353 | $ hg clone temp f | |
1354 | updating to branch default |
|
1354 | updating to branch default | |
1355 | getting changed largefiles |
|
1355 | getting changed largefiles | |
1356 | 3 largefiles updated, 0 removed |
|
1356 | 3 largefiles updated, 0 removed | |
1357 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1357 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1358 | # Delete the largefiles in the largefiles system cache so that we have an |
|
1358 | # Delete the largefiles in the largefiles system cache so that we have an | |
1359 | # opportunity to test that caching after a pull works. |
|
1359 | # opportunity to test that caching after a pull works. | |
1360 | $ rm "${USERCACHE}"/* |
|
1360 | $ rm "${USERCACHE}"/* | |
1361 | $ cd f |
|
1361 | $ cd f | |
1362 | $ echo "large4-merge-test" > sub/large4 |
|
1362 | $ echo "large4-merge-test" > sub/large4 | |
1363 | $ hg commit -m "Modify large4 to test merge" |
|
1363 | $ hg commit -m "Modify large4 to test merge" | |
1364 | Invoking status precommit hook |
|
1364 | Invoking status precommit hook | |
1365 | M sub/large4 |
|
1365 | M sub/large4 | |
1366 | # Test --cache-largefiles flag |
|
1366 | # Test --cache-largefiles flag | |
1367 | $ hg pull --lfrev 'heads(pulled())' ../e |
|
1367 | $ hg pull --lfrev 'heads(pulled())' ../e | |
1368 | pulling from ../e |
|
1368 | pulling from ../e | |
1369 | searching for changes |
|
1369 | searching for changes | |
1370 | adding changesets |
|
1370 | adding changesets | |
1371 | adding manifests |
|
1371 | adding manifests | |
1372 | adding file changes |
|
1372 | adding file changes | |
1373 | added 2 changesets with 4 changes to 4 files (+1 heads) |
|
1373 | added 2 changesets with 4 changes to 4 files (+1 heads) | |
1374 |
(run 'hg heads' |
|
1374 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
1375 | 2 largefiles cached |
|
1375 | 2 largefiles cached | |
1376 | $ hg merge |
|
1376 | $ hg merge | |
1377 | largefile sub/large4 has a merge conflict |
|
1377 | largefile sub/large4 has a merge conflict | |
1378 | ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 |
|
1378 | ancestor was 971fb41e78fea4f8e0ba5244784239371cb00591 | |
1379 | keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or |
|
1379 | keep (l)ocal d846f26643bfa8ec210be40cc93cc6b7ff1128ea or | |
1380 | take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l |
|
1380 | take (o)ther e166e74c7303192238d60af5a9c4ce9bef0b7928? l | |
1381 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1381 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1382 | (branch merge, don't forget to commit) |
|
1382 | (branch merge, don't forget to commit) | |
1383 | getting changed largefiles |
|
1383 | getting changed largefiles | |
1384 | 1 largefiles updated, 0 removed |
|
1384 | 1 largefiles updated, 0 removed | |
1385 | $ hg commit -m "Merge repos e and f" |
|
1385 | $ hg commit -m "Merge repos e and f" | |
1386 | Invoking status precommit hook |
|
1386 | Invoking status precommit hook | |
1387 | M normal3 |
|
1387 | M normal3 | |
1388 | M sub/normal4 |
|
1388 | M sub/normal4 | |
1389 | M sub2/large6 |
|
1389 | M sub2/large6 | |
1390 | $ cat normal3 |
|
1390 | $ cat normal3 | |
1391 | normal3-modified |
|
1391 | normal3-modified | |
1392 | $ cat sub/normal4 |
|
1392 | $ cat sub/normal4 | |
1393 | normal4-modified |
|
1393 | normal4-modified | |
1394 | $ cat sub/large4 |
|
1394 | $ cat sub/large4 | |
1395 | large4-merge-test |
|
1395 | large4-merge-test | |
1396 | $ cat sub2/large6 |
|
1396 | $ cat sub2/large6 | |
1397 | large6-modified |
|
1397 | large6-modified | |
1398 | $ cat sub2/large7 |
|
1398 | $ cat sub2/large7 | |
1399 | large7 |
|
1399 | large7 | |
1400 |
|
1400 | |||
1401 | Test status after merging with a branch that introduces a new largefile: |
|
1401 | Test status after merging with a branch that introduces a new largefile: | |
1402 |
|
1402 | |||
1403 | $ echo large > large |
|
1403 | $ echo large > large | |
1404 | $ hg add --large large |
|
1404 | $ hg add --large large | |
1405 |
$ |
|
1405 | $ hg commit -m 'add largefile' | |
1406 | Invoking status precommit hook |
|
1406 | Invoking status precommit hook | |
1407 | A large |
|
1407 | A large | |
1408 | $ hg update -q ".^" |
|
1408 | $ hg update -q ".^" | |
1409 | $ echo change >> normal3 |
|
1409 | $ echo change >> normal3 | |
1410 |
$ |
|
1410 | $ hg commit -m 'some change' | |
1411 | Invoking status precommit hook |
|
1411 | Invoking status precommit hook | |
1412 | M normal3 |
|
1412 | M normal3 | |
1413 | created new head |
|
1413 | created new head | |
1414 | $ hg merge |
|
1414 | $ hg merge | |
1415 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1415 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1416 |
|
|
1416 | (branch merge, don't forget to commit) | |
1417 | getting changed largefiles |
|
1417 | getting changed largefiles | |
1418 | 1 largefiles updated, 0 removed |
|
1418 | 1 largefiles updated, 0 removed | |
1419 | $ hg status |
|
1419 | $ hg status | |
1420 | M large |
|
1420 | M large | |
1421 |
|
1421 | |||
1422 | - make sure update of merge with removed largefiles fails as expected |
|
1422 | - make sure update of merge with removed largefiles fails as expected | |
1423 | $ hg rm sub2/large6 |
|
1423 | $ hg rm sub2/large6 | |
1424 | $ hg up -r. |
|
1424 | $ hg up -r. | |
1425 | abort: outstanding uncommitted merges |
|
1425 | abort: outstanding uncommitted merges | |
1426 | [255] |
|
1426 | [255] | |
1427 |
|
1427 | |||
1428 | - revert should be able to revert files introduced in a pending merge |
|
1428 | - revert should be able to revert files introduced in a pending merge | |
1429 | $ hg revert --all -r . |
|
1429 | $ hg revert --all -r . | |
1430 | removing .hglf/large (glob) |
|
1430 | removing .hglf/large (glob) | |
1431 | undeleting .hglf/sub2/large6 (glob) |
|
1431 | undeleting .hglf/sub2/large6 (glob) | |
1432 |
|
1432 | |||
1433 | Test that a normal file and a largefile with the same name and path cannot |
|
1433 | Test that a normal file and a largefile with the same name and path cannot | |
1434 | coexist. |
|
1434 | coexist. | |
1435 |
|
1435 | |||
1436 | $ rm sub2/large7 |
|
1436 | $ rm sub2/large7 | |
1437 | $ echo "largeasnormal" > sub2/large7 |
|
1437 | $ echo "largeasnormal" > sub2/large7 | |
1438 | $ hg add sub2/large7 |
|
1438 | $ hg add sub2/large7 | |
1439 | sub2/large7 already a largefile |
|
1439 | sub2/large7 already a largefile | |
1440 |
|
1440 | |||
1441 | Test that transplanting a largefile change works correctly. |
|
1441 | Test that transplanting a largefile change works correctly. | |
1442 |
|
1442 | |||
1443 | $ cd .. |
|
1443 | $ cd .. | |
1444 | $ hg clone -r 8 d g |
|
1444 | $ hg clone -r 8 d g | |
1445 | adding changesets |
|
1445 | adding changesets | |
1446 | adding manifests |
|
1446 | adding manifests | |
1447 | adding file changes |
|
1447 | adding file changes | |
1448 | added 9 changesets with 26 changes to 10 files |
|
1448 | added 9 changesets with 26 changes to 10 files | |
1449 | updating to branch default |
|
1449 | updating to branch default | |
1450 | getting changed largefiles |
|
1450 | getting changed largefiles | |
1451 | 3 largefiles updated, 0 removed |
|
1451 | 3 largefiles updated, 0 removed | |
1452 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1452 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1453 | $ cd g |
|
1453 | $ cd g | |
1454 | $ hg transplant -s ../d 598410d3eb9a |
|
1454 | $ hg transplant -s ../d 598410d3eb9a | |
1455 | searching for changes |
|
1455 | searching for changes | |
1456 | searching for changes |
|
1456 | searching for changes | |
1457 | adding changesets |
|
1457 | adding changesets | |
1458 | adding manifests |
|
1458 | adding manifests | |
1459 | adding file changes |
|
1459 | adding file changes | |
1460 | added 1 changesets with 2 changes to 2 files |
|
1460 | added 1 changesets with 2 changes to 2 files | |
1461 | getting changed largefiles |
|
1461 | getting changed largefiles | |
1462 | 1 largefiles updated, 0 removed |
|
1462 | 1 largefiles updated, 0 removed | |
1463 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' |
|
1463 | $ hg log --template '{rev}:{node|short} {desc|firstline}\n' | |
1464 | 9:598410d3eb9a modify normal file largefile in repo d |
|
1464 | 9:598410d3eb9a modify normal file largefile in repo d | |
1465 | 8:a381d2c8c80e modify normal file and largefile in repo b |
|
1465 | 8:a381d2c8c80e modify normal file and largefile in repo b | |
1466 | 7:daea875e9014 add/edit more largefiles |
|
1466 | 7:daea875e9014 add/edit more largefiles | |
1467 | 6:4355d653f84f edit files yet again |
|
1467 | 6:4355d653f84f edit files yet again | |
1468 | 5:9d5af5072dbd edit files again |
|
1468 | 5:9d5af5072dbd edit files again | |
1469 | 4:74c02385b94c move files |
|
1469 | 4:74c02385b94c move files | |
1470 | 3:9e8fbc4bce62 copy files |
|
1470 | 3:9e8fbc4bce62 copy files | |
1471 | 2:51a0ae4d5864 remove files |
|
1471 | 2:51a0ae4d5864 remove files | |
1472 | 1:ce8896473775 edit files |
|
1472 | 1:ce8896473775 edit files | |
1473 | 0:30d30fe6a5be add files |
|
1473 | 0:30d30fe6a5be add files | |
1474 | $ cat normal3 |
|
1474 | $ cat normal3 | |
1475 | normal3-modified |
|
1475 | normal3-modified | |
1476 | $ cat sub/normal4 |
|
1476 | $ cat sub/normal4 | |
1477 | normal4-modified |
|
1477 | normal4-modified | |
1478 | $ cat sub/large4 |
|
1478 | $ cat sub/large4 | |
1479 | large4-modified |
|
1479 | large4-modified | |
1480 | $ cat sub2/large6 |
|
1480 | $ cat sub2/large6 | |
1481 | large6-modified |
|
1481 | large6-modified | |
1482 | $ cat sub2/large7 |
|
1482 | $ cat sub2/large7 | |
1483 | large7 |
|
1483 | large7 | |
1484 |
|
1484 | |||
1485 | Cat a largefile |
|
1485 | Cat a largefile | |
1486 | $ hg cat normal3 |
|
1486 | $ hg cat normal3 | |
1487 | normal3-modified |
|
1487 | normal3-modified | |
1488 | $ hg cat sub/large4 |
|
1488 | $ hg cat sub/large4 | |
1489 | large4-modified |
|
1489 | large4-modified | |
1490 | $ rm "${USERCACHE}"/* |
|
1490 | $ rm "${USERCACHE}"/* | |
1491 | $ hg cat -r a381d2c8c80e -o cat.out sub/large4 |
|
1491 | $ hg cat -r a381d2c8c80e -o cat.out sub/large4 | |
1492 | $ cat cat.out |
|
1492 | $ cat cat.out | |
1493 | large4-modified |
|
1493 | large4-modified | |
1494 | $ rm cat.out |
|
1494 | $ rm cat.out | |
1495 | $ hg cat -r a381d2c8c80e normal3 |
|
1495 | $ hg cat -r a381d2c8c80e normal3 | |
1496 | normal3-modified |
|
1496 | normal3-modified | |
1497 | $ hg cat -r '.^' normal3 |
|
1497 | $ hg cat -r '.^' normal3 | |
1498 | normal3-modified |
|
1498 | normal3-modified | |
1499 | $ hg cat -r '.^' sub/large4 doesntexist |
|
1499 | $ hg cat -r '.^' sub/large4 doesntexist | |
1500 | large4-modified |
|
1500 | large4-modified | |
1501 | doesntexist: no such file in rev a381d2c8c80e |
|
1501 | doesntexist: no such file in rev a381d2c8c80e | |
1502 | $ hg --cwd sub cat -r '.^' large4 |
|
1502 | $ hg --cwd sub cat -r '.^' large4 | |
1503 | large4-modified |
|
1503 | large4-modified | |
1504 |
$ hg --cwd sub cat -r '. |
|
1504 | $ hg --cwd sub cat -r '.^' ../normal3 | |
1505 | normal3-modified |
|
1505 | normal3-modified | |
1506 |
|
1506 | |||
1507 | Test that renaming a largefile results in correct output for status |
|
1507 | Test that renaming a largefile results in correct output for status | |
1508 |
|
1508 | |||
1509 | $ hg rename sub/large4 large4-renamed |
|
1509 | $ hg rename sub/large4 large4-renamed | |
1510 | $ hg commit -m "test rename output" |
|
1510 | $ hg commit -m "test rename output" | |
1511 | Invoking status precommit hook |
|
1511 | Invoking status precommit hook | |
1512 | A large4-renamed |
|
1512 | A large4-renamed | |
1513 | R sub/large4 |
|
1513 | R sub/large4 | |
1514 | $ cat large4-renamed |
|
1514 | $ cat large4-renamed | |
1515 | large4-modified |
|
1515 | large4-modified | |
1516 | $ cd sub2 |
|
1516 | $ cd sub2 | |
1517 | $ hg rename large6 large6-renamed |
|
1517 | $ hg rename large6 large6-renamed | |
1518 | $ hg st |
|
1518 | $ hg st | |
1519 | A sub2/large6-renamed |
|
1519 | A sub2/large6-renamed | |
1520 | R sub2/large6 |
|
1520 | R sub2/large6 | |
1521 | $ cd .. |
|
1521 | $ cd .. | |
1522 |
|
1522 | |||
1523 | Test --normal flag |
|
1523 | Test --normal flag | |
1524 |
|
1524 | |||
1525 | $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null |
|
1525 | $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null | |
1526 | $ hg add --normal --large new-largefile |
|
1526 | $ hg add --normal --large new-largefile | |
1527 | abort: --normal cannot be used with --large |
|
1527 | abort: --normal cannot be used with --large | |
1528 | [255] |
|
1528 | [255] | |
1529 | $ hg add --normal new-largefile |
|
1529 | $ hg add --normal new-largefile | |
1530 | new-largefile: up to 69 MB of RAM may be required to manage this file |
|
1530 | new-largefile: up to 69 MB of RAM may be required to manage this file | |
1531 |
(use 'hg |
|
1531 | (use 'hg revert new-largefile' to cancel the pending addition) | |
1532 | $ cd .. |
|
1532 | $ cd .. | |
1533 |
|
1533 | |||
1534 | #if serve |
|
1534 | #if serve | |
1535 | vanilla clients not locked out from largefiles servers on vanilla repos |
|
1535 | vanilla clients not locked out from largefiles servers on vanilla repos | |
1536 | $ mkdir r1 |
|
1536 | $ mkdir r1 | |
1537 | $ cd r1 |
|
1537 | $ cd r1 | |
1538 | $ hg init |
|
1538 | $ hg init | |
1539 | $ echo c1 > f1 |
|
1539 | $ echo c1 > f1 | |
1540 | $ hg add f1 |
|
1540 | $ hg add f1 | |
1541 | $ hg commit -m "m1" |
|
1541 | $ hg commit -m "m1" | |
1542 | Invoking status precommit hook |
|
1542 | Invoking status precommit hook | |
1543 | A f1 |
|
1543 | A f1 | |
1544 | $ cd .. |
|
1544 | $ cd .. | |
1545 | $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid |
|
1545 | $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid | |
1546 | $ cat hg.pid >> $DAEMON_PIDS |
|
1546 | $ cat hg.pid >> $DAEMON_PIDS | |
1547 | $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2 |
|
1547 | $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2 | |
1548 | requesting all changes |
|
1548 | requesting all changes | |
1549 | adding changesets |
|
1549 | adding changesets | |
1550 | adding manifests |
|
1550 | adding manifests | |
1551 | adding file changes |
|
1551 | adding file changes | |
1552 | added 1 changesets with 1 changes to 1 files |
|
1552 | added 1 changesets with 1 changes to 1 files | |
1553 | updating to branch default |
|
1553 | updating to branch default | |
1554 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1554 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1555 |
|
1555 | |||
1556 | largefiles clients still work with vanilla servers |
|
1556 | largefiles clients still work with vanilla servers | |
1557 | $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid |
|
1557 | $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid | |
1558 | $ cat hg.pid >> $DAEMON_PIDS |
|
1558 | $ cat hg.pid >> $DAEMON_PIDS | |
1559 | $ hg clone http://localhost:$HGPORT1 r3 |
|
1559 | $ hg clone http://localhost:$HGPORT1 r3 | |
1560 | requesting all changes |
|
1560 | requesting all changes | |
1561 | adding changesets |
|
1561 | adding changesets | |
1562 | adding manifests |
|
1562 | adding manifests | |
1563 | adding file changes |
|
1563 | adding file changes | |
1564 | added 1 changesets with 1 changes to 1 files |
|
1564 | added 1 changesets with 1 changes to 1 files | |
1565 | updating to branch default |
|
1565 | updating to branch default | |
1566 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1566 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1567 | #endif |
|
1567 | #endif | |
1568 |
|
1568 | |||
1569 |
|
1569 | |||
1570 | vanilla clients locked out from largefiles http repos |
|
1570 | vanilla clients locked out from largefiles http repos | |
1571 | $ mkdir r4 |
|
1571 | $ mkdir r4 | |
1572 | $ cd r4 |
|
1572 | $ cd r4 | |
1573 | $ hg init |
|
1573 | $ hg init | |
1574 | $ echo c1 > f1 |
|
1574 | $ echo c1 > f1 | |
1575 | $ hg add --large f1 |
|
1575 | $ hg add --large f1 | |
1576 | $ hg commit -m "m1" |
|
1576 | $ hg commit -m "m1" | |
1577 | Invoking status precommit hook |
|
1577 | Invoking status precommit hook | |
1578 | A f1 |
|
1578 | A f1 | |
1579 | $ cd .. |
|
1579 | $ cd .. | |
1580 |
|
1580 | |||
1581 | largefiles can be pushed locally (issue3583) |
|
1581 | largefiles can be pushed locally (issue3583) | |
1582 | $ hg init dest |
|
1582 | $ hg init dest | |
1583 | $ cd r4 |
|
1583 | $ cd r4 | |
1584 | $ hg outgoing ../dest |
|
1584 | $ hg outgoing ../dest | |
1585 | comparing with ../dest |
|
1585 | comparing with ../dest | |
1586 | searching for changes |
|
1586 | searching for changes | |
1587 | changeset: 0:639881c12b4c |
|
1587 | changeset: 0:639881c12b4c | |
1588 | tag: tip |
|
1588 | tag: tip | |
1589 | user: test |
|
1589 | user: test | |
1590 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1590 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1591 | summary: m1 |
|
1591 | summary: m1 | |
1592 |
|
1592 | |||
1593 | $ hg push ../dest |
|
1593 | $ hg push ../dest | |
1594 | pushing to ../dest |
|
1594 | pushing to ../dest | |
1595 | searching for changes |
|
1595 | searching for changes | |
1596 | searching for changes |
|
1596 | searching for changes | |
1597 | adding changesets |
|
1597 | adding changesets | |
1598 | adding manifests |
|
1598 | adding manifests | |
1599 | adding file changes |
|
1599 | adding file changes | |
1600 | added 1 changesets with 1 changes to 1 files |
|
1600 | added 1 changesets with 1 changes to 1 files | |
1601 |
|
1601 | |||
1602 | exit code with nothing outgoing (issue3611) |
|
1602 | exit code with nothing outgoing (issue3611) | |
1603 | $ hg outgoing ../dest |
|
1603 | $ hg outgoing ../dest | |
1604 | comparing with ../dest |
|
1604 | comparing with ../dest | |
1605 | searching for changes |
|
1605 | searching for changes | |
1606 | no changes found |
|
1606 | no changes found | |
1607 | [1] |
|
1607 | [1] | |
1608 | $ cd .. |
|
1608 | $ cd .. | |
1609 |
|
1609 | |||
1610 | #if serve |
|
1610 | #if serve | |
1611 | $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid |
|
1611 | $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid | |
1612 | $ cat hg.pid >> $DAEMON_PIDS |
|
1612 | $ cat hg.pid >> $DAEMON_PIDS | |
1613 | $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5 |
|
1613 | $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5 | |
1614 | abort: remote error: |
|
1614 | abort: remote error: | |
1615 |
|
1615 | |||
1616 | This repository uses the largefiles extension. |
|
1616 | This repository uses the largefiles extension. | |
1617 |
|
1617 | |||
1618 | Please enable it in your Mercurial config file. |
|
1618 | Please enable it in your Mercurial config file. | |
1619 | [255] |
|
1619 | [255] | |
1620 |
|
1620 | |||
1621 | used all HGPORTs, kill all daemons |
|
1621 | used all HGPORTs, kill all daemons | |
1622 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
|
1622 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | |
1623 | #endif |
|
1623 | #endif | |
1624 |
|
1624 | |||
1625 | vanilla clients locked out from largefiles ssh repos |
|
1625 | vanilla clients locked out from largefiles ssh repos | |
1626 | $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5 |
|
1626 | $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5 | |
1627 | abort: remote error: |
|
1627 | abort: remote error: | |
1628 |
|
1628 | |||
1629 | This repository uses the largefiles extension. |
|
1629 | This repository uses the largefiles extension. | |
1630 |
|
1630 | |||
1631 | Please enable it in your Mercurial config file. |
|
1631 | Please enable it in your Mercurial config file. | |
1632 | [255] |
|
1632 | [255] | |
1633 |
|
1633 | |||
1634 | #if serve |
|
1634 | #if serve | |
1635 |
|
1635 | |||
1636 | largefiles clients refuse to push largefiles repos to vanilla servers |
|
1636 | largefiles clients refuse to push largefiles repos to vanilla servers | |
1637 | $ mkdir r6 |
|
1637 | $ mkdir r6 | |
1638 | $ cd r6 |
|
1638 | $ cd r6 | |
1639 | $ hg init |
|
1639 | $ hg init | |
1640 | $ echo c1 > f1 |
|
1640 | $ echo c1 > f1 | |
1641 | $ hg add f1 |
|
1641 | $ hg add f1 | |
1642 | $ hg commit -m "m1" |
|
1642 | $ hg commit -m "m1" | |
1643 | Invoking status precommit hook |
|
1643 | Invoking status precommit hook | |
1644 | A f1 |
|
1644 | A f1 | |
1645 | $ cat >> .hg/hgrc <<! |
|
1645 | $ cat >> .hg/hgrc <<! | |
1646 | > [web] |
|
1646 | > [web] | |
1647 | > push_ssl = false |
|
1647 | > push_ssl = false | |
1648 | > allow_push = * |
|
1648 | > allow_push = * | |
1649 | > ! |
|
1649 | > ! | |
1650 |
$ |
|
1650 | $ cd .. | |
1651 |
$ |
|
1651 | $ hg clone r6 r7 | |
1652 |
|
|
1652 | updating to branch default | |
1653 |
|
|
1653 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1654 |
$ |
|
1654 | $ cd r7 | |
1655 |
$ |
|
1655 | $ echo c2 > f2 | |
1656 |
$ |
|
1656 | $ hg add --large f2 | |
1657 |
$ |
|
1657 | $ hg commit -m "m2" | |
1658 |
|
|
1658 | Invoking status precommit hook | |
1659 |
|
|
1659 | A f2 | |
1660 |
$ |
|
1660 | $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid | |
1661 |
$ |
|
1661 | $ cat ../hg.pid >> $DAEMON_PIDS | |
1662 | $ hg push http://localhost:$HGPORT |
|
1662 | $ hg push http://localhost:$HGPORT | |
1663 | pushing to http://localhost:$HGPORT/ |
|
1663 | pushing to http://localhost:$HGPORT/ | |
1664 | searching for changes |
|
1664 | searching for changes | |
1665 | abort: http://localhost:$HGPORT/ does not appear to be a largefile store |
|
1665 | abort: http://localhost:$HGPORT/ does not appear to be a largefile store | |
1666 | [255] |
|
1666 | [255] | |
1667 | $ cd .. |
|
1667 | $ cd .. | |
1668 |
|
1668 | |||
1669 | putlfile errors are shown (issue3123) |
|
1669 | putlfile errors are shown (issue3123) | |
1670 | Corrupt the cached largefile in r7 and move it out of the servers usercache |
|
1670 | Corrupt the cached largefile in r7 and move it out of the servers usercache | |
1671 | $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 . |
|
1671 | $ mv r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 . | |
1672 |
$ echo 'client |
|
1672 | $ echo 'client side corruption' > r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 | |
1673 | $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8" |
|
1673 | $ rm "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8" | |
1674 | $ hg init empty |
|
1674 | $ hg init empty | |
1675 | $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \ |
|
1675 | $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \ | |
1676 |
> --config 'web. |
|
1676 | > --config 'web.allow_push=*' --config web.push_ssl=False | |
1677 | $ cat hg.pid >> $DAEMON_PIDS |
|
1677 | $ cat hg.pid >> $DAEMON_PIDS | |
1678 | $ hg push -R r7 http://localhost:$HGPORT1 |
|
1678 | $ hg push -R r7 http://localhost:$HGPORT1 | |
1679 | pushing to http://localhost:$HGPORT1/ |
|
1679 | pushing to http://localhost:$HGPORT1/ | |
1680 | searching for changes |
|
1680 | searching for changes | |
1681 | remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash |
|
1681 | remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash | |
1682 | abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob) |
|
1682 | abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob) | |
1683 | [255] |
|
1683 | [255] | |
1684 | $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 |
|
1684 | $ mv 4cdac4d8b084d0b599525cf732437fb337d422a8 r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 | |
1685 | Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic |
|
1685 | Push of file that exists on server but is corrupted - magic healing would be nice ... but too magic | |
1686 | $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 |
|
1686 | $ echo "server side corruption" > empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 | |
1687 | $ hg push -R r7 http://localhost:$HGPORT1 |
|
1687 | $ hg push -R r7 http://localhost:$HGPORT1 | |
1688 | pushing to http://localhost:$HGPORT1/ |
|
1688 | pushing to http://localhost:$HGPORT1/ | |
1689 | searching for changes |
|
1689 | searching for changes | |
1690 | searching for changes |
|
1690 | searching for changes | |
1691 | remote: adding changesets |
|
1691 | remote: adding changesets | |
1692 | remote: adding manifests |
|
1692 | remote: adding manifests | |
1693 | remote: adding file changes |
|
1693 | remote: adding file changes | |
1694 | remote: added 2 changesets with 2 changes to 2 files |
|
1694 | remote: added 2 changesets with 2 changes to 2 files | |
1695 | $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 |
|
1695 | $ cat empty/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 | |
1696 | server side corruption |
|
1696 | server side corruption | |
1697 | $ rm -rf empty |
|
1697 | $ rm -rf empty | |
1698 |
|
1698 | |||
1699 | Push a largefiles repository to a served empty repository |
|
1699 | Push a largefiles repository to a served empty repository | |
1700 | $ hg init r8 |
|
1700 | $ hg init r8 | |
1701 | $ echo c3 > r8/f1 |
|
1701 | $ echo c3 > r8/f1 | |
1702 | $ hg add --large r8/f1 -R r8 |
|
1702 | $ hg add --large r8/f1 -R r8 | |
1703 | $ hg commit -m "m1" -R r8 |
|
1703 | $ hg commit -m "m1" -R r8 | |
1704 | Invoking status precommit hook |
|
1704 | Invoking status precommit hook | |
1705 | A f1 |
|
1705 | A f1 | |
1706 | $ hg init empty |
|
1706 | $ hg init empty | |
1707 | $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \ |
|
1707 | $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \ | |
1708 |
> --config 'web. |
|
1708 | > --config 'web.allow_push=*' --config web.push_ssl=False | |
1709 | $ cat hg.pid >> $DAEMON_PIDS |
|
1709 | $ cat hg.pid >> $DAEMON_PIDS | |
1710 | $ rm "${USERCACHE}"/* |
|
1710 | $ rm "${USERCACHE}"/* | |
1711 | $ hg push -R r8 http://localhost:$HGPORT2/#default |
|
1711 | $ hg push -R r8 http://localhost:$HGPORT2/#default | |
1712 | pushing to http://localhost:$HGPORT2/ |
|
1712 | pushing to http://localhost:$HGPORT2/ | |
1713 | searching for changes |
|
1713 | searching for changes | |
1714 | searching for changes |
|
1714 | searching for changes | |
1715 | remote: adding changesets |
|
1715 | remote: adding changesets | |
1716 | remote: adding manifests |
|
1716 | remote: adding manifests | |
1717 | remote: adding file changes |
|
1717 | remote: adding file changes | |
1718 | remote: added 1 changesets with 1 changes to 1 files |
|
1718 | remote: added 1 changesets with 1 changes to 1 files | |
1719 | $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] |
|
1719 | $ [ -f "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] | |
1720 | $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] |
|
1720 | $ [ -f empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] | |
1721 |
|
1721 | |||
1722 | Clone over http, no largefiles pulled on clone. |
|
1722 | Clone over http, no largefiles pulled on clone. | |
1723 |
|
1723 | |||
1724 | $ hg clone http://localhost:$HGPORT2/#default http-clone -U |
|
1724 | $ hg clone http://localhost:$HGPORT2/#default http-clone -U | |
1725 | adding changesets |
|
1725 | adding changesets | |
1726 | adding manifests |
|
1726 | adding manifests | |
1727 | adding file changes |
|
1727 | adding file changes | |
1728 | added 1 changesets with 1 changes to 1 files |
|
1728 | added 1 changesets with 1 changes to 1 files | |
1729 |
|
1729 | |||
1730 | test 'verify' with remotestore: |
|
1730 | test 'verify' with remotestore: | |
1731 |
|
1731 | |||
1732 | $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 |
|
1732 | $ rm "${USERCACHE}"/02a439e5c31c526465ab1a0ca1f431f76b827b90 | |
1733 | $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 . |
|
1733 | $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 . | |
1734 | $ hg -R http-clone verify --large --lfa |
|
1734 | $ hg -R http-clone verify --large --lfa | |
1735 | checking changesets |
|
1735 | checking changesets | |
1736 | checking manifests |
|
1736 | checking manifests | |
1737 | crosschecking files in changesets and manifests |
|
1737 | crosschecking files in changesets and manifests | |
1738 | checking files |
|
1738 | checking files | |
1739 | 1 files, 1 changesets, 1 total revisions |
|
1739 | 1 files, 1 changesets, 1 total revisions | |
1740 | searching 1 changesets for largefiles |
|
1740 | searching 1 changesets for largefiles | |
1741 | changeset 0:cf03e5bb9936: f1 missing |
|
1741 | changeset 0:cf03e5bb9936: f1 missing | |
1742 | verified existence of 1 revisions of 1 largefiles |
|
1742 | verified existence of 1 revisions of 1 largefiles | |
1743 | [1] |
|
1743 | [1] | |
1744 | $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/ |
|
1744 | $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/ | |
1745 | $ hg -R http-clone -q verify --large --lfa |
|
1745 | $ hg -R http-clone -q verify --large --lfa | |
1746 |
|
1746 | |||
1747 | largefiles pulled on update - a largefile missing on the server: |
|
1747 | largefiles pulled on update - a largefile missing on the server: | |
1748 | $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 . |
|
1748 | $ mv empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 . | |
1749 | $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache |
|
1749 | $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache | |
1750 | getting changed largefiles |
|
1750 | getting changed largefiles | |
1751 | f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/ |
|
1751 | f1: largefile 02a439e5c31c526465ab1a0ca1f431f76b827b90 not available from http://localhost:$HGPORT2/ | |
1752 | 0 largefiles updated, 0 removed |
|
1752 | 0 largefiles updated, 0 removed | |
1753 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1753 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1754 | $ hg -R http-clone st |
|
1754 | $ hg -R http-clone st | |
1755 | ! f1 |
|
1755 | ! f1 | |
1756 | $ hg -R http-clone up -Cqr null |
|
1756 | $ hg -R http-clone up -Cqr null | |
1757 |
|
1757 | |||
1758 | largefiles pulled on update - a largefile corrupted on the server: |
|
1758 | largefiles pulled on update - a largefile corrupted on the server: | |
1759 | $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 |
|
1759 | $ echo corruption > empty/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 | |
1760 | $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache |
|
1760 | $ hg -R http-clone up --config largefiles.usercache=http-clone-usercache | |
1761 | getting changed largefiles |
|
1761 | getting changed largefiles | |
1762 | f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27) |
|
1762 | f1: data corruption (expected 02a439e5c31c526465ab1a0ca1f431f76b827b90, got 6a7bb2556144babe3899b25e5428123735bb1e27) | |
1763 | 0 largefiles updated, 0 removed |
|
1763 | 0 largefiles updated, 0 removed | |
1764 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1764 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1765 | $ hg -R http-clone st |
|
1765 | $ hg -R http-clone st | |
1766 | ! f1 |
|
1766 | ! f1 | |
1767 | $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] |
|
1767 | $ [ ! -f http-clone/.hg/largefiles/02a439e5c31c526465ab1a0ca1f431f76b827b90 ] | |
1768 | $ [ ! -f http-clone/f1 ] |
|
1768 | $ [ ! -f http-clone/f1 ] | |
1769 | $ [ ! -f http-clone-usercache ] |
|
1769 | $ [ ! -f http-clone-usercache ] | |
1770 | $ hg -R http-clone verify --large --lfc |
|
1770 | $ hg -R http-clone verify --large --lfc | |
1771 | checking changesets |
|
1771 | checking changesets | |
1772 | checking manifests |
|
1772 | checking manifests | |
1773 | crosschecking files in changesets and manifests |
|
1773 | crosschecking files in changesets and manifests | |
1774 | checking files |
|
1774 | checking files | |
1775 | 1 files, 1 changesets, 1 total revisions |
|
1775 | 1 files, 1 changesets, 1 total revisions | |
1776 | searching 1 changesets for largefiles |
|
1776 | searching 1 changesets for largefiles | |
1777 | verified contents of 1 revisions of 1 largefiles |
|
1777 | verified contents of 1 revisions of 1 largefiles | |
1778 | $ hg -R http-clone up -Cqr null |
|
1778 | $ hg -R http-clone up -Cqr null | |
1779 |
|
1779 | |||
1780 | largefiles pulled on update - no server side problems: |
|
1780 | largefiles pulled on update - no server side problems: | |
1781 | $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/ |
|
1781 | $ mv 02a439e5c31c526465ab1a0ca1f431f76b827b90 empty/.hg/largefiles/ | |
1782 | $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache |
|
1782 | $ hg -R http-clone --debug up --config largefiles.usercache=http-clone-usercache | |
1783 | resolving manifests |
|
1783 | resolving manifests | |
1784 | branchmerge: False, force: False, partial: False |
|
1784 | branchmerge: False, force: False, partial: False | |
1785 | ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936 |
|
1785 | ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936 | |
1786 | .hglf/f1: remote created -> g |
|
1786 | .hglf/f1: remote created -> g | |
1787 | getting .hglf/f1 |
|
1787 | getting .hglf/f1 | |
1788 | updating: .hglf/f1 1/1 files (100.00%) |
|
1788 | updating: .hglf/f1 1/1 files (100.00%) | |
1789 | getting changed largefiles |
|
1789 | getting changed largefiles | |
1790 | using http://localhost:$HGPORT2/ |
|
1790 | using http://localhost:$HGPORT2/ | |
1791 | sending capabilities command |
|
1791 | sending capabilities command | |
1792 | sending batch command |
|
1792 | sending batch command | |
1793 | getting largefiles: 0/1 lfile (0.00%) |
|
1793 | getting largefiles: 0/1 lfile (0.00%) | |
1794 | getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90 |
|
1794 | getting f1:02a439e5c31c526465ab1a0ca1f431f76b827b90 | |
1795 | sending getlfile command |
|
1795 | sending getlfile command | |
1796 | found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store |
|
1796 | found 02a439e5c31c526465ab1a0ca1f431f76b827b90 in store | |
1797 | 1 largefiles updated, 0 removed |
|
1797 | 1 largefiles updated, 0 removed | |
1798 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1798 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1799 |
|
1799 | |||
1800 | $ ls http-clone-usercache/* |
|
1800 | $ ls http-clone-usercache/* | |
1801 | http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90 |
|
1801 | http-clone-usercache/02a439e5c31c526465ab1a0ca1f431f76b827b90 | |
1802 |
|
1802 | |||
1803 | $ rm -rf empty http-clone* |
|
1803 | $ rm -rf empty http-clone* | |
1804 |
|
1804 | |||
1805 | used all HGPORTs, kill all daemons |
|
1805 | used all HGPORTs, kill all daemons | |
1806 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
|
1806 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS | |
1807 |
|
1807 | |||
1808 | #endif |
|
1808 | #endif | |
1809 |
|
1809 | |||
1810 |
|
1810 | |||
1811 | #if unix-permissions |
|
1811 | #if unix-permissions | |
1812 |
|
1812 | |||
1813 | Clone a local repository owned by another user |
|
1813 | Clone a local repository owned by another user | |
1814 | We have to simulate that here by setting $HOME and removing write permissions |
|
1814 | We have to simulate that here by setting $HOME and removing write permissions | |
1815 | $ ORIGHOME="$HOME" |
|
1815 | $ ORIGHOME="$HOME" | |
1816 | $ mkdir alice |
|
1816 | $ mkdir alice | |
1817 | $ HOME="`pwd`/alice" |
|
1817 | $ HOME="`pwd`/alice" | |
1818 | $ cd alice |
|
1818 | $ cd alice | |
1819 | $ hg init pubrepo |
|
1819 | $ hg init pubrepo | |
1820 | $ cd pubrepo |
|
1820 | $ cd pubrepo | |
1821 | $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null |
|
1821 | $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null | |
1822 | $ hg add --large a-large-file |
|
1822 | $ hg add --large a-large-file | |
1823 | $ hg commit -m "Add a large file" |
|
1823 | $ hg commit -m "Add a large file" | |
1824 | Invoking status precommit hook |
|
1824 | Invoking status precommit hook | |
1825 | A a-large-file |
|
1825 | A a-large-file | |
1826 | $ cd .. |
|
1826 | $ cd .. | |
1827 | $ chmod -R a-w pubrepo |
|
1827 | $ chmod -R a-w pubrepo | |
1828 | $ cd .. |
|
1828 | $ cd .. | |
1829 | $ mkdir bob |
|
1829 | $ mkdir bob | |
1830 | $ HOME="`pwd`/bob" |
|
1830 | $ HOME="`pwd`/bob" | |
1831 | $ cd bob |
|
1831 | $ cd bob | |
1832 | $ hg clone --pull ../alice/pubrepo pubrepo |
|
1832 | $ hg clone --pull ../alice/pubrepo pubrepo | |
1833 | requesting all changes |
|
1833 | requesting all changes | |
1834 | adding changesets |
|
1834 | adding changesets | |
1835 | adding manifests |
|
1835 | adding manifests | |
1836 | adding file changes |
|
1836 | adding file changes | |
1837 | added 1 changesets with 1 changes to 1 files |
|
1837 | added 1 changesets with 1 changes to 1 files | |
1838 | updating to branch default |
|
1838 | updating to branch default | |
1839 | getting changed largefiles |
|
1839 | getting changed largefiles | |
1840 | 1 largefiles updated, 0 removed |
|
1840 | 1 largefiles updated, 0 removed | |
1841 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1841 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1842 | $ cd .. |
|
1842 | $ cd .. | |
1843 | $ chmod -R u+w alice/pubrepo |
|
1843 | $ chmod -R u+w alice/pubrepo | |
1844 | $ HOME="$ORIGHOME" |
|
1844 | $ HOME="$ORIGHOME" | |
1845 |
|
1845 | |||
1846 | #endif |
|
1846 | #endif | |
1847 |
|
1847 | |||
1848 | #if symlink |
|
1848 | #if symlink | |
1849 |
|
1849 | |||
1850 | Symlink to a large largefile should behave the same as a symlink to a normal file |
|
1850 | Symlink to a large largefile should behave the same as a symlink to a normal file | |
1851 | $ hg init largesymlink |
|
1851 | $ hg init largesymlink | |
1852 | $ cd largesymlink |
|
1852 | $ cd largesymlink | |
1853 | $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null |
|
1853 | $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null | |
1854 | $ hg add --large largefile |
|
1854 | $ hg add --large largefile | |
1855 | $ hg commit -m "commit a large file" |
|
1855 | $ hg commit -m "commit a large file" | |
1856 | Invoking status precommit hook |
|
1856 | Invoking status precommit hook | |
1857 | A largefile |
|
1857 | A largefile | |
1858 | $ ln -s largefile largelink |
|
1858 | $ ln -s largefile largelink | |
1859 | $ hg add largelink |
|
1859 | $ hg add largelink | |
1860 | $ hg commit -m "commit a large symlink" |
|
1860 | $ hg commit -m "commit a large symlink" | |
1861 | Invoking status precommit hook |
|
1861 | Invoking status precommit hook | |
1862 | A largelink |
|
1862 | A largelink | |
1863 | $ rm -f largelink |
|
1863 | $ rm -f largelink | |
1864 | $ hg up >/dev/null |
|
1864 | $ hg up >/dev/null | |
1865 | $ test -f largelink |
|
1865 | $ test -f largelink | |
1866 | [1] |
|
1866 | [1] | |
1867 | $ test -L largelink |
|
1867 | $ test -L largelink | |
1868 | [1] |
|
1868 | [1] | |
1869 | $ rm -f largelink # make next part of the test independent of the previous |
|
1869 | $ rm -f largelink # make next part of the test independent of the previous | |
1870 | $ hg up -C >/dev/null |
|
1870 | $ hg up -C >/dev/null | |
1871 | $ test -f largelink |
|
1871 | $ test -f largelink | |
1872 | $ test -L largelink |
|
1872 | $ test -L largelink | |
1873 | $ cd .. |
|
1873 | $ cd .. | |
1874 |
|
1874 | |||
1875 | #endif |
|
1875 | #endif | |
1876 |
|
1876 | |||
1877 | test for pattern matching on 'hg status': |
|
1877 | test for pattern matching on 'hg status': | |
1878 | to boost performance, largefiles checks whether specified patterns are |
|
1878 | to boost performance, largefiles checks whether specified patterns are | |
1879 | related to largefiles in working directory (NOT to STANDIN) or not. |
|
1879 | related to largefiles in working directory (NOT to STANDIN) or not. | |
1880 |
|
1880 | |||
1881 | $ hg init statusmatch |
|
1881 | $ hg init statusmatch | |
1882 | $ cd statusmatch |
|
1882 | $ cd statusmatch | |
1883 |
|
1883 | |||
1884 | $ mkdir -p a/b/c/d |
|
1884 | $ mkdir -p a/b/c/d | |
1885 | $ echo normal > a/b/c/d/e.normal.txt |
|
1885 | $ echo normal > a/b/c/d/e.normal.txt | |
1886 | $ hg add a/b/c/d/e.normal.txt |
|
1886 | $ hg add a/b/c/d/e.normal.txt | |
1887 | $ echo large > a/b/c/d/e.large.txt |
|
1887 | $ echo large > a/b/c/d/e.large.txt | |
1888 | $ hg add --large a/b/c/d/e.large.txt |
|
1888 | $ hg add --large a/b/c/d/e.large.txt | |
1889 | $ mkdir -p a/b/c/x |
|
1889 | $ mkdir -p a/b/c/x | |
1890 | $ echo normal > a/b/c/x/y.normal.txt |
|
1890 | $ echo normal > a/b/c/x/y.normal.txt | |
1891 | $ hg add a/b/c/x/y.normal.txt |
|
1891 | $ hg add a/b/c/x/y.normal.txt | |
1892 | $ hg commit -m 'add files' |
|
1892 | $ hg commit -m 'add files' | |
1893 | Invoking status precommit hook |
|
1893 | Invoking status precommit hook | |
1894 | A a/b/c/d/e.large.txt |
|
1894 | A a/b/c/d/e.large.txt | |
1895 | A a/b/c/d/e.normal.txt |
|
1895 | A a/b/c/d/e.normal.txt | |
1896 | A a/b/c/x/y.normal.txt |
|
1896 | A a/b/c/x/y.normal.txt | |
1897 |
|
1897 | |||
1898 | (1) no pattern: no performance boost |
|
1898 | (1) no pattern: no performance boost | |
1899 | $ hg status -A |
|
1899 | $ hg status -A | |
1900 | C a/b/c/d/e.large.txt |
|
1900 | C a/b/c/d/e.large.txt | |
1901 | C a/b/c/d/e.normal.txt |
|
1901 | C a/b/c/d/e.normal.txt | |
1902 | C a/b/c/x/y.normal.txt |
|
1902 | C a/b/c/x/y.normal.txt | |
1903 |
|
1903 | |||
1904 | (2) pattern not related to largefiles: performance boost |
|
1904 | (2) pattern not related to largefiles: performance boost | |
1905 | $ hg status -A a/b/c/x |
|
1905 | $ hg status -A a/b/c/x | |
1906 | C a/b/c/x/y.normal.txt |
|
1906 | C a/b/c/x/y.normal.txt | |
1907 |
|
1907 | |||
1908 | (3) pattern related to largefiles: no performance boost |
|
1908 | (3) pattern related to largefiles: no performance boost | |
1909 | $ hg status -A a/b/c/d |
|
1909 | $ hg status -A a/b/c/d | |
1910 | C a/b/c/d/e.large.txt |
|
1910 | C a/b/c/d/e.large.txt | |
1911 | C a/b/c/d/e.normal.txt |
|
1911 | C a/b/c/d/e.normal.txt | |
1912 |
|
1912 | |||
1913 | (4) pattern related to STANDIN (not to largefiles): performance boost |
|
1913 | (4) pattern related to STANDIN (not to largefiles): performance boost | |
1914 | $ hg status -A .hglf/a |
|
1914 | $ hg status -A .hglf/a | |
1915 | C .hglf/a/b/c/d/e.large.txt |
|
1915 | C .hglf/a/b/c/d/e.large.txt | |
1916 |
|
1916 | |||
1917 | (5) mixed case: no performance boost |
|
1917 | (5) mixed case: no performance boost | |
1918 | $ hg status -A a/b/c/x a/b/c/d |
|
1918 | $ hg status -A a/b/c/x a/b/c/d | |
1919 | C a/b/c/d/e.large.txt |
|
1919 | C a/b/c/d/e.large.txt | |
1920 | C a/b/c/d/e.normal.txt |
|
1920 | C a/b/c/d/e.normal.txt | |
1921 | C a/b/c/x/y.normal.txt |
|
1921 | C a/b/c/x/y.normal.txt | |
1922 |
|
1922 | |||
1923 | verify that largefiles doesn't break filesets |
|
1923 | verify that largefiles doesn't break filesets | |
1924 |
|
1924 | |||
1925 | $ hg log --rev . --exclude "set:binary()" |
|
1925 | $ hg log --rev . --exclude "set:binary()" | |
1926 | changeset: 0:41bd42f10efa |
|
1926 | changeset: 0:41bd42f10efa | |
1927 | tag: tip |
|
1927 | tag: tip | |
1928 | user: test |
|
1928 | user: test | |
1929 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1929 | date: Thu Jan 01 00:00:00 1970 +0000 | |
1930 | summary: add files |
|
1930 | summary: add files | |
1931 |
|
|
1931 | ||
1932 | verify that large files in subrepos handled properly |
|
1932 | verify that large files in subrepos handled properly | |
1933 | $ hg init subrepo |
|
1933 | $ hg init subrepo | |
1934 | $ echo "subrepo = subrepo" > .hgsub |
|
1934 | $ echo "subrepo = subrepo" > .hgsub | |
1935 | $ hg add .hgsub |
|
1935 | $ hg add .hgsub | |
1936 | $ hg ci -m "add subrepo" |
|
1936 | $ hg ci -m "add subrepo" | |
1937 | Invoking status precommit hook |
|
1937 | Invoking status precommit hook | |
1938 | A .hgsub |
|
1938 | A .hgsub | |
1939 | ? .hgsubstate |
|
1939 | ? .hgsubstate | |
1940 | $ echo "rev 1" > subrepo/large.txt |
|
1940 | $ echo "rev 1" > subrepo/large.txt | |
1941 | $ hg -R subrepo add --large subrepo/large.txt |
|
1941 | $ hg -R subrepo add --large subrepo/large.txt | |
1942 | $ hg sum |
|
1942 | $ hg sum | |
1943 | parent: 1:8ee150ea2e9c tip |
|
1943 | parent: 1:8ee150ea2e9c tip | |
1944 | add subrepo |
|
1944 | add subrepo | |
1945 | branch: default |
|
1945 | branch: default | |
1946 | commit: 1 subrepos |
|
1946 | commit: 1 subrepos | |
1947 | update: (current) |
|
1947 | update: (current) | |
1948 | $ hg st |
|
1948 | $ hg st | |
1949 | $ hg st -S |
|
1949 | $ hg st -S | |
1950 | A subrepo/large.txt |
|
1950 | A subrepo/large.txt | |
1951 | $ hg ci -S -m "commit top repo" |
|
1951 | $ hg ci -S -m "commit top repo" | |
1952 | committing subrepository subrepo |
|
1952 | committing subrepository subrepo | |
1953 | Invoking status precommit hook |
|
1953 | Invoking status precommit hook | |
1954 | A large.txt |
|
1954 | A large.txt | |
1955 | Invoking status precommit hook |
|
1955 | Invoking status precommit hook | |
1956 | M .hgsubstate |
|
1956 | M .hgsubstate | |
1957 |
|
|
1957 | # No differences | |
1958 | $ hg st -S |
|
1958 | $ hg st -S | |
1959 | $ hg sum |
|
1959 | $ hg sum | |
1960 | parent: 2:ce4cd0c527a6 tip |
|
1960 | parent: 2:ce4cd0c527a6 tip | |
1961 | commit top repo |
|
1961 | commit top repo | |
1962 | branch: default |
|
1962 | branch: default | |
1963 | commit: (clean) |
|
1963 | commit: (clean) | |
1964 | update: (current) |
|
1964 | update: (current) | |
1965 | $ echo "rev 2" > subrepo/large.txt |
|
1965 | $ echo "rev 2" > subrepo/large.txt | |
1966 | $ hg st -S |
|
1966 | $ hg st -S | |
1967 | M subrepo/large.txt |
|
1967 | M subrepo/large.txt | |
1968 | $ hg sum |
|
1968 | $ hg sum | |
1969 | parent: 2:ce4cd0c527a6 tip |
|
1969 | parent: 2:ce4cd0c527a6 tip | |
1970 | commit top repo |
|
1970 | commit top repo | |
1971 | branch: default |
|
1971 | branch: default | |
1972 | commit: 1 subrepos |
|
1972 | commit: 1 subrepos | |
1973 | update: (current) |
|
1973 | update: (current) | |
1974 | $ hg ci -m "this commit should fail without -S" |
|
1974 | $ hg ci -m "this commit should fail without -S" | |
1975 | abort: uncommitted changes in subrepo subrepo |
|
1975 | abort: uncommitted changes in subrepo subrepo | |
1976 | (use --subrepos for recursive commit) |
|
1976 | (use --subrepos for recursive commit) | |
1977 | [255] |
|
1977 | [255] | |
1978 |
|
1978 | |||
1979 | Add a normal file to the subrepo, then test archiving |
|
1979 | Add a normal file to the subrepo, then test archiving | |
1980 |
|
1980 | |||
1981 |
$ e |
|
1981 | $ echo 'normal file' > subrepo/normal.txt | |
1982 | $ hg -R subrepo add subrepo/normal.txt |
|
1982 | $ hg -R subrepo add subrepo/normal.txt | |
1983 |
|
1983 | |||
1984 |
|
|
1984 | Lock in subrepo, otherwise the change isn't archived | |
1985 |
|
1985 | |||
1986 | $ hg ci -S -m "add normal file to top level" |
|
1986 | $ hg ci -S -m "add normal file to top level" | |
1987 | committing subrepository subrepo |
|
1987 | committing subrepository subrepo | |
1988 | Invoking status precommit hook |
|
1988 | Invoking status precommit hook | |
1989 | M large.txt |
|
1989 | M large.txt | |
1990 | A normal.txt |
|
1990 | A normal.txt | |
1991 | Invoking status precommit hook |
|
1991 | Invoking status precommit hook | |
1992 | M .hgsubstate |
|
1992 | M .hgsubstate | |
1993 | $ hg archive -S ../lf_subrepo_archive |
|
1993 | $ hg archive -S ../lf_subrepo_archive | |
1994 | $ find ../lf_subrepo_archive | sort |
|
1994 | $ find ../lf_subrepo_archive | sort | |
1995 | ../lf_subrepo_archive |
|
1995 | ../lf_subrepo_archive | |
1996 | ../lf_subrepo_archive/.hg_archival.txt |
|
1996 | ../lf_subrepo_archive/.hg_archival.txt | |
1997 | ../lf_subrepo_archive/.hgsub |
|
1997 | ../lf_subrepo_archive/.hgsub | |
1998 | ../lf_subrepo_archive/.hgsubstate |
|
1998 | ../lf_subrepo_archive/.hgsubstate | |
1999 | ../lf_subrepo_archive/a |
|
1999 | ../lf_subrepo_archive/a | |
2000 | ../lf_subrepo_archive/a/b |
|
2000 | ../lf_subrepo_archive/a/b | |
2001 | ../lf_subrepo_archive/a/b/c |
|
2001 | ../lf_subrepo_archive/a/b/c | |
2002 | ../lf_subrepo_archive/a/b/c/d |
|
2002 | ../lf_subrepo_archive/a/b/c/d | |
2003 | ../lf_subrepo_archive/a/b/c/d/e.large.txt |
|
2003 | ../lf_subrepo_archive/a/b/c/d/e.large.txt | |
2004 | ../lf_subrepo_archive/a/b/c/d/e.normal.txt |
|
2004 | ../lf_subrepo_archive/a/b/c/d/e.normal.txt | |
2005 | ../lf_subrepo_archive/a/b/c/x |
|
2005 | ../lf_subrepo_archive/a/b/c/x | |
2006 | ../lf_subrepo_archive/a/b/c/x/y.normal.txt |
|
2006 | ../lf_subrepo_archive/a/b/c/x/y.normal.txt | |
2007 | ../lf_subrepo_archive/subrepo |
|
2007 | ../lf_subrepo_archive/subrepo | |
2008 | ../lf_subrepo_archive/subrepo/large.txt |
|
2008 | ../lf_subrepo_archive/subrepo/large.txt | |
2009 | ../lf_subrepo_archive/subrepo/normal.txt |
|
2009 | ../lf_subrepo_archive/subrepo/normal.txt | |
2010 |
|
2010 | |||
2011 | Test update with subrepos. |
|
2011 | Test update with subrepos. | |
2012 |
|
2012 | |||
2013 | $ hg update 0 |
|
2013 | $ hg update 0 | |
2014 | getting changed largefiles |
|
2014 | getting changed largefiles | |
2015 | 0 largefiles updated, 1 removed |
|
2015 | 0 largefiles updated, 1 removed | |
2016 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2016 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
2017 | $ hg status -S |
|
2017 | $ hg status -S | |
2018 | $ hg update tip |
|
2018 | $ hg update tip | |
2019 | getting changed largefiles |
|
2019 | getting changed largefiles | |
2020 | 1 largefiles updated, 0 removed |
|
2020 | 1 largefiles updated, 0 removed | |
2021 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2021 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2022 | $ hg status -S |
|
2022 | $ hg status -S | |
2023 | # modify a large file |
|
2023 | # modify a large file | |
2024 | $ echo "modified" > subrepo/large.txt |
|
2024 | $ echo "modified" > subrepo/large.txt | |
2025 | $ hg st -S |
|
2025 | $ hg st -S | |
2026 | M subrepo/large.txt |
|
2026 | M subrepo/large.txt | |
2027 | # update -C should revert the change. |
|
2027 | # update -C should revert the change. | |
2028 | $ hg update -C |
|
2028 | $ hg update -C | |
2029 | getting changed largefiles |
|
2029 | getting changed largefiles | |
2030 | 1 largefiles updated, 0 removed |
|
2030 | 1 largefiles updated, 0 removed | |
2031 | getting changed largefiles |
|
2031 | getting changed largefiles | |
2032 | 0 largefiles updated, 0 removed |
|
2032 | 0 largefiles updated, 0 removed | |
2033 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2033 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2034 | $ hg status -S |
|
2034 | $ hg status -S | |
2035 |
|
2035 | |||
2036 | Test archiving a revision that references a subrepo that is not yet |
|
2036 | Test archiving a revision that references a subrepo that is not yet | |
2037 | cloned (see test-subrepo-recursion.t): |
|
2037 | cloned (see test-subrepo-recursion.t): | |
2038 |
|
2038 | |||
2039 | $ hg clone -U . ../empty |
|
2039 | $ hg clone -U . ../empty | |
2040 | $ cd ../empty |
|
2040 | $ cd ../empty | |
2041 | $ hg archive --subrepos -r tip ../archive.tar.gz |
|
2041 | $ hg archive --subrepos -r tip ../archive.tar.gz | |
2042 | cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo |
|
2042 | cloning subrepo subrepo from $TESTTMP/statusmatch/subrepo | |
2043 | $ cd .. |
|
2043 | $ cd .. | |
2044 |
|
2044 | |||
2045 | Test that addremove picks up largefiles prior to the initial commit (issue3541) |
|
2045 | Test that addremove picks up largefiles prior to the initial commit (issue3541) | |
2046 |
|
2046 | |||
2047 | $ hg init addrm2 |
|
2047 | $ hg init addrm2 | |
2048 | $ cd addrm2 |
|
2048 | $ cd addrm2 | |
2049 | $ touch large.dat |
|
2049 | $ touch large.dat | |
2050 | $ touch large2.dat |
|
2050 | $ touch large2.dat | |
2051 | $ touch normal |
|
2051 | $ touch normal | |
2052 | $ hg add --large large.dat |
|
2052 | $ hg add --large large.dat | |
2053 | $ hg addremove -v |
|
2053 | $ hg addremove -v | |
2054 | adding large2.dat as a largefile |
|
2054 | adding large2.dat as a largefile | |
2055 | adding normal |
|
2055 | adding normal | |
2056 |
|
2056 | |||
2057 | Test that forgetting all largefiles reverts to islfilesrepo() == False |
|
2057 | Test that forgetting all largefiles reverts to islfilesrepo() == False | |
2058 | (addremove will add *.dat as normal files now) |
|
2058 | (addremove will add *.dat as normal files now) | |
2059 | $ hg forget large.dat |
|
2059 | $ hg forget large.dat | |
2060 | $ hg forget large2.dat |
|
2060 | $ hg forget large2.dat | |
2061 | $ hg addremove -v |
|
2061 | $ hg addremove -v | |
2062 | adding large.dat |
|
2062 | adding large.dat | |
2063 | adding large2.dat |
|
2063 | adding large2.dat | |
2064 |
|
2064 | |||
2065 |
Test |
|
2065 | Test commit's addremove option prior to the first commit | |
2066 | $ hg forget large.dat |
|
2066 | $ hg forget large.dat | |
2067 | $ hg forget large2.dat |
|
2067 | $ hg forget large2.dat | |
2068 | $ hg add --large large.dat |
|
2068 | $ hg add --large large.dat | |
2069 | $ hg ci -Am "commit" |
|
2069 | $ hg ci -Am "commit" | |
2070 | adding large2.dat as a largefile |
|
2070 | adding large2.dat as a largefile | |
2071 | Invoking status precommit hook |
|
2071 | Invoking status precommit hook | |
2072 | A large.dat |
|
2072 | A large.dat | |
2073 | A large2.dat |
|
2073 | A large2.dat | |
2074 | A normal |
|
2074 | A normal | |
2075 | $ find .hglf | sort |
|
2075 | $ find .hglf | sort | |
2076 | .hglf |
|
2076 | .hglf | |
2077 | .hglf/large.dat |
|
2077 | .hglf/large.dat | |
2078 | .hglf/large2.dat |
|
2078 | .hglf/large2.dat | |
2079 |
|
2079 | |||
2080 | Test actions on largefiles using relative paths from subdir |
|
2080 | Test actions on largefiles using relative paths from subdir | |
2081 |
|
2081 | |||
2082 | $ mkdir sub |
|
2082 | $ mkdir sub | |
2083 | $ cd sub |
|
2083 | $ cd sub | |
2084 | $ echo anotherlarge > anotherlarge |
|
2084 | $ echo anotherlarge > anotherlarge | |
2085 | $ hg add --large anotherlarge |
|
2085 | $ hg add --large anotherlarge | |
2086 | $ hg st |
|
2086 | $ hg st | |
2087 | A sub/anotherlarge |
|
2087 | A sub/anotherlarge | |
2088 | $ hg st anotherlarge |
|
2088 | $ hg st anotherlarge | |
2089 | A anotherlarge |
|
2089 | A anotherlarge | |
2090 | $ hg commit -m anotherlarge anotherlarge |
|
2090 | $ hg commit -m anotherlarge anotherlarge | |
2091 | Invoking status precommit hook |
|
2091 | Invoking status precommit hook | |
2092 | A sub/anotherlarge |
|
2092 | A sub/anotherlarge | |
2093 | $ hg log anotherlarge |
|
2093 | $ hg log anotherlarge | |
2094 | changeset: 1:9627a577c5e9 |
|
2094 | changeset: 1:9627a577c5e9 | |
2095 | tag: tip |
|
2095 | tag: tip | |
2096 | user: test |
|
2096 | user: test | |
2097 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2097 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2098 | summary: anotherlarge |
|
2098 | summary: anotherlarge | |
2099 |
|
|
2099 | ||
2100 | $ echo more >> anotherlarge |
|
2100 | $ echo more >> anotherlarge | |
2101 | $ hg st . |
|
2101 | $ hg st . | |
2102 | M anotherlarge |
|
2102 | M anotherlarge | |
2103 | $ hg cat anotherlarge |
|
2103 | $ hg cat anotherlarge | |
2104 | anotherlarge |
|
2104 | anotherlarge | |
2105 | $ hg revert anotherlarge |
|
2105 | $ hg revert anotherlarge | |
2106 | $ hg st |
|
2106 | $ hg st | |
2107 | ? sub/anotherlarge.orig |
|
2107 | ? sub/anotherlarge.orig | |
2108 | $ cd .. |
|
2108 | $ cd .. | |
2109 |
|
2109 | |||
2110 | $ cd .. |
|
2110 | $ cd .. | |
2111 |
|
2111 | |||
2112 | issue3651: summary/outgoing with largefiles shows "no remote repo" |
|
2112 | issue3651: summary/outgoing with largefiles shows "no remote repo" | |
2113 |
|
|
2113 | unexpectedly | |
2114 |
|
2114 | |||
2115 | $ mkdir issue3651 |
|
2115 | $ mkdir issue3651 | |
2116 | $ cd issue3651 |
|
2116 | $ cd issue3651 | |
2117 |
|
2117 | |||
2118 | $ hg init src |
|
2118 | $ hg init src | |
2119 | $ echo a > src/a |
|
2119 | $ echo a > src/a | |
2120 | $ hg -R src add --large src/a |
|
2120 | $ hg -R src add --large src/a | |
2121 | $ hg -R src commit -m '#0' |
|
2121 | $ hg -R src commit -m '#0' | |
2122 | Invoking status precommit hook |
|
2122 | Invoking status precommit hook | |
2123 | A a |
|
2123 | A a | |
2124 |
|
2124 | |||
2125 | check messages when no remote repository is specified: |
|
2125 | check messages when no remote repository is specified: | |
2126 | "no remote repo" route for "hg outgoing --large" is not tested here, |
|
2126 | "no remote repo" route for "hg outgoing --large" is not tested here, | |
2127 |
|
|
2127 | because it can't be reproduced easily. | |
2128 |
|
2128 | |||
2129 | $ hg init clone1 |
|
2129 | $ hg init clone1 | |
2130 | $ hg -R clone1 -q pull src |
|
2130 | $ hg -R clone1 -q pull src | |
2131 | $ hg -R clone1 -q update |
|
2131 | $ hg -R clone1 -q update | |
2132 | $ hg -R clone1 paths | grep default |
|
2132 | $ hg -R clone1 paths | grep default | |
2133 | [1] |
|
2133 | [1] | |
2134 |
|
2134 | |||
2135 | $ hg -R clone1 summary --large |
|
2135 | $ hg -R clone1 summary --large | |
2136 | parent: 0:fc0bd45326d3 tip |
|
2136 | parent: 0:fc0bd45326d3 tip | |
2137 | #0 |
|
2137 | #0 | |
2138 | branch: default |
|
2138 | branch: default | |
2139 | commit: (clean) |
|
2139 | commit: (clean) | |
2140 | update: (current) |
|
2140 | update: (current) | |
2141 | largefiles: (no remote repo) |
|
2141 | largefiles: (no remote repo) | |
2142 |
|
2142 | |||
2143 | check messages when there is no files to upload: |
|
2143 | check messages when there is no files to upload: | |
2144 |
|
2144 | |||
2145 | $ hg -q clone src clone2 |
|
2145 | $ hg -q clone src clone2 | |
2146 | $ hg -R clone2 paths | grep default |
|
2146 | $ hg -R clone2 paths | grep default | |
2147 | default = $TESTTMP/issue3651/src (glob) |
|
2147 | default = $TESTTMP/issue3651/src (glob) | |
2148 |
|
2148 | |||
2149 | $ hg -R clone2 summary --large |
|
2149 | $ hg -R clone2 summary --large | |
2150 | parent: 0:fc0bd45326d3 tip |
|
2150 | parent: 0:fc0bd45326d3 tip | |
2151 | #0 |
|
2151 | #0 | |
2152 | branch: default |
|
2152 | branch: default | |
2153 | commit: (clean) |
|
2153 | commit: (clean) | |
2154 | update: (current) |
|
2154 | update: (current) | |
2155 | searching for changes |
|
2155 | searching for changes | |
2156 | largefiles: (no files to upload) |
|
2156 | largefiles: (no files to upload) | |
2157 | $ hg -R clone2 outgoing --large |
|
2157 | $ hg -R clone2 outgoing --large | |
2158 | comparing with $TESTTMP/issue3651/src (glob) |
|
2158 | comparing with $TESTTMP/issue3651/src (glob) | |
2159 | searching for changes |
|
2159 | searching for changes | |
2160 | no changes found |
|
2160 | no changes found | |
2161 | searching for changes |
|
2161 | searching for changes | |
2162 | largefiles: no files to upload |
|
2162 | largefiles: no files to upload | |
2163 | [1] |
|
2163 | [1] | |
2164 |
|
2164 | |||
2165 | check messages when there are files to upload: |
|
2165 | check messages when there are files to upload: | |
2166 |
|
2166 | |||
2167 | $ echo b > clone2/b |
|
2167 | $ echo b > clone2/b | |
2168 | $ hg -R clone2 add --large clone2/b |
|
2168 | $ hg -R clone2 add --large clone2/b | |
2169 | $ hg -R clone2 commit -m '#1' |
|
2169 | $ hg -R clone2 commit -m '#1' | |
2170 | Invoking status precommit hook |
|
2170 | Invoking status precommit hook | |
2171 | A b |
|
2171 | A b | |
2172 | $ hg -R clone2 summary --large |
|
2172 | $ hg -R clone2 summary --large | |
2173 | parent: 1:1acbe71ce432 tip |
|
2173 | parent: 1:1acbe71ce432 tip | |
2174 | #1 |
|
2174 | #1 | |
2175 | branch: default |
|
2175 | branch: default | |
2176 | commit: (clean) |
|
2176 | commit: (clean) | |
2177 | update: (current) |
|
2177 | update: (current) | |
2178 | searching for changes |
|
2178 | searching for changes | |
2179 | largefiles: 1 to upload |
|
2179 | largefiles: 1 to upload | |
2180 | $ hg -R clone2 outgoing --large |
|
2180 | $ hg -R clone2 outgoing --large | |
2181 | comparing with $TESTTMP/issue3651/src (glob) |
|
2181 | comparing with $TESTTMP/issue3651/src (glob) | |
2182 | searching for changes |
|
2182 | searching for changes | |
2183 | changeset: 1:1acbe71ce432 |
|
2183 | changeset: 1:1acbe71ce432 | |
2184 | tag: tip |
|
2184 | tag: tip | |
2185 | user: test |
|
2185 | user: test | |
2186 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
2186 | date: Thu Jan 01 00:00:00 1970 +0000 | |
2187 | summary: #1 |
|
2187 | summary: #1 | |
2188 |
|
2188 | |||
2189 | searching for changes |
|
2189 | searching for changes | |
2190 | largefiles to upload: |
|
2190 | largefiles to upload: | |
2191 | b |
|
2191 | b | |
2192 |
|
2192 | |||
2193 |
|
2193 | |||
2194 | $ cd .. |
|
2194 | $ cd .. | |
2195 |
|
2195 | |||
2196 |
merge action ' |
|
2196 | merge action 'd' for 'local renamed directory to d2/g' which has no filename | |
2197 |
|
2197 | |||
2198 | $ hg init merge-action |
|
2198 | $ hg init merge-action | |
2199 | $ cd merge-action |
|
2199 | $ cd merge-action | |
2200 | $ touch l |
|
2200 | $ touch l | |
2201 | $ hg add --large l |
|
2201 | $ hg add --large l | |
2202 | $ mkdir d1 |
|
2202 | $ mkdir d1 | |
2203 | $ touch d1/f |
|
2203 | $ touch d1/f | |
2204 | $ hg ci -Aqm0 |
|
2204 | $ hg ci -Aqm0 | |
2205 | Invoking status precommit hook |
|
2205 | Invoking status precommit hook | |
2206 | A d1/f |
|
2206 | A d1/f | |
2207 | A l |
|
2207 | A l | |
2208 | $ echo > d1/f |
|
2208 | $ echo > d1/f | |
2209 | $ touch d1/g |
|
2209 | $ touch d1/g | |
2210 | $ hg ci -Aqm1 |
|
2210 | $ hg ci -Aqm1 | |
2211 | Invoking status precommit hook |
|
2211 | Invoking status precommit hook | |
2212 | M d1/f |
|
2212 | M d1/f | |
2213 | A d1/g |
|
2213 | A d1/g | |
2214 | $ hg up -qr0 |
|
2214 | $ hg up -qr0 | |
2215 | $ hg mv d1 d2 |
|
2215 | $ hg mv d1 d2 | |
2216 | moving d1/f to d2/f (glob) |
|
2216 | moving d1/f to d2/f (glob) | |
2217 | $ hg ci -qm2 |
|
2217 | $ hg ci -qm2 | |
2218 | Invoking status precommit hook |
|
2218 | Invoking status precommit hook | |
2219 | A d2/f |
|
2219 | A d2/f | |
2220 | R d1/f |
|
2220 | R d1/f | |
2221 | $ hg merge |
|
2221 | $ hg merge | |
2222 | merging d2/f and d1/f to d2/f |
|
2222 | merging d2/f and d1/f to d2/f | |
2223 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
2223 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
2224 | (branch merge, don't forget to commit) |
|
2224 | (branch merge, don't forget to commit) | |
2225 | getting changed largefiles |
|
2225 | getting changed largefiles | |
2226 | 0 largefiles updated, 0 removed |
|
2226 | 0 largefiles updated, 0 removed | |
2227 | $ cd .. |
|
2227 | $ cd .. | |
2228 |
|
2228 | |||
2229 | Check whether "largefiles" feature is supported only in repositories |
|
2229 | Check whether "largefiles" feature is supported only in repositories | |
2230 | enabling largefiles extension. |
|
2230 | enabling largefiles extension. | |
2231 |
|
2231 | |||
2232 | $ mkdir individualenabling |
|
2232 | $ mkdir individualenabling | |
2233 | $ cd individualenabling |
|
2233 | $ cd individualenabling | |
2234 |
|
2234 | |||
2235 | $ hg init enabledlocally |
|
2235 | $ hg init enabledlocally | |
2236 | $ echo large > enabledlocally/large |
|
2236 | $ echo large > enabledlocally/large | |
2237 | $ hg -R enabledlocally add --large enabledlocally/large |
|
2237 | $ hg -R enabledlocally add --large enabledlocally/large | |
2238 | $ hg -R enabledlocally commit -m '#0' |
|
2238 | $ hg -R enabledlocally commit -m '#0' | |
2239 | Invoking status precommit hook |
|
2239 | Invoking status precommit hook | |
2240 | A large |
|
2240 | A large | |
2241 |
|
2241 | |||
2242 | $ hg init notenabledlocally |
|
2242 | $ hg init notenabledlocally | |
2243 | $ echo large > notenabledlocally/large |
|
2243 | $ echo large > notenabledlocally/large | |
2244 | $ hg -R notenabledlocally add --large notenabledlocally/large |
|
2244 | $ hg -R notenabledlocally add --large notenabledlocally/large | |
2245 | $ hg -R notenabledlocally commit -m '#0' |
|
2245 | $ hg -R notenabledlocally commit -m '#0' | |
2246 | Invoking status precommit hook |
|
2246 | Invoking status precommit hook | |
2247 | A large |
|
2247 | A large | |
2248 |
|
2248 | |||
2249 | $ cat >> $HGRCPATH <<EOF |
|
2249 | $ cat >> $HGRCPATH <<EOF | |
2250 | > [extensions] |
|
2250 | > [extensions] | |
2251 | > # disable globally |
|
2251 | > # disable globally | |
2252 | > largefiles=! |
|
2252 | > largefiles=! | |
2253 | > EOF |
|
2253 | > EOF | |
2254 | $ cat >> enabledlocally/.hg/hgrc <<EOF |
|
2254 | $ cat >> enabledlocally/.hg/hgrc <<EOF | |
2255 | > [extensions] |
|
2255 | > [extensions] | |
2256 | > # enable locally |
|
2256 | > # enable locally | |
2257 | > largefiles= |
|
2257 | > largefiles= | |
2258 | > EOF |
|
2258 | > EOF | |
2259 | $ hg -R enabledlocally root |
|
2259 | $ hg -R enabledlocally root | |
2260 | $TESTTMP/individualenabling/enabledlocally (glob) |
|
2260 | $TESTTMP/individualenabling/enabledlocally (glob) | |
2261 | $ hg -R notenabledlocally root |
|
2261 | $ hg -R notenabledlocally root | |
2262 | abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)! |
|
2262 | abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)! | |
2263 | [255] |
|
2263 | [255] | |
2264 |
|
2264 | |||
2265 | $ hg init push-dst |
|
2265 | $ hg init push-dst | |
2266 | $ hg -R enabledlocally push push-dst |
|
2266 | $ hg -R enabledlocally push push-dst | |
2267 | pushing to push-dst |
|
2267 | pushing to push-dst | |
2268 | abort: required features are not supported in the destination: largefiles |
|
2268 | abort: required features are not supported in the destination: largefiles | |
2269 | [255] |
|
2269 | [255] | |
2270 |
|
2270 | |||
2271 | $ hg init pull-src |
|
2271 | $ hg init pull-src | |
2272 | $ hg -R pull-src pull enabledlocally |
|
2272 | $ hg -R pull-src pull enabledlocally | |
2273 | pulling from enabledlocally |
|
2273 | pulling from enabledlocally | |
2274 | abort: required features are not supported in the destination: largefiles |
|
2274 | abort: required features are not supported in the destination: largefiles | |
2275 | [255] |
|
2275 | [255] | |
2276 |
|
2276 | |||
2277 | $ hg clone enabledlocally clone-dst |
|
2277 | $ hg clone enabledlocally clone-dst | |
2278 | abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)! |
|
2278 | abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)! | |
2279 | [255] |
|
2279 | [255] | |
2280 | $ test -d clone-dst |
|
2280 | $ test -d clone-dst | |
2281 | [1] |
|
2281 | [1] | |
2282 | $ hg clone --pull enabledlocally clone-pull-dst |
|
2282 | $ hg clone --pull enabledlocally clone-pull-dst | |
2283 | abort: required features are not supported in the destination: largefiles |
|
2283 | abort: required features are not supported in the destination: largefiles | |
2284 | [255] |
|
2284 | [255] | |
2285 | $ test -d clone-pull-dst |
|
2285 | $ test -d clone-pull-dst | |
2286 | [1] |
|
2286 | [1] | |
2287 |
|
2287 | |||
2288 | $ cd .. |
|
2288 | $ cd .. |
@@ -1,349 +1,349 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 | > share = |
|
6 | > share = | |
7 | > strip = |
|
7 | > strip = | |
8 | > convert = |
|
8 | > convert = | |
9 | > [largefiles] |
|
9 | > [largefiles] | |
10 | > minsize = 0.5 |
|
10 | > minsize = 0.5 | |
11 | > patterns = **.other |
|
11 | > patterns = **.other | |
12 | > **.dat |
|
12 | > **.dat | |
13 | > usercache=${USERCACHE} |
|
13 | > usercache=${USERCACHE} | |
14 | > EOF |
|
14 | > EOF | |
15 |
|
15 | |||
16 | "lfconvert" works |
|
16 | "lfconvert" works | |
17 | $ hg init bigfile-repo |
|
17 | $ hg init bigfile-repo | |
18 | $ cd bigfile-repo |
|
18 | $ cd bigfile-repo | |
19 | $ cat >> .hg/hgrc <<EOF |
|
19 | $ cat >> .hg/hgrc <<EOF | |
20 | > [extensions] |
|
20 | > [extensions] | |
21 | > largefiles = ! |
|
21 | > largefiles = ! | |
22 | > EOF |
|
22 | > EOF | |
23 | $ mkdir sub |
|
23 | $ mkdir sub | |
24 | $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null |
|
24 | $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null | |
25 | $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null |
|
25 | $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null | |
26 | $ echo normal > normal1 |
|
26 | $ echo normal > normal1 | |
27 | $ echo alsonormal > sub/normal2 |
|
27 | $ echo alsonormal > sub/normal2 | |
28 | $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null |
|
28 | $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null | |
29 | $ hg addremove |
|
29 | $ hg addremove | |
30 | adding large |
|
30 | adding large | |
31 | adding large2 |
|
31 | adding large2 | |
32 | adding normal1 |
|
32 | adding normal1 | |
33 | adding sub/maybelarge.dat |
|
33 | adding sub/maybelarge.dat | |
34 | adding sub/normal2 |
|
34 | adding sub/normal2 | |
35 | $ hg commit -m"add large, normal1" large normal1 |
|
35 | $ hg commit -m"add large, normal1" large normal1 | |
36 | $ hg commit -m"add sub/*" sub |
|
36 | $ hg commit -m"add sub/*" sub | |
37 |
|
37 | |||
38 | Test tag parsing |
|
38 | Test tag parsing | |
39 | $ cat >> .hgtags <<EOF |
|
39 | $ cat >> .hgtags <<EOF | |
40 | > IncorrectlyFormattedTag! |
|
40 | > IncorrectlyFormattedTag! | |
41 | > invalidhash sometag |
|
41 | > invalidhash sometag | |
42 | > 0123456789abcdef anothertag |
|
42 | > 0123456789abcdef anothertag | |
43 | > EOF |
|
43 | > EOF | |
44 | $ hg add .hgtags |
|
44 | $ hg add .hgtags | |
45 | $ hg commit -m"add large2" large2 .hgtags |
|
45 | $ hg commit -m"add large2" large2 .hgtags | |
46 |
|
46 | |||
47 | Test link+rename largefile codepath |
|
47 | Test link+rename largefile codepath | |
48 | $ [ -d .hg/largefiles ] && echo fail || echo pass |
|
48 | $ [ -d .hg/largefiles ] && echo fail || echo pass | |
49 | pass |
|
49 | pass | |
50 | $ cd .. |
|
50 | $ cd .. | |
51 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
|
51 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo | |
52 | initializing destination largefiles-repo |
|
52 | initializing destination largefiles-repo | |
53 | skipping incorrectly formatted tag IncorrectlyFormattedTag! |
|
53 | skipping incorrectly formatted tag IncorrectlyFormattedTag! | |
54 | skipping incorrectly formatted id invalidhash |
|
54 | skipping incorrectly formatted id invalidhash | |
55 | no mapping for id 0123456789abcdef |
|
55 | no mapping for id 0123456789abcdef | |
56 | #if symlink |
|
56 | #if symlink | |
57 | $ hg --cwd bigfile-repo rename large2 large3 |
|
57 | $ hg --cwd bigfile-repo rename large2 large3 | |
58 | $ ln -sf large bigfile-repo/large3 |
|
58 | $ ln -sf large bigfile-repo/large3 | |
59 | $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3 |
|
59 | $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3 | |
60 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink |
|
60 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink | |
61 | initializing destination largefiles-repo-symlink |
|
61 | initializing destination largefiles-repo-symlink | |
62 | skipping incorrectly formatted tag IncorrectlyFormattedTag! |
|
62 | skipping incorrectly formatted tag IncorrectlyFormattedTag! | |
63 | skipping incorrectly formatted id invalidhash |
|
63 | skipping incorrectly formatted id invalidhash | |
64 | no mapping for id 0123456789abcdef |
|
64 | no mapping for id 0123456789abcdef | |
65 | abort: renamed/copied largefile large3 becomes symlink |
|
65 | abort: renamed/copied largefile large3 becomes symlink | |
66 | [255] |
|
66 | [255] | |
67 | #endif |
|
67 | #endif | |
68 | $ cd bigfile-repo |
|
68 | $ cd bigfile-repo | |
69 | $ hg strip --no-backup 2 |
|
69 | $ hg strip --no-backup 2 | |
70 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
70 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
71 | $ cd .. |
|
71 | $ cd .. | |
72 | $ rm -rf largefiles-repo largefiles-repo-symlink |
|
72 | $ rm -rf largefiles-repo largefiles-repo-symlink | |
73 |
|
73 | |||
74 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
|
74 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo | |
75 | initializing destination largefiles-repo |
|
75 | initializing destination largefiles-repo | |
76 |
|
76 | |||
77 | "lfconvert" converts content correctly |
|
77 | "lfconvert" converts content correctly | |
78 | $ cd largefiles-repo |
|
78 | $ cd largefiles-repo | |
79 | $ hg up |
|
79 | $ hg up | |
80 | getting changed largefiles |
|
80 | getting changed largefiles | |
81 | 2 largefiles updated, 0 removed |
|
81 | 2 largefiles updated, 0 removed | |
82 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
83 | $ hg locate |
|
83 | $ hg locate | |
84 | .hglf/large |
|
84 | .hglf/large | |
85 | .hglf/sub/maybelarge.dat |
|
85 | .hglf/sub/maybelarge.dat | |
86 | normal1 |
|
86 | normal1 | |
87 | sub/normal2 |
|
87 | sub/normal2 | |
88 | $ cat normal1 |
|
88 | $ cat normal1 | |
89 | normal |
|
89 | normal | |
90 | $ cat sub/normal2 |
|
90 | $ cat sub/normal2 | |
91 | alsonormal |
|
91 | alsonormal | |
92 | $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat |
|
92 | $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat | |
93 | ec87a838931d4d5d2e94a04644788a55 large |
|
93 | ec87a838931d4d5d2e94a04644788a55 large | |
94 | 1276481102f218c981e0324180bafd9f sub/maybelarge.dat |
|
94 | 1276481102f218c981e0324180bafd9f sub/maybelarge.dat | |
95 |
|
95 | |||
96 | "lfconvert" adds 'largefiles' to .hg/requires. |
|
96 | "lfconvert" adds 'largefiles' to .hg/requires. | |
97 | $ cat .hg/requires |
|
97 | $ cat .hg/requires | |
98 | dotencode |
|
98 | dotencode | |
99 | fncache |
|
99 | fncache | |
100 | largefiles |
|
100 | largefiles | |
101 | revlogv1 |
|
101 | revlogv1 | |
102 | store |
|
102 | store | |
103 |
|
103 | |||
104 | "lfconvert" includes a newline at the end of the standin files. |
|
104 | "lfconvert" includes a newline at the end of the standin files. | |
105 | $ cat .hglf/large .hglf/sub/maybelarge.dat |
|
105 | $ cat .hglf/large .hglf/sub/maybelarge.dat | |
106 | 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 |
|
106 | 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 | |
107 | 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c |
|
107 | 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c | |
108 | $ cd .. |
|
108 | $ cd .. | |
109 |
|
109 | |||
110 | add some changesets to rename/remove/merge |
|
110 | add some changesets to rename/remove/merge | |
111 | $ cd bigfile-repo |
|
111 | $ cd bigfile-repo | |
112 | $ hg mv -q sub stuff |
|
112 | $ hg mv -q sub stuff | |
113 | $ hg commit -m"rename sub/ to stuff/" |
|
113 | $ hg commit -m"rename sub/ to stuff/" | |
114 | $ hg update -q 1 |
|
114 | $ hg update -q 1 | |
115 | $ echo blah >> normal3 |
|
115 | $ echo blah >> normal3 | |
116 | $ echo blah >> sub/normal2 |
|
116 | $ echo blah >> sub/normal2 | |
117 | $ echo blah >> sub/maybelarge.dat |
|
117 | $ echo blah >> sub/maybelarge.dat | |
118 | $ "$TESTDIR/md5sum.py" sub/maybelarge.dat |
|
118 | $ "$TESTDIR/md5sum.py" sub/maybelarge.dat | |
119 | 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat |
|
119 | 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat | |
120 | $ hg commit -A -m"add normal3, modify sub/*" |
|
120 | $ hg commit -A -m"add normal3, modify sub/*" | |
121 | adding normal3 |
|
121 | adding normal3 | |
122 | created new head |
|
122 | created new head | |
123 | $ hg rm large normal3 |
|
123 | $ hg rm large normal3 | |
124 | $ hg commit -q -m"remove large, normal3" |
|
124 | $ hg commit -q -m"remove large, normal3" | |
125 | $ hg merge |
|
125 | $ hg merge | |
126 | merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
|
126 | merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat | |
127 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) |
|
127 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) | |
128 | merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
128 | merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark') | |
129 | merging sub/normal2 and stuff/normal2 to stuff/normal2 |
|
129 | merging sub/normal2 and stuff/normal2 to stuff/normal2 | |
130 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
130 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved | |
131 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
131 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
132 | [1] |
|
132 | [1] | |
133 | $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
|
133 | $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat | |
134 | $ hg resolve -m stuff/maybelarge.dat |
|
134 | $ hg resolve -m stuff/maybelarge.dat | |
135 | $ hg commit -m"merge" |
|
135 | $ hg commit -m"merge" | |
136 | $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
|
136 | $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" | |
137 | @ 5:4884f215abda merge |
|
137 | @ 5:4884f215abda merge | |
138 | |\ |
|
138 | |\ | |
139 | | o 4:7285f817b77e remove large, normal3 |
|
139 | | o 4:7285f817b77e remove large, normal3 | |
140 | | | |
|
140 | | | | |
141 | | o 3:67e3892e3534 add normal3, modify sub/* |
|
141 | | o 3:67e3892e3534 add normal3, modify sub/* | |
142 | | | |
|
142 | | | | |
143 | o | 2:c96c8beb5d56 rename sub/ to stuff/ |
|
143 | o | 2:c96c8beb5d56 rename sub/ to stuff/ | |
144 | |/ |
|
144 | |/ | |
145 | o 1:020c65d24e11 add sub/* |
|
145 | o 1:020c65d24e11 add sub/* | |
146 | | |
|
146 | | | |
147 | o 0:117b8328f97a add large, normal1 |
|
147 | o 0:117b8328f97a add large, normal1 | |
148 |
|
|
148 | ||
149 | $ cd .. |
|
149 | $ cd .. | |
150 |
|
150 | |||
151 | lfconvert with rename, merge, and remove |
|
151 | lfconvert with rename, merge, and remove | |
152 | $ rm -rf largefiles-repo |
|
152 | $ rm -rf largefiles-repo | |
153 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo |
|
153 | $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo | |
154 | initializing destination largefiles-repo |
|
154 | initializing destination largefiles-repo | |
155 | $ cd largefiles-repo |
|
155 | $ cd largefiles-repo | |
156 | $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
|
156 | $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" | |
157 | o 5:8e05f5f2b77e merge |
|
157 | o 5:8e05f5f2b77e merge | |
158 | |\ |
|
158 | |\ | |
159 | | o 4:a5a02de7a8e4 remove large, normal3 |
|
159 | | o 4:a5a02de7a8e4 remove large, normal3 | |
160 | | | |
|
160 | | | | |
161 | | o 3:55759520c76f add normal3, modify sub/* |
|
161 | | o 3:55759520c76f add normal3, modify sub/* | |
162 | | | |
|
162 | | | | |
163 | o | 2:261ad3f3f037 rename sub/ to stuff/ |
|
163 | o | 2:261ad3f3f037 rename sub/ to stuff/ | |
164 | |/ |
|
164 | |/ | |
165 | o 1:334e5237836d add sub/* |
|
165 | o 1:334e5237836d add sub/* | |
166 | | |
|
166 | | | |
167 | o 0:d4892ec57ce2 add large, normal1 |
|
167 | o 0:d4892ec57ce2 add large, normal1 | |
168 |
|
|
168 | ||
169 | $ hg locate -r 2 |
|
169 | $ hg locate -r 2 | |
170 | .hglf/large |
|
170 | .hglf/large | |
171 | .hglf/stuff/maybelarge.dat |
|
171 | .hglf/stuff/maybelarge.dat | |
172 | normal1 |
|
172 | normal1 | |
173 | stuff/normal2 |
|
173 | stuff/normal2 | |
174 | $ hg locate -r 3 |
|
174 | $ hg locate -r 3 | |
175 | .hglf/large |
|
175 | .hglf/large | |
176 | .hglf/sub/maybelarge.dat |
|
176 | .hglf/sub/maybelarge.dat | |
177 | normal1 |
|
177 | normal1 | |
178 | normal3 |
|
178 | normal3 | |
179 | sub/normal2 |
|
179 | sub/normal2 | |
180 | $ hg locate -r 4 |
|
180 | $ hg locate -r 4 | |
181 | .hglf/sub/maybelarge.dat |
|
181 | .hglf/sub/maybelarge.dat | |
182 | normal1 |
|
182 | normal1 | |
183 | sub/normal2 |
|
183 | sub/normal2 | |
184 | $ hg locate -r 5 |
|
184 | $ hg locate -r 5 | |
185 | .hglf/stuff/maybelarge.dat |
|
185 | .hglf/stuff/maybelarge.dat | |
186 | normal1 |
|
186 | normal1 | |
187 | stuff/normal2 |
|
187 | stuff/normal2 | |
188 | $ hg update |
|
188 | $ hg update | |
189 | getting changed largefiles |
|
189 | getting changed largefiles | |
190 | 1 largefiles updated, 0 removed |
|
190 | 1 largefiles updated, 0 removed | |
191 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
191 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
192 | $ cat stuff/normal2 |
|
192 | $ cat stuff/normal2 | |
193 | alsonormal |
|
193 | alsonormal | |
194 | blah |
|
194 | blah | |
195 | $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat |
|
195 | $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat | |
196 | 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat |
|
196 | 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat | |
197 | $ cat .hglf/stuff/maybelarge.dat |
|
197 | $ cat .hglf/stuff/maybelarge.dat | |
198 | 76236b6a2c6102826c61af4297dd738fb3b1de38 |
|
198 | 76236b6a2c6102826c61af4297dd738fb3b1de38 | |
199 | $ cd .. |
|
199 | $ cd .. | |
200 |
|
200 | |||
201 | "lfconvert" error cases |
|
201 | "lfconvert" error cases | |
202 | $ hg lfconvert http://localhost/foo foo |
|
202 | $ hg lfconvert http://localhost/foo foo | |
203 | abort: http://localhost/foo is not a local Mercurial repo |
|
203 | abort: http://localhost/foo is not a local Mercurial repo | |
204 | [255] |
|
204 | [255] | |
205 | $ hg lfconvert foo ssh://localhost/foo |
|
205 | $ hg lfconvert foo ssh://localhost/foo | |
206 | abort: ssh://localhost/foo is not a local Mercurial repo |
|
206 | abort: ssh://localhost/foo is not a local Mercurial repo | |
207 | [255] |
|
207 | [255] | |
208 | $ hg lfconvert nosuchrepo foo |
|
208 | $ hg lfconvert nosuchrepo foo | |
209 | abort: repository nosuchrepo not found! |
|
209 | abort: repository nosuchrepo not found! | |
210 | [255] |
|
210 | [255] | |
211 | $ hg share -q -U bigfile-repo shared |
|
211 | $ hg share -q -U bigfile-repo shared | |
212 | $ printf 'bogus' > shared/.hg/sharedpath |
|
212 | $ printf 'bogus' > shared/.hg/sharedpath | |
213 | $ hg lfconvert shared foo |
|
213 | $ hg lfconvert shared foo | |
214 | abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob) |
|
214 | abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob) | |
215 | [255] |
|
215 | [255] | |
216 | $ hg lfconvert bigfile-repo largefiles-repo |
|
216 | $ hg lfconvert bigfile-repo largefiles-repo | |
217 | initializing destination largefiles-repo |
|
217 | initializing destination largefiles-repo | |
218 | abort: repository largefiles-repo already exists! |
|
218 | abort: repository largefiles-repo already exists! | |
219 | [255] |
|
219 | [255] | |
220 |
|
220 | |||
221 | add another largefile to the new largefiles repo |
|
221 | add another largefile to the new largefiles repo | |
222 | $ cd largefiles-repo |
|
222 | $ cd largefiles-repo | |
223 | $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null |
|
223 | $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null | |
224 | $ hg add --lfsize=1 anotherlarge |
|
224 | $ hg add --lfsize=1 anotherlarge | |
225 | $ hg commit -m "add anotherlarge (should be a largefile)" |
|
225 | $ hg commit -m "add anotherlarge (should be a largefile)" | |
226 | $ cat .hglf/anotherlarge |
|
226 | $ cat .hglf/anotherlarge | |
227 | 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 |
|
227 | 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 | |
228 | $ cd .. |
|
228 | $ cd .. | |
229 |
|
229 | |||
230 | round-trip: converting back to a normal (non-largefiles) repo with |
|
230 | round-trip: converting back to a normal (non-largefiles) repo with | |
231 | "lfconvert --to-normal" should give the same as ../bigfile-repo |
|
231 | "lfconvert --to-normal" should give the same as ../bigfile-repo | |
232 | $ cd largefiles-repo |
|
232 | $ cd largefiles-repo | |
233 | $ hg lfconvert --to-normal . ../normal-repo |
|
233 | $ hg lfconvert --to-normal . ../normal-repo | |
234 | initializing destination ../normal-repo |
|
234 | initializing destination ../normal-repo | |
235 | $ cd ../normal-repo |
|
235 | $ cd ../normal-repo | |
236 | $ cat >> .hg/hgrc <<EOF |
|
236 | $ cat >> .hg/hgrc <<EOF | |
237 | > [extensions] |
|
237 | > [extensions] | |
238 | > largefiles = ! |
|
238 | > largefiles = ! | |
239 | > EOF |
|
239 | > EOF | |
240 |
|
240 | |||
241 |
|
|
241 | # Hmmm: the changeset ID for rev 5 is different from the original | |
242 |
|
|
242 | # normal repo (../bigfile-repo), because the changelog filelist | |
243 |
|
|
243 | # differs between the two incarnations of rev 5: this repo includes | |
244 |
|
|
244 | # 'large' in the list, but ../bigfile-repo does not. Since rev 5 | |
245 |
|
|
245 | # removes 'large' relative to the first parent in both repos, it seems | |
246 |
|
|
246 | # to me that lfconvert is doing a *better* job than | |
247 |
|
|
247 | # "hg remove" + "hg merge" + "hg commit". | |
248 |
|
|
248 | # $ hg -R ../bigfile-repo debugdata -c 5 | |
249 |
|
|
249 | # $ hg debugdata -c 5 | |
250 | $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
|
250 | $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" | |
251 | o 6:1635824e6f59 add anotherlarge (should be a largefile) |
|
251 | o 6:1635824e6f59 add anotherlarge (should be a largefile) | |
252 | | |
|
252 | | | |
253 | o 5:7215f8deeaaf merge |
|
253 | o 5:7215f8deeaaf merge | |
254 | |\ |
|
254 | |\ | |
255 | | o 4:7285f817b77e remove large, normal3 |
|
255 | | o 4:7285f817b77e remove large, normal3 | |
256 | | | |
|
256 | | | | |
257 | | o 3:67e3892e3534 add normal3, modify sub/* |
|
257 | | o 3:67e3892e3534 add normal3, modify sub/* | |
258 | | | |
|
258 | | | | |
259 | o | 2:c96c8beb5d56 rename sub/ to stuff/ |
|
259 | o | 2:c96c8beb5d56 rename sub/ to stuff/ | |
260 | |/ |
|
260 | |/ | |
261 | o 1:020c65d24e11 add sub/* |
|
261 | o 1:020c65d24e11 add sub/* | |
262 | | |
|
262 | | | |
263 | o 0:117b8328f97a add large, normal1 |
|
263 | o 0:117b8328f97a add large, normal1 | |
264 |
|
|
264 | ||
265 | $ hg update |
|
265 | $ hg update | |
266 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
266 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
267 | $ hg locate |
|
267 | $ hg locate | |
268 | anotherlarge |
|
268 | anotherlarge | |
269 | normal1 |
|
269 | normal1 | |
270 | stuff/maybelarge.dat |
|
270 | stuff/maybelarge.dat | |
271 | stuff/normal2 |
|
271 | stuff/normal2 | |
272 | $ [ -d .hg/largefiles ] && echo fail || echo pass |
|
272 | $ [ -d .hg/largefiles ] && echo fail || echo pass | |
273 | pass |
|
273 | pass | |
274 |
|
274 | |||
275 | $ cd .. |
|
275 | $ cd .. | |
276 |
|
276 | |||
277 | Clearing the usercache ensures that commitctx doesn't try to cache largefiles |
|
277 | Clearing the usercache ensures that commitctx doesn't try to cache largefiles | |
278 | from the working dir on a convert. |
|
278 | from the working dir on a convert. | |
279 | $ rm "${USERCACHE}"/* |
|
279 | $ rm "${USERCACHE}"/* | |
280 | $ hg convert largefiles-repo |
|
280 | $ hg convert largefiles-repo | |
281 | assuming destination largefiles-repo-hg |
|
281 | assuming destination largefiles-repo-hg | |
282 | initializing destination largefiles-repo-hg repository |
|
282 | initializing destination largefiles-repo-hg repository | |
283 | scanning source... |
|
283 | scanning source... | |
284 | sorting... |
|
284 | sorting... | |
285 | converting... |
|
285 | converting... | |
286 | 6 add large, normal1 |
|
286 | 6 add large, normal1 | |
287 | 5 add sub/* |
|
287 | 5 add sub/* | |
288 | 4 rename sub/ to stuff/ |
|
288 | 4 rename sub/ to stuff/ | |
289 | 3 add normal3, modify sub/* |
|
289 | 3 add normal3, modify sub/* | |
290 | 2 remove large, normal3 |
|
290 | 2 remove large, normal3 | |
291 | 1 merge |
|
291 | 1 merge | |
292 | 0 add anotherlarge (should be a largefile) |
|
292 | 0 add anotherlarge (should be a largefile) | |
293 |
|
293 | |||
294 | $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n" |
|
294 | $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n" | |
295 | o 6:17126745edfd add anotherlarge (should be a largefile) |
|
295 | o 6:17126745edfd add anotherlarge (should be a largefile) | |
296 | | |
|
296 | | | |
297 | o 5:9cc5aa7204f0 merge |
|
297 | o 5:9cc5aa7204f0 merge | |
298 | |\ |
|
298 | |\ | |
299 |
|
|
299 | | o 4:a5a02de7a8e4 remove large, normal3 | |
300 | | | |
|
300 | | | | |
301 | | o 3:55759520c76f add normal3, modify sub/* |
|
301 | | o 3:55759520c76f add normal3, modify sub/* | |
302 | | | |
|
302 | | | | |
303 | o | 2:261ad3f3f037 rename sub/ to stuff/ |
|
303 | o | 2:261ad3f3f037 rename sub/ to stuff/ | |
304 | |/ |
|
304 | |/ | |
305 | o 1:334e5237836d add sub/* |
|
305 | o 1:334e5237836d add sub/* | |
306 | | |
|
306 | | | |
307 | o 0:d4892ec57ce2 add large, normal1 |
|
307 | o 0:d4892ec57ce2 add large, normal1 | |
308 |
|
308 | |||
309 | Verify will fail (for now) if the usercache is purged before converting, since |
|
309 | Verify will fail (for now) if the usercache is purged before converting, since | |
310 | largefiles are not cached in the converted repo's local store by the conversion |
|
310 | largefiles are not cached in the converted repo's local store by the conversion | |
311 | process. |
|
311 | process. | |
312 | $ hg -R largefiles-repo-hg verify --large --lfa |
|
312 | $ hg -R largefiles-repo-hg verify --large --lfa | |
313 | checking changesets |
|
313 | checking changesets | |
314 | checking manifests |
|
314 | checking manifests | |
315 | crosschecking files in changesets and manifests |
|
315 | crosschecking files in changesets and manifests | |
316 | checking files |
|
316 | checking files | |
317 | 8 files, 7 changesets, 12 total revisions |
|
317 | 8 files, 7 changesets, 12 total revisions | |
318 | searching 7 changesets for largefiles |
|
318 | searching 7 changesets for largefiles | |
319 | changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob) |
|
319 | changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob) | |
320 | changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob) |
|
320 | changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob) | |
321 | changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob) |
|
321 | changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob) | |
322 | changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob) |
|
322 | changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob) | |
323 | changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob) |
|
323 | changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob) | |
324 | changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob) |
|
324 | changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob) | |
325 | verified existence of 6 revisions of 4 largefiles |
|
325 | verified existence of 6 revisions of 4 largefiles | |
326 | [1] |
|
326 | [1] | |
327 | $ hg -R largefiles-repo-hg showconfig paths |
|
327 | $ hg -R largefiles-repo-hg showconfig paths | |
328 |
|
328 | |||
329 |
|
329 | |||
330 | Avoid a traceback if a largefile isn't available (issue3519) |
|
330 | Avoid a traceback if a largefile isn't available (issue3519) | |
331 |
|
331 | |||
332 | Ensure the largefile can be cached in the source if necessary |
|
332 | Ensure the largefile can be cached in the source if necessary | |
333 | $ hg clone -U largefiles-repo issue3519 |
|
333 | $ hg clone -U largefiles-repo issue3519 | |
334 | $ rm -f "${USERCACHE}"/* |
|
334 | $ rm -f "${USERCACHE}"/* | |
335 | $ hg lfconvert --to-normal issue3519 normalized3519 |
|
335 | $ hg lfconvert --to-normal issue3519 normalized3519 | |
336 | initializing destination normalized3519 |
|
336 | initializing destination normalized3519 | |
337 |
|
337 | |||
338 | Ensure the abort message is useful if a largefile is entirely unavailable |
|
338 | Ensure the abort message is useful if a largefile is entirely unavailable | |
339 | $ rm -rf normalized3519 |
|
339 | $ rm -rf normalized3519 | |
340 | $ rm "${USERCACHE}"/* |
|
340 | $ rm "${USERCACHE}"/* | |
341 | $ rm issue3519/.hg/largefiles/* |
|
341 | $ rm issue3519/.hg/largefiles/* | |
342 | $ rm largefiles-repo/.hg/largefiles/* |
|
342 | $ rm largefiles-repo/.hg/largefiles/* | |
343 | $ hg lfconvert --to-normal issue3519 normalized3519 |
|
343 | $ hg lfconvert --to-normal issue3519 normalized3519 | |
344 | initializing destination normalized3519 |
|
344 | initializing destination normalized3519 | |
345 | large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file://$TESTTMP/largefiles-repo (glob) |
|
345 | large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob) | |
346 | abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad |
|
346 | abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad | |
347 | [255] |
|
347 | [255] | |
348 |
|
348 | |||
349 |
|
349 |
General Comments 0
You need to be logged in to leave comments.
Login now