##// END OF EJS Templates
windows: use raw string in test log paths...
Raphaël Gomès -
r49114:7a4d1874 default
parent child Browse files
Show More
@@ -1,1852 +1,1852 b''
1 A script that implements uppercasing of specific lines in a file. This
1 A script that implements uppercasing of specific lines in a file. This
2 approximates the behavior of code formatters well enough for our tests.
2 approximates the behavior of code formatters well enough for our tests.
3
3
4 $ UPPERCASEPY="$TESTTMP/uppercase.py"
4 $ UPPERCASEPY="$TESTTMP/uppercase.py"
5 $ cat > $UPPERCASEPY <<EOF
5 $ cat > $UPPERCASEPY <<EOF
6 > import re
6 > import re
7 > import sys
7 > import sys
8 > from mercurial.utils.procutil import setbinary
8 > from mercurial.utils.procutil import setbinary
9 > setbinary(sys.stdin)
9 > setbinary(sys.stdin)
10 > setbinary(sys.stdout)
10 > setbinary(sys.stdout)
11 > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
11 > stdin = getattr(sys.stdin, 'buffer', sys.stdin)
12 > stdout = getattr(sys.stdout, 'buffer', sys.stdout)
12 > stdout = getattr(sys.stdout, 'buffer', sys.stdout)
13 > lines = set()
13 > lines = set()
14 > def format(text):
14 > def format(text):
15 > return re.sub(b' +', b' ', text.upper())
15 > return re.sub(b' +', b' ', text.upper())
16 > for arg in sys.argv[1:]:
16 > for arg in sys.argv[1:]:
17 > if arg == 'all':
17 > if arg == 'all':
18 > stdout.write(format(stdin.read()))
18 > stdout.write(format(stdin.read()))
19 > sys.exit(0)
19 > sys.exit(0)
20 > else:
20 > else:
21 > first, last = arg.split('-')
21 > first, last = arg.split('-')
22 > lines.update(range(int(first), int(last) + 1))
22 > lines.update(range(int(first), int(last) + 1))
23 > for i, line in enumerate(stdin.readlines()):
23 > for i, line in enumerate(stdin.readlines()):
24 > if i + 1 in lines:
24 > if i + 1 in lines:
25 > stdout.write(format(line))
25 > stdout.write(format(line))
26 > else:
26 > else:
27 > stdout.write(line)
27 > stdout.write(line)
28 > EOF
28 > EOF
29 $ TESTLINES="foo\nbar\nbaz\nqux\n"
29 $ TESTLINES="foo\nbar\nbaz\nqux\n"
30 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY
30 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY
31 foo
31 foo
32 bar
32 bar
33 baz
33 baz
34 qux
34 qux
35 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY all
35 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY all
36 FOO
36 FOO
37 BAR
37 BAR
38 BAZ
38 BAZ
39 QUX
39 QUX
40 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 1-1
40 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 1-1
41 FOO
41 FOO
42 bar
42 bar
43 baz
43 baz
44 qux
44 qux
45 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 1-2
45 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 1-2
46 FOO
46 FOO
47 BAR
47 BAR
48 baz
48 baz
49 qux
49 qux
50 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 2-3
50 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 2-3
51 foo
51 foo
52 BAR
52 BAR
53 BAZ
53 BAZ
54 qux
54 qux
55 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 2-2 4-4
55 $ printf $TESTLINES | "$PYTHON" $UPPERCASEPY 2-2 4-4
56 foo
56 foo
57 BAR
57 BAR
58 baz
58 baz
59 QUX
59 QUX
60
60
61 Set up the config with two simple fixers: one that fixes specific line ranges,
61 Set up the config with two simple fixers: one that fixes specific line ranges,
62 and one that always fixes the whole file. They both "fix" files by converting
62 and one that always fixes the whole file. They both "fix" files by converting
63 letters to uppercase. They use different file extensions, so each test case can
63 letters to uppercase. They use different file extensions, so each test case can
64 choose which behavior to use by naming files.
64 choose which behavior to use by naming files.
65
65
66 $ cat >> $HGRCPATH <<EOF
66 $ cat >> $HGRCPATH <<EOF
67 > [extensions]
67 > [extensions]
68 > fix =
68 > fix =
69 > [experimental]
69 > [experimental]
70 > evolution.createmarkers=True
70 > evolution.createmarkers=True
71 > evolution.allowunstable=True
71 > evolution.allowunstable=True
72 > [fix]
72 > [fix]
73 > uppercase-whole-file:command="$PYTHON" $UPPERCASEPY all
73 > uppercase-whole-file:command="$PYTHON" $UPPERCASEPY all
74 > uppercase-whole-file:pattern=set:**.whole
74 > uppercase-whole-file:pattern=set:**.whole
75 > uppercase-changed-lines:command="$PYTHON" $UPPERCASEPY
75 > uppercase-changed-lines:command="$PYTHON" $UPPERCASEPY
76 > uppercase-changed-lines:linerange={first}-{last}
76 > uppercase-changed-lines:linerange={first}-{last}
77 > uppercase-changed-lines:pattern=set:**.changed
77 > uppercase-changed-lines:pattern=set:**.changed
78 > EOF
78 > EOF
79
79
80 Help text for fix.
80 Help text for fix.
81
81
82 $ hg help fix
82 $ hg help fix
83 hg fix [OPTION]... [FILE]...
83 hg fix [OPTION]... [FILE]...
84
84
85 rewrite file content in changesets or working directory
85 rewrite file content in changesets or working directory
86
86
87 Runs any configured tools to fix the content of files. Only affects files
87 Runs any configured tools to fix the content of files. Only affects files
88 with changes, unless file arguments are provided. Only affects changed
88 with changes, unless file arguments are provided. Only affects changed
89 lines of files, unless the --whole flag is used. Some tools may always
89 lines of files, unless the --whole flag is used. Some tools may always
90 affect the whole file regardless of --whole.
90 affect the whole file regardless of --whole.
91
91
92 If --working-dir is used, files with uncommitted changes in the working
92 If --working-dir is used, files with uncommitted changes in the working
93 copy will be fixed. Note that no backup are made.
93 copy will be fixed. Note that no backup are made.
94
94
95 If revisions are specified with --source, those revisions and their
95 If revisions are specified with --source, those revisions and their
96 descendants will be checked, and they may be replaced with new revisions
96 descendants will be checked, and they may be replaced with new revisions
97 that have fixed file content. By automatically including the descendants,
97 that have fixed file content. By automatically including the descendants,
98 no merging, rebasing, or evolution will be required. If an ancestor of the
98 no merging, rebasing, or evolution will be required. If an ancestor of the
99 working copy is included, then the working copy itself will also be fixed,
99 working copy is included, then the working copy itself will also be fixed,
100 and the working copy will be updated to the fixed parent.
100 and the working copy will be updated to the fixed parent.
101
101
102 When determining what lines of each file to fix at each revision, the
102 When determining what lines of each file to fix at each revision, the
103 whole set of revisions being fixed is considered, so that fixes to earlier
103 whole set of revisions being fixed is considered, so that fixes to earlier
104 revisions are not forgotten in later ones. The --base flag can be used to
104 revisions are not forgotten in later ones. The --base flag can be used to
105 override this default behavior, though it is not usually desirable to do
105 override this default behavior, though it is not usually desirable to do
106 so.
106 so.
107
107
108 (use 'hg help -e fix' to show help for the fix extension)
108 (use 'hg help -e fix' to show help for the fix extension)
109
109
110 options ([+] can be repeated):
110 options ([+] can be repeated):
111
111
112 --all fix all non-public non-obsolete revisions
112 --all fix all non-public non-obsolete revisions
113 --base REV [+] revisions to diff against (overrides automatic selection,
113 --base REV [+] revisions to diff against (overrides automatic selection,
114 and applies to every revision being fixed)
114 and applies to every revision being fixed)
115 -s --source REV [+] fix the specified revisions and their descendants
115 -s --source REV [+] fix the specified revisions and their descendants
116 -w --working-dir fix the working directory
116 -w --working-dir fix the working directory
117 --whole always fix every line of a file
117 --whole always fix every line of a file
118
118
119 (some details hidden, use --verbose to show complete help)
119 (some details hidden, use --verbose to show complete help)
120
120
121 $ hg help -e fix
121 $ hg help -e fix
122 fix extension - rewrite file content in changesets or working copy
122 fix extension - rewrite file content in changesets or working copy
123 (EXPERIMENTAL)
123 (EXPERIMENTAL)
124
124
125 Provides a command that runs configured tools on the contents of modified
125 Provides a command that runs configured tools on the contents of modified
126 files, writing back any fixes to the working copy or replacing changesets.
126 files, writing back any fixes to the working copy or replacing changesets.
127
127
128 Here is an example configuration that causes 'hg fix' to apply automatic
128 Here is an example configuration that causes 'hg fix' to apply automatic
129 formatting fixes to modified lines in C++ code:
129 formatting fixes to modified lines in C++ code:
130
130
131 [fix]
131 [fix]
132 clang-format:command=clang-format --assume-filename={rootpath}
132 clang-format:command=clang-format --assume-filename={rootpath}
133 clang-format:linerange=--lines={first}:{last}
133 clang-format:linerange=--lines={first}:{last}
134 clang-format:pattern=set:**.cpp or **.hpp
134 clang-format:pattern=set:**.cpp or **.hpp
135
135
136 The :command suboption forms the first part of the shell command that will be
136 The :command suboption forms the first part of the shell command that will be
137 used to fix a file. The content of the file is passed on standard input, and
137 used to fix a file. The content of the file is passed on standard input, and
138 the fixed file content is expected on standard output. Any output on standard
138 the fixed file content is expected on standard output. Any output on standard
139 error will be displayed as a warning. If the exit status is not zero, the file
139 error will be displayed as a warning. If the exit status is not zero, the file
140 will not be affected. A placeholder warning is displayed if there is a non-
140 will not be affected. A placeholder warning is displayed if there is a non-
141 zero exit status but no standard error output. Some values may be substituted
141 zero exit status but no standard error output. Some values may be substituted
142 into the command:
142 into the command:
143
143
144 {rootpath} The path of the file being fixed, relative to the repo root
144 {rootpath} The path of the file being fixed, relative to the repo root
145 {basename} The name of the file being fixed, without the directory path
145 {basename} The name of the file being fixed, without the directory path
146
146
147 If the :linerange suboption is set, the tool will only be run if there are
147 If the :linerange suboption is set, the tool will only be run if there are
148 changed lines in a file. The value of this suboption is appended to the shell
148 changed lines in a file. The value of this suboption is appended to the shell
149 command once for every range of changed lines in the file. Some values may be
149 command once for every range of changed lines in the file. Some values may be
150 substituted into the command:
150 substituted into the command:
151
151
152 {first} The 1-based line number of the first line in the modified range
152 {first} The 1-based line number of the first line in the modified range
153 {last} The 1-based line number of the last line in the modified range
153 {last} The 1-based line number of the last line in the modified range
154
154
155 Deleted sections of a file will be ignored by :linerange, because there is no
155 Deleted sections of a file will be ignored by :linerange, because there is no
156 corresponding line range in the version being fixed.
156 corresponding line range in the version being fixed.
157
157
158 By default, tools that set :linerange will only be executed if there is at
158 By default, tools that set :linerange will only be executed if there is at
159 least one changed line range. This is meant to prevent accidents like running
159 least one changed line range. This is meant to prevent accidents like running
160 a code formatter in such a way that it unexpectedly reformats the whole file.
160 a code formatter in such a way that it unexpectedly reformats the whole file.
161 If such a tool needs to operate on unchanged files, it should set the
161 If such a tool needs to operate on unchanged files, it should set the
162 :skipclean suboption to false.
162 :skipclean suboption to false.
163
163
164 The :pattern suboption determines which files will be passed through each
164 The :pattern suboption determines which files will be passed through each
165 configured tool. See 'hg help patterns' for possible values. However, all
165 configured tool. See 'hg help patterns' for possible values. However, all
166 patterns are relative to the repo root, even if that text says they are
166 patterns are relative to the repo root, even if that text says they are
167 relative to the current working directory. If there are file arguments to 'hg
167 relative to the current working directory. If there are file arguments to 'hg
168 fix', the intersection of these patterns is used.
168 fix', the intersection of these patterns is used.
169
169
170 There is also a configurable limit for the maximum size of file that will be
170 There is also a configurable limit for the maximum size of file that will be
171 processed by 'hg fix':
171 processed by 'hg fix':
172
172
173 [fix]
173 [fix]
174 maxfilesize = 2MB
174 maxfilesize = 2MB
175
175
176 Normally, execution of configured tools will continue after a failure
176 Normally, execution of configured tools will continue after a failure
177 (indicated by a non-zero exit status). It can also be configured to abort
177 (indicated by a non-zero exit status). It can also be configured to abort
178 after the first such failure, so that no files will be affected if any tool
178 after the first such failure, so that no files will be affected if any tool
179 fails. This abort will also cause 'hg fix' to exit with a non-zero status:
179 fails. This abort will also cause 'hg fix' to exit with a non-zero status:
180
180
181 [fix]
181 [fix]
182 failure = abort
182 failure = abort
183
183
184 When multiple tools are configured to affect a file, they execute in an order
184 When multiple tools are configured to affect a file, they execute in an order
185 defined by the :priority suboption. The priority suboption has a default value
185 defined by the :priority suboption. The priority suboption has a default value
186 of zero for each tool. Tools are executed in order of descending priority. The
186 of zero for each tool. Tools are executed in order of descending priority. The
187 execution order of tools with equal priority is unspecified. For example, you
187 execution order of tools with equal priority is unspecified. For example, you
188 could use the 'sort' and 'head' utilities to keep only the 10 smallest numbers
188 could use the 'sort' and 'head' utilities to keep only the 10 smallest numbers
189 in a text file by ensuring that 'sort' runs before 'head':
189 in a text file by ensuring that 'sort' runs before 'head':
190
190
191 [fix]
191 [fix]
192 sort:command = sort -n
192 sort:command = sort -n
193 head:command = head -n 10
193 head:command = head -n 10
194 sort:pattern = numbers.txt
194 sort:pattern = numbers.txt
195 head:pattern = numbers.txt
195 head:pattern = numbers.txt
196 sort:priority = 2
196 sort:priority = 2
197 head:priority = 1
197 head:priority = 1
198
198
199 To account for changes made by each tool, the line numbers used for
199 To account for changes made by each tool, the line numbers used for
200 incremental formatting are recomputed before executing the next tool. So, each
200 incremental formatting are recomputed before executing the next tool. So, each
201 tool may see different values for the arguments added by the :linerange
201 tool may see different values for the arguments added by the :linerange
202 suboption.
202 suboption.
203
203
204 Each fixer tool is allowed to return some metadata in addition to the fixed
204 Each fixer tool is allowed to return some metadata in addition to the fixed
205 file content. The metadata must be placed before the file content on stdout,
205 file content. The metadata must be placed before the file content on stdout,
206 separated from the file content by a zero byte. The metadata is parsed as a
206 separated from the file content by a zero byte. The metadata is parsed as a
207 JSON value (so, it should be UTF-8 encoded and contain no zero bytes). A fixer
207 JSON value (so, it should be UTF-8 encoded and contain no zero bytes). A fixer
208 tool is expected to produce this metadata encoding if and only if the
208 tool is expected to produce this metadata encoding if and only if the
209 :metadata suboption is true:
209 :metadata suboption is true:
210
210
211 [fix]
211 [fix]
212 tool:command = tool --prepend-json-metadata
212 tool:command = tool --prepend-json-metadata
213 tool:metadata = true
213 tool:metadata = true
214
214
215 The metadata values are passed to hooks, which can be used to print summaries
215 The metadata values are passed to hooks, which can be used to print summaries
216 or perform other post-fixing work. The supported hooks are:
216 or perform other post-fixing work. The supported hooks are:
217
217
218 "postfixfile"
218 "postfixfile"
219 Run once for each file in each revision where any fixer tools made changes
219 Run once for each file in each revision where any fixer tools made changes
220 to the file content. Provides "$HG_REV" and "$HG_PATH" to identify the file,
220 to the file content. Provides "$HG_REV" and "$HG_PATH" to identify the file,
221 and "$HG_METADATA" with a map of fixer names to metadata values from fixer
221 and "$HG_METADATA" with a map of fixer names to metadata values from fixer
222 tools that affected the file. Fixer tools that didn't affect the file have a
222 tools that affected the file. Fixer tools that didn't affect the file have a
223 value of None. Only fixer tools that executed are present in the metadata.
223 value of None. Only fixer tools that executed are present in the metadata.
224
224
225 "postfix"
225 "postfix"
226 Run once after all files and revisions have been handled. Provides
226 Run once after all files and revisions have been handled. Provides
227 "$HG_REPLACEMENTS" with information about what revisions were created and
227 "$HG_REPLACEMENTS" with information about what revisions were created and
228 made obsolete. Provides a boolean "$HG_WDIRWRITTEN" to indicate whether any
228 made obsolete. Provides a boolean "$HG_WDIRWRITTEN" to indicate whether any
229 files in the working copy were updated. Provides a list "$HG_METADATA"
229 files in the working copy were updated. Provides a list "$HG_METADATA"
230 mapping fixer tool names to lists of metadata values returned from
230 mapping fixer tool names to lists of metadata values returned from
231 executions that modified a file. This aggregates the same metadata
231 executions that modified a file. This aggregates the same metadata
232 previously passed to the "postfixfile" hook.
232 previously passed to the "postfixfile" hook.
233
233
234 Fixer tools are run in the repository's root directory. This allows them to
234 Fixer tools are run in the repository's root directory. This allows them to
235 read configuration files from the working copy, or even write to the working
235 read configuration files from the working copy, or even write to the working
236 copy. The working copy is not updated to match the revision being fixed. In
236 copy. The working copy is not updated to match the revision being fixed. In
237 fact, several revisions may be fixed in parallel. Writes to the working copy
237 fact, several revisions may be fixed in parallel. Writes to the working copy
238 are not amended into the revision being fixed; fixer tools should always write
238 are not amended into the revision being fixed; fixer tools should always write
239 fixed file content back to stdout as documented above.
239 fixed file content back to stdout as documented above.
240
240
241 list of commands:
241 list of commands:
242
242
243 fix rewrite file content in changesets or working directory
243 fix rewrite file content in changesets or working directory
244
244
245 (use 'hg help -v -e fix' to show built-in aliases and global options)
245 (use 'hg help -v -e fix' to show built-in aliases and global options)
246
246
247 There is no default behavior in the absence of --rev and --working-dir.
247 There is no default behavior in the absence of --rev and --working-dir.
248
248
249 $ hg init badusage
249 $ hg init badusage
250 $ cd badusage
250 $ cd badusage
251
251
252 $ hg fix
252 $ hg fix
253 abort: no changesets specified
253 abort: no changesets specified
254 (use --source or --working-dir)
254 (use --source or --working-dir)
255 [255]
255 [255]
256 $ hg fix --whole
256 $ hg fix --whole
257 abort: no changesets specified
257 abort: no changesets specified
258 (use --source or --working-dir)
258 (use --source or --working-dir)
259 [255]
259 [255]
260 $ hg fix --base 0
260 $ hg fix --base 0
261 abort: no changesets specified
261 abort: no changesets specified
262 (use --source or --working-dir)
262 (use --source or --working-dir)
263 [255]
263 [255]
264
264
265 Fixing a public revision isn't allowed. It should abort early enough that
265 Fixing a public revision isn't allowed. It should abort early enough that
266 nothing happens, even to the working directory.
266 nothing happens, even to the working directory.
267
267
268 $ printf "hello\n" > hello.whole
268 $ printf "hello\n" > hello.whole
269 $ hg commit -Aqm "hello"
269 $ hg commit -Aqm "hello"
270 $ hg phase -r 0 --public
270 $ hg phase -r 0 --public
271 $ hg fix -r 0
271 $ hg fix -r 0
272 abort: cannot fix public changesets: 6470986d2e7b
272 abort: cannot fix public changesets: 6470986d2e7b
273 (see 'hg help phases' for details)
273 (see 'hg help phases' for details)
274 [10]
274 [10]
275 $ hg fix -r 0 --working-dir
275 $ hg fix -r 0 --working-dir
276 abort: cannot fix public changesets: 6470986d2e7b
276 abort: cannot fix public changesets: 6470986d2e7b
277 (see 'hg help phases' for details)
277 (see 'hg help phases' for details)
278 [10]
278 [10]
279 $ hg cat -r tip hello.whole
279 $ hg cat -r tip hello.whole
280 hello
280 hello
281 $ cat hello.whole
281 $ cat hello.whole
282 hello
282 hello
283
283
284 $ cd ..
284 $ cd ..
285
285
286 Fixing a clean working directory should do nothing. Even the --whole flag
286 Fixing a clean working directory should do nothing. Even the --whole flag
287 shouldn't cause any clean files to be fixed. Specifying a clean file explicitly
287 shouldn't cause any clean files to be fixed. Specifying a clean file explicitly
288 should only fix it if the fixer always fixes the whole file. The combination of
288 should only fix it if the fixer always fixes the whole file. The combination of
289 an explicit filename and --whole should format the entire file regardless.
289 an explicit filename and --whole should format the entire file regardless.
290
290
291 $ hg init fixcleanwdir
291 $ hg init fixcleanwdir
292 $ cd fixcleanwdir
292 $ cd fixcleanwdir
293
293
294 $ printf "hello\n" > hello.changed
294 $ printf "hello\n" > hello.changed
295 $ printf "world\n" > hello.whole
295 $ printf "world\n" > hello.whole
296 $ hg commit -Aqm "foo"
296 $ hg commit -Aqm "foo"
297 $ hg fix --working-dir
297 $ hg fix --working-dir
298 $ hg diff
298 $ hg diff
299 $ hg fix --working-dir --whole
299 $ hg fix --working-dir --whole
300 $ hg diff
300 $ hg diff
301 $ hg fix --working-dir *
301 $ hg fix --working-dir *
302 $ cat *
302 $ cat *
303 hello
303 hello
304 WORLD
304 WORLD
305 $ hg revert --all --no-backup
305 $ hg revert --all --no-backup
306 reverting hello.whole
306 reverting hello.whole
307 $ hg fix --working-dir * --whole
307 $ hg fix --working-dir * --whole
308 $ cat *
308 $ cat *
309 HELLO
309 HELLO
310 WORLD
310 WORLD
311
311
312 The same ideas apply to fixing a revision, so we create a revision that doesn't
312 The same ideas apply to fixing a revision, so we create a revision that doesn't
313 modify either of the files in question and try fixing it. This also tests that
313 modify either of the files in question and try fixing it. This also tests that
314 we ignore a file that doesn't match any configured fixer.
314 we ignore a file that doesn't match any configured fixer.
315
315
316 $ hg revert --all --no-backup
316 $ hg revert --all --no-backup
317 reverting hello.changed
317 reverting hello.changed
318 reverting hello.whole
318 reverting hello.whole
319 $ printf "unimportant\n" > some.file
319 $ printf "unimportant\n" > some.file
320 $ hg commit -Aqm "some other file"
320 $ hg commit -Aqm "some other file"
321
321
322 $ hg fix -r .
322 $ hg fix -r .
323 $ hg cat -r tip *
323 $ hg cat -r tip *
324 hello
324 hello
325 world
325 world
326 unimportant
326 unimportant
327 $ hg fix -r . --whole
327 $ hg fix -r . --whole
328 $ hg cat -r tip *
328 $ hg cat -r tip *
329 hello
329 hello
330 world
330 world
331 unimportant
331 unimportant
332 $ hg fix -r . *
332 $ hg fix -r . *
333 $ hg cat -r tip *
333 $ hg cat -r tip *
334 hello
334 hello
335 WORLD
335 WORLD
336 unimportant
336 unimportant
337 $ hg fix -r . * --whole --config experimental.evolution.allowdivergence=true
337 $ hg fix -r . * --whole --config experimental.evolution.allowdivergence=true
338 2 new content-divergent changesets
338 2 new content-divergent changesets
339 $ hg cat -r tip *
339 $ hg cat -r tip *
340 HELLO
340 HELLO
341 WORLD
341 WORLD
342 unimportant
342 unimportant
343
343
344 $ cd ..
344 $ cd ..
345
345
346 Fixing the working directory should still work if there are no revisions.
346 Fixing the working directory should still work if there are no revisions.
347
347
348 $ hg init norevisions
348 $ hg init norevisions
349 $ cd norevisions
349 $ cd norevisions
350
350
351 $ printf "something\n" > something.whole
351 $ printf "something\n" > something.whole
352 $ hg add
352 $ hg add
353 adding something.whole
353 adding something.whole
354 $ hg fix --working-dir
354 $ hg fix --working-dir
355 $ cat something.whole
355 $ cat something.whole
356 SOMETHING
356 SOMETHING
357
357
358 $ cd ..
358 $ cd ..
359
359
360 Test that the working copy is reported clean if formatting of the parent makes
360 Test that the working copy is reported clean if formatting of the parent makes
361 it clean.
361 it clean.
362 $ hg init wc-already-formatted
362 $ hg init wc-already-formatted
363 $ cd wc-already-formatted
363 $ cd wc-already-formatted
364
364
365 $ printf "hello world\n" > hello.whole
365 $ printf "hello world\n" > hello.whole
366 $ hg commit -Am initial
366 $ hg commit -Am initial
367 adding hello.whole
367 adding hello.whole
368 $ hg fix -w *
368 $ hg fix -w *
369 $ hg st
369 $ hg st
370 M hello.whole
370 M hello.whole
371 $ hg fix -s . *
371 $ hg fix -s . *
372 $ hg st
372 $ hg st
373 $ hg diff
373 $ hg diff
374
374
375 $ cd ..
375 $ cd ..
376
376
377 Test the effect of fixing the working directory for each possible status, with
377 Test the effect of fixing the working directory for each possible status, with
378 and without providing explicit file arguments.
378 and without providing explicit file arguments.
379
379
380 $ hg init implicitlyfixstatus
380 $ hg init implicitlyfixstatus
381 $ cd implicitlyfixstatus
381 $ cd implicitlyfixstatus
382
382
383 $ printf "modified\n" > modified.whole
383 $ printf "modified\n" > modified.whole
384 $ printf "removed\n" > removed.whole
384 $ printf "removed\n" > removed.whole
385 $ printf "deleted\n" > deleted.whole
385 $ printf "deleted\n" > deleted.whole
386 $ printf "clean\n" > clean.whole
386 $ printf "clean\n" > clean.whole
387 $ printf "ignored.whole" > .hgignore
387 $ printf "ignored.whole" > .hgignore
388 $ hg commit -Aqm "stuff"
388 $ hg commit -Aqm "stuff"
389
389
390 $ printf "modified!!!\n" > modified.whole
390 $ printf "modified!!!\n" > modified.whole
391 $ printf "unknown\n" > unknown.whole
391 $ printf "unknown\n" > unknown.whole
392 $ printf "ignored\n" > ignored.whole
392 $ printf "ignored\n" > ignored.whole
393 $ printf "added\n" > added.whole
393 $ printf "added\n" > added.whole
394 $ hg add added.whole
394 $ hg add added.whole
395 $ hg remove removed.whole
395 $ hg remove removed.whole
396 $ rm deleted.whole
396 $ rm deleted.whole
397
397
398 $ hg status --all
398 $ hg status --all
399 M modified.whole
399 M modified.whole
400 A added.whole
400 A added.whole
401 R removed.whole
401 R removed.whole
402 ! deleted.whole
402 ! deleted.whole
403 ? unknown.whole
403 ? unknown.whole
404 I ignored.whole
404 I ignored.whole
405 C .hgignore
405 C .hgignore
406 C clean.whole
406 C clean.whole
407
407
408 $ hg fix --working-dir
408 $ hg fix --working-dir
409
409
410 $ hg status --all
410 $ hg status --all
411 M modified.whole
411 M modified.whole
412 A added.whole
412 A added.whole
413 R removed.whole
413 R removed.whole
414 ! deleted.whole
414 ! deleted.whole
415 ? unknown.whole
415 ? unknown.whole
416 I ignored.whole
416 I ignored.whole
417 C .hgignore
417 C .hgignore
418 C clean.whole
418 C clean.whole
419
419
420 $ cat *.whole
420 $ cat *.whole
421 ADDED
421 ADDED
422 clean
422 clean
423 ignored
423 ignored
424 MODIFIED!!!
424 MODIFIED!!!
425 unknown
425 unknown
426
426
427 $ printf "modified!!!\n" > modified.whole
427 $ printf "modified!!!\n" > modified.whole
428 $ printf "added\n" > added.whole
428 $ printf "added\n" > added.whole
429
429
430 Listing the files explicitly causes untracked files to also be fixed, but
430 Listing the files explicitly causes untracked files to also be fixed, but
431 ignored files are still unaffected.
431 ignored files are still unaffected.
432
432
433 $ hg fix --working-dir *.whole
433 $ hg fix --working-dir *.whole
434
434
435 $ hg status --all
435 $ hg status --all
436 M clean.whole
436 M clean.whole
437 M modified.whole
437 M modified.whole
438 A added.whole
438 A added.whole
439 R removed.whole
439 R removed.whole
440 ! deleted.whole
440 ! deleted.whole
441 ? unknown.whole
441 ? unknown.whole
442 I ignored.whole
442 I ignored.whole
443 C .hgignore
443 C .hgignore
444
444
445 $ cat *.whole
445 $ cat *.whole
446 ADDED
446 ADDED
447 CLEAN
447 CLEAN
448 ignored
448 ignored
449 MODIFIED!!!
449 MODIFIED!!!
450 UNKNOWN
450 UNKNOWN
451
451
452 $ cd ..
452 $ cd ..
453
453
454 Test that incremental fixing works on files with additions, deletions, and
454 Test that incremental fixing works on files with additions, deletions, and
455 changes in multiple line ranges. Note that deletions do not generally cause
455 changes in multiple line ranges. Note that deletions do not generally cause
456 neighboring lines to be fixed, so we don't return a line range for purely
456 neighboring lines to be fixed, so we don't return a line range for purely
457 deleted sections. In the future we should support a :deletion config that
457 deleted sections. In the future we should support a :deletion config that
458 allows fixers to know where deletions are located.
458 allows fixers to know where deletions are located.
459
459
460 $ hg init incrementalfixedlines
460 $ hg init incrementalfixedlines
461 $ cd incrementalfixedlines
461 $ cd incrementalfixedlines
462
462
463 $ printf "a\nb\nc\nd\ne\nf\ng\n" > foo.txt
463 $ printf "a\nb\nc\nd\ne\nf\ng\n" > foo.txt
464 $ hg commit -Aqm "foo"
464 $ hg commit -Aqm "foo"
465 $ printf "zz\na\nc\ndd\nee\nff\nf\ngg\n" > foo.txt
465 $ printf "zz\na\nc\ndd\nee\nff\nf\ngg\n" > foo.txt
466
466
467 $ hg --config "fix.fail:command=echo" \
467 $ hg --config "fix.fail:command=echo" \
468 > --config "fix.fail:linerange={first}:{last}" \
468 > --config "fix.fail:linerange={first}:{last}" \
469 > --config "fix.fail:pattern=foo.txt" \
469 > --config "fix.fail:pattern=foo.txt" \
470 > fix --working-dir
470 > fix --working-dir
471 $ cat foo.txt
471 $ cat foo.txt
472 1:1 4:6 8:8
472 1:1 4:6 8:8
473
473
474 $ cd ..
474 $ cd ..
475
475
476 Test that --whole fixes all lines regardless of the diffs present.
476 Test that --whole fixes all lines regardless of the diffs present.
477
477
478 $ hg init wholeignoresdiffs
478 $ hg init wholeignoresdiffs
479 $ cd wholeignoresdiffs
479 $ cd wholeignoresdiffs
480
480
481 $ printf "a\nb\nc\nd\ne\nf\ng\n" > foo.changed
481 $ printf "a\nb\nc\nd\ne\nf\ng\n" > foo.changed
482 $ hg commit -Aqm "foo"
482 $ hg commit -Aqm "foo"
483 $ printf "zz\na\nc\ndd\nee\nff\nf\ngg\n" > foo.changed
483 $ printf "zz\na\nc\ndd\nee\nff\nf\ngg\n" > foo.changed
484
484
485 $ hg fix --working-dir
485 $ hg fix --working-dir
486 $ cat foo.changed
486 $ cat foo.changed
487 ZZ
487 ZZ
488 a
488 a
489 c
489 c
490 DD
490 DD
491 EE
491 EE
492 FF
492 FF
493 f
493 f
494 GG
494 GG
495
495
496 $ hg fix --working-dir --whole
496 $ hg fix --working-dir --whole
497 $ cat foo.changed
497 $ cat foo.changed
498 ZZ
498 ZZ
499 A
499 A
500 C
500 C
501 DD
501 DD
502 EE
502 EE
503 FF
503 FF
504 F
504 F
505 GG
505 GG
506
506
507 $ cd ..
507 $ cd ..
508
508
509 We should do nothing with symlinks, and their targets should be unaffected. Any
509 We should do nothing with symlinks, and their targets should be unaffected. Any
510 other behavior would be more complicated to implement and harder to document.
510 other behavior would be more complicated to implement and harder to document.
511
511
512 #if symlink
512 #if symlink
513 $ hg init dontmesswithsymlinks
513 $ hg init dontmesswithsymlinks
514 $ cd dontmesswithsymlinks
514 $ cd dontmesswithsymlinks
515
515
516 $ printf "hello\n" > hello.whole
516 $ printf "hello\n" > hello.whole
517 $ ln -s hello.whole hellolink
517 $ ln -s hello.whole hellolink
518 $ hg add
518 $ hg add
519 adding hello.whole
519 adding hello.whole
520 adding hellolink
520 adding hellolink
521 $ hg fix --working-dir hellolink
521 $ hg fix --working-dir hellolink
522 $ hg status
522 $ hg status
523 A hello.whole
523 A hello.whole
524 A hellolink
524 A hellolink
525
525
526 $ cd ..
526 $ cd ..
527 #endif
527 #endif
528
528
529 We should allow fixers to run on binary files, even though this doesn't sound
529 We should allow fixers to run on binary files, even though this doesn't sound
530 like a common use case. There's not much benefit to disallowing it, and users
530 like a common use case. There's not much benefit to disallowing it, and users
531 can add "and not binary()" to their filesets if needed. The Mercurial
531 can add "and not binary()" to their filesets if needed. The Mercurial
532 philosophy is generally to not handle binary files specially anyway.
532 philosophy is generally to not handle binary files specially anyway.
533
533
534 $ hg init cantouchbinaryfiles
534 $ hg init cantouchbinaryfiles
535 $ cd cantouchbinaryfiles
535 $ cd cantouchbinaryfiles
536
536
537 $ printf "hello\0\n" > hello.whole
537 $ printf "hello\0\n" > hello.whole
538 $ hg add
538 $ hg add
539 adding hello.whole
539 adding hello.whole
540 $ hg fix --working-dir 'set:binary()'
540 $ hg fix --working-dir 'set:binary()'
541 $ cat hello.whole
541 $ cat hello.whole
542 HELLO\x00 (esc)
542 HELLO\x00 (esc)
543
543
544 $ cd ..
544 $ cd ..
545
545
546 We have a config for the maximum size of file we will attempt to fix. This can
546 We have a config for the maximum size of file we will attempt to fix. This can
547 be helpful to avoid running unsuspecting fixer tools on huge inputs, which
547 be helpful to avoid running unsuspecting fixer tools on huge inputs, which
548 could happen by accident without a well considered configuration. A more
548 could happen by accident without a well considered configuration. A more
549 precise configuration could use the size() fileset function if one global limit
549 precise configuration could use the size() fileset function if one global limit
550 is undesired.
550 is undesired.
551
551
552 $ hg init maxfilesize
552 $ hg init maxfilesize
553 $ cd maxfilesize
553 $ cd maxfilesize
554
554
555 $ printf "this file is huge\n" > hello.whole
555 $ printf "this file is huge\n" > hello.whole
556 $ hg add
556 $ hg add
557 adding hello.whole
557 adding hello.whole
558 $ hg --config fix.maxfilesize=10 fix --working-dir
558 $ hg --config fix.maxfilesize=10 fix --working-dir
559 ignoring file larger than 10 bytes: hello.whole
559 ignoring file larger than 10 bytes: hello.whole
560 $ cat hello.whole
560 $ cat hello.whole
561 this file is huge
561 this file is huge
562
562
563 $ cd ..
563 $ cd ..
564
564
565 If we specify a file to fix, other files should be left alone, even if they
565 If we specify a file to fix, other files should be left alone, even if they
566 have changes.
566 have changes.
567
567
568 $ hg init fixonlywhatitellyouto
568 $ hg init fixonlywhatitellyouto
569 $ cd fixonlywhatitellyouto
569 $ cd fixonlywhatitellyouto
570
570
571 $ printf "fix me!\n" > fixme.whole
571 $ printf "fix me!\n" > fixme.whole
572 $ printf "not me.\n" > notme.whole
572 $ printf "not me.\n" > notme.whole
573 $ hg add
573 $ hg add
574 adding fixme.whole
574 adding fixme.whole
575 adding notme.whole
575 adding notme.whole
576 $ hg fix --working-dir fixme.whole
576 $ hg fix --working-dir fixme.whole
577 $ cat *.whole
577 $ cat *.whole
578 FIX ME!
578 FIX ME!
579 not me.
579 not me.
580
580
581 $ cd ..
581 $ cd ..
582
582
583 If we try to fix a missing file, we still fix other files.
583 If we try to fix a missing file, we still fix other files.
584
584
585 $ hg init fixmissingfile
585 $ hg init fixmissingfile
586 $ cd fixmissingfile
586 $ cd fixmissingfile
587
587
588 $ printf "fix me!\n" > foo.whole
588 $ printf "fix me!\n" > foo.whole
589 $ hg add
589 $ hg add
590 adding foo.whole
590 adding foo.whole
591 $ hg fix --working-dir foo.whole bar.whole
591 $ hg fix --working-dir foo.whole bar.whole
592 bar.whole: $ENOENT$
592 bar.whole: $ENOENT$
593 $ cat *.whole
593 $ cat *.whole
594 FIX ME!
594 FIX ME!
595
595
596 $ cd ..
596 $ cd ..
597
597
598 Specifying a directory name should fix all its files and subdirectories.
598 Specifying a directory name should fix all its files and subdirectories.
599
599
600 $ hg init fixdirectory
600 $ hg init fixdirectory
601 $ cd fixdirectory
601 $ cd fixdirectory
602
602
603 $ mkdir -p dir1/dir2
603 $ mkdir -p dir1/dir2
604 $ printf "foo\n" > foo.whole
604 $ printf "foo\n" > foo.whole
605 $ printf "bar\n" > dir1/bar.whole
605 $ printf "bar\n" > dir1/bar.whole
606 $ printf "baz\n" > dir1/dir2/baz.whole
606 $ printf "baz\n" > dir1/dir2/baz.whole
607 $ hg add
607 $ hg add
608 adding dir1/bar.whole
608 adding dir1/bar.whole
609 adding dir1/dir2/baz.whole
609 adding dir1/dir2/baz.whole
610 adding foo.whole
610 adding foo.whole
611 $ hg fix --working-dir dir1
611 $ hg fix --working-dir dir1
612 $ cat foo.whole dir1/bar.whole dir1/dir2/baz.whole
612 $ cat foo.whole dir1/bar.whole dir1/dir2/baz.whole
613 foo
613 foo
614 BAR
614 BAR
615 BAZ
615 BAZ
616
616
617 $ cd ..
617 $ cd ..
618
618
619 Fixing a file in the working directory that needs no fixes should not actually
619 Fixing a file in the working directory that needs no fixes should not actually
620 write back to the file, so for example the mtime shouldn't change.
620 write back to the file, so for example the mtime shouldn't change.
621
621
622 $ hg init donttouchunfixedfiles
622 $ hg init donttouchunfixedfiles
623 $ cd donttouchunfixedfiles
623 $ cd donttouchunfixedfiles
624
624
625 $ printf "NO FIX NEEDED\n" > foo.whole
625 $ printf "NO FIX NEEDED\n" > foo.whole
626 $ hg add
626 $ hg add
627 adding foo.whole
627 adding foo.whole
628 $ cp -p foo.whole foo.whole.orig
628 $ cp -p foo.whole foo.whole.orig
629 $ cp -p foo.whole.orig foo.whole
629 $ cp -p foo.whole.orig foo.whole
630 $ sleep 2 # mtime has a resolution of one or two seconds.
630 $ sleep 2 # mtime has a resolution of one or two seconds.
631 $ hg fix --working-dir
631 $ hg fix --working-dir
632 $ f foo.whole.orig --newer foo.whole
632 $ f foo.whole.orig --newer foo.whole
633 foo.whole.orig: newer than foo.whole
633 foo.whole.orig: newer than foo.whole
634
634
635 $ cd ..
635 $ cd ..
636
636
637 When a fixer prints to stderr, we don't assume that it has failed. We show the
637 When a fixer prints to stderr, we don't assume that it has failed. We show the
638 error messages to the user, and we still let the fixer affect the file it was
638 error messages to the user, and we still let the fixer affect the file it was
639 fixing if its exit code is zero. Some code formatters might emit error messages
639 fixing if its exit code is zero. Some code formatters might emit error messages
640 on stderr and nothing on stdout, which would cause us the clear the file,
640 on stderr and nothing on stdout, which would cause us the clear the file,
641 except that they also exit with a non-zero code. We show the user which fixer
641 except that they also exit with a non-zero code. We show the user which fixer
642 emitted the stderr, and which revision, but we assume that the fixer will print
642 emitted the stderr, and which revision, but we assume that the fixer will print
643 the filename if it is relevant (since the issue may be non-specific). There is
643 the filename if it is relevant (since the issue may be non-specific). There is
644 also a config to abort (without affecting any files whatsoever) if we see any
644 also a config to abort (without affecting any files whatsoever) if we see any
645 tool with a non-zero exit status.
645 tool with a non-zero exit status.
646
646
647 $ hg init showstderr
647 $ hg init showstderr
648 $ cd showstderr
648 $ cd showstderr
649
649
650 $ printf "hello\n" > hello.txt
650 $ printf "hello\n" > hello.txt
651 $ hg add
651 $ hg add
652 adding hello.txt
652 adding hello.txt
653 $ cat > $TESTTMP/work.sh <<'EOF'
653 $ cat > $TESTTMP/work.sh <<'EOF'
654 > printf 'HELLO\n'
654 > printf 'HELLO\n'
655 > printf "$@: some\nerror that didn't stop the tool" >&2
655 > printf "$@: some\nerror that didn't stop the tool" >&2
656 > exit 0 # success despite the stderr output
656 > exit 0 # success despite the stderr output
657 > EOF
657 > EOF
658 $ hg --config "fix.work:command=sh $TESTTMP/work.sh {rootpath}" \
658 $ hg --config "fix.work:command=sh $TESTTMP/work.sh {rootpath}" \
659 > --config "fix.work:pattern=hello.txt" \
659 > --config "fix.work:pattern=hello.txt" \
660 > fix --working-dir
660 > fix --working-dir
661 [wdir] work: hello.txt: some
661 [wdir] work: hello.txt: some
662 [wdir] work: error that didn't stop the tool
662 [wdir] work: error that didn't stop the tool
663 $ cat hello.txt
663 $ cat hello.txt
664 HELLO
664 HELLO
665
665
666 $ printf "goodbye\n" > hello.txt
666 $ printf "goodbye\n" > hello.txt
667 $ printf "foo\n" > foo.whole
667 $ printf "foo\n" > foo.whole
668 $ hg add
668 $ hg add
669 adding foo.whole
669 adding foo.whole
670 $ cat > $TESTTMP/fail.sh <<'EOF'
670 $ cat > $TESTTMP/fail.sh <<'EOF'
671 > printf 'GOODBYE\n'
671 > printf 'GOODBYE\n'
672 > printf "$@: some\nerror that did stop the tool\n" >&2
672 > printf "$@: some\nerror that did stop the tool\n" >&2
673 > exit 42 # success despite the stdout output
673 > exit 42 # success despite the stdout output
674 > EOF
674 > EOF
675 $ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \
675 $ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \
676 > --config "fix.fail:pattern=hello.txt" \
676 > --config "fix.fail:pattern=hello.txt" \
677 > --config "fix.failure=abort" \
677 > --config "fix.failure=abort" \
678 > fix --working-dir
678 > fix --working-dir
679 [wdir] fail: hello.txt: some
679 [wdir] fail: hello.txt: some
680 [wdir] fail: error that did stop the tool
680 [wdir] fail: error that did stop the tool
681 abort: no fixes will be applied
681 abort: no fixes will be applied
682 (use --config fix.failure=continue to apply any successful fixes anyway)
682 (use --config fix.failure=continue to apply any successful fixes anyway)
683 [255]
683 [255]
684 $ cat hello.txt
684 $ cat hello.txt
685 goodbye
685 goodbye
686 $ cat foo.whole
686 $ cat foo.whole
687 foo
687 foo
688
688
689 $ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \
689 $ hg --config "fix.fail:command=sh $TESTTMP/fail.sh {rootpath}" \
690 > --config "fix.fail:pattern=hello.txt" \
690 > --config "fix.fail:pattern=hello.txt" \
691 > fix --working-dir
691 > fix --working-dir
692 [wdir] fail: hello.txt: some
692 [wdir] fail: hello.txt: some
693 [wdir] fail: error that did stop the tool
693 [wdir] fail: error that did stop the tool
694 $ cat hello.txt
694 $ cat hello.txt
695 goodbye
695 goodbye
696 $ cat foo.whole
696 $ cat foo.whole
697 FOO
697 FOO
698
698
699 $ hg --config "fix.fail:command=exit 42" \
699 $ hg --config "fix.fail:command=exit 42" \
700 > --config "fix.fail:pattern=hello.txt" \
700 > --config "fix.fail:pattern=hello.txt" \
701 > fix --working-dir
701 > fix --working-dir
702 [wdir] fail: exited with status 42
702 [wdir] fail: exited with status 42
703
703
704 $ cd ..
704 $ cd ..
705
705
706 Fixing the working directory and its parent revision at the same time should
706 Fixing the working directory and its parent revision at the same time should
707 check out the replacement revision for the parent. This prevents any new
707 check out the replacement revision for the parent. This prevents any new
708 uncommitted changes from appearing. We test this for a clean working directory
708 uncommitted changes from appearing. We test this for a clean working directory
709 and a dirty one. In both cases, all lines/files changed since the grandparent
709 and a dirty one. In both cases, all lines/files changed since the grandparent
710 will be fixed. The grandparent is the "baserev" for both the parent and the
710 will be fixed. The grandparent is the "baserev" for both the parent and the
711 working copy.
711 working copy.
712
712
713 $ hg init fixdotandcleanwdir
713 $ hg init fixdotandcleanwdir
714 $ cd fixdotandcleanwdir
714 $ cd fixdotandcleanwdir
715
715
716 $ printf "hello\n" > hello.whole
716 $ printf "hello\n" > hello.whole
717 $ printf "world\n" > world.whole
717 $ printf "world\n" > world.whole
718 $ hg commit -Aqm "the parent commit"
718 $ hg commit -Aqm "the parent commit"
719
719
720 $ hg parents --template '{rev} {desc}\n'
720 $ hg parents --template '{rev} {desc}\n'
721 0 the parent commit
721 0 the parent commit
722 $ hg fix --working-dir -r .
722 $ hg fix --working-dir -r .
723 $ hg parents --template '{rev} {desc}\n'
723 $ hg parents --template '{rev} {desc}\n'
724 1 the parent commit
724 1 the parent commit
725 $ hg cat -r . *.whole
725 $ hg cat -r . *.whole
726 HELLO
726 HELLO
727 WORLD
727 WORLD
728 $ cat *.whole
728 $ cat *.whole
729 HELLO
729 HELLO
730 WORLD
730 WORLD
731 $ hg status
731 $ hg status
732
732
733 $ cd ..
733 $ cd ..
734
734
735 Same test with a dirty working copy.
735 Same test with a dirty working copy.
736
736
737 $ hg init fixdotanddirtywdir
737 $ hg init fixdotanddirtywdir
738 $ cd fixdotanddirtywdir
738 $ cd fixdotanddirtywdir
739
739
740 $ printf "hello\n" > hello.whole
740 $ printf "hello\n" > hello.whole
741 $ printf "world\n" > world.whole
741 $ printf "world\n" > world.whole
742 $ hg commit -Aqm "the parent commit"
742 $ hg commit -Aqm "the parent commit"
743
743
744 $ printf "hello,\n" > hello.whole
744 $ printf "hello,\n" > hello.whole
745 $ printf "world!\n" > world.whole
745 $ printf "world!\n" > world.whole
746
746
747 $ hg parents --template '{rev} {desc}\n'
747 $ hg parents --template '{rev} {desc}\n'
748 0 the parent commit
748 0 the parent commit
749 $ hg fix --working-dir -r .
749 $ hg fix --working-dir -r .
750 $ hg parents --template '{rev} {desc}\n'
750 $ hg parents --template '{rev} {desc}\n'
751 1 the parent commit
751 1 the parent commit
752 $ hg cat -r . *.whole
752 $ hg cat -r . *.whole
753 HELLO
753 HELLO
754 WORLD
754 WORLD
755 $ cat *.whole
755 $ cat *.whole
756 HELLO,
756 HELLO,
757 WORLD!
757 WORLD!
758 $ hg status
758 $ hg status
759 M hello.whole
759 M hello.whole
760 M world.whole
760 M world.whole
761
761
762 $ cd ..
762 $ cd ..
763
763
764 When we have a chain of commits that change mutually exclusive lines of code,
764 When we have a chain of commits that change mutually exclusive lines of code,
765 we should be able to do incremental fixing that causes each commit in the chain
765 we should be able to do incremental fixing that causes each commit in the chain
766 to include fixes made to the previous commits. This prevents children from
766 to include fixes made to the previous commits. This prevents children from
767 backing out the fixes made in their parents. A dirty working directory is
767 backing out the fixes made in their parents. A dirty working directory is
768 conceptually similar to another commit in the chain.
768 conceptually similar to another commit in the chain.
769
769
770 $ hg init incrementallyfixchain
770 $ hg init incrementallyfixchain
771 $ cd incrementallyfixchain
771 $ cd incrementallyfixchain
772
772
773 $ cat > file.changed <<EOF
773 $ cat > file.changed <<EOF
774 > first
774 > first
775 > second
775 > second
776 > third
776 > third
777 > fourth
777 > fourth
778 > fifth
778 > fifth
779 > EOF
779 > EOF
780 $ hg commit -Aqm "the common ancestor (the baserev)"
780 $ hg commit -Aqm "the common ancestor (the baserev)"
781 $ cat > file.changed <<EOF
781 $ cat > file.changed <<EOF
782 > first (changed)
782 > first (changed)
783 > second
783 > second
784 > third
784 > third
785 > fourth
785 > fourth
786 > fifth
786 > fifth
787 > EOF
787 > EOF
788 $ hg commit -Aqm "the first commit to fix"
788 $ hg commit -Aqm "the first commit to fix"
789 $ cat > file.changed <<EOF
789 $ cat > file.changed <<EOF
790 > first (changed)
790 > first (changed)
791 > second
791 > second
792 > third (changed)
792 > third (changed)
793 > fourth
793 > fourth
794 > fifth
794 > fifth
795 > EOF
795 > EOF
796 $ hg commit -Aqm "the second commit to fix"
796 $ hg commit -Aqm "the second commit to fix"
797 $ cat > file.changed <<EOF
797 $ cat > file.changed <<EOF
798 > first (changed)
798 > first (changed)
799 > second
799 > second
800 > third (changed)
800 > third (changed)
801 > fourth
801 > fourth
802 > fifth (changed)
802 > fifth (changed)
803 > EOF
803 > EOF
804
804
805 $ hg fix -r . -r '.^' --working-dir
805 $ hg fix -r . -r '.^' --working-dir
806
806
807 $ hg parents --template '{rev}\n'
807 $ hg parents --template '{rev}\n'
808 4
808 4
809 $ hg cat -r '.^^' file.changed
809 $ hg cat -r '.^^' file.changed
810 first
810 first
811 second
811 second
812 third
812 third
813 fourth
813 fourth
814 fifth
814 fifth
815 $ hg cat -r '.^' file.changed
815 $ hg cat -r '.^' file.changed
816 FIRST (CHANGED)
816 FIRST (CHANGED)
817 second
817 second
818 third
818 third
819 fourth
819 fourth
820 fifth
820 fifth
821 $ hg cat -r . file.changed
821 $ hg cat -r . file.changed
822 FIRST (CHANGED)
822 FIRST (CHANGED)
823 second
823 second
824 THIRD (CHANGED)
824 THIRD (CHANGED)
825 fourth
825 fourth
826 fifth
826 fifth
827 $ cat file.changed
827 $ cat file.changed
828 FIRST (CHANGED)
828 FIRST (CHANGED)
829 second
829 second
830 THIRD (CHANGED)
830 THIRD (CHANGED)
831 fourth
831 fourth
832 FIFTH (CHANGED)
832 FIFTH (CHANGED)
833
833
834 $ cd ..
834 $ cd ..
835
835
836 If we incrementally fix a merge commit, we should fix any lines that changed
836 If we incrementally fix a merge commit, we should fix any lines that changed
837 versus either parent. You could imagine only fixing the intersection or some
837 versus either parent. You could imagine only fixing the intersection or some
838 other subset, but this is necessary if either parent is being fixed. It
838 other subset, but this is necessary if either parent is being fixed. It
839 prevents us from forgetting fixes made in either parent.
839 prevents us from forgetting fixes made in either parent.
840
840
841 $ hg init incrementallyfixmergecommit
841 $ hg init incrementallyfixmergecommit
842 $ cd incrementallyfixmergecommit
842 $ cd incrementallyfixmergecommit
843
843
844 $ printf "a\nb\nc\n" > file.changed
844 $ printf "a\nb\nc\n" > file.changed
845 $ hg commit -Aqm "ancestor"
845 $ hg commit -Aqm "ancestor"
846
846
847 $ printf "aa\nb\nc\n" > file.changed
847 $ printf "aa\nb\nc\n" > file.changed
848 $ hg commit -m "change a"
848 $ hg commit -m "change a"
849
849
850 $ hg checkout '.^'
850 $ hg checkout '.^'
851 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
851 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
852 $ printf "a\nb\ncc\n" > file.changed
852 $ printf "a\nb\ncc\n" > file.changed
853 $ hg commit -m "change c"
853 $ hg commit -m "change c"
854 created new head
854 created new head
855
855
856 $ hg merge
856 $ hg merge
857 merging file.changed
857 merging file.changed
858 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
858 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
859 (branch merge, don't forget to commit)
859 (branch merge, don't forget to commit)
860 $ hg commit -m "merge"
860 $ hg commit -m "merge"
861 $ hg cat -r . file.changed
861 $ hg cat -r . file.changed
862 aa
862 aa
863 b
863 b
864 cc
864 cc
865
865
866 $ hg fix -r . --working-dir
866 $ hg fix -r . --working-dir
867 $ hg cat -r . file.changed
867 $ hg cat -r . file.changed
868 AA
868 AA
869 b
869 b
870 CC
870 CC
871
871
872 $ cd ..
872 $ cd ..
873
873
874 We should be allowed to fix the working (and only the working copy) while
874 We should be allowed to fix the working (and only the working copy) while
875 merging.
875 merging.
876
876
877 $ hg init fixworkingcopywhilemerging
877 $ hg init fixworkingcopywhilemerging
878 $ cd fixworkingcopywhilemerging
878 $ cd fixworkingcopywhilemerging
879
879
880 $ printf "a\nb\nc\n" > file.changed
880 $ printf "a\nb\nc\n" > file.changed
881 $ hg commit -Aqm "ancestor"
881 $ hg commit -Aqm "ancestor"
882
882
883 $ printf "aa\nb\nc\n" > file.changed
883 $ printf "aa\nb\nc\n" > file.changed
884 $ hg commit -m "change a"
884 $ hg commit -m "change a"
885
885
886 $ hg checkout '.^'
886 $ hg checkout '.^'
887 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
887 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
888 $ printf "a\nb\ncc\n" > file.changed
888 $ printf "a\nb\ncc\n" > file.changed
889 $ hg commit -m "change c"
889 $ hg commit -m "change c"
890 created new head
890 created new head
891
891
892 $ hg merge
892 $ hg merge
893 merging file.changed
893 merging file.changed
894 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
894 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
895 (branch merge, don't forget to commit)
895 (branch merge, don't forget to commit)
896 $ cat file.changed
896 $ cat file.changed
897 aa
897 aa
898 b
898 b
899 cc
899 cc
900 Not allowed to fix a parent of the working copy while merging
900 Not allowed to fix a parent of the working copy while merging
901 $ hg fix -r . --working-dir
901 $ hg fix -r . --working-dir
902 abort: outstanding uncommitted merge
902 abort: outstanding uncommitted merge
903 (use 'hg commit' or 'hg merge --abort')
903 (use 'hg commit' or 'hg merge --abort')
904 [20]
904 [20]
905 $ hg fix --working-dir
905 $ hg fix --working-dir
906 $ cat file.changed
906 $ cat file.changed
907 AA
907 AA
908 b
908 b
909 CC
909 CC
910
910
911 $ cd ..
911 $ cd ..
912
912
913 Abort fixing revisions if there is an unfinished operation. We don't want to
913 Abort fixing revisions if there is an unfinished operation. We don't want to
914 make things worse by editing files or stripping/obsoleting things. Also abort
914 make things worse by editing files or stripping/obsoleting things. Also abort
915 fixing the working directory if there are unresolved merge conflicts.
915 fixing the working directory if there are unresolved merge conflicts.
916
916
917 $ hg init abortunresolved
917 $ hg init abortunresolved
918 $ cd abortunresolved
918 $ cd abortunresolved
919
919
920 $ echo "foo1" > foo.whole
920 $ echo "foo1" > foo.whole
921 $ hg commit -Aqm "foo 1"
921 $ hg commit -Aqm "foo 1"
922
922
923 $ hg update null
923 $ hg update null
924 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
924 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
925 $ echo "foo2" > foo.whole
925 $ echo "foo2" > foo.whole
926 $ hg commit -Aqm "foo 2"
926 $ hg commit -Aqm "foo 2"
927
927
928 $ hg --config extensions.rebase= rebase -r 1 -d 0
928 $ hg --config extensions.rebase= rebase -r 1 -d 0
929 rebasing 1:c3b6dc0e177a tip "foo 2"
929 rebasing 1:c3b6dc0e177a tip "foo 2"
930 merging foo.whole
930 merging foo.whole
931 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
931 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark')
932 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
932 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
933 [240]
933 [240]
934
934
935 $ hg --config extensions.rebase= fix --working-dir
935 $ hg --config extensions.rebase= fix --working-dir
936 abort: unresolved conflicts
936 abort: unresolved conflicts
937 (use 'hg resolve')
937 (use 'hg resolve')
938 [255]
938 [255]
939
939
940 $ hg --config extensions.rebase= fix -r .
940 $ hg --config extensions.rebase= fix -r .
941 abort: rebase in progress
941 abort: rebase in progress
942 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
942 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
943 [20]
943 [20]
944
944
945 $ cd ..
945 $ cd ..
946
946
947 When fixing a file that was renamed, we should diff against the source of the
947 When fixing a file that was renamed, we should diff against the source of the
948 rename for incremental fixing and we should correctly reproduce the rename in
948 rename for incremental fixing and we should correctly reproduce the rename in
949 the replacement revision.
949 the replacement revision.
950
950
951 $ hg init fixrenamecommit
951 $ hg init fixrenamecommit
952 $ cd fixrenamecommit
952 $ cd fixrenamecommit
953
953
954 $ printf "a\nb\nc\n" > source.changed
954 $ printf "a\nb\nc\n" > source.changed
955 $ hg commit -Aqm "source revision"
955 $ hg commit -Aqm "source revision"
956 $ hg move source.changed dest.changed
956 $ hg move source.changed dest.changed
957 $ printf "a\nb\ncc\n" > dest.changed
957 $ printf "a\nb\ncc\n" > dest.changed
958 $ hg commit -m "dest revision"
958 $ hg commit -m "dest revision"
959
959
960 $ hg fix -r .
960 $ hg fix -r .
961 $ hg log -r tip --copies --template "{file_copies}\n"
961 $ hg log -r tip --copies --template "{file_copies}\n"
962 dest.changed (source.changed)
962 dest.changed (source.changed)
963 $ hg cat -r tip dest.changed
963 $ hg cat -r tip dest.changed
964 a
964 a
965 b
965 b
966 CC
966 CC
967
967
968 $ cd ..
968 $ cd ..
969
969
970 When fixing revisions that remove files we must ensure that the replacement
970 When fixing revisions that remove files we must ensure that the replacement
971 actually removes the file, whereas it could accidentally leave it unchanged or
971 actually removes the file, whereas it could accidentally leave it unchanged or
972 write an empty string to it.
972 write an empty string to it.
973
973
974 $ hg init fixremovedfile
974 $ hg init fixremovedfile
975 $ cd fixremovedfile
975 $ cd fixremovedfile
976
976
977 $ printf "foo\n" > foo.whole
977 $ printf "foo\n" > foo.whole
978 $ printf "bar\n" > bar.whole
978 $ printf "bar\n" > bar.whole
979 $ hg commit -Aqm "add files"
979 $ hg commit -Aqm "add files"
980 $ hg remove bar.whole
980 $ hg remove bar.whole
981 $ hg commit -m "remove file"
981 $ hg commit -m "remove file"
982 $ hg status --change .
982 $ hg status --change .
983 R bar.whole
983 R bar.whole
984 $ hg fix -r . foo.whole
984 $ hg fix -r . foo.whole
985 $ hg status --change tip
985 $ hg status --change tip
986 M foo.whole
986 M foo.whole
987 R bar.whole
987 R bar.whole
988
988
989 $ cd ..
989 $ cd ..
990
990
991 If fixing a revision finds no fixes to make, no replacement revision should be
991 If fixing a revision finds no fixes to make, no replacement revision should be
992 created.
992 created.
993
993
994 $ hg init nofixesneeded
994 $ hg init nofixesneeded
995 $ cd nofixesneeded
995 $ cd nofixesneeded
996
996
997 $ printf "FOO\n" > foo.whole
997 $ printf "FOO\n" > foo.whole
998 $ hg commit -Aqm "add file"
998 $ hg commit -Aqm "add file"
999 $ hg log --template '{rev}\n'
999 $ hg log --template '{rev}\n'
1000 0
1000 0
1001 $ hg fix -r .
1001 $ hg fix -r .
1002 $ hg log --template '{rev}\n'
1002 $ hg log --template '{rev}\n'
1003 0
1003 0
1004
1004
1005 $ cd ..
1005 $ cd ..
1006
1006
1007 If fixing a commit reverts all the changes in the commit, we replace it with a
1007 If fixing a commit reverts all the changes in the commit, we replace it with a
1008 commit that changes no files.
1008 commit that changes no files.
1009
1009
1010 $ hg init nochangesleft
1010 $ hg init nochangesleft
1011 $ cd nochangesleft
1011 $ cd nochangesleft
1012
1012
1013 $ printf "FOO\n" > foo.whole
1013 $ printf "FOO\n" > foo.whole
1014 $ hg commit -Aqm "add file"
1014 $ hg commit -Aqm "add file"
1015 $ printf "foo\n" > foo.whole
1015 $ printf "foo\n" > foo.whole
1016 $ hg commit -m "edit file"
1016 $ hg commit -m "edit file"
1017 $ hg status --change .
1017 $ hg status --change .
1018 M foo.whole
1018 M foo.whole
1019 $ hg fix -r .
1019 $ hg fix -r .
1020 $ hg status --change tip
1020 $ hg status --change tip
1021
1021
1022 $ cd ..
1022 $ cd ..
1023
1023
1024 If we fix a parent and child revision together, the child revision must be
1024 If we fix a parent and child revision together, the child revision must be
1025 replaced if the parent is replaced, even if the diffs of the child needed no
1025 replaced if the parent is replaced, even if the diffs of the child needed no
1026 fixes. However, we're free to not replace revisions that need no fixes and have
1026 fixes. However, we're free to not replace revisions that need no fixes and have
1027 no ancestors that are replaced.
1027 no ancestors that are replaced.
1028
1028
1029 $ hg init mustreplacechild
1029 $ hg init mustreplacechild
1030 $ cd mustreplacechild
1030 $ cd mustreplacechild
1031
1031
1032 $ printf "FOO\n" > foo.whole
1032 $ printf "FOO\n" > foo.whole
1033 $ hg commit -Aqm "add foo"
1033 $ hg commit -Aqm "add foo"
1034 $ printf "foo\n" > foo.whole
1034 $ printf "foo\n" > foo.whole
1035 $ hg commit -m "edit foo"
1035 $ hg commit -m "edit foo"
1036 $ printf "BAR\n" > bar.whole
1036 $ printf "BAR\n" > bar.whole
1037 $ hg commit -Aqm "add bar"
1037 $ hg commit -Aqm "add bar"
1038
1038
1039 $ hg log --graph --template '{rev} {files}'
1039 $ hg log --graph --template '{rev} {files}'
1040 @ 2 bar.whole
1040 @ 2 bar.whole
1041 |
1041 |
1042 o 1 foo.whole
1042 o 1 foo.whole
1043 |
1043 |
1044 o 0 foo.whole
1044 o 0 foo.whole
1045
1045
1046 $ hg fix -r 0:2
1046 $ hg fix -r 0:2
1047 $ hg log --graph --template '{rev} {files}'
1047 $ hg log --graph --template '{rev} {files}'
1048 o 4 bar.whole
1048 o 4 bar.whole
1049 |
1049 |
1050 o 3
1050 o 3
1051 |
1051 |
1052 | @ 2 bar.whole
1052 | @ 2 bar.whole
1053 | |
1053 | |
1054 | x 1 foo.whole
1054 | x 1 foo.whole
1055 |/
1055 |/
1056 o 0 foo.whole
1056 o 0 foo.whole
1057
1057
1058
1058
1059 $ cd ..
1059 $ cd ..
1060
1060
1061 It's also possible that the child needs absolutely no changes, but we still
1061 It's also possible that the child needs absolutely no changes, but we still
1062 need to replace it to update its parent. If we skipped replacing the child
1062 need to replace it to update its parent. If we skipped replacing the child
1063 because it had no file content changes, it would become an orphan for no good
1063 because it had no file content changes, it would become an orphan for no good
1064 reason.
1064 reason.
1065
1065
1066 $ hg init mustreplacechildevenifnop
1066 $ hg init mustreplacechildevenifnop
1067 $ cd mustreplacechildevenifnop
1067 $ cd mustreplacechildevenifnop
1068
1068
1069 $ printf "Foo\n" > foo.whole
1069 $ printf "Foo\n" > foo.whole
1070 $ hg commit -Aqm "add a bad foo"
1070 $ hg commit -Aqm "add a bad foo"
1071 $ printf "FOO\n" > foo.whole
1071 $ printf "FOO\n" > foo.whole
1072 $ hg commit -m "add a good foo"
1072 $ hg commit -m "add a good foo"
1073 $ hg fix -r . -r '.^'
1073 $ hg fix -r . -r '.^'
1074 $ hg log --graph --template '{rev} {desc}'
1074 $ hg log --graph --template '{rev} {desc}'
1075 o 3 add a good foo
1075 o 3 add a good foo
1076 |
1076 |
1077 o 2 add a bad foo
1077 o 2 add a bad foo
1078
1078
1079 @ 1 add a good foo
1079 @ 1 add a good foo
1080 |
1080 |
1081 x 0 add a bad foo
1081 x 0 add a bad foo
1082
1082
1083
1083
1084 $ cd ..
1084 $ cd ..
1085
1085
1086 Similar to the case above, the child revision may become empty as a result of
1086 Similar to the case above, the child revision may become empty as a result of
1087 fixing its parent. We should still create an empty replacement child.
1087 fixing its parent. We should still create an empty replacement child.
1088 TODO: determine how this should interact with ui.allowemptycommit given that
1088 TODO: determine how this should interact with ui.allowemptycommit given that
1089 the empty replacement could have children.
1089 the empty replacement could have children.
1090
1090
1091 $ hg init mustreplacechildevenifempty
1091 $ hg init mustreplacechildevenifempty
1092 $ cd mustreplacechildevenifempty
1092 $ cd mustreplacechildevenifempty
1093
1093
1094 $ printf "foo\n" > foo.whole
1094 $ printf "foo\n" > foo.whole
1095 $ hg commit -Aqm "add foo"
1095 $ hg commit -Aqm "add foo"
1096 $ printf "Foo\n" > foo.whole
1096 $ printf "Foo\n" > foo.whole
1097 $ hg commit -m "edit foo"
1097 $ hg commit -m "edit foo"
1098 $ hg fix -r . -r '.^'
1098 $ hg fix -r . -r '.^'
1099 $ hg log --graph --template '{rev} {desc}\n' --stat
1099 $ hg log --graph --template '{rev} {desc}\n' --stat
1100 o 3 edit foo
1100 o 3 edit foo
1101 |
1101 |
1102 o 2 add foo
1102 o 2 add foo
1103 foo.whole | 1 +
1103 foo.whole | 1 +
1104 1 files changed, 1 insertions(+), 0 deletions(-)
1104 1 files changed, 1 insertions(+), 0 deletions(-)
1105
1105
1106 @ 1 edit foo
1106 @ 1 edit foo
1107 | foo.whole | 2 +-
1107 | foo.whole | 2 +-
1108 | 1 files changed, 1 insertions(+), 1 deletions(-)
1108 | 1 files changed, 1 insertions(+), 1 deletions(-)
1109 |
1109 |
1110 x 0 add foo
1110 x 0 add foo
1111 foo.whole | 1 +
1111 foo.whole | 1 +
1112 1 files changed, 1 insertions(+), 0 deletions(-)
1112 1 files changed, 1 insertions(+), 0 deletions(-)
1113
1113
1114
1114
1115 $ cd ..
1115 $ cd ..
1116
1116
1117 Fixing a secret commit should replace it with another secret commit.
1117 Fixing a secret commit should replace it with another secret commit.
1118
1118
1119 $ hg init fixsecretcommit
1119 $ hg init fixsecretcommit
1120 $ cd fixsecretcommit
1120 $ cd fixsecretcommit
1121
1121
1122 $ printf "foo\n" > foo.whole
1122 $ printf "foo\n" > foo.whole
1123 $ hg commit -Aqm "add foo" --secret
1123 $ hg commit -Aqm "add foo" --secret
1124 $ hg fix -r .
1124 $ hg fix -r .
1125 $ hg log --template '{rev} {phase}\n'
1125 $ hg log --template '{rev} {phase}\n'
1126 1 secret
1126 1 secret
1127 0 secret
1127 0 secret
1128
1128
1129 $ cd ..
1129 $ cd ..
1130
1130
1131 We should also preserve phase when fixing a draft commit while the user has
1131 We should also preserve phase when fixing a draft commit while the user has
1132 their default set to secret.
1132 their default set to secret.
1133
1133
1134 $ hg init respectphasesnewcommit
1134 $ hg init respectphasesnewcommit
1135 $ cd respectphasesnewcommit
1135 $ cd respectphasesnewcommit
1136
1136
1137 $ printf "foo\n" > foo.whole
1137 $ printf "foo\n" > foo.whole
1138 $ hg commit -Aqm "add foo"
1138 $ hg commit -Aqm "add foo"
1139 $ hg --config phases.newcommit=secret fix -r .
1139 $ hg --config phases.newcommit=secret fix -r .
1140 $ hg log --template '{rev} {phase}\n'
1140 $ hg log --template '{rev} {phase}\n'
1141 1 draft
1141 1 draft
1142 0 draft
1142 0 draft
1143
1143
1144 $ cd ..
1144 $ cd ..
1145
1145
1146 Debug output should show what fixer commands are being subprocessed, which is
1146 Debug output should show what fixer commands are being subprocessed, which is
1147 useful for anyone trying to set up a new config.
1147 useful for anyone trying to set up a new config.
1148
1148
1149 $ hg init debugoutput
1149 $ hg init debugoutput
1150 $ cd debugoutput
1150 $ cd debugoutput
1151
1151
1152 $ printf "foo\nbar\nbaz\n" > foo.changed
1152 $ printf "foo\nbar\nbaz\n" > foo.changed
1153 $ hg commit -Aqm "foo"
1153 $ hg commit -Aqm "foo"
1154 $ printf "Foo\nbar\nBaz\n" > foo.changed
1154 $ printf "Foo\nbar\nBaz\n" > foo.changed
1155 $ hg --debug fix --working-dir
1155 $ hg --debug fix --working-dir
1156 subprocess: * $TESTTMP/uppercase.py 1-1 3-3 (glob)
1156 subprocess: * $TESTTMP/uppercase.py 1-1 3-3 (glob)
1157
1157
1158 $ cd ..
1158 $ cd ..
1159
1159
1160 Fixing an obsolete revision can cause divergence, so we abort unless the user
1160 Fixing an obsolete revision can cause divergence, so we abort unless the user
1161 configures to allow it. This is not yet smart enough to know whether there is a
1161 configures to allow it. This is not yet smart enough to know whether there is a
1162 successor, but even then it is not likely intentional or idiomatic to fix an
1162 successor, but even then it is not likely intentional or idiomatic to fix an
1163 obsolete revision.
1163 obsolete revision.
1164
1164
1165 $ hg init abortobsoleterev
1165 $ hg init abortobsoleterev
1166 $ cd abortobsoleterev
1166 $ cd abortobsoleterev
1167
1167
1168 $ printf "foo\n" > foo.changed
1168 $ printf "foo\n" > foo.changed
1169 $ hg commit -Aqm "foo"
1169 $ hg commit -Aqm "foo"
1170 $ hg ci --amend -m rewritten
1170 $ hg ci --amend -m rewritten
1171 $ hg --hidden fix -r 0
1171 $ hg --hidden fix -r 0
1172 abort: fixing obsolete revision could cause divergence
1172 abort: fixing obsolete revision could cause divergence
1173 [255]
1173 [255]
1174
1174
1175 $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
1175 $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
1176 2 new content-divergent changesets
1176 2 new content-divergent changesets
1177 $ hg cat -r tip foo.changed
1177 $ hg cat -r tip foo.changed
1178 FOO
1178 FOO
1179
1179
1180 $ cd ..
1180 $ cd ..
1181
1181
1182 Test all of the available substitution values for fixer commands.
1182 Test all of the available substitution values for fixer commands.
1183
1183
1184 $ hg init substitution
1184 $ hg init substitution
1185 $ cd substitution
1185 $ cd substitution
1186
1186
1187 $ mkdir foo
1187 $ mkdir foo
1188 $ printf "hello\ngoodbye\n" > foo/bar
1188 $ printf "hello\ngoodbye\n" > foo/bar
1189 $ hg add
1189 $ hg add
1190 adding foo/bar
1190 adding foo/bar
1191 $ hg --config "fix.fail:command=printf '%s\n' '{rootpath}' '{basename}'" \
1191 $ hg --config "fix.fail:command=printf '%s\n' '{rootpath}' '{basename}'" \
1192 > --config "fix.fail:linerange='{first}' '{last}'" \
1192 > --config "fix.fail:linerange='{first}' '{last}'" \
1193 > --config "fix.fail:pattern=foo/bar" \
1193 > --config "fix.fail:pattern=foo/bar" \
1194 > fix --working-dir
1194 > fix --working-dir
1195 $ cat foo/bar
1195 $ cat foo/bar
1196 foo/bar
1196 foo/bar
1197 bar
1197 bar
1198 1
1198 1
1199 2
1199 2
1200
1200
1201 $ cd ..
1201 $ cd ..
1202
1202
1203 The --base flag should allow picking the revisions to diff against for changed
1203 The --base flag should allow picking the revisions to diff against for changed
1204 files and incremental line formatting.
1204 files and incremental line formatting.
1205
1205
1206 $ hg init baseflag
1206 $ hg init baseflag
1207 $ cd baseflag
1207 $ cd baseflag
1208
1208
1209 $ printf "one\ntwo\n" > foo.changed
1209 $ printf "one\ntwo\n" > foo.changed
1210 $ printf "bar\n" > bar.changed
1210 $ printf "bar\n" > bar.changed
1211 $ hg commit -Aqm "first"
1211 $ hg commit -Aqm "first"
1212 $ printf "one\nTwo\n" > foo.changed
1212 $ printf "one\nTwo\n" > foo.changed
1213 $ hg commit -m "second"
1213 $ hg commit -m "second"
1214 $ hg fix -w --base .
1214 $ hg fix -w --base .
1215 $ hg status
1215 $ hg status
1216 $ hg fix -w --base null
1216 $ hg fix -w --base null
1217 $ cat foo.changed
1217 $ cat foo.changed
1218 ONE
1218 ONE
1219 TWO
1219 TWO
1220 $ cat bar.changed
1220 $ cat bar.changed
1221 BAR
1221 BAR
1222
1222
1223 $ cd ..
1223 $ cd ..
1224
1224
1225 If the user asks to fix the parent of another commit, they are asking to create
1225 If the user asks to fix the parent of another commit, they are asking to create
1226 an orphan. We must respect experimental.evolution.allowunstable.
1226 an orphan. We must respect experimental.evolution.allowunstable.
1227
1227
1228 $ hg init allowunstable
1228 $ hg init allowunstable
1229 $ cd allowunstable
1229 $ cd allowunstable
1230
1230
1231 $ printf "one\n" > foo.whole
1231 $ printf "one\n" > foo.whole
1232 $ hg commit -Aqm "first"
1232 $ hg commit -Aqm "first"
1233 $ printf "two\n" > foo.whole
1233 $ printf "two\n" > foo.whole
1234 $ hg commit -m "second"
1234 $ hg commit -m "second"
1235 $ hg --config experimental.evolution.allowunstable=False fix -r '.^'
1235 $ hg --config experimental.evolution.allowunstable=False fix -r '.^'
1236 abort: cannot fix changeset, as that will orphan 1 descendants
1236 abort: cannot fix changeset, as that will orphan 1 descendants
1237 (see 'hg help evolution.instability')
1237 (see 'hg help evolution.instability')
1238 [10]
1238 [10]
1239 $ hg fix -r '.^'
1239 $ hg fix -r '.^'
1240 1 new orphan changesets
1240 1 new orphan changesets
1241 $ hg cat -r 2 foo.whole
1241 $ hg cat -r 2 foo.whole
1242 ONE
1242 ONE
1243
1243
1244 $ cd ..
1244 $ cd ..
1245
1245
1246 The --base flag affects the set of files being fixed. So while the --whole flag
1246 The --base flag affects the set of files being fixed. So while the --whole flag
1247 makes the base irrelevant for changed line ranges, it still changes the
1247 makes the base irrelevant for changed line ranges, it still changes the
1248 meaning and effect of the command. In this example, no files or lines are fixed
1248 meaning and effect of the command. In this example, no files or lines are fixed
1249 until we specify the base, but then we do fix unchanged lines.
1249 until we specify the base, but then we do fix unchanged lines.
1250
1250
1251 $ hg init basewhole
1251 $ hg init basewhole
1252 $ cd basewhole
1252 $ cd basewhole
1253 $ printf "foo1\n" > foo.changed
1253 $ printf "foo1\n" > foo.changed
1254 $ hg commit -Aqm "first"
1254 $ hg commit -Aqm "first"
1255 $ printf "foo2\n" >> foo.changed
1255 $ printf "foo2\n" >> foo.changed
1256 $ printf "bar\n" > bar.changed
1256 $ printf "bar\n" > bar.changed
1257 $ hg commit -Aqm "second"
1257 $ hg commit -Aqm "second"
1258
1258
1259 $ hg fix --working-dir --whole
1259 $ hg fix --working-dir --whole
1260 $ cat *.changed
1260 $ cat *.changed
1261 bar
1261 bar
1262 foo1
1262 foo1
1263 foo2
1263 foo2
1264
1264
1265 $ hg fix --working-dir --base 0 --whole
1265 $ hg fix --working-dir --base 0 --whole
1266 $ cat *.changed
1266 $ cat *.changed
1267 BAR
1267 BAR
1268 FOO1
1268 FOO1
1269 FOO2
1269 FOO2
1270
1270
1271 $ cd ..
1271 $ cd ..
1272
1272
1273 The execution order of tools can be controlled. This example doesn't work if
1273 The execution order of tools can be controlled. This example doesn't work if
1274 you sort after truncating, but the config defines the correct order while the
1274 you sort after truncating, but the config defines the correct order while the
1275 definitions are out of order (which might imply the incorrect order given the
1275 definitions are out of order (which might imply the incorrect order given the
1276 implementation of fix). The goal is to use multiple tools to select the lowest
1276 implementation of fix). The goal is to use multiple tools to select the lowest
1277 5 numbers in the file.
1277 5 numbers in the file.
1278
1278
1279 $ hg init priorityexample
1279 $ hg init priorityexample
1280 $ cd priorityexample
1280 $ cd priorityexample
1281
1281
1282 $ cat >> .hg/hgrc <<EOF
1282 $ cat >> .hg/hgrc <<EOF
1283 > [fix]
1283 > [fix]
1284 > head:command = head -n 5
1284 > head:command = head -n 5
1285 > head:pattern = numbers.txt
1285 > head:pattern = numbers.txt
1286 > head:priority = 1
1286 > head:priority = 1
1287 > sort:command = sort -n
1287 > sort:command = sort -n
1288 > sort:pattern = numbers.txt
1288 > sort:pattern = numbers.txt
1289 > sort:priority = 2
1289 > sort:priority = 2
1290 > EOF
1290 > EOF
1291
1291
1292 $ printf "8\n2\n3\n6\n7\n4\n9\n5\n1\n0\n" > numbers.txt
1292 $ printf "8\n2\n3\n6\n7\n4\n9\n5\n1\n0\n" > numbers.txt
1293 $ hg add -q
1293 $ hg add -q
1294 $ hg fix -w
1294 $ hg fix -w
1295 $ cat numbers.txt
1295 $ cat numbers.txt
1296 0
1296 0
1297 1
1297 1
1298 2
1298 2
1299 3
1299 3
1300 4
1300 4
1301
1301
1302 And of course we should be able to break this by reversing the execution order.
1302 And of course we should be able to break this by reversing the execution order.
1303 Test negative priorities while we're at it.
1303 Test negative priorities while we're at it.
1304
1304
1305 $ cat >> .hg/hgrc <<EOF
1305 $ cat >> .hg/hgrc <<EOF
1306 > [fix]
1306 > [fix]
1307 > head:priority = -1
1307 > head:priority = -1
1308 > sort:priority = -2
1308 > sort:priority = -2
1309 > EOF
1309 > EOF
1310 $ printf "8\n2\n3\n6\n7\n4\n9\n5\n1\n0\n" > numbers.txt
1310 $ printf "8\n2\n3\n6\n7\n4\n9\n5\n1\n0\n" > numbers.txt
1311 $ hg fix -w
1311 $ hg fix -w
1312 $ cat numbers.txt
1312 $ cat numbers.txt
1313 2
1313 2
1314 3
1314 3
1315 6
1315 6
1316 7
1316 7
1317 8
1317 8
1318
1318
1319 $ cd ..
1319 $ cd ..
1320
1320
1321 It's possible for repeated applications of a fixer tool to create cycles in the
1321 It's possible for repeated applications of a fixer tool to create cycles in the
1322 generated content of a file. For example, two users with different versions of
1322 generated content of a file. For example, two users with different versions of
1323 a code formatter might fight over the formatting when they run hg fix. In the
1323 a code formatter might fight over the formatting when they run hg fix. In the
1324 absence of other changes, this means we could produce commits with the same
1324 absence of other changes, this means we could produce commits with the same
1325 hash in subsequent runs of hg fix. This is a problem unless we support
1325 hash in subsequent runs of hg fix. This is a problem unless we support
1326 obsolescence cycles well. We avoid this by adding an extra field to the
1326 obsolescence cycles well. We avoid this by adding an extra field to the
1327 successor which forces it to have a new hash. That's why this test creates
1327 successor which forces it to have a new hash. That's why this test creates
1328 three revisions instead of two.
1328 three revisions instead of two.
1329
1329
1330 $ hg init cyclictool
1330 $ hg init cyclictool
1331 $ cd cyclictool
1331 $ cd cyclictool
1332
1332
1333 $ cat >> .hg/hgrc <<EOF
1333 $ cat >> .hg/hgrc <<EOF
1334 > [fix]
1334 > [fix]
1335 > swapletters:command = tr ab ba
1335 > swapletters:command = tr ab ba
1336 > swapletters:pattern = foo
1336 > swapletters:pattern = foo
1337 > EOF
1337 > EOF
1338
1338
1339 $ echo ab > foo
1339 $ echo ab > foo
1340 $ hg commit -Aqm foo
1340 $ hg commit -Aqm foo
1341
1341
1342 $ hg fix -r 0
1342 $ hg fix -r 0
1343 $ hg fix -r 1
1343 $ hg fix -r 1
1344
1344
1345 $ hg cat -r 0 foo --hidden
1345 $ hg cat -r 0 foo --hidden
1346 ab
1346 ab
1347 $ hg cat -r 1 foo --hidden
1347 $ hg cat -r 1 foo --hidden
1348 ba
1348 ba
1349 $ hg cat -r 2 foo
1349 $ hg cat -r 2 foo
1350 ab
1350 ab
1351
1351
1352 $ cd ..
1352 $ cd ..
1353
1353
1354 We run fixer tools in the repo root so they can look for config files or other
1354 We run fixer tools in the repo root so they can look for config files or other
1355 important things in the working directory. This does NOT mean we are
1355 important things in the working directory. This does NOT mean we are
1356 reconstructing a working copy of every revision being fixed; we're just giving
1356 reconstructing a working copy of every revision being fixed; we're just giving
1357 the tool knowledge of the repo's location in case it can do something
1357 the tool knowledge of the repo's location in case it can do something
1358 reasonable with that.
1358 reasonable with that.
1359
1359
1360 $ hg init subprocesscwd
1360 $ hg init subprocesscwd
1361 $ cd subprocesscwd
1361 $ cd subprocesscwd
1362
1362
1363 $ cat >> .hg/hgrc <<EOF
1363 $ cat >> .hg/hgrc <<EOF
1364 > [fix]
1364 > [fix]
1365 > printcwd:command = "$PYTHON" -c "import os; print(os.getcwd())"
1365 > printcwd:command = "$PYTHON" -c "import os; print(os.getcwd())"
1366 > printcwd:pattern = relpath:foo/bar
1366 > printcwd:pattern = relpath:foo/bar
1367 > filesetpwd:command = "$PYTHON" -c "import os; print('fs: ' + os.getcwd())"
1367 > filesetpwd:command = "$PYTHON" -c "import os; print('fs: ' + os.getcwd())"
1368 > filesetpwd:pattern = set:**quux
1368 > filesetpwd:pattern = set:**quux
1369 > EOF
1369 > EOF
1370
1370
1371 $ mkdir foo
1371 $ mkdir foo
1372 $ printf "bar\n" > foo/bar
1372 $ printf "bar\n" > foo/bar
1373 $ printf "quux\n" > quux
1373 $ printf "quux\n" > quux
1374 $ hg commit -Aqm blah
1374 $ hg commit -Aqm blah
1375
1375
1376 $ hg fix -w -r . foo/bar
1376 $ hg fix -w -r . foo/bar
1377 $ hg cat -r tip foo/bar
1377 $ hg cat -r tip foo/bar
1378 $TESTTMP/subprocesscwd
1378 $TESTTMP/subprocesscwd
1379 $ cat foo/bar
1379 $ cat foo/bar
1380 $TESTTMP/subprocesscwd
1380 $TESTTMP/subprocesscwd
1381
1381
1382 $ cd foo
1382 $ cd foo
1383
1383
1384 $ hg fix -w -r . bar
1384 $ hg fix -w -r . bar
1385 $ hg cat -r tip bar ../quux
1385 $ hg cat -r tip bar ../quux
1386 $TESTTMP/subprocesscwd
1386 $TESTTMP/subprocesscwd
1387 quux
1387 quux
1388 $ cat bar ../quux
1388 $ cat bar ../quux
1389 $TESTTMP/subprocesscwd
1389 $TESTTMP/subprocesscwd
1390 quux
1390 quux
1391 $ echo modified > bar
1391 $ echo modified > bar
1392 $ hg fix -w bar
1392 $ hg fix -w bar
1393 $ cat bar
1393 $ cat bar
1394 $TESTTMP/subprocesscwd
1394 $TESTTMP/subprocesscwd
1395
1395
1396 Apparently fixing p1() and its descendants doesn't include wdir() unless
1396 Apparently fixing p1() and its descendants doesn't include wdir() unless
1397 explicitly stated.
1397 explicitly stated.
1398
1398
1399 $ hg fix -r '.::'
1399 $ hg fix -r '.::'
1400 $ hg cat -r . ../quux
1400 $ hg cat -r . ../quux
1401 quux
1401 quux
1402 $ hg cat -r tip ../quux
1402 $ hg cat -r tip ../quux
1403 fs: $TESTTMP/subprocesscwd
1403 fs: $TESTTMP/subprocesscwd
1404 $ cat ../quux
1404 $ cat ../quux
1405 quux
1405 quux
1406
1406
1407 Clean files are not fixed unless explicitly named
1407 Clean files are not fixed unless explicitly named
1408 $ echo 'dirty' > ../quux
1408 $ echo 'dirty' > ../quux
1409
1409
1410 $ hg fix --working-dir
1410 $ hg fix --working-dir
1411 $ cat ../quux
1411 $ cat ../quux
1412 fs: $TESTTMP/subprocesscwd
1412 fs: $TESTTMP/subprocesscwd
1413
1413
1414 $ cd ../..
1414 $ cd ../..
1415
1415
1416 Tools configured without a pattern are ignored. It would be too dangerous to
1416 Tools configured without a pattern are ignored. It would be too dangerous to
1417 run them on all files, because this might happen while testing a configuration
1417 run them on all files, because this might happen while testing a configuration
1418 that also deletes all of the file content. There is no reasonable subset of the
1418 that also deletes all of the file content. There is no reasonable subset of the
1419 files to use as a default. Users should be explicit about what files are
1419 files to use as a default. Users should be explicit about what files are
1420 affected by a tool. This test also confirms that we don't crash when the
1420 affected by a tool. This test also confirms that we don't crash when the
1421 pattern config is missing, and that we only warn about it once.
1421 pattern config is missing, and that we only warn about it once.
1422
1422
1423 $ hg init nopatternconfigured
1423 $ hg init nopatternconfigured
1424 $ cd nopatternconfigured
1424 $ cd nopatternconfigured
1425
1425
1426 $ printf "foo" > foo
1426 $ printf "foo" > foo
1427 $ printf "bar" > bar
1427 $ printf "bar" > bar
1428 $ hg add -q
1428 $ hg add -q
1429 $ hg fix --debug --working-dir --config "fix.nopattern:command=echo fixed"
1429 $ hg fix --debug --working-dir --config "fix.nopattern:command=echo fixed"
1430 fixer tool has no pattern configuration: nopattern
1430 fixer tool has no pattern configuration: nopattern
1431 $ cat foo bar
1431 $ cat foo bar
1432 foobar (no-eol)
1432 foobar (no-eol)
1433 $ hg fix --debug --working-dir --config "fix.nocommand:pattern=foo.bar"
1433 $ hg fix --debug --working-dir --config "fix.nocommand:pattern=foo.bar"
1434 fixer tool has no command configuration: nocommand
1434 fixer tool has no command configuration: nocommand
1435
1435
1436 $ cd ..
1436 $ cd ..
1437
1437
1438 Tools can be disabled. Disabled tools do nothing but print a debug message.
1438 Tools can be disabled. Disabled tools do nothing but print a debug message.
1439
1439
1440 $ hg init disabled
1440 $ hg init disabled
1441 $ cd disabled
1441 $ cd disabled
1442
1442
1443 $ printf "foo\n" > foo
1443 $ printf "foo\n" > foo
1444 $ hg add -q
1444 $ hg add -q
1445 $ hg fix --debug --working-dir --config "fix.disabled:command=echo fixed" \
1445 $ hg fix --debug --working-dir --config "fix.disabled:command=echo fixed" \
1446 > --config "fix.disabled:pattern=foo" \
1446 > --config "fix.disabled:pattern=foo" \
1447 > --config "fix.disabled:enabled=false"
1447 > --config "fix.disabled:enabled=false"
1448 ignoring disabled fixer tool: disabled
1448 ignoring disabled fixer tool: disabled
1449 $ cat foo
1449 $ cat foo
1450 foo
1450 foo
1451
1451
1452 $ cd ..
1452 $ cd ..
1453
1453
1454 Test that we can configure a fixer to affect all files regardless of the cwd.
1454 Test that we can configure a fixer to affect all files regardless of the cwd.
1455 The way we invoke matching must not prohibit this.
1455 The way we invoke matching must not prohibit this.
1456
1456
1457 $ hg init affectallfiles
1457 $ hg init affectallfiles
1458 $ cd affectallfiles
1458 $ cd affectallfiles
1459
1459
1460 $ mkdir foo bar
1460 $ mkdir foo bar
1461 $ printf "foo" > foo/file
1461 $ printf "foo" > foo/file
1462 $ printf "bar" > bar/file
1462 $ printf "bar" > bar/file
1463 $ printf "baz" > baz_file
1463 $ printf "baz" > baz_file
1464 $ hg add -q
1464 $ hg add -q
1465
1465
1466 $ cd bar
1466 $ cd bar
1467 $ hg fix --working-dir --config "fix.cooltool:command=echo fixed" \
1467 $ hg fix --working-dir --config "fix.cooltool:command=echo fixed" \
1468 > --config "fix.cooltool:pattern=glob:**"
1468 > --config "fix.cooltool:pattern=glob:**"
1469 $ cd ..
1469 $ cd ..
1470
1470
1471 $ cat foo/file
1471 $ cat foo/file
1472 fixed
1472 fixed
1473 $ cat bar/file
1473 $ cat bar/file
1474 fixed
1474 fixed
1475 $ cat baz_file
1475 $ cat baz_file
1476 fixed
1476 fixed
1477
1477
1478 $ cd ..
1478 $ cd ..
1479
1479
1480 Tools should be able to run on unchanged files, even if they set :linerange.
1480 Tools should be able to run on unchanged files, even if they set :linerange.
1481 This includes a corner case where deleted chunks of a file are not considered
1481 This includes a corner case where deleted chunks of a file are not considered
1482 changes.
1482 changes.
1483
1483
1484 $ hg init skipclean
1484 $ hg init skipclean
1485 $ cd skipclean
1485 $ cd skipclean
1486
1486
1487 $ printf "a\nb\nc\n" > foo
1487 $ printf "a\nb\nc\n" > foo
1488 $ printf "a\nb\nc\n" > bar
1488 $ printf "a\nb\nc\n" > bar
1489 $ printf "a\nb\nc\n" > baz
1489 $ printf "a\nb\nc\n" > baz
1490 $ hg commit -Aqm "base"
1490 $ hg commit -Aqm "base"
1491
1491
1492 $ printf "a\nc\n" > foo
1492 $ printf "a\nc\n" > foo
1493 $ printf "a\nx\nc\n" > baz
1493 $ printf "a\nx\nc\n" > baz
1494
1494
1495 $ cat >> print.py <<EOF
1495 $ cat >> print.py <<EOF
1496 > import sys
1496 > import sys
1497 > for a in sys.argv[1:]:
1497 > for a in sys.argv[1:]:
1498 > print(a)
1498 > print(a)
1499 > EOF
1499 > EOF
1500
1500
1501 $ hg fix --working-dir foo bar baz \
1501 $ hg fix --working-dir foo bar baz \
1502 > --config "fix.changedlines:command=\"$PYTHON\" print.py \"Line ranges:\"" \
1502 > --config "fix.changedlines:command=\"$PYTHON\" print.py \"Line ranges:\"" \
1503 > --config 'fix.changedlines:linerange="{first} through {last}"' \
1503 > --config 'fix.changedlines:linerange="{first} through {last}"' \
1504 > --config 'fix.changedlines:pattern=glob:**' \
1504 > --config 'fix.changedlines:pattern=glob:**' \
1505 > --config 'fix.changedlines:skipclean=false'
1505 > --config 'fix.changedlines:skipclean=false'
1506
1506
1507 $ cat foo
1507 $ cat foo
1508 Line ranges:
1508 Line ranges:
1509 $ cat bar
1509 $ cat bar
1510 Line ranges:
1510 Line ranges:
1511 $ cat baz
1511 $ cat baz
1512 Line ranges:
1512 Line ranges:
1513 2 through 2
1513 2 through 2
1514
1514
1515 $ cd ..
1515 $ cd ..
1516
1516
1517 Test various cases around merges. We were previously dropping files if they were
1517 Test various cases around merges. We were previously dropping files if they were
1518 created on only the p2 side of the merge, so let's test permutations of:
1518 created on only the p2 side of the merge, so let's test permutations of:
1519 * added, was fixed
1519 * added, was fixed
1520 * added, considered for fixing but was already good
1520 * added, considered for fixing but was already good
1521 * added, not considered for fixing
1521 * added, not considered for fixing
1522 * modified, was fixed
1522 * modified, was fixed
1523 * modified, considered for fixing but was already good
1523 * modified, considered for fixing but was already good
1524 * modified, not considered for fixing
1524 * modified, not considered for fixing
1525
1525
1526 Before the bug was fixed where we would drop files, this test demonstrated the
1526 Before the bug was fixed where we would drop files, this test demonstrated the
1527 following issues:
1527 following issues:
1528 * new_in_r1.ignored, new_in_r1_already_good.changed, and
1528 * new_in_r1.ignored, new_in_r1_already_good.changed, and
1529 > mod_in_r1_already_good.changed were NOT in the manifest for the merge commit
1529 > mod_in_r1_already_good.changed were NOT in the manifest for the merge commit
1530 * mod_in_r1.ignored had its contents from r0, NOT r1.
1530 * mod_in_r1.ignored had its contents from r0, NOT r1.
1531
1531
1532 We're also setting a named branch for every commit to demonstrate that the
1532 We're also setting a named branch for every commit to demonstrate that the
1533 branch is kept intact and there aren't issues updating to another branch in the
1533 branch is kept intact and there aren't issues updating to another branch in the
1534 middle of fix.
1534 middle of fix.
1535
1535
1536 $ hg init merge_keeps_files
1536 $ hg init merge_keeps_files
1537 $ cd merge_keeps_files
1537 $ cd merge_keeps_files
1538 $ for f in r0 mod_in_r1 mod_in_r2 mod_in_merge mod_in_child; do
1538 $ for f in r0 mod_in_r1 mod_in_r2 mod_in_merge mod_in_child; do
1539 > for c in changed whole ignored; do
1539 > for c in changed whole ignored; do
1540 > printf "hello\n" > $f.$c
1540 > printf "hello\n" > $f.$c
1541 > done
1541 > done
1542 > printf "HELLO\n" > "mod_in_${f}_already_good.changed"
1542 > printf "HELLO\n" > "mod_in_${f}_already_good.changed"
1543 > done
1543 > done
1544 $ hg branch -q r0
1544 $ hg branch -q r0
1545 $ hg ci -Aqm 'r0'
1545 $ hg ci -Aqm 'r0'
1546 $ hg phase -p
1546 $ hg phase -p
1547 $ make_test_files() {
1547 $ make_test_files() {
1548 > printf "world\n" >> "mod_in_$1.changed"
1548 > printf "world\n" >> "mod_in_$1.changed"
1549 > printf "world\n" >> "mod_in_$1.whole"
1549 > printf "world\n" >> "mod_in_$1.whole"
1550 > printf "world\n" >> "mod_in_$1.ignored"
1550 > printf "world\n" >> "mod_in_$1.ignored"
1551 > printf "WORLD\n" >> "mod_in_$1_already_good.changed"
1551 > printf "WORLD\n" >> "mod_in_$1_already_good.changed"
1552 > printf "new in $1\n" > "new_in_$1.changed"
1552 > printf "new in $1\n" > "new_in_$1.changed"
1553 > printf "new in $1\n" > "new_in_$1.whole"
1553 > printf "new in $1\n" > "new_in_$1.whole"
1554 > printf "new in $1\n" > "new_in_$1.ignored"
1554 > printf "new in $1\n" > "new_in_$1.ignored"
1555 > printf "ALREADY GOOD, NEW IN THIS REV\n" > "new_in_$1_already_good.changed"
1555 > printf "ALREADY GOOD, NEW IN THIS REV\n" > "new_in_$1_already_good.changed"
1556 > }
1556 > }
1557 $ make_test_commit() {
1557 $ make_test_commit() {
1558 > make_test_files "$1"
1558 > make_test_files "$1"
1559 > hg branch -q "$1"
1559 > hg branch -q "$1"
1560 > hg ci -Aqm "$2"
1560 > hg ci -Aqm "$2"
1561 > }
1561 > }
1562 $ make_test_commit r1 "merge me, pt1"
1562 $ make_test_commit r1 "merge me, pt1"
1563 $ hg co -q ".^"
1563 $ hg co -q ".^"
1564 $ make_test_commit r2 "merge me, pt2"
1564 $ make_test_commit r2 "merge me, pt2"
1565 $ hg merge -qr 1
1565 $ hg merge -qr 1
1566 $ make_test_commit merge "evil merge"
1566 $ make_test_commit merge "evil merge"
1567 $ make_test_commit child "child of merge"
1567 $ make_test_commit child "child of merge"
1568 $ make_test_files wdir
1568 $ make_test_files wdir
1569 $ hg fix -r 'not public()' -w
1569 $ hg fix -r 'not public()' -w
1570 $ hg log -G -T'{rev}:{shortest(node,8)}: branch:{branch} desc:{desc}'
1570 $ hg log -G -T'{rev}:{shortest(node,8)}: branch:{branch} desc:{desc}'
1571 @ 8:c22ce900: branch:child desc:child of merge
1571 @ 8:c22ce900: branch:child desc:child of merge
1572 |
1572 |
1573 o 7:5a30615a: branch:merge desc:evil merge
1573 o 7:5a30615a: branch:merge desc:evil merge
1574 |\
1574 |\
1575 | o 6:4e5acdc4: branch:r2 desc:merge me, pt2
1575 | o 6:4e5acdc4: branch:r2 desc:merge me, pt2
1576 | |
1576 | |
1577 o | 5:eea01878: branch:r1 desc:merge me, pt1
1577 o | 5:eea01878: branch:r1 desc:merge me, pt1
1578 |/
1578 |/
1579 o 0:0c548d87: branch:r0 desc:r0
1579 o 0:0c548d87: branch:r0 desc:r0
1580
1580
1581 $ hg files -r tip
1581 $ hg files -r tip
1582 mod_in_child.changed
1582 mod_in_child.changed
1583 mod_in_child.ignored
1583 mod_in_child.ignored
1584 mod_in_child.whole
1584 mod_in_child.whole
1585 mod_in_child_already_good.changed
1585 mod_in_child_already_good.changed
1586 mod_in_merge.changed
1586 mod_in_merge.changed
1587 mod_in_merge.ignored
1587 mod_in_merge.ignored
1588 mod_in_merge.whole
1588 mod_in_merge.whole
1589 mod_in_merge_already_good.changed
1589 mod_in_merge_already_good.changed
1590 mod_in_mod_in_child_already_good.changed
1590 mod_in_mod_in_child_already_good.changed
1591 mod_in_mod_in_merge_already_good.changed
1591 mod_in_mod_in_merge_already_good.changed
1592 mod_in_mod_in_r1_already_good.changed
1592 mod_in_mod_in_r1_already_good.changed
1593 mod_in_mod_in_r2_already_good.changed
1593 mod_in_mod_in_r2_already_good.changed
1594 mod_in_r0_already_good.changed
1594 mod_in_r0_already_good.changed
1595 mod_in_r1.changed
1595 mod_in_r1.changed
1596 mod_in_r1.ignored
1596 mod_in_r1.ignored
1597 mod_in_r1.whole
1597 mod_in_r1.whole
1598 mod_in_r1_already_good.changed
1598 mod_in_r1_already_good.changed
1599 mod_in_r2.changed
1599 mod_in_r2.changed
1600 mod_in_r2.ignored
1600 mod_in_r2.ignored
1601 mod_in_r2.whole
1601 mod_in_r2.whole
1602 mod_in_r2_already_good.changed
1602 mod_in_r2_already_good.changed
1603 new_in_child.changed
1603 new_in_child.changed
1604 new_in_child.ignored
1604 new_in_child.ignored
1605 new_in_child.whole
1605 new_in_child.whole
1606 new_in_child_already_good.changed
1606 new_in_child_already_good.changed
1607 new_in_merge.changed
1607 new_in_merge.changed
1608 new_in_merge.ignored
1608 new_in_merge.ignored
1609 new_in_merge.whole
1609 new_in_merge.whole
1610 new_in_merge_already_good.changed
1610 new_in_merge_already_good.changed
1611 new_in_r1.changed
1611 new_in_r1.changed
1612 new_in_r1.ignored
1612 new_in_r1.ignored
1613 new_in_r1.whole
1613 new_in_r1.whole
1614 new_in_r1_already_good.changed
1614 new_in_r1_already_good.changed
1615 new_in_r2.changed
1615 new_in_r2.changed
1616 new_in_r2.ignored
1616 new_in_r2.ignored
1617 new_in_r2.whole
1617 new_in_r2.whole
1618 new_in_r2_already_good.changed
1618 new_in_r2_already_good.changed
1619 r0.changed
1619 r0.changed
1620 r0.ignored
1620 r0.ignored
1621 r0.whole
1621 r0.whole
1622 $ for f in "$(hg files -r tip)"; do hg cat -r tip $f -T'{path}:\n{data}\n'; done
1622 $ for f in "$(hg files -r tip)"; do hg cat -r tip $f -T'{path}:\n{data}\n'; done
1623 mod_in_child.changed:
1623 mod_in_child.changed:
1624 hello
1624 hello
1625 WORLD
1625 WORLD
1626
1626
1627 mod_in_child.ignored:
1627 mod_in_child.ignored:
1628 hello
1628 hello
1629 world
1629 world
1630
1630
1631 mod_in_child.whole:
1631 mod_in_child.whole:
1632 HELLO
1632 HELLO
1633 WORLD
1633 WORLD
1634
1634
1635 mod_in_child_already_good.changed:
1635 mod_in_child_already_good.changed:
1636 WORLD
1636 WORLD
1637
1637
1638 mod_in_merge.changed:
1638 mod_in_merge.changed:
1639 hello
1639 hello
1640 WORLD
1640 WORLD
1641
1641
1642 mod_in_merge.ignored:
1642 mod_in_merge.ignored:
1643 hello
1643 hello
1644 world
1644 world
1645
1645
1646 mod_in_merge.whole:
1646 mod_in_merge.whole:
1647 HELLO
1647 HELLO
1648 WORLD
1648 WORLD
1649
1649
1650 mod_in_merge_already_good.changed:
1650 mod_in_merge_already_good.changed:
1651 WORLD
1651 WORLD
1652
1652
1653 mod_in_mod_in_child_already_good.changed:
1653 mod_in_mod_in_child_already_good.changed:
1654 HELLO
1654 HELLO
1655
1655
1656 mod_in_mod_in_merge_already_good.changed:
1656 mod_in_mod_in_merge_already_good.changed:
1657 HELLO
1657 HELLO
1658
1658
1659 mod_in_mod_in_r1_already_good.changed:
1659 mod_in_mod_in_r1_already_good.changed:
1660 HELLO
1660 HELLO
1661
1661
1662 mod_in_mod_in_r2_already_good.changed:
1662 mod_in_mod_in_r2_already_good.changed:
1663 HELLO
1663 HELLO
1664
1664
1665 mod_in_r0_already_good.changed:
1665 mod_in_r0_already_good.changed:
1666 HELLO
1666 HELLO
1667
1667
1668 mod_in_r1.changed:
1668 mod_in_r1.changed:
1669 hello
1669 hello
1670 WORLD
1670 WORLD
1671
1671
1672 mod_in_r1.ignored:
1672 mod_in_r1.ignored:
1673 hello
1673 hello
1674 world
1674 world
1675
1675
1676 mod_in_r1.whole:
1676 mod_in_r1.whole:
1677 HELLO
1677 HELLO
1678 WORLD
1678 WORLD
1679
1679
1680 mod_in_r1_already_good.changed:
1680 mod_in_r1_already_good.changed:
1681 WORLD
1681 WORLD
1682
1682
1683 mod_in_r2.changed:
1683 mod_in_r2.changed:
1684 hello
1684 hello
1685 WORLD
1685 WORLD
1686
1686
1687 mod_in_r2.ignored:
1687 mod_in_r2.ignored:
1688 hello
1688 hello
1689 world
1689 world
1690
1690
1691 mod_in_r2.whole:
1691 mod_in_r2.whole:
1692 HELLO
1692 HELLO
1693 WORLD
1693 WORLD
1694
1694
1695 mod_in_r2_already_good.changed:
1695 mod_in_r2_already_good.changed:
1696 WORLD
1696 WORLD
1697
1697
1698 new_in_child.changed:
1698 new_in_child.changed:
1699 NEW IN CHILD
1699 NEW IN CHILD
1700
1700
1701 new_in_child.ignored:
1701 new_in_child.ignored:
1702 new in child
1702 new in child
1703
1703
1704 new_in_child.whole:
1704 new_in_child.whole:
1705 NEW IN CHILD
1705 NEW IN CHILD
1706
1706
1707 new_in_child_already_good.changed:
1707 new_in_child_already_good.changed:
1708 ALREADY GOOD, NEW IN THIS REV
1708 ALREADY GOOD, NEW IN THIS REV
1709
1709
1710 new_in_merge.changed:
1710 new_in_merge.changed:
1711 NEW IN MERGE
1711 NEW IN MERGE
1712
1712
1713 new_in_merge.ignored:
1713 new_in_merge.ignored:
1714 new in merge
1714 new in merge
1715
1715
1716 new_in_merge.whole:
1716 new_in_merge.whole:
1717 NEW IN MERGE
1717 NEW IN MERGE
1718
1718
1719 new_in_merge_already_good.changed:
1719 new_in_merge_already_good.changed:
1720 ALREADY GOOD, NEW IN THIS REV
1720 ALREADY GOOD, NEW IN THIS REV
1721
1721
1722 new_in_r1.changed:
1722 new_in_r1.changed:
1723 NEW IN R1
1723 NEW IN R1
1724
1724
1725 new_in_r1.ignored:
1725 new_in_r1.ignored:
1726 new in r1
1726 new in r1
1727
1727
1728 new_in_r1.whole:
1728 new_in_r1.whole:
1729 NEW IN R1
1729 NEW IN R1
1730
1730
1731 new_in_r1_already_good.changed:
1731 new_in_r1_already_good.changed:
1732 ALREADY GOOD, NEW IN THIS REV
1732 ALREADY GOOD, NEW IN THIS REV
1733
1733
1734 new_in_r2.changed:
1734 new_in_r2.changed:
1735 NEW IN R2
1735 NEW IN R2
1736
1736
1737 new_in_r2.ignored:
1737 new_in_r2.ignored:
1738 new in r2
1738 new in r2
1739
1739
1740 new_in_r2.whole:
1740 new_in_r2.whole:
1741 NEW IN R2
1741 NEW IN R2
1742
1742
1743 new_in_r2_already_good.changed:
1743 new_in_r2_already_good.changed:
1744 ALREADY GOOD, NEW IN THIS REV
1744 ALREADY GOOD, NEW IN THIS REV
1745
1745
1746 r0.changed:
1746 r0.changed:
1747 hello
1747 hello
1748
1748
1749 r0.ignored:
1749 r0.ignored:
1750 hello
1750 hello
1751
1751
1752 r0.whole:
1752 r0.whole:
1753 hello
1753 hello
1754
1754
1755
1755
1756 We should execute the fixer tools as few times as possible, because they might
1756 We should execute the fixer tools as few times as possible, because they might
1757 be slow or expensive to execute. The inputs to each execution are effectively
1757 be slow or expensive to execute. The inputs to each execution are effectively
1758 the file path, file content, and line ranges. So, we should be able to re-use
1758 the file path, file content, and line ranges. So, we should be able to re-use
1759 results whenever those inputs are repeated. That saves a lot of work when
1759 results whenever those inputs are repeated. That saves a lot of work when
1760 fixing chains of commits that all have the same file revision for a path being
1760 fixing chains of commits that all have the same file revision for a path being
1761 fixed.
1761 fixed.
1762
1762
1763 $ hg init numberofinvocations
1763 $ hg init numberofinvocations
1764 $ cd numberofinvocations
1764 $ cd numberofinvocations
1765
1765
1766 $ printf "bar1" > bar.log
1766 $ printf "bar1" > bar.log
1767 $ printf "baz1" > baz.log
1767 $ printf "baz1" > baz.log
1768 $ printf "foo1" > foo.log
1768 $ printf "foo1" > foo.log
1769 $ printf "qux1" > qux.log
1769 $ printf "qux1" > qux.log
1770 $ hg commit -Aqm "commit1"
1770 $ hg commit -Aqm "commit1"
1771
1771
1772 $ printf "bar2" > bar.log
1772 $ printf "bar2" > bar.log
1773 $ printf "baz2" > baz.log
1773 $ printf "baz2" > baz.log
1774 $ printf "foo2" > foo.log
1774 $ printf "foo2" > foo.log
1775 $ hg commit -Aqm "commit2"
1775 $ hg commit -Aqm "commit2"
1776
1776
1777 $ printf "bar3" > bar.log
1777 $ printf "bar3" > bar.log
1778 $ printf "baz3" > baz.log
1778 $ printf "baz3" > baz.log
1779 $ hg commit -Aqm "commit3"
1779 $ hg commit -Aqm "commit3"
1780
1780
1781 $ printf "bar4" > bar.log
1781 $ printf "bar4" > bar.log
1782
1782
1783 $ LOGFILE=$TESTTMP/log
1783 $ LOGFILE=$TESTTMP/log
1784 $ LOGGER=$TESTTMP/log.py
1784 $ LOGGER=$TESTTMP/log.py
1785 $ cat >> $LOGGER <<EOF
1785 $ cat >> $LOGGER <<EOF
1786 > # Appends the input file's name to the log file.
1786 > # Appends the input file's name to the log file.
1787 > import sys
1787 > import sys
1788 > with open('$LOGFILE', 'a') as f:
1788 > with open(r'$LOGFILE', 'a') as f:
1789 > f.write(sys.argv[1] + '\n')
1789 > f.write(sys.argv[1] + '\n')
1790 > sys.stdout.write(sys.stdin.read())
1790 > sys.stdout.write(sys.stdin.read())
1791 > EOF
1791 > EOF
1792
1792
1793 $ hg fix --working-dir -r "all()" \
1793 $ hg fix --working-dir -r "all()" \
1794 > --config "fix.log:command=\"$PYTHON\" \"$LOGGER\" {rootpath}" \
1794 > --config "fix.log:command=\"$PYTHON\" \"$LOGGER\" {rootpath}" \
1795 > --config "fix.log:pattern=glob:**.log"
1795 > --config "fix.log:pattern=glob:**.log"
1796
1796
1797 $ cat $LOGFILE | sort | uniq -c
1797 $ cat $LOGFILE | sort | uniq -c
1798 4 bar.log
1798 4 bar.log
1799 4 baz.log
1799 4 baz.log
1800 3 foo.log
1800 3 foo.log
1801 2 qux.log
1801 2 qux.log
1802
1802
1803 $ cd ..
1803 $ cd ..
1804
1804
1805 For tools that support line ranges, it's wrong to blindly re-use fixed file
1805 For tools that support line ranges, it's wrong to blindly re-use fixed file
1806 content for the same file revision if it appears twice with different baserevs,
1806 content for the same file revision if it appears twice with different baserevs,
1807 because the line ranges could be different. Since computing line ranges is
1807 because the line ranges could be different. Since computing line ranges is
1808 ambiguous, this isn't a matter of correctness, but it affects the usability of
1808 ambiguous, this isn't a matter of correctness, but it affects the usability of
1809 this extension. It could maybe be simpler if baserevs were computed on a
1809 this extension. It could maybe be simpler if baserevs were computed on a
1810 per-file basis to make this situation impossible to construct.
1810 per-file basis to make this situation impossible to construct.
1811
1811
1812 In the following example, we construct two subgraphs with the same file
1812 In the following example, we construct two subgraphs with the same file
1813 revisions, and fix different sub-subgraphs to get different baserevs and
1813 revisions, and fix different sub-subgraphs to get different baserevs and
1814 different changed line ranges. The key precondition is that revisions 1 and 4
1814 different changed line ranges. The key precondition is that revisions 1 and 4
1815 have the same file revision, and the key result is that their successors don't
1815 have the same file revision, and the key result is that their successors don't
1816 have the same file content, because we want to fix different areas of that same
1816 have the same file content, because we want to fix different areas of that same
1817 file revision's content.
1817 file revision's content.
1818
1818
1819 $ hg init differentlineranges
1819 $ hg init differentlineranges
1820 $ cd differentlineranges
1820 $ cd differentlineranges
1821
1821
1822 $ printf "a\nb\n" > file.changed
1822 $ printf "a\nb\n" > file.changed
1823 $ hg commit -Aqm "0 ab"
1823 $ hg commit -Aqm "0 ab"
1824 $ printf "a\nx\n" > file.changed
1824 $ printf "a\nx\n" > file.changed
1825 $ hg commit -Aqm "1 ax"
1825 $ hg commit -Aqm "1 ax"
1826 $ hg remove file.changed
1826 $ hg remove file.changed
1827 $ hg commit -Aqm "2 removed"
1827 $ hg commit -Aqm "2 removed"
1828 $ hg revert file.changed -r 0
1828 $ hg revert file.changed -r 0
1829 $ hg commit -Aqm "3 ab (reverted)"
1829 $ hg commit -Aqm "3 ab (reverted)"
1830 $ hg revert file.changed -r 1
1830 $ hg revert file.changed -r 1
1831 $ hg commit -Aqm "4 ax (reverted)"
1831 $ hg commit -Aqm "4 ax (reverted)"
1832
1832
1833 $ hg manifest --debug --template "{hash}\n" -r 0; \
1833 $ hg manifest --debug --template "{hash}\n" -r 0; \
1834 > hg manifest --debug --template "{hash}\n" -r 3
1834 > hg manifest --debug --template "{hash}\n" -r 3
1835 418f692145676128d2fb518b027ddbac624be76e
1835 418f692145676128d2fb518b027ddbac624be76e
1836 418f692145676128d2fb518b027ddbac624be76e
1836 418f692145676128d2fb518b027ddbac624be76e
1837 $ hg manifest --debug --template "{hash}\n" -r 1; \
1837 $ hg manifest --debug --template "{hash}\n" -r 1; \
1838 > hg manifest --debug --template "{hash}\n" -r 4
1838 > hg manifest --debug --template "{hash}\n" -r 4
1839 09b8b3ce5a507caaa282f7262679e6d04091426c
1839 09b8b3ce5a507caaa282f7262679e6d04091426c
1840 09b8b3ce5a507caaa282f7262679e6d04091426c
1840 09b8b3ce5a507caaa282f7262679e6d04091426c
1841
1841
1842 $ hg fix --working-dir -r 1+3+4
1842 $ hg fix --working-dir -r 1+3+4
1843 3 new orphan changesets
1843 3 new orphan changesets
1844
1844
1845 $ hg cat file.changed -r "successors(1)" --hidden
1845 $ hg cat file.changed -r "successors(1)" --hidden
1846 a
1846 a
1847 X
1847 X
1848 $ hg cat file.changed -r "successors(4)" --hidden
1848 $ hg cat file.changed -r "successors(4)" --hidden
1849 A
1849 A
1850 X
1850 X
1851
1851
1852 $ cd ..
1852 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now