##// END OF EJS Templates
tests: consistently use a HGEDITOR pattern that works with msys on windows...
Mads Kiilerich -
r16901:5b89700c default
parent child Browse files
Show More
@@ -1,352 +1,349 b''
1 $ "$TESTDIR/hghave" execbit || exit 80
2
3 $ hg init
1 $ hg init
4
2
5 Setup:
3 Setup:
6
4
7 $ echo a >> a
5 $ echo a >> a
8 $ hg ci -Am 'base'
6 $ hg ci -Am 'base'
9 adding a
7 adding a
10
8
11 Refuse to amend public csets:
9 Refuse to amend public csets:
12
10
13 $ hg phase -r . -p
11 $ hg phase -r . -p
14 $ hg ci --amend
12 $ hg ci --amend
15 abort: cannot amend public changesets
13 abort: cannot amend public changesets
16 [255]
14 [255]
17 $ hg phase -r . -f -d
15 $ hg phase -r . -f -d
18
16
19 $ echo a >> a
17 $ echo a >> a
20 $ hg ci -Am 'base1'
18 $ hg ci -Am 'base1'
21
19
22 Nothing to amend:
20 Nothing to amend:
23
21
24 $ hg ci --amend
22 $ hg ci --amend
25 nothing changed
23 nothing changed
26 [1]
24 [1]
27
25
28 Amending changeset with changes in working dir:
26 Amending changeset with changes in working dir:
29
27
30 $ echo a >> a
28 $ echo a >> a
31 $ hg ci --amend -m 'amend base1'
29 $ hg ci --amend -m 'amend base1'
32 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
30 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
33 $ hg diff -c .
31 $ hg diff -c .
34 diff -r ad120869acf0 -r 9cd25b479c51 a
32 diff -r ad120869acf0 -r 9cd25b479c51 a
35 --- a/a Thu Jan 01 00:00:00 1970 +0000
33 --- a/a Thu Jan 01 00:00:00 1970 +0000
36 +++ b/a Thu Jan 01 00:00:00 1970 +0000
34 +++ b/a Thu Jan 01 00:00:00 1970 +0000
37 @@ -1,1 +1,3 @@
35 @@ -1,1 +1,3 @@
38 a
36 a
39 +a
37 +a
40 +a
38 +a
41 $ hg log
39 $ hg log
42 changeset: 1:9cd25b479c51
40 changeset: 1:9cd25b479c51
43 tag: tip
41 tag: tip
44 user: test
42 user: test
45 date: Thu Jan 01 00:00:00 1970 +0000
43 date: Thu Jan 01 00:00:00 1970 +0000
46 summary: amend base1
44 summary: amend base1
47
45
48 changeset: 0:ad120869acf0
46 changeset: 0:ad120869acf0
49 user: test
47 user: test
50 date: Thu Jan 01 00:00:00 1970 +0000
48 date: Thu Jan 01 00:00:00 1970 +0000
51 summary: base
49 summary: base
52
50
53
51
54 Add new file:
52 Add new file:
55
53
56 $ echo b > b
54 $ echo b > b
57 $ hg ci --amend -Am 'amend base1 new file'
55 $ hg ci --amend -Am 'amend base1 new file'
58 adding b
56 adding b
59 saved backup bundle to $TESTTMP/.hg/strip-backup/9cd25b479c51-amend-backup.hg (glob)
57 saved backup bundle to $TESTTMP/.hg/strip-backup/9cd25b479c51-amend-backup.hg (glob)
60
58
61 Remove file that was added in amended commit:
59 Remove file that was added in amended commit:
62
60
63 $ hg rm b
61 $ hg rm b
64 $ hg ci --amend -m 'amend base1 remove new file'
62 $ hg ci --amend -m 'amend base1 remove new file'
65 saved backup bundle to $TESTTMP/.hg/strip-backup/e2bb3ecffd2f-amend-backup.hg (glob)
63 saved backup bundle to $TESTTMP/.hg/strip-backup/e2bb3ecffd2f-amend-backup.hg (glob)
66
64
67 $ hg cat b
65 $ hg cat b
68 b: no such file in rev 664a9b2d60cd
66 b: no such file in rev 664a9b2d60cd
69 [1]
67 [1]
70
68
71 No changes, just a different message:
69 No changes, just a different message:
72
70
73 $ hg ci -v --amend -m 'no changes, new message'
71 $ hg ci -v --amend -m 'no changes, new message'
74 amending changeset 664a9b2d60cd
72 amending changeset 664a9b2d60cd
75 copying changeset 664a9b2d60cd to ad120869acf0
73 copying changeset 664a9b2d60cd to ad120869acf0
76 a
74 a
77 stripping amended changeset 664a9b2d60cd
75 stripping amended changeset 664a9b2d60cd
78 1 changesets found
76 1 changesets found
79 saved backup bundle to $TESTTMP/.hg/strip-backup/664a9b2d60cd-amend-backup.hg (glob)
77 saved backup bundle to $TESTTMP/.hg/strip-backup/664a9b2d60cd-amend-backup.hg (glob)
80 1 changesets found
78 1 changesets found
81 adding branch
79 adding branch
82 adding changesets
80 adding changesets
83 adding manifests
81 adding manifests
84 adding file changes
82 adding file changes
85 added 1 changesets with 1 changes to 1 files
83 added 1 changesets with 1 changes to 1 files
86 committed changeset 1:ea6e356ff2ad
84 committed changeset 1:ea6e356ff2ad
87 $ hg diff -c .
85 $ hg diff -c .
88 diff -r ad120869acf0 -r ea6e356ff2ad a
86 diff -r ad120869acf0 -r ea6e356ff2ad a
89 --- a/a Thu Jan 01 00:00:00 1970 +0000
87 --- a/a Thu Jan 01 00:00:00 1970 +0000
90 +++ b/a Thu Jan 01 00:00:00 1970 +0000
88 +++ b/a Thu Jan 01 00:00:00 1970 +0000
91 @@ -1,1 +1,3 @@
89 @@ -1,1 +1,3 @@
92 a
90 a
93 +a
91 +a
94 +a
92 +a
95 $ hg log
93 $ hg log
96 changeset: 1:ea6e356ff2ad
94 changeset: 1:ea6e356ff2ad
97 tag: tip
95 tag: tip
98 user: test
96 user: test
99 date: Thu Jan 01 00:00:00 1970 +0000
97 date: Thu Jan 01 00:00:00 1970 +0000
100 summary: no changes, new message
98 summary: no changes, new message
101
99
102 changeset: 0:ad120869acf0
100 changeset: 0:ad120869acf0
103 user: test
101 user: test
104 date: Thu Jan 01 00:00:00 1970 +0000
102 date: Thu Jan 01 00:00:00 1970 +0000
105 summary: base
103 summary: base
106
104
107
105
108 Disable default date on commit so when -d isn't given, the old date is preserved:
106 Disable default date on commit so when -d isn't given, the old date is preserved:
109
107
110 $ echo '[defaults]' >> $HGRCPATH
108 $ echo '[defaults]' >> $HGRCPATH
111 $ echo 'commit=' >> $HGRCPATH
109 $ echo 'commit=' >> $HGRCPATH
112
110
113 Test -u/-d:
111 Test -u/-d:
114
112
115 $ hg ci --amend -u foo -d '1 0'
113 $ hg ci --amend -u foo -d '1 0'
116 saved backup bundle to $TESTTMP/.hg/strip-backup/ea6e356ff2ad-amend-backup.hg (glob)
114 saved backup bundle to $TESTTMP/.hg/strip-backup/ea6e356ff2ad-amend-backup.hg (glob)
117 $ echo a >> a
115 $ echo a >> a
118 $ hg ci --amend -u foo -d '1 0'
116 $ hg ci --amend -u foo -d '1 0'
119 saved backup bundle to $TESTTMP/.hg/strip-backup/377b91ce8b56-amend-backup.hg (glob)
117 saved backup bundle to $TESTTMP/.hg/strip-backup/377b91ce8b56-amend-backup.hg (glob)
120 $ hg log -r .
118 $ hg log -r .
121 changeset: 1:2c94e4a5756f
119 changeset: 1:2c94e4a5756f
122 tag: tip
120 tag: tip
123 user: foo
121 user: foo
124 date: Thu Jan 01 00:00:01 1970 +0000
122 date: Thu Jan 01 00:00:01 1970 +0000
125 summary: no changes, new message
123 summary: no changes, new message
126
124
127
125
128 Open editor with old commit message if a message isn't given otherwise:
126 Open editor with old commit message if a message isn't given otherwise:
129
127
130 $ cat > editor << '__EOF__'
128 $ cat > editor.sh << '__EOF__'
131 > #!/bin/sh
129 > #!/bin/sh
132 > cat $1
130 > cat $1
133 > echo "another precious commit message" > "$1"
131 > echo "another precious commit message" > "$1"
134 > __EOF__
132 > __EOF__
135 $ chmod +x editor
133 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
136 $ HGEDITOR="'`pwd`'"/editor hg commit --amend -v
137 amending changeset 2c94e4a5756f
134 amending changeset 2c94e4a5756f
138 copying changeset 2c94e4a5756f to ad120869acf0
135 copying changeset 2c94e4a5756f to ad120869acf0
139 no changes, new message
136 no changes, new message
140
137
141
138
142 HG: Enter commit message. Lines beginning with 'HG:' are removed.
139 HG: Enter commit message. Lines beginning with 'HG:' are removed.
143 HG: Leave message empty to abort commit.
140 HG: Leave message empty to abort commit.
144 HG: --
141 HG: --
145 HG: user: foo
142 HG: user: foo
146 HG: branch 'default'
143 HG: branch 'default'
147 HG: changed a
144 HG: changed a
148 a
145 a
149 stripping amended changeset 2c94e4a5756f
146 stripping amended changeset 2c94e4a5756f
150 1 changesets found
147 1 changesets found
151 saved backup bundle to $TESTTMP/.hg/strip-backup/2c94e4a5756f-amend-backup.hg (glob)
148 saved backup bundle to $TESTTMP/.hg/strip-backup/2c94e4a5756f-amend-backup.hg (glob)
152 1 changesets found
149 1 changesets found
153 adding branch
150 adding branch
154 adding changesets
151 adding changesets
155 adding manifests
152 adding manifests
156 adding file changes
153 adding file changes
157 added 1 changesets with 1 changes to 1 files
154 added 1 changesets with 1 changes to 1 files
158 committed changeset 1:ffb49186f961
155 committed changeset 1:ffb49186f961
159
156
160 Same, but with changes in working dir (different code path):
157 Same, but with changes in working dir (different code path):
161
158
162 $ echo a >> a
159 $ echo a >> a
163 $ HGEDITOR="'`pwd`'"/editor hg commit --amend -v
160 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v
164 amending changeset ffb49186f961
161 amending changeset ffb49186f961
165 another precious commit message
162 another precious commit message
166
163
167
164
168 HG: Enter commit message. Lines beginning with 'HG:' are removed.
165 HG: Enter commit message. Lines beginning with 'HG:' are removed.
169 HG: Leave message empty to abort commit.
166 HG: Leave message empty to abort commit.
170 HG: --
167 HG: --
171 HG: user: foo
168 HG: user: foo
172 HG: branch 'default'
169 HG: branch 'default'
173 HG: changed a
170 HG: changed a
174 a
171 a
175 copying changeset 27f3aacd3011 to ad120869acf0
172 copying changeset 27f3aacd3011 to ad120869acf0
176 a
173 a
177 stripping intermediate changeset 27f3aacd3011
174 stripping intermediate changeset 27f3aacd3011
178 stripping amended changeset ffb49186f961
175 stripping amended changeset ffb49186f961
179 2 changesets found
176 2 changesets found
180 saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg (glob)
177 saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg (glob)
181 1 changesets found
178 1 changesets found
182 adding branch
179 adding branch
183 adding changesets
180 adding changesets
184 adding manifests
181 adding manifests
185 adding file changes
182 adding file changes
186 added 1 changesets with 1 changes to 1 files
183 added 1 changesets with 1 changes to 1 files
187 committed changeset 1:fb6cca43446f
184 committed changeset 1:fb6cca43446f
188
185
189 $ rm editor
186 $ rm editor.sh
190 $ hg log -r .
187 $ hg log -r .
191 changeset: 1:fb6cca43446f
188 changeset: 1:fb6cca43446f
192 tag: tip
189 tag: tip
193 user: foo
190 user: foo
194 date: Thu Jan 01 00:00:01 1970 +0000
191 date: Thu Jan 01 00:00:01 1970 +0000
195 summary: another precious commit message
192 summary: another precious commit message
196
193
197
194
198 Moving bookmarks, preserve active bookmark:
195 Moving bookmarks, preserve active bookmark:
199
196
200 $ hg book book1
197 $ hg book book1
201 $ hg book book2
198 $ hg book book2
202 $ hg ci --amend -m 'move bookmarks'
199 $ hg ci --amend -m 'move bookmarks'
203 saved backup bundle to $TESTTMP/.hg/strip-backup/fb6cca43446f-amend-backup.hg (glob)
200 saved backup bundle to $TESTTMP/.hg/strip-backup/fb6cca43446f-amend-backup.hg (glob)
204 $ hg book
201 $ hg book
205 book1 1:0cf1c7a51bcf
202 book1 1:0cf1c7a51bcf
206 * book2 1:0cf1c7a51bcf
203 * book2 1:0cf1c7a51bcf
207 $ echo a >> a
204 $ echo a >> a
208 $ hg ci --amend -m 'move bookmarks'
205 $ hg ci --amend -m 'move bookmarks'
209 saved backup bundle to $TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg (glob)
206 saved backup bundle to $TESTTMP/.hg/strip-backup/0cf1c7a51bcf-amend-backup.hg (glob)
210 $ hg book
207 $ hg book
211 book1 1:7344472bd951
208 book1 1:7344472bd951
212 * book2 1:7344472bd951
209 * book2 1:7344472bd951
213
210
214 $ echo '[defaults]' >> $HGRCPATH
211 $ echo '[defaults]' >> $HGRCPATH
215 $ echo "commit=-d '0 0'" >> $HGRCPATH
212 $ echo "commit=-d '0 0'" >> $HGRCPATH
216
213
217 Moving branches:
214 Moving branches:
218
215
219 $ hg branch foo
216 $ hg branch foo
220 marked working directory as branch foo
217 marked working directory as branch foo
221 (branches are permanent and global, did you want a bookmark?)
218 (branches are permanent and global, did you want a bookmark?)
222 $ echo a >> a
219 $ echo a >> a
223 $ hg ci -m 'branch foo'
220 $ hg ci -m 'branch foo'
224 $ hg branch default -f
221 $ hg branch default -f
225 marked working directory as branch default
222 marked working directory as branch default
226 (branches are permanent and global, did you want a bookmark?)
223 (branches are permanent and global, did you want a bookmark?)
227 $ hg ci --amend -m 'back to default'
224 $ hg ci --amend -m 'back to default'
228 saved backup bundle to $TESTTMP/.hg/strip-backup/1661ca36a2db-amend-backup.hg (glob)
225 saved backup bundle to $TESTTMP/.hg/strip-backup/1661ca36a2db-amend-backup.hg (glob)
229 $ hg branches
226 $ hg branches
230 default 2:f24ee5961967
227 default 2:f24ee5961967
231
228
232 Close branch:
229 Close branch:
233
230
234 $ hg up -q 0
231 $ hg up -q 0
235 $ echo b >> b
232 $ echo b >> b
236 $ hg branch foo
233 $ hg branch foo
237 marked working directory as branch foo
234 marked working directory as branch foo
238 (branches are permanent and global, did you want a bookmark?)
235 (branches are permanent and global, did you want a bookmark?)
239 $ hg ci -Am 'fork'
236 $ hg ci -Am 'fork'
240 adding b
237 adding b
241 $ echo b >> b
238 $ echo b >> b
242 $ hg ci -mb
239 $ hg ci -mb
243 $ hg ci --amend --close-branch -m 'closing branch foo'
240 $ hg ci --amend --close-branch -m 'closing branch foo'
244 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
241 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
245
242
246 Same thing, different code path:
243 Same thing, different code path:
247
244
248 $ echo b >> b
245 $ echo b >> b
249 $ hg ci -m 'reopen branch'
246 $ hg ci -m 'reopen branch'
250 reopening closed branch head 4
247 reopening closed branch head 4
251 $ echo b >> b
248 $ echo b >> b
252 $ hg ci --amend --close-branch
249 $ hg ci --amend --close-branch
253 saved backup bundle to $TESTTMP/.hg/strip-backup/5e302dcc12b8-amend-backup.hg (glob)
250 saved backup bundle to $TESTTMP/.hg/strip-backup/5e302dcc12b8-amend-backup.hg (glob)
254 $ hg branches
251 $ hg branches
255 default 2:f24ee5961967
252 default 2:f24ee5961967
256
253
257 Refuse to amend merges:
254 Refuse to amend merges:
258
255
259 $ hg up -q default
256 $ hg up -q default
260 $ hg merge foo
257 $ hg merge foo
261 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
258 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
262 (branch merge, don't forget to commit)
259 (branch merge, don't forget to commit)
263 $ hg ci --amend
260 $ hg ci --amend
264 abort: cannot amend while merging
261 abort: cannot amend while merging
265 [255]
262 [255]
266 $ hg ci -m 'merge'
263 $ hg ci -m 'merge'
267 $ hg ci --amend
264 $ hg ci --amend
268 abort: cannot amend merge changesets
265 abort: cannot amend merge changesets
269 [255]
266 [255]
270
267
271 Follow copies/renames:
268 Follow copies/renames:
272
269
273 $ hg mv b c
270 $ hg mv b c
274 $ hg ci -m 'b -> c'
271 $ hg ci -m 'b -> c'
275 $ hg mv c d
272 $ hg mv c d
276 $ hg ci --amend -m 'b -> d'
273 $ hg ci --amend -m 'b -> d'
277 saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg (glob)
274 saved backup bundle to $TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg (glob)
278 $ hg st --rev '.^' --copies d
275 $ hg st --rev '.^' --copies d
279 A d
276 A d
280 b
277 b
281 $ hg cp d e
278 $ hg cp d e
282 $ hg ci -m 'e = d'
279 $ hg ci -m 'e = d'
283 $ hg cp e f
280 $ hg cp e f
284 $ hg ci --amend -m 'f = d'
281 $ hg ci --amend -m 'f = d'
285 saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg (glob)
282 saved backup bundle to $TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg (glob)
286 $ hg st --rev '.^' --copies f
283 $ hg st --rev '.^' --copies f
287 A f
284 A f
288 d
285 d
289
286
290 $ mv f f.orig
287 $ mv f f.orig
291 $ hg rm -A f
288 $ hg rm -A f
292 $ hg ci -m removef
289 $ hg ci -m removef
293 $ hg cp a f
290 $ hg cp a f
294 $ mv f.orig f
291 $ mv f.orig f
295 $ hg ci --amend -m replacef
292 $ hg ci --amend -m replacef
296 saved backup bundle to $TESTTMP/.hg/strip-backup/20a7413547f9-amend-backup.hg (glob)
293 saved backup bundle to $TESTTMP/.hg/strip-backup/20a7413547f9-amend-backup.hg (glob)
297 $ hg st --change . --copies
294 $ hg st --change . --copies
298 $ hg log -r . --template "{file_copies}\n"
295 $ hg log -r . --template "{file_copies}\n"
299
296
300
297
301 Move added file (issue3410):
298 Move added file (issue3410):
302
299
303 $ echo g >> g
300 $ echo g >> g
304 $ hg ci -Am g
301 $ hg ci -Am g
305 adding g
302 adding g
306 $ hg mv g h
303 $ hg mv g h
307 $ hg ci --amend
304 $ hg ci --amend
308 saved backup bundle to $TESTTMP/.hg/strip-backup/5daa77a5d616-amend-backup.hg (glob)
305 saved backup bundle to $TESTTMP/.hg/strip-backup/5daa77a5d616-amend-backup.hg (glob)
309 $ hg st --change . --copies h
306 $ hg st --change . --copies h
310 A h
307 A h
311 $ hg log -r . --template "{file_copies}\n"
308 $ hg log -r . --template "{file_copies}\n"
312
309
313
310
314 Can't rollback an amend:
311 Can't rollback an amend:
315
312
316 $ hg rollback
313 $ hg rollback
317 no rollback information available
314 no rollback information available
318 [1]
315 [1]
319
316
320 Preserve extra dict (issue3430):
317 Preserve extra dict (issue3430):
321
318
322 $ hg branch a
319 $ hg branch a
323 marked working directory as branch a
320 marked working directory as branch a
324 (branches are permanent and global, did you want a bookmark?)
321 (branches are permanent and global, did you want a bookmark?)
325 $ echo a >> a
322 $ echo a >> a
326 $ hg ci -ma
323 $ hg ci -ma
327 $ hg ci --amend -m "a'"
324 $ hg ci --amend -m "a'"
328 saved backup bundle to $TESTTMP/.hg/strip-backup/167f8e3031df-amend-backup.hg (glob)
325 saved backup bundle to $TESTTMP/.hg/strip-backup/167f8e3031df-amend-backup.hg (glob)
329 $ hg log -r . --template "{branch}\n"
326 $ hg log -r . --template "{branch}\n"
330 a
327 a
331 $ hg ci --amend -m "a''"
328 $ hg ci --amend -m "a''"
332 saved backup bundle to $TESTTMP/.hg/strip-backup/ceac1a44c806-amend-backup.hg (glob)
329 saved backup bundle to $TESTTMP/.hg/strip-backup/ceac1a44c806-amend-backup.hg (glob)
333 $ hg log -r . --template "{branch}\n"
330 $ hg log -r . --template "{branch}\n"
334 a
331 a
335
332
336 Also preserve other entries in the dict that are in the old commit,
333 Also preserve other entries in the dict that are in the old commit,
337 first graft something so there's an additional entry:
334 first graft something so there's an additional entry:
338
335
339 $ hg up 0 -q
336 $ hg up 0 -q
340 $ echo z > z
337 $ echo z > z
341 $ hg ci -Am 'fork'
338 $ hg ci -Am 'fork'
342 adding z
339 adding z
343 created new head
340 created new head
344 $ hg up 11
341 $ hg up 11
345 5 files updated, 0 files merged, 1 files removed, 0 files unresolved
342 5 files updated, 0 files merged, 1 files removed, 0 files unresolved
346 $ hg graft 12
343 $ hg graft 12
347 grafting revision 12
344 grafting revision 12
348 $ hg ci --amend -m 'graft amend'
345 $ hg ci --amend -m 'graft amend'
349 saved backup bundle to $TESTTMP/.hg/strip-backup/18a5124daf7a-amend-backup.hg (glob)
346 saved backup bundle to $TESTTMP/.hg/strip-backup/18a5124daf7a-amend-backup.hg (glob)
350 $ hg log -r . --debug | grep extra
347 $ hg log -r . --debug | grep extra
351 extra: branch=a
348 extra: branch=a
352 extra: source=2647734878ef0236dda712fae9c1651cf694ea8a
349 extra: source=2647734878ef0236dda712fae9c1651cf694ea8a
@@ -1,2390 +1,2386 b''
1 $ "$TESTDIR/hghave" system-sh || exit 80
2
3 $ echo "[extensions]" >> $HGRCPATH
1 $ echo "[extensions]" >> $HGRCPATH
4 $ echo "patchbomb=" >> $HGRCPATH
2 $ echo "patchbomb=" >> $HGRCPATH
5
3
6 $ hg init t
4 $ hg init t
7 $ cd t
5 $ cd t
8 $ echo a > a
6 $ echo a > a
9 $ hg commit -Ama -d '1 0'
7 $ hg commit -Ama -d '1 0'
10 adding a
8 adding a
11
9
12 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -r tip
10 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -r tip
13 This patch series consists of 1 patches.
11 This patch series consists of 1 patches.
14
12
15
13
16 Displaying [PATCH] a ...
14 Displaying [PATCH] a ...
17 Content-Type: text/plain; charset="us-ascii"
15 Content-Type: text/plain; charset="us-ascii"
18 MIME-Version: 1.0
16 MIME-Version: 1.0
19 Content-Transfer-Encoding: 7bit
17 Content-Transfer-Encoding: 7bit
20 Subject: [PATCH] a
18 Subject: [PATCH] a
21 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
19 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
22 Message-Id: <8580ff50825a50c8f716.60@*> (glob)
20 Message-Id: <8580ff50825a50c8f716.60@*> (glob)
23 User-Agent: Mercurial-patchbomb/* (glob)
21 User-Agent: Mercurial-patchbomb/* (glob)
24 Date: Thu, 01 Jan 1970 00:01:00 +0000
22 Date: Thu, 01 Jan 1970 00:01:00 +0000
25 From: quux
23 From: quux
26 To: foo
24 To: foo
27 Cc: bar
25 Cc: bar
28
26
29 # HG changeset patch
27 # HG changeset patch
30 # User test
28 # User test
31 # Date 1 0
29 # Date 1 0
32 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
30 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
33 # Parent 0000000000000000000000000000000000000000
31 # Parent 0000000000000000000000000000000000000000
34 a
32 a
35
33
36 diff -r 000000000000 -r 8580ff50825a a
34 diff -r 000000000000 -r 8580ff50825a a
37 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
35 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
38 +++ b/a Thu Jan 01 00:00:01 1970 +0000
36 +++ b/a Thu Jan 01 00:00:01 1970 +0000
39 @@ -0,0 +1,1 @@
37 @@ -0,0 +1,1 @@
40 +a
38 +a
41
39
42
40
43 $ hg --config ui.interactive=1 email --confirm -n -f quux -t foo -c bar -r tip<<EOF
41 $ hg --config ui.interactive=1 email --confirm -n -f quux -t foo -c bar -r tip<<EOF
44 > n
42 > n
45 > EOF
43 > EOF
46 This patch series consists of 1 patches.
44 This patch series consists of 1 patches.
47
45
48
46
49 Final summary:
47 Final summary:
50
48
51 From: quux
49 From: quux
52 To: foo
50 To: foo
53 Cc: bar
51 Cc: bar
54 Subject: [PATCH] a
52 Subject: [PATCH] a
55 a | 1 +
53 a | 1 +
56 1 files changed, 1 insertions(+), 0 deletions(-)
54 1 files changed, 1 insertions(+), 0 deletions(-)
57
55
58 are you sure you want to send (yn)? abort: patchbomb canceled
56 are you sure you want to send (yn)? abort: patchbomb canceled
59 [255]
57 [255]
60
58
61 $ echo b > b
59 $ echo b > b
62 $ hg commit -Amb -d '2 0'
60 $ hg commit -Amb -d '2 0'
63 adding b
61 adding b
64
62
65 $ hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test -r 0:tip
63 $ hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test -r 0:tip
66 This patch series consists of 2 patches.
64 This patch series consists of 2 patches.
67
65
68
66
69 Write the introductory message for the patch series.
67 Write the introductory message for the patch series.
70
68
71
69
72 Displaying [PATCH 0 of 2] test ...
70 Displaying [PATCH 0 of 2] test ...
73 Content-Type: text/plain; charset="us-ascii"
71 Content-Type: text/plain; charset="us-ascii"
74 MIME-Version: 1.0
72 MIME-Version: 1.0
75 Content-Transfer-Encoding: 7bit
73 Content-Transfer-Encoding: 7bit
76 Subject: [PATCH 0 of 2] test
74 Subject: [PATCH 0 of 2] test
77 Message-Id: <patchbomb.120@*> (glob)
75 Message-Id: <patchbomb.120@*> (glob)
78 User-Agent: Mercurial-patchbomb/* (glob)
76 User-Agent: Mercurial-patchbomb/* (glob)
79 Date: Thu, 01 Jan 1970 00:02:00 +0000
77 Date: Thu, 01 Jan 1970 00:02:00 +0000
80 From: quux
78 From: quux
81 To: foo
79 To: foo
82 Cc: bar
80 Cc: bar
83
81
84
82
85 Displaying [PATCH 1 of 2] a ...
83 Displaying [PATCH 1 of 2] a ...
86 Content-Type: text/plain; charset="us-ascii"
84 Content-Type: text/plain; charset="us-ascii"
87 MIME-Version: 1.0
85 MIME-Version: 1.0
88 Content-Transfer-Encoding: 7bit
86 Content-Transfer-Encoding: 7bit
89 Subject: [PATCH 1 of 2] a
87 Subject: [PATCH 1 of 2] a
90 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
88 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
91 Message-Id: <8580ff50825a50c8f716.121@*> (glob)
89 Message-Id: <8580ff50825a50c8f716.121@*> (glob)
92 In-Reply-To: <patchbomb.120@*> (glob)
90 In-Reply-To: <patchbomb.120@*> (glob)
93 References: <patchbomb.120@*> (glob)
91 References: <patchbomb.120@*> (glob)
94 User-Agent: Mercurial-patchbomb/* (glob)
92 User-Agent: Mercurial-patchbomb/* (glob)
95 Date: Thu, 01 Jan 1970 00:02:01 +0000
93 Date: Thu, 01 Jan 1970 00:02:01 +0000
96 From: quux
94 From: quux
97 To: foo
95 To: foo
98 Cc: bar
96 Cc: bar
99
97
100 # HG changeset patch
98 # HG changeset patch
101 # User test
99 # User test
102 # Date 1 0
100 # Date 1 0
103 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
101 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
104 # Parent 0000000000000000000000000000000000000000
102 # Parent 0000000000000000000000000000000000000000
105 a
103 a
106
104
107 diff -r 000000000000 -r 8580ff50825a a
105 diff -r 000000000000 -r 8580ff50825a a
108 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
106 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
109 +++ b/a Thu Jan 01 00:00:01 1970 +0000
107 +++ b/a Thu Jan 01 00:00:01 1970 +0000
110 @@ -0,0 +1,1 @@
108 @@ -0,0 +1,1 @@
111 +a
109 +a
112
110
113 Displaying [PATCH 2 of 2] b ...
111 Displaying [PATCH 2 of 2] b ...
114 Content-Type: text/plain; charset="us-ascii"
112 Content-Type: text/plain; charset="us-ascii"
115 MIME-Version: 1.0
113 MIME-Version: 1.0
116 Content-Transfer-Encoding: 7bit
114 Content-Transfer-Encoding: 7bit
117 Subject: [PATCH 2 of 2] b
115 Subject: [PATCH 2 of 2] b
118 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
116 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
119 Message-Id: <97d72e5f12c7e84f8506.122@*> (glob)
117 Message-Id: <97d72e5f12c7e84f8506.122@*> (glob)
120 In-Reply-To: <patchbomb.120@*> (glob)
118 In-Reply-To: <patchbomb.120@*> (glob)
121 References: <patchbomb.120@*> (glob)
119 References: <patchbomb.120@*> (glob)
122 User-Agent: Mercurial-patchbomb/* (glob)
120 User-Agent: Mercurial-patchbomb/* (glob)
123 Date: Thu, 01 Jan 1970 00:02:02 +0000
121 Date: Thu, 01 Jan 1970 00:02:02 +0000
124 From: quux
122 From: quux
125 To: foo
123 To: foo
126 Cc: bar
124 Cc: bar
127
125
128 # HG changeset patch
126 # HG changeset patch
129 # User test
127 # User test
130 # Date 2 0
128 # Date 2 0
131 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
129 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
132 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
130 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
133 b
131 b
134
132
135 diff -r 8580ff50825a -r 97d72e5f12c7 b
133 diff -r 8580ff50825a -r 97d72e5f12c7 b
136 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
134 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
137 +++ b/b Thu Jan 01 00:00:02 1970 +0000
135 +++ b/b Thu Jan 01 00:00:02 1970 +0000
138 @@ -0,0 +1,1 @@
136 @@ -0,0 +1,1 @@
139 +b
137 +b
140
138
141
139
142 .hg/last-email.txt
140 .hg/last-email.txt
143
141
144 $ cat > editor << '__EOF__'
142 $ cat > editor.sh << '__EOF__'
145 > #!/bin/sh
146 > echo "a precious introductory message" > "$1"
143 > echo "a precious introductory message" > "$1"
147 > __EOF__
144 > __EOF__
148 $ chmod +x editor
145 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg email -n -t foo -s test -r 0:tip > /dev/null
149 $ HGEDITOR="'`pwd`'"/editor hg email -n -t foo -s test -r 0:tip > /dev/null
150 $ cat .hg/last-email.txt
146 $ cat .hg/last-email.txt
151 a precious introductory message
147 a precious introductory message
152
148
153 $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \
149 $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \
154 > --config extensions.progress= --config progress.assume-tty=1 \
150 > --config extensions.progress= --config progress.assume-tty=1 \
155 > --config progress.delay=0 --config progress.refresh=0 \
151 > --config progress.delay=0 --config progress.refresh=0 \
156 > --config progress.width=60 2>&1 | \
152 > --config progress.width=60 2>&1 | \
157 > python "$TESTDIR/filtercr.py"
153 > python "$TESTDIR/filtercr.py"
158 This patch series consists of 2 patches.
154 This patch series consists of 2 patches.
159
155
160
156
161 Write the introductory message for the patch series.
157 Write the introductory message for the patch series.
162
158
163
159
164 sending [ ] 0/3
160 sending [ ] 0/3
165 sending [ ] 0/3
161 sending [ ] 0/3
166
162
167
163
168 sending [==============> ] 1/3
164 sending [==============> ] 1/3
169 sending [==============> ] 1/3
165 sending [==============> ] 1/3
170
166
171
167
172 sending [=============================> ] 2/3
168 sending [=============================> ] 2/3
173 sending [=============================> ] 2/3
169 sending [=============================> ] 2/3
174 \r (esc)
170 \r (esc)
175 Sending [PATCH 0 of 2] test ...
171 Sending [PATCH 0 of 2] test ...
176 Sending [PATCH 1 of 2] a ...
172 Sending [PATCH 1 of 2] a ...
177 Sending [PATCH 2 of 2] b ...
173 Sending [PATCH 2 of 2] b ...
178
174
179
175
180 $ cd ..
176 $ cd ..
181
177
182 $ hg clone -q t t2
178 $ hg clone -q t t2
183 $ cd t2
179 $ cd t2
184 $ echo c > c
180 $ echo c > c
185 $ hg commit -Amc -d '3 0'
181 $ hg commit -Amc -d '3 0'
186 adding c
182 adding c
187
183
188 $ cat > description <<EOF
184 $ cat > description <<EOF
189 > a multiline
185 > a multiline
190 >
186 >
191 > description
187 > description
192 > EOF
188 > EOF
193
189
194
190
195 test bundle and description:
191 test bundle and description:
196 $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \
192 $ hg email --date '1970-1-1 0:3' -n -f quux -t foo \
197 > -c bar -s test -r tip -b --desc description
193 > -c bar -s test -r tip -b --desc description
198 searching for changes
194 searching for changes
199 1 changesets found
195 1 changesets found
200
196
201 Displaying test ...
197 Displaying test ...
202 Content-Type: multipart/mixed; boundary="===*" (glob)
198 Content-Type: multipart/mixed; boundary="===*" (glob)
203 MIME-Version: 1.0
199 MIME-Version: 1.0
204 Subject: test
200 Subject: test
205 Message-Id: <patchbomb.180@*> (glob)
201 Message-Id: <patchbomb.180@*> (glob)
206 User-Agent: Mercurial-patchbomb/* (glob)
202 User-Agent: Mercurial-patchbomb/* (glob)
207 Date: Thu, 01 Jan 1970 00:03:00 +0000
203 Date: Thu, 01 Jan 1970 00:03:00 +0000
208 From: quux
204 From: quux
209 To: foo
205 To: foo
210 Cc: bar
206 Cc: bar
211
207
212 --===* (glob)
208 --===* (glob)
213 Content-Type: text/plain; charset="us-ascii"
209 Content-Type: text/plain; charset="us-ascii"
214 MIME-Version: 1.0
210 MIME-Version: 1.0
215 Content-Transfer-Encoding: 7bit
211 Content-Transfer-Encoding: 7bit
216
212
217 a multiline
213 a multiline
218
214
219 description
215 description
220
216
221 --===* (glob)
217 --===* (glob)
222 Content-Type: application/x-mercurial-bundle
218 Content-Type: application/x-mercurial-bundle
223 MIME-Version: 1.0
219 MIME-Version: 1.0
224 Content-Disposition: attachment; filename="bundle.hg"
220 Content-Disposition: attachment; filename="bundle.hg"
225 Content-Transfer-Encoding: base64
221 Content-Transfer-Encoding: base64
226
222
227 SEcxMEJaaDkxQVkmU1nvR7I3AAAN////lFYQWj1/4HwRkdC/AywIAk0E4pfoSIIIgQCgGEQOcLAA
223 SEcxMEJaaDkxQVkmU1nvR7I3AAAN////lFYQWj1/4HwRkdC/AywIAk0E4pfoSIIIgQCgGEQOcLAA
228 2tA1VPyp4mkeoG0EaaPU0GTT1GjRiNPIg9CZGBqZ6UbU9J+KFU09DNUaGgAAAAAANAGgAAAAA1U8
224 2tA1VPyp4mkeoG0EaaPU0GTT1GjRiNPIg9CZGBqZ6UbU9J+KFU09DNUaGgAAAAAANAGgAAAAA1U8
229 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2
225 oGgAADQGgAANNANAAAAAAZipFLz3XoakCEQB3PVPyHJVi1iYkAAKQAZQGpQGZESInRnCFMqLDla2
230 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE
226 Bx3qfRQeA2N4lnzKkAmP8kR2asievLLXXebVU8Vg4iEBqcJNJAxIapSU6SM4888ZAciRG6MYAIEE
231 SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD
227 SlIBpFisgGkyRjX//TMtfcUAEsGu56+YnE1OlTZmzKm8BSu2rvo4rHAYYaadIFFuTy0LYgIkgLVD
232 sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC
228 sgVa2F19D1tx9+hgbAygLgQwaIqcDdgA4BjQgIiz/AEP72++llgDKhKducqodGE4B0ETqF3JFOFC
233 Q70eyNw=
229 Q70eyNw=
234 --===*-- (glob)
230 --===*-- (glob)
235
231
236 utf-8 patch:
232 utf-8 patch:
237 $ python -c 'fp = open("utf", "wb"); fp.write("h\xC3\xB6mma!\n"); fp.close();'
233 $ python -c 'fp = open("utf", "wb"); fp.write("h\xC3\xB6mma!\n"); fp.close();'
238 $ hg commit -A -d '4 0' -m 'utf-8 content'
234 $ hg commit -A -d '4 0' -m 'utf-8 content'
239 adding description
235 adding description
240 adding utf
236 adding utf
241
237
242 no mime encoding for email --test:
238 no mime encoding for email --test:
243 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
239 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
244 This patch series consists of 1 patches.
240 This patch series consists of 1 patches.
245
241
246
242
247 Displaying [PATCH] utf-8 content ...
243 Displaying [PATCH] utf-8 content ...
248 Content-Type: text/plain; charset="us-ascii"
244 Content-Type: text/plain; charset="us-ascii"
249 MIME-Version: 1.0
245 MIME-Version: 1.0
250 Content-Transfer-Encoding: 8bit
246 Content-Transfer-Encoding: 8bit
251 Subject: [PATCH] utf-8 content
247 Subject: [PATCH] utf-8 content
252 X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f
248 X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f
253 Message-Id: <909a00e13e9d78b575ae.240@*> (glob)
249 Message-Id: <909a00e13e9d78b575ae.240@*> (glob)
254 User-Agent: Mercurial-patchbomb/* (glob)
250 User-Agent: Mercurial-patchbomb/* (glob)
255 Date: Thu, 01 Jan 1970 00:04:00 +0000
251 Date: Thu, 01 Jan 1970 00:04:00 +0000
256 From: quux
252 From: quux
257 To: foo
253 To: foo
258 Cc: bar
254 Cc: bar
259
255
260 # HG changeset patch
256 # HG changeset patch
261 # User test
257 # User test
262 # Date 4 0
258 # Date 4 0
263 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
259 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
264 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
260 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
265 utf-8 content
261 utf-8 content
266
262
267 diff -r ff2c9fa2018b -r 909a00e13e9d description
263 diff -r ff2c9fa2018b -r 909a00e13e9d description
268 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
264 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
269 +++ b/description Thu Jan 01 00:00:04 1970 +0000
265 +++ b/description Thu Jan 01 00:00:04 1970 +0000
270 @@ -0,0 +1,3 @@
266 @@ -0,0 +1,3 @@
271 +a multiline
267 +a multiline
272 +
268 +
273 +description
269 +description
274 diff -r ff2c9fa2018b -r 909a00e13e9d utf
270 diff -r ff2c9fa2018b -r 909a00e13e9d utf
275 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
271 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
276 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
272 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
277 @@ -0,0 +1,1 @@
273 @@ -0,0 +1,1 @@
278 +h\xc3\xb6mma! (esc)
274 +h\xc3\xb6mma! (esc)
279
275
280
276
281 mime encoded mbox (base64):
277 mime encoded mbox (base64):
282 $ hg email --date '1970-1-1 0:4' -f 'Q <quux>' -t foo -c bar -r tip -m mbox
278 $ hg email --date '1970-1-1 0:4' -f 'Q <quux>' -t foo -c bar -r tip -m mbox
283 This patch series consists of 1 patches.
279 This patch series consists of 1 patches.
284
280
285
281
286 Sending [PATCH] utf-8 content ...
282 Sending [PATCH] utf-8 content ...
287
283
288 $ cat mbox
284 $ cat mbox
289 From quux ... ... .. ..:..:.. .... (re)
285 From quux ... ... .. ..:..:.. .... (re)
290 Content-Type: text/plain; charset="utf-8"
286 Content-Type: text/plain; charset="utf-8"
291 MIME-Version: 1.0
287 MIME-Version: 1.0
292 Content-Transfer-Encoding: base64
288 Content-Transfer-Encoding: base64
293 Subject: [PATCH] utf-8 content
289 Subject: [PATCH] utf-8 content
294 X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f
290 X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f
295 Message-Id: <909a00e13e9d78b575ae.240@*> (glob)
291 Message-Id: <909a00e13e9d78b575ae.240@*> (glob)
296 User-Agent: Mercurial-patchbomb/* (glob)
292 User-Agent: Mercurial-patchbomb/* (glob)
297 Date: Thu, 01 Jan 1970 00:04:00 +0000
293 Date: Thu, 01 Jan 1970 00:04:00 +0000
298 From: Q <quux>
294 From: Q <quux>
299 To: foo
295 To: foo
300 Cc: bar
296 Cc: bar
301
297
302 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgOTA5
298 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHRlc3QKIyBEYXRlIDQgMAojIE5vZGUgSUQgOTA5
303 YTAwZTEzZTlkNzhiNTc1YWVlZTIzZGRkYmFkYTQ2ZDVhMTQzZgojIFBhcmVudCAgZmYyYzlmYTIw
299 YTAwZTEzZTlkNzhiNTc1YWVlZTIzZGRkYmFkYTQ2ZDVhMTQzZgojIFBhcmVudCAgZmYyYzlmYTIw
304 MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5Zgp1dGYtOCBjb250ZW50CgpkaWZmIC1yIGZm
300 MThiMTVmYTc0YjMzMzYzYmRhOTUyNzMyM2UyYTk5Zgp1dGYtOCBjb250ZW50CgpkaWZmIC1yIGZm
305 MmM5ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgZGVzY3JpcHRpb24KLS0tIC9kZXYvbnVsbAlUaHUg
301 MmM5ZmEyMDE4YiAtciA5MDlhMDBlMTNlOWQgZGVzY3JpcHRpb24KLS0tIC9kZXYvbnVsbAlUaHUg
306 SmFuIDAxIDAwOjAwOjAwIDE5NzAgKzAwMDAKKysrIGIvZGVzY3JpcHRpb24JVGh1IEphbiAwMSAw
302 SmFuIDAxIDAwOjAwOjAwIDE5NzAgKzAwMDAKKysrIGIvZGVzY3JpcHRpb24JVGh1IEphbiAwMSAw
307 MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMyBAQAorYSBtdWx0aWxpbmUKKworZGVzY3Jp
303 MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMyBAQAorYSBtdWx0aWxpbmUKKworZGVzY3Jp
308 cHRpb24KZGlmZiAtciBmZjJjOWZhMjAxOGIgLXIgOTA5YTAwZTEzZTlkIHV0ZgotLS0gL2Rldi9u
304 cHRpb24KZGlmZiAtciBmZjJjOWZhMjAxOGIgLXIgOTA5YTAwZTEzZTlkIHV0ZgotLS0gL2Rldi9u
309 dWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCArMDAwMAorKysgYi91dGYJVGh1IEphbiAwMSAw
305 dWxsCVRodSBKYW4gMDEgMDA6MDA6MDAgMTk3MCArMDAwMAorKysgYi91dGYJVGh1IEphbiAwMSAw
310 MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMSBAQAoraMO2bW1hIQo=
306 MDowMDowNCAxOTcwICswMDAwCkBAIC0wLDAgKzEsMSBAQAoraMO2bW1hIQo=
311
307
312
308
313 $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")'
309 $ python -c 'print open("mbox").read().split("\n\n")[1].decode("base64")'
314 # HG changeset patch
310 # HG changeset patch
315 # User test
311 # User test
316 # Date 4 0
312 # Date 4 0
317 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
313 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
318 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
314 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
319 utf-8 content
315 utf-8 content
320
316
321 diff -r ff2c9fa2018b -r 909a00e13e9d description
317 diff -r ff2c9fa2018b -r 909a00e13e9d description
322 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
318 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
323 +++ b/description Thu Jan 01 00:00:04 1970 +0000
319 +++ b/description Thu Jan 01 00:00:04 1970 +0000
324 @@ -0,0 +1,3 @@
320 @@ -0,0 +1,3 @@
325 +a multiline
321 +a multiline
326 +
322 +
327 +description
323 +description
328 diff -r ff2c9fa2018b -r 909a00e13e9d utf
324 diff -r ff2c9fa2018b -r 909a00e13e9d utf
329 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
325 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
330 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
326 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
331 @@ -0,0 +1,1 @@
327 @@ -0,0 +1,1 @@
332 +h\xc3\xb6mma! (esc)
328 +h\xc3\xb6mma! (esc)
333
329
334 $ rm mbox
330 $ rm mbox
335
331
336 mime encoded mbox (quoted-printable):
332 mime encoded mbox (quoted-printable):
337 $ python -c 'fp = open("long", "wb"); fp.write("%s\nfoo\n\nbar\n" % ("x" * 1024)); fp.close();'
333 $ python -c 'fp = open("long", "wb"); fp.write("%s\nfoo\n\nbar\n" % ("x" * 1024)); fp.close();'
338 $ hg commit -A -d '4 0' -m 'long line'
334 $ hg commit -A -d '4 0' -m 'long line'
339 adding long
335 adding long
340
336
341 no mime encoding for email --test:
337 no mime encoding for email --test:
342 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
338 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -n
343 This patch series consists of 1 patches.
339 This patch series consists of 1 patches.
344
340
345
341
346 Displaying [PATCH] long line ...
342 Displaying [PATCH] long line ...
347 Content-Type: text/plain; charset="us-ascii"
343 Content-Type: text/plain; charset="us-ascii"
348 MIME-Version: 1.0
344 MIME-Version: 1.0
349 Content-Transfer-Encoding: quoted-printable
345 Content-Transfer-Encoding: quoted-printable
350 Subject: [PATCH] long line
346 Subject: [PATCH] long line
351 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
347 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
352 Message-Id: <a2ea8fc83dd8b93cfd86.240@*> (glob)
348 Message-Id: <a2ea8fc83dd8b93cfd86.240@*> (glob)
353 User-Agent: Mercurial-patchbomb/* (glob)
349 User-Agent: Mercurial-patchbomb/* (glob)
354 Date: Thu, 01 Jan 1970 00:04:00 +0000
350 Date: Thu, 01 Jan 1970 00:04:00 +0000
355 From: quux
351 From: quux
356 To: foo
352 To: foo
357 Cc: bar
353 Cc: bar
358
354
359 # HG changeset patch
355 # HG changeset patch
360 # User test
356 # User test
361 # Date 4 0
357 # Date 4 0
362 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
358 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
363 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
359 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
364 long line
360 long line
365
361
366 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
362 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
367 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
363 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
368 +++ b/long Thu Jan 01 00:00:04 1970 +0000
364 +++ b/long Thu Jan 01 00:00:04 1970 +0000
369 @@ -0,0 +1,4 @@
365 @@ -0,0 +1,4 @@
370 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
366 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
371 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
367 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
372 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
368 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
373 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
369 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
374 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
370 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
375 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
371 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
376 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
372 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
377 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
373 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
378 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
374 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
379 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
375 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
380 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
376 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
381 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
377 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
382 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
378 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
383 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
379 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
384 +foo
380 +foo
385 +
381 +
386 +bar
382 +bar
387
383
388
384
389 mime encoded mbox (quoted-printable):
385 mime encoded mbox (quoted-printable):
390 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
386 $ hg email --date '1970-1-1 0:4' -f quux -t foo -c bar -r tip -m mbox
391 This patch series consists of 1 patches.
387 This patch series consists of 1 patches.
392
388
393
389
394 Sending [PATCH] long line ...
390 Sending [PATCH] long line ...
395 $ cat mbox
391 $ cat mbox
396 From quux ... ... .. ..:..:.. .... (re)
392 From quux ... ... .. ..:..:.. .... (re)
397 Content-Type: text/plain; charset="us-ascii"
393 Content-Type: text/plain; charset="us-ascii"
398 MIME-Version: 1.0
394 MIME-Version: 1.0
399 Content-Transfer-Encoding: quoted-printable
395 Content-Transfer-Encoding: quoted-printable
400 Subject: [PATCH] long line
396 Subject: [PATCH] long line
401 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
397 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
402 Message-Id: <a2ea8fc83dd8b93cfd86.240@*> (glob)
398 Message-Id: <a2ea8fc83dd8b93cfd86.240@*> (glob)
403 User-Agent: Mercurial-patchbomb/* (glob)
399 User-Agent: Mercurial-patchbomb/* (glob)
404 Date: Thu, 01 Jan 1970 00:04:00 +0000
400 Date: Thu, 01 Jan 1970 00:04:00 +0000
405 From: quux
401 From: quux
406 To: foo
402 To: foo
407 Cc: bar
403 Cc: bar
408
404
409 # HG changeset patch
405 # HG changeset patch
410 # User test
406 # User test
411 # Date 4 0
407 # Date 4 0
412 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
408 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
413 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
409 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
414 long line
410 long line
415
411
416 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
412 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
417 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
413 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
418 +++ b/long Thu Jan 01 00:00:04 1970 +0000
414 +++ b/long Thu Jan 01 00:00:04 1970 +0000
419 @@ -0,0 +1,4 @@
415 @@ -0,0 +1,4 @@
420 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
416 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
421 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
417 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
422 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
418 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
423 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
419 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
424 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
420 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
425 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
421 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
426 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
422 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
427 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
423 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
428 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
424 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
429 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
425 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
430 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
426 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
431 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
427 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
432 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
428 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
433 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
429 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
434 +foo
430 +foo
435 +
431 +
436 +bar
432 +bar
437
433
438
434
439
435
440 $ rm mbox
436 $ rm mbox
441
437
442 iso-8859-1 patch:
438 iso-8859-1 patch:
443 $ python -c 'fp = open("isolatin", "wb"); fp.write("h\xF6mma!\n"); fp.close();'
439 $ python -c 'fp = open("isolatin", "wb"); fp.write("h\xF6mma!\n"); fp.close();'
444 $ hg commit -A -d '5 0' -m 'isolatin 8-bit encoding'
440 $ hg commit -A -d '5 0' -m 'isolatin 8-bit encoding'
445 adding isolatin
441 adding isolatin
446
442
447 fake ascii mbox:
443 fake ascii mbox:
448 $ hg email --date '1970-1-1 0:5' -f quux -t foo -c bar -r tip -m mbox
444 $ hg email --date '1970-1-1 0:5' -f quux -t foo -c bar -r tip -m mbox
449 This patch series consists of 1 patches.
445 This patch series consists of 1 patches.
450
446
451
447
452 Sending [PATCH] isolatin 8-bit encoding ...
448 Sending [PATCH] isolatin 8-bit encoding ...
453 $ cat mbox
449 $ cat mbox
454 From quux ... ... .. ..:..:.. .... (re)
450 From quux ... ... .. ..:..:.. .... (re)
455 Content-Type: text/plain; charset="us-ascii"
451 Content-Type: text/plain; charset="us-ascii"
456 MIME-Version: 1.0
452 MIME-Version: 1.0
457 Content-Transfer-Encoding: 8bit
453 Content-Transfer-Encoding: 8bit
458 Subject: [PATCH] isolatin 8-bit encoding
454 Subject: [PATCH] isolatin 8-bit encoding
459 X-Mercurial-Node: 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
455 X-Mercurial-Node: 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
460 Message-Id: <240fb913fc1b7ff15ddb.300@*> (glob)
456 Message-Id: <240fb913fc1b7ff15ddb.300@*> (glob)
461 User-Agent: Mercurial-patchbomb/* (glob)
457 User-Agent: Mercurial-patchbomb/* (glob)
462 Date: Thu, 01 Jan 1970 00:05:00 +0000
458 Date: Thu, 01 Jan 1970 00:05:00 +0000
463 From: quux
459 From: quux
464 To: foo
460 To: foo
465 Cc: bar
461 Cc: bar
466
462
467 # HG changeset patch
463 # HG changeset patch
468 # User test
464 # User test
469 # Date 5 0
465 # Date 5 0
470 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
466 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
471 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
467 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
472 isolatin 8-bit encoding
468 isolatin 8-bit encoding
473
469
474 diff -r a2ea8fc83dd8 -r 240fb913fc1b isolatin
470 diff -r a2ea8fc83dd8 -r 240fb913fc1b isolatin
475 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
471 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
476 +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000
472 +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000
477 @@ -0,0 +1,1 @@
473 @@ -0,0 +1,1 @@
478 +h\xf6mma! (esc)
474 +h\xf6mma! (esc)
479
475
480
476
481
477
482 test diffstat for single patch:
478 test diffstat for single patch:
483 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y -r 2
479 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y -r 2
484 This patch series consists of 1 patches.
480 This patch series consists of 1 patches.
485
481
486
482
487 Final summary:
483 Final summary:
488
484
489 From: quux
485 From: quux
490 To: foo
486 To: foo
491 Cc: bar
487 Cc: bar
492 Subject: [PATCH] test
488 Subject: [PATCH] test
493 c | 1 +
489 c | 1 +
494 1 files changed, 1 insertions(+), 0 deletions(-)
490 1 files changed, 1 insertions(+), 0 deletions(-)
495
491
496 are you sure you want to send (yn)? y
492 are you sure you want to send (yn)? y
497
493
498 Displaying [PATCH] test ...
494 Displaying [PATCH] test ...
499 Content-Type: text/plain; charset="us-ascii"
495 Content-Type: text/plain; charset="us-ascii"
500 MIME-Version: 1.0
496 MIME-Version: 1.0
501 Content-Transfer-Encoding: 7bit
497 Content-Transfer-Encoding: 7bit
502 Subject: [PATCH] test
498 Subject: [PATCH] test
503 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
499 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
504 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
500 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
505 User-Agent: Mercurial-patchbomb/* (glob)
501 User-Agent: Mercurial-patchbomb/* (glob)
506 Date: Thu, 01 Jan 1970 00:01:00 +0000
502 Date: Thu, 01 Jan 1970 00:01:00 +0000
507 From: quux
503 From: quux
508 To: foo
504 To: foo
509 Cc: bar
505 Cc: bar
510
506
511 c | 1 +
507 c | 1 +
512 1 files changed, 1 insertions(+), 0 deletions(-)
508 1 files changed, 1 insertions(+), 0 deletions(-)
513
509
514
510
515 # HG changeset patch
511 # HG changeset patch
516 # User test
512 # User test
517 # Date 3 0
513 # Date 3 0
518 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
514 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
519 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
515 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
520 c
516 c
521
517
522 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
518 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
523 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
519 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
524 +++ b/c Thu Jan 01 00:00:03 1970 +0000
520 +++ b/c Thu Jan 01 00:00:03 1970 +0000
525 @@ -0,0 +1,1 @@
521 @@ -0,0 +1,1 @@
526 +c
522 +c
527
523
528
524
529 test diffstat for multiple patches:
525 test diffstat for multiple patches:
530 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y \
526 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -d -y \
531 > -r 0:1
527 > -r 0:1
532 This patch series consists of 2 patches.
528 This patch series consists of 2 patches.
533
529
534
530
535 Write the introductory message for the patch series.
531 Write the introductory message for the patch series.
536
532
537
533
538 Final summary:
534 Final summary:
539
535
540 From: quux
536 From: quux
541 To: foo
537 To: foo
542 Cc: bar
538 Cc: bar
543 Subject: [PATCH 0 of 2] test
539 Subject: [PATCH 0 of 2] test
544 a | 1 +
540 a | 1 +
545 b | 1 +
541 b | 1 +
546 2 files changed, 2 insertions(+), 0 deletions(-)
542 2 files changed, 2 insertions(+), 0 deletions(-)
547 Subject: [PATCH 1 of 2] a
543 Subject: [PATCH 1 of 2] a
548 a | 1 +
544 a | 1 +
549 1 files changed, 1 insertions(+), 0 deletions(-)
545 1 files changed, 1 insertions(+), 0 deletions(-)
550 Subject: [PATCH 2 of 2] b
546 Subject: [PATCH 2 of 2] b
551 b | 1 +
547 b | 1 +
552 1 files changed, 1 insertions(+), 0 deletions(-)
548 1 files changed, 1 insertions(+), 0 deletions(-)
553
549
554 are you sure you want to send (yn)? y
550 are you sure you want to send (yn)? y
555
551
556 Displaying [PATCH 0 of 2] test ...
552 Displaying [PATCH 0 of 2] test ...
557 Content-Type: text/plain; charset="us-ascii"
553 Content-Type: text/plain; charset="us-ascii"
558 MIME-Version: 1.0
554 MIME-Version: 1.0
559 Content-Transfer-Encoding: 7bit
555 Content-Transfer-Encoding: 7bit
560 Subject: [PATCH 0 of 2] test
556 Subject: [PATCH 0 of 2] test
561 Message-Id: <patchbomb.60@*> (glob)
557 Message-Id: <patchbomb.60@*> (glob)
562 User-Agent: Mercurial-patchbomb/* (glob)
558 User-Agent: Mercurial-patchbomb/* (glob)
563 Date: Thu, 01 Jan 1970 00:01:00 +0000
559 Date: Thu, 01 Jan 1970 00:01:00 +0000
564 From: quux
560 From: quux
565 To: foo
561 To: foo
566 Cc: bar
562 Cc: bar
567
563
568
564
569 a | 1 +
565 a | 1 +
570 b | 1 +
566 b | 1 +
571 2 files changed, 2 insertions(+), 0 deletions(-)
567 2 files changed, 2 insertions(+), 0 deletions(-)
572
568
573 Displaying [PATCH 1 of 2] a ...
569 Displaying [PATCH 1 of 2] a ...
574 Content-Type: text/plain; charset="us-ascii"
570 Content-Type: text/plain; charset="us-ascii"
575 MIME-Version: 1.0
571 MIME-Version: 1.0
576 Content-Transfer-Encoding: 7bit
572 Content-Transfer-Encoding: 7bit
577 Subject: [PATCH 1 of 2] a
573 Subject: [PATCH 1 of 2] a
578 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
574 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
579 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
575 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
580 In-Reply-To: <patchbomb.60@*> (glob)
576 In-Reply-To: <patchbomb.60@*> (glob)
581 References: <patchbomb.60@*> (glob)
577 References: <patchbomb.60@*> (glob)
582 User-Agent: Mercurial-patchbomb/* (glob)
578 User-Agent: Mercurial-patchbomb/* (glob)
583 Date: Thu, 01 Jan 1970 00:01:01 +0000
579 Date: Thu, 01 Jan 1970 00:01:01 +0000
584 From: quux
580 From: quux
585 To: foo
581 To: foo
586 Cc: bar
582 Cc: bar
587
583
588 a | 1 +
584 a | 1 +
589 1 files changed, 1 insertions(+), 0 deletions(-)
585 1 files changed, 1 insertions(+), 0 deletions(-)
590
586
591
587
592 # HG changeset patch
588 # HG changeset patch
593 # User test
589 # User test
594 # Date 1 0
590 # Date 1 0
595 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
591 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
596 # Parent 0000000000000000000000000000000000000000
592 # Parent 0000000000000000000000000000000000000000
597 a
593 a
598
594
599 diff -r 000000000000 -r 8580ff50825a a
595 diff -r 000000000000 -r 8580ff50825a a
600 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
596 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
601 +++ b/a Thu Jan 01 00:00:01 1970 +0000
597 +++ b/a Thu Jan 01 00:00:01 1970 +0000
602 @@ -0,0 +1,1 @@
598 @@ -0,0 +1,1 @@
603 +a
599 +a
604
600
605 Displaying [PATCH 2 of 2] b ...
601 Displaying [PATCH 2 of 2] b ...
606 Content-Type: text/plain; charset="us-ascii"
602 Content-Type: text/plain; charset="us-ascii"
607 MIME-Version: 1.0
603 MIME-Version: 1.0
608 Content-Transfer-Encoding: 7bit
604 Content-Transfer-Encoding: 7bit
609 Subject: [PATCH 2 of 2] b
605 Subject: [PATCH 2 of 2] b
610 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
606 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
611 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
607 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
612 In-Reply-To: <patchbomb.60@*> (glob)
608 In-Reply-To: <patchbomb.60@*> (glob)
613 References: <patchbomb.60@*> (glob)
609 References: <patchbomb.60@*> (glob)
614 User-Agent: Mercurial-patchbomb/* (glob)
610 User-Agent: Mercurial-patchbomb/* (glob)
615 Date: Thu, 01 Jan 1970 00:01:02 +0000
611 Date: Thu, 01 Jan 1970 00:01:02 +0000
616 From: quux
612 From: quux
617 To: foo
613 To: foo
618 Cc: bar
614 Cc: bar
619
615
620 b | 1 +
616 b | 1 +
621 1 files changed, 1 insertions(+), 0 deletions(-)
617 1 files changed, 1 insertions(+), 0 deletions(-)
622
618
623
619
624 # HG changeset patch
620 # HG changeset patch
625 # User test
621 # User test
626 # Date 2 0
622 # Date 2 0
627 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
623 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
628 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
624 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
629 b
625 b
630
626
631 diff -r 8580ff50825a -r 97d72e5f12c7 b
627 diff -r 8580ff50825a -r 97d72e5f12c7 b
632 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
628 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
633 +++ b/b Thu Jan 01 00:00:02 1970 +0000
629 +++ b/b Thu Jan 01 00:00:02 1970 +0000
634 @@ -0,0 +1,1 @@
630 @@ -0,0 +1,1 @@
635 +b
631 +b
636
632
637
633
638 test inline for single patch:
634 test inline for single patch:
639 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
635 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
640 This patch series consists of 1 patches.
636 This patch series consists of 1 patches.
641
637
642
638
643 Displaying [PATCH] test ...
639 Displaying [PATCH] test ...
644 Content-Type: multipart/mixed; boundary="===*" (glob)
640 Content-Type: multipart/mixed; boundary="===*" (glob)
645 MIME-Version: 1.0
641 MIME-Version: 1.0
646 Subject: [PATCH] test
642 Subject: [PATCH] test
647 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
643 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
648 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
644 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
649 User-Agent: Mercurial-patchbomb/* (glob)
645 User-Agent: Mercurial-patchbomb/* (glob)
650 Date: Thu, 01 Jan 1970 00:01:00 +0000
646 Date: Thu, 01 Jan 1970 00:01:00 +0000
651 From: quux
647 From: quux
652 To: foo
648 To: foo
653 Cc: bar
649 Cc: bar
654
650
655 --===* (glob)
651 --===* (glob)
656 Content-Type: text/x-patch; charset="us-ascii"
652 Content-Type: text/x-patch; charset="us-ascii"
657 MIME-Version: 1.0
653 MIME-Version: 1.0
658 Content-Transfer-Encoding: 7bit
654 Content-Transfer-Encoding: 7bit
659 Content-Disposition: inline; filename=t2.patch
655 Content-Disposition: inline; filename=t2.patch
660
656
661 # HG changeset patch
657 # HG changeset patch
662 # User test
658 # User test
663 # Date 3 0
659 # Date 3 0
664 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
660 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
665 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
661 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
666 c
662 c
667
663
668 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
664 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
669 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
665 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
670 +++ b/c Thu Jan 01 00:00:03 1970 +0000
666 +++ b/c Thu Jan 01 00:00:03 1970 +0000
671 @@ -0,0 +1,1 @@
667 @@ -0,0 +1,1 @@
672 +c
668 +c
673
669
674 --===*-- (glob)
670 --===*-- (glob)
675
671
676
672
677 test inline for single patch (quoted-printable):
673 test inline for single patch (quoted-printable):
678 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4
674 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 4
679 This patch series consists of 1 patches.
675 This patch series consists of 1 patches.
680
676
681
677
682 Displaying [PATCH] test ...
678 Displaying [PATCH] test ...
683 Content-Type: multipart/mixed; boundary="===*" (glob)
679 Content-Type: multipart/mixed; boundary="===*" (glob)
684 MIME-Version: 1.0
680 MIME-Version: 1.0
685 Subject: [PATCH] test
681 Subject: [PATCH] test
686 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
682 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
687 Message-Id: <a2ea8fc83dd8b93cfd86.60@*> (glob)
683 Message-Id: <a2ea8fc83dd8b93cfd86.60@*> (glob)
688 User-Agent: Mercurial-patchbomb/* (glob)
684 User-Agent: Mercurial-patchbomb/* (glob)
689 Date: Thu, 01 Jan 1970 00:01:00 +0000
685 Date: Thu, 01 Jan 1970 00:01:00 +0000
690 From: quux
686 From: quux
691 To: foo
687 To: foo
692 Cc: bar
688 Cc: bar
693
689
694 --===* (glob)
690 --===* (glob)
695 Content-Type: text/x-patch; charset="us-ascii"
691 Content-Type: text/x-patch; charset="us-ascii"
696 MIME-Version: 1.0
692 MIME-Version: 1.0
697 Content-Transfer-Encoding: quoted-printable
693 Content-Transfer-Encoding: quoted-printable
698 Content-Disposition: inline; filename=t2.patch
694 Content-Disposition: inline; filename=t2.patch
699
695
700 # HG changeset patch
696 # HG changeset patch
701 # User test
697 # User test
702 # Date 4 0
698 # Date 4 0
703 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
699 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
704 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
700 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
705 long line
701 long line
706
702
707 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
703 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
708 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
704 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
709 +++ b/long Thu Jan 01 00:00:04 1970 +0000
705 +++ b/long Thu Jan 01 00:00:04 1970 +0000
710 @@ -0,0 +1,4 @@
706 @@ -0,0 +1,4 @@
711 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
707 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
712 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
708 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
713 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
709 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
714 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
710 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
715 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
711 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
716 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
712 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
717 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
713 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
718 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
714 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
719 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
715 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
720 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
716 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
721 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
717 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
722 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
718 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
723 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
719 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
724 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
720 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
725 +foo
721 +foo
726 +
722 +
727 +bar
723 +bar
728
724
729 --===*-- (glob)
725 --===*-- (glob)
730
726
731 test inline for multiple patches:
727 test inline for multiple patches:
732 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
728 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i \
733 > -r 0:1 -r 4
729 > -r 0:1 -r 4
734 This patch series consists of 3 patches.
730 This patch series consists of 3 patches.
735
731
736
732
737 Write the introductory message for the patch series.
733 Write the introductory message for the patch series.
738
734
739
735
740 Displaying [PATCH 0 of 3] test ...
736 Displaying [PATCH 0 of 3] test ...
741 Content-Type: text/plain; charset="us-ascii"
737 Content-Type: text/plain; charset="us-ascii"
742 MIME-Version: 1.0
738 MIME-Version: 1.0
743 Content-Transfer-Encoding: 7bit
739 Content-Transfer-Encoding: 7bit
744 Subject: [PATCH 0 of 3] test
740 Subject: [PATCH 0 of 3] test
745 Message-Id: <patchbomb.60@*> (glob)
741 Message-Id: <patchbomb.60@*> (glob)
746 User-Agent: Mercurial-patchbomb/* (glob)
742 User-Agent: Mercurial-patchbomb/* (glob)
747 Date: Thu, 01 Jan 1970 00:01:00 +0000
743 Date: Thu, 01 Jan 1970 00:01:00 +0000
748 From: quux
744 From: quux
749 To: foo
745 To: foo
750 Cc: bar
746 Cc: bar
751
747
752
748
753 Displaying [PATCH 1 of 3] a ...
749 Displaying [PATCH 1 of 3] a ...
754 Content-Type: multipart/mixed; boundary="===*" (glob)
750 Content-Type: multipart/mixed; boundary="===*" (glob)
755 MIME-Version: 1.0
751 MIME-Version: 1.0
756 Subject: [PATCH 1 of 3] a
752 Subject: [PATCH 1 of 3] a
757 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
753 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
758 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
754 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
759 In-Reply-To: <patchbomb.60@*> (glob)
755 In-Reply-To: <patchbomb.60@*> (glob)
760 References: <patchbomb.60@*> (glob)
756 References: <patchbomb.60@*> (glob)
761 User-Agent: Mercurial-patchbomb/* (glob)
757 User-Agent: Mercurial-patchbomb/* (glob)
762 Date: Thu, 01 Jan 1970 00:01:01 +0000
758 Date: Thu, 01 Jan 1970 00:01:01 +0000
763 From: quux
759 From: quux
764 To: foo
760 To: foo
765 Cc: bar
761 Cc: bar
766
762
767 --===* (glob)
763 --===* (glob)
768 Content-Type: text/x-patch; charset="us-ascii"
764 Content-Type: text/x-patch; charset="us-ascii"
769 MIME-Version: 1.0
765 MIME-Version: 1.0
770 Content-Transfer-Encoding: 7bit
766 Content-Transfer-Encoding: 7bit
771 Content-Disposition: inline; filename=t2-1.patch
767 Content-Disposition: inline; filename=t2-1.patch
772
768
773 # HG changeset patch
769 # HG changeset patch
774 # User test
770 # User test
775 # Date 1 0
771 # Date 1 0
776 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
772 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
777 # Parent 0000000000000000000000000000000000000000
773 # Parent 0000000000000000000000000000000000000000
778 a
774 a
779
775
780 diff -r 000000000000 -r 8580ff50825a a
776 diff -r 000000000000 -r 8580ff50825a a
781 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
777 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
782 +++ b/a Thu Jan 01 00:00:01 1970 +0000
778 +++ b/a Thu Jan 01 00:00:01 1970 +0000
783 @@ -0,0 +1,1 @@
779 @@ -0,0 +1,1 @@
784 +a
780 +a
785
781
786 --===*-- (glob)
782 --===*-- (glob)
787 Displaying [PATCH 2 of 3] b ...
783 Displaying [PATCH 2 of 3] b ...
788 Content-Type: multipart/mixed; boundary="===*" (glob)
784 Content-Type: multipart/mixed; boundary="===*" (glob)
789 MIME-Version: 1.0
785 MIME-Version: 1.0
790 Subject: [PATCH 2 of 3] b
786 Subject: [PATCH 2 of 3] b
791 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
787 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
792 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
788 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
793 In-Reply-To: <patchbomb.60@*> (glob)
789 In-Reply-To: <patchbomb.60@*> (glob)
794 References: <patchbomb.60@*> (glob)
790 References: <patchbomb.60@*> (glob)
795 User-Agent: Mercurial-patchbomb/* (glob)
791 User-Agent: Mercurial-patchbomb/* (glob)
796 Date: Thu, 01 Jan 1970 00:01:02 +0000
792 Date: Thu, 01 Jan 1970 00:01:02 +0000
797 From: quux
793 From: quux
798 To: foo
794 To: foo
799 Cc: bar
795 Cc: bar
800
796
801 --===* (glob)
797 --===* (glob)
802 Content-Type: text/x-patch; charset="us-ascii"
798 Content-Type: text/x-patch; charset="us-ascii"
803 MIME-Version: 1.0
799 MIME-Version: 1.0
804 Content-Transfer-Encoding: 7bit
800 Content-Transfer-Encoding: 7bit
805 Content-Disposition: inline; filename=t2-2.patch
801 Content-Disposition: inline; filename=t2-2.patch
806
802
807 # HG changeset patch
803 # HG changeset patch
808 # User test
804 # User test
809 # Date 2 0
805 # Date 2 0
810 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
806 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
811 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
807 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
812 b
808 b
813
809
814 diff -r 8580ff50825a -r 97d72e5f12c7 b
810 diff -r 8580ff50825a -r 97d72e5f12c7 b
815 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
811 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
816 +++ b/b Thu Jan 01 00:00:02 1970 +0000
812 +++ b/b Thu Jan 01 00:00:02 1970 +0000
817 @@ -0,0 +1,1 @@
813 @@ -0,0 +1,1 @@
818 +b
814 +b
819
815
820 --===*-- (glob)
816 --===*-- (glob)
821 Displaying [PATCH 3 of 3] long line ...
817 Displaying [PATCH 3 of 3] long line ...
822 Content-Type: multipart/mixed; boundary="===*" (glob)
818 Content-Type: multipart/mixed; boundary="===*" (glob)
823 MIME-Version: 1.0
819 MIME-Version: 1.0
824 Subject: [PATCH 3 of 3] long line
820 Subject: [PATCH 3 of 3] long line
825 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
821 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
826 Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob)
822 Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob)
827 In-Reply-To: <patchbomb.60@*> (glob)
823 In-Reply-To: <patchbomb.60@*> (glob)
828 References: <patchbomb.60@*> (glob)
824 References: <patchbomb.60@*> (glob)
829 User-Agent: Mercurial-patchbomb/* (glob)
825 User-Agent: Mercurial-patchbomb/* (glob)
830 Date: Thu, 01 Jan 1970 00:01:03 +0000
826 Date: Thu, 01 Jan 1970 00:01:03 +0000
831 From: quux
827 From: quux
832 To: foo
828 To: foo
833 Cc: bar
829 Cc: bar
834
830
835 --===* (glob)
831 --===* (glob)
836 Content-Type: text/x-patch; charset="us-ascii"
832 Content-Type: text/x-patch; charset="us-ascii"
837 MIME-Version: 1.0
833 MIME-Version: 1.0
838 Content-Transfer-Encoding: quoted-printable
834 Content-Transfer-Encoding: quoted-printable
839 Content-Disposition: inline; filename=t2-3.patch
835 Content-Disposition: inline; filename=t2-3.patch
840
836
841 # HG changeset patch
837 # HG changeset patch
842 # User test
838 # User test
843 # Date 4 0
839 # Date 4 0
844 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
840 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
845 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
841 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
846 long line
842 long line
847
843
848 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
844 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
849 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
845 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
850 +++ b/long Thu Jan 01 00:00:04 1970 +0000
846 +++ b/long Thu Jan 01 00:00:04 1970 +0000
851 @@ -0,0 +1,4 @@
847 @@ -0,0 +1,4 @@
852 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
848 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
853 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
849 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
854 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
850 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
855 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
851 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
856 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
852 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
857 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
853 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
858 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
854 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
859 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
855 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
860 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
856 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
861 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
857 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
862 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
858 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
863 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
859 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
864 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
860 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
865 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
861 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
866 +foo
862 +foo
867 +
863 +
868 +bar
864 +bar
869
865
870 --===*-- (glob)
866 --===*-- (glob)
871
867
872 test attach for single patch:
868 test attach for single patch:
873 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2
869 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 2
874 This patch series consists of 1 patches.
870 This patch series consists of 1 patches.
875
871
876
872
877 Displaying [PATCH] test ...
873 Displaying [PATCH] test ...
878 Content-Type: multipart/mixed; boundary="===*" (glob)
874 Content-Type: multipart/mixed; boundary="===*" (glob)
879 MIME-Version: 1.0
875 MIME-Version: 1.0
880 Subject: [PATCH] test
876 Subject: [PATCH] test
881 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
877 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
882 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
878 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
883 User-Agent: Mercurial-patchbomb/* (glob)
879 User-Agent: Mercurial-patchbomb/* (glob)
884 Date: Thu, 01 Jan 1970 00:01:00 +0000
880 Date: Thu, 01 Jan 1970 00:01:00 +0000
885 From: quux
881 From: quux
886 To: foo
882 To: foo
887 Cc: bar
883 Cc: bar
888
884
889 --===* (glob)
885 --===* (glob)
890 Content-Type: text/plain; charset="us-ascii"
886 Content-Type: text/plain; charset="us-ascii"
891 MIME-Version: 1.0
887 MIME-Version: 1.0
892 Content-Transfer-Encoding: 7bit
888 Content-Transfer-Encoding: 7bit
893
889
894 Patch subject is complete summary.
890 Patch subject is complete summary.
895
891
896
892
897
893
898 --===* (glob)
894 --===* (glob)
899 Content-Type: text/x-patch; charset="us-ascii"
895 Content-Type: text/x-patch; charset="us-ascii"
900 MIME-Version: 1.0
896 MIME-Version: 1.0
901 Content-Transfer-Encoding: 7bit
897 Content-Transfer-Encoding: 7bit
902 Content-Disposition: attachment; filename=t2.patch
898 Content-Disposition: attachment; filename=t2.patch
903
899
904 # HG changeset patch
900 # HG changeset patch
905 # User test
901 # User test
906 # Date 3 0
902 # Date 3 0
907 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
903 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
908 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
904 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
909 c
905 c
910
906
911 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
907 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
912 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
908 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
913 +++ b/c Thu Jan 01 00:00:03 1970 +0000
909 +++ b/c Thu Jan 01 00:00:03 1970 +0000
914 @@ -0,0 +1,1 @@
910 @@ -0,0 +1,1 @@
915 +c
911 +c
916
912
917 --===*-- (glob)
913 --===*-- (glob)
918
914
919 test attach for single patch (quoted-printable):
915 test attach for single patch (quoted-printable):
920 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4
916 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a -r 4
921 This patch series consists of 1 patches.
917 This patch series consists of 1 patches.
922
918
923
919
924 Displaying [PATCH] test ...
920 Displaying [PATCH] test ...
925 Content-Type: multipart/mixed; boundary="===*" (glob)
921 Content-Type: multipart/mixed; boundary="===*" (glob)
926 MIME-Version: 1.0
922 MIME-Version: 1.0
927 Subject: [PATCH] test
923 Subject: [PATCH] test
928 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
924 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
929 Message-Id: <a2ea8fc83dd8b93cfd86.60@*> (glob)
925 Message-Id: <a2ea8fc83dd8b93cfd86.60@*> (glob)
930 User-Agent: Mercurial-patchbomb/* (glob)
926 User-Agent: Mercurial-patchbomb/* (glob)
931 Date: Thu, 01 Jan 1970 00:01:00 +0000
927 Date: Thu, 01 Jan 1970 00:01:00 +0000
932 From: quux
928 From: quux
933 To: foo
929 To: foo
934 Cc: bar
930 Cc: bar
935
931
936 --===* (glob)
932 --===* (glob)
937 Content-Type: text/plain; charset="us-ascii"
933 Content-Type: text/plain; charset="us-ascii"
938 MIME-Version: 1.0
934 MIME-Version: 1.0
939 Content-Transfer-Encoding: 7bit
935 Content-Transfer-Encoding: 7bit
940
936
941 Patch subject is complete summary.
937 Patch subject is complete summary.
942
938
943
939
944
940
945 --===* (glob)
941 --===* (glob)
946 Content-Type: text/x-patch; charset="us-ascii"
942 Content-Type: text/x-patch; charset="us-ascii"
947 MIME-Version: 1.0
943 MIME-Version: 1.0
948 Content-Transfer-Encoding: quoted-printable
944 Content-Transfer-Encoding: quoted-printable
949 Content-Disposition: attachment; filename=t2.patch
945 Content-Disposition: attachment; filename=t2.patch
950
946
951 # HG changeset patch
947 # HG changeset patch
952 # User test
948 # User test
953 # Date 4 0
949 # Date 4 0
954 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
950 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
955 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
951 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
956 long line
952 long line
957
953
958 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
954 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
959 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
955 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
960 +++ b/long Thu Jan 01 00:00:04 1970 +0000
956 +++ b/long Thu Jan 01 00:00:04 1970 +0000
961 @@ -0,0 +1,4 @@
957 @@ -0,0 +1,4 @@
962 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
958 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
963 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
959 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
964 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
960 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
965 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
961 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
966 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
962 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
967 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
963 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
968 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
964 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
969 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
965 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
970 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
966 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
971 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
967 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
972 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
968 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
973 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
969 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
974 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
970 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
975 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
971 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
976 +foo
972 +foo
977 +
973 +
978 +bar
974 +bar
979
975
980 --===*-- (glob)
976 --===*-- (glob)
981
977
982 test attach and body for single patch:
978 test attach and body for single patch:
983 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2
979 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a --body -r 2
984 This patch series consists of 1 patches.
980 This patch series consists of 1 patches.
985
981
986
982
987 Displaying [PATCH] test ...
983 Displaying [PATCH] test ...
988 Content-Type: multipart/mixed; boundary="===*" (glob)
984 Content-Type: multipart/mixed; boundary="===*" (glob)
989 MIME-Version: 1.0
985 MIME-Version: 1.0
990 Subject: [PATCH] test
986 Subject: [PATCH] test
991 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
987 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
992 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
988 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
993 User-Agent: Mercurial-patchbomb/* (glob)
989 User-Agent: Mercurial-patchbomb/* (glob)
994 Date: Thu, 01 Jan 1970 00:01:00 +0000
990 Date: Thu, 01 Jan 1970 00:01:00 +0000
995 From: quux
991 From: quux
996 To: foo
992 To: foo
997 Cc: bar
993 Cc: bar
998
994
999 --===* (glob)
995 --===* (glob)
1000 Content-Type: text/plain; charset="us-ascii"
996 Content-Type: text/plain; charset="us-ascii"
1001 MIME-Version: 1.0
997 MIME-Version: 1.0
1002 Content-Transfer-Encoding: 7bit
998 Content-Transfer-Encoding: 7bit
1003
999
1004 # HG changeset patch
1000 # HG changeset patch
1005 # User test
1001 # User test
1006 # Date 3 0
1002 # Date 3 0
1007 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1003 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1008 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1004 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1009 c
1005 c
1010
1006
1011 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1007 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1012 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1008 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1013 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1009 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1014 @@ -0,0 +1,1 @@
1010 @@ -0,0 +1,1 @@
1015 +c
1011 +c
1016
1012
1017 --===* (glob)
1013 --===* (glob)
1018 Content-Type: text/x-patch; charset="us-ascii"
1014 Content-Type: text/x-patch; charset="us-ascii"
1019 MIME-Version: 1.0
1015 MIME-Version: 1.0
1020 Content-Transfer-Encoding: 7bit
1016 Content-Transfer-Encoding: 7bit
1021 Content-Disposition: attachment; filename=t2.patch
1017 Content-Disposition: attachment; filename=t2.patch
1022
1018
1023 # HG changeset patch
1019 # HG changeset patch
1024 # User test
1020 # User test
1025 # Date 3 0
1021 # Date 3 0
1026 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1022 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1027 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1023 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1028 c
1024 c
1029
1025
1030 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1026 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1031 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1027 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1032 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1028 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1033 @@ -0,0 +1,1 @@
1029 @@ -0,0 +1,1 @@
1034 +c
1030 +c
1035
1031
1036 --===*-- (glob)
1032 --===*-- (glob)
1037
1033
1038 test attach for multiple patches:
1034 test attach for multiple patches:
1039 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
1035 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -a \
1040 > -r 0:1 -r 4
1036 > -r 0:1 -r 4
1041 This patch series consists of 3 patches.
1037 This patch series consists of 3 patches.
1042
1038
1043
1039
1044 Write the introductory message for the patch series.
1040 Write the introductory message for the patch series.
1045
1041
1046
1042
1047 Displaying [PATCH 0 of 3] test ...
1043 Displaying [PATCH 0 of 3] test ...
1048 Content-Type: text/plain; charset="us-ascii"
1044 Content-Type: text/plain; charset="us-ascii"
1049 MIME-Version: 1.0
1045 MIME-Version: 1.0
1050 Content-Transfer-Encoding: 7bit
1046 Content-Transfer-Encoding: 7bit
1051 Subject: [PATCH 0 of 3] test
1047 Subject: [PATCH 0 of 3] test
1052 Message-Id: <patchbomb.60@*> (glob)
1048 Message-Id: <patchbomb.60@*> (glob)
1053 User-Agent: Mercurial-patchbomb/* (glob)
1049 User-Agent: Mercurial-patchbomb/* (glob)
1054 Date: Thu, 01 Jan 1970 00:01:00 +0000
1050 Date: Thu, 01 Jan 1970 00:01:00 +0000
1055 From: quux
1051 From: quux
1056 To: foo
1052 To: foo
1057 Cc: bar
1053 Cc: bar
1058
1054
1059
1055
1060 Displaying [PATCH 1 of 3] a ...
1056 Displaying [PATCH 1 of 3] a ...
1061 Content-Type: multipart/mixed; boundary="===*" (glob)
1057 Content-Type: multipart/mixed; boundary="===*" (glob)
1062 MIME-Version: 1.0
1058 MIME-Version: 1.0
1063 Subject: [PATCH 1 of 3] a
1059 Subject: [PATCH 1 of 3] a
1064 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1060 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1065 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1061 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1066 In-Reply-To: <patchbomb.60@*> (glob)
1062 In-Reply-To: <patchbomb.60@*> (glob)
1067 References: <patchbomb.60@*> (glob)
1063 References: <patchbomb.60@*> (glob)
1068 User-Agent: Mercurial-patchbomb/* (glob)
1064 User-Agent: Mercurial-patchbomb/* (glob)
1069 Date: Thu, 01 Jan 1970 00:01:01 +0000
1065 Date: Thu, 01 Jan 1970 00:01:01 +0000
1070 From: quux
1066 From: quux
1071 To: foo
1067 To: foo
1072 Cc: bar
1068 Cc: bar
1073
1069
1074 --===* (glob)
1070 --===* (glob)
1075 Content-Type: text/plain; charset="us-ascii"
1071 Content-Type: text/plain; charset="us-ascii"
1076 MIME-Version: 1.0
1072 MIME-Version: 1.0
1077 Content-Transfer-Encoding: 7bit
1073 Content-Transfer-Encoding: 7bit
1078
1074
1079 Patch subject is complete summary.
1075 Patch subject is complete summary.
1080
1076
1081
1077
1082
1078
1083 --===* (glob)
1079 --===* (glob)
1084 Content-Type: text/x-patch; charset="us-ascii"
1080 Content-Type: text/x-patch; charset="us-ascii"
1085 MIME-Version: 1.0
1081 MIME-Version: 1.0
1086 Content-Transfer-Encoding: 7bit
1082 Content-Transfer-Encoding: 7bit
1087 Content-Disposition: attachment; filename=t2-1.patch
1083 Content-Disposition: attachment; filename=t2-1.patch
1088
1084
1089 # HG changeset patch
1085 # HG changeset patch
1090 # User test
1086 # User test
1091 # Date 1 0
1087 # Date 1 0
1092 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1088 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1093 # Parent 0000000000000000000000000000000000000000
1089 # Parent 0000000000000000000000000000000000000000
1094 a
1090 a
1095
1091
1096 diff -r 000000000000 -r 8580ff50825a a
1092 diff -r 000000000000 -r 8580ff50825a a
1097 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1093 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1098 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1094 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1099 @@ -0,0 +1,1 @@
1095 @@ -0,0 +1,1 @@
1100 +a
1096 +a
1101
1097
1102 --===*-- (glob)
1098 --===*-- (glob)
1103 Displaying [PATCH 2 of 3] b ...
1099 Displaying [PATCH 2 of 3] b ...
1104 Content-Type: multipart/mixed; boundary="===*" (glob)
1100 Content-Type: multipart/mixed; boundary="===*" (glob)
1105 MIME-Version: 1.0
1101 MIME-Version: 1.0
1106 Subject: [PATCH 2 of 3] b
1102 Subject: [PATCH 2 of 3] b
1107 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1103 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1108 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1104 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1109 In-Reply-To: <patchbomb.60@*> (glob)
1105 In-Reply-To: <patchbomb.60@*> (glob)
1110 References: <patchbomb.60@*> (glob)
1106 References: <patchbomb.60@*> (glob)
1111 User-Agent: Mercurial-patchbomb/* (glob)
1107 User-Agent: Mercurial-patchbomb/* (glob)
1112 Date: Thu, 01 Jan 1970 00:01:02 +0000
1108 Date: Thu, 01 Jan 1970 00:01:02 +0000
1113 From: quux
1109 From: quux
1114 To: foo
1110 To: foo
1115 Cc: bar
1111 Cc: bar
1116
1112
1117 --===* (glob)
1113 --===* (glob)
1118 Content-Type: text/plain; charset="us-ascii"
1114 Content-Type: text/plain; charset="us-ascii"
1119 MIME-Version: 1.0
1115 MIME-Version: 1.0
1120 Content-Transfer-Encoding: 7bit
1116 Content-Transfer-Encoding: 7bit
1121
1117
1122 Patch subject is complete summary.
1118 Patch subject is complete summary.
1123
1119
1124
1120
1125
1121
1126 --===* (glob)
1122 --===* (glob)
1127 Content-Type: text/x-patch; charset="us-ascii"
1123 Content-Type: text/x-patch; charset="us-ascii"
1128 MIME-Version: 1.0
1124 MIME-Version: 1.0
1129 Content-Transfer-Encoding: 7bit
1125 Content-Transfer-Encoding: 7bit
1130 Content-Disposition: attachment; filename=t2-2.patch
1126 Content-Disposition: attachment; filename=t2-2.patch
1131
1127
1132 # HG changeset patch
1128 # HG changeset patch
1133 # User test
1129 # User test
1134 # Date 2 0
1130 # Date 2 0
1135 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1131 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1136 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1132 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1137 b
1133 b
1138
1134
1139 diff -r 8580ff50825a -r 97d72e5f12c7 b
1135 diff -r 8580ff50825a -r 97d72e5f12c7 b
1140 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1136 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1141 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1137 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1142 @@ -0,0 +1,1 @@
1138 @@ -0,0 +1,1 @@
1143 +b
1139 +b
1144
1140
1145 --===*-- (glob)
1141 --===*-- (glob)
1146 Displaying [PATCH 3 of 3] long line ...
1142 Displaying [PATCH 3 of 3] long line ...
1147 Content-Type: multipart/mixed; boundary="===*" (glob)
1143 Content-Type: multipart/mixed; boundary="===*" (glob)
1148 MIME-Version: 1.0
1144 MIME-Version: 1.0
1149 Subject: [PATCH 3 of 3] long line
1145 Subject: [PATCH 3 of 3] long line
1150 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1146 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1151 Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob)
1147 Message-Id: <a2ea8fc83dd8b93cfd86.63@*> (glob)
1152 In-Reply-To: <patchbomb.60@*> (glob)
1148 In-Reply-To: <patchbomb.60@*> (glob)
1153 References: <patchbomb.60@*> (glob)
1149 References: <patchbomb.60@*> (glob)
1154 User-Agent: Mercurial-patchbomb/* (glob)
1150 User-Agent: Mercurial-patchbomb/* (glob)
1155 Date: Thu, 01 Jan 1970 00:01:03 +0000
1151 Date: Thu, 01 Jan 1970 00:01:03 +0000
1156 From: quux
1152 From: quux
1157 To: foo
1153 To: foo
1158 Cc: bar
1154 Cc: bar
1159
1155
1160 --===* (glob)
1156 --===* (glob)
1161 Content-Type: text/plain; charset="us-ascii"
1157 Content-Type: text/plain; charset="us-ascii"
1162 MIME-Version: 1.0
1158 MIME-Version: 1.0
1163 Content-Transfer-Encoding: 7bit
1159 Content-Transfer-Encoding: 7bit
1164
1160
1165 Patch subject is complete summary.
1161 Patch subject is complete summary.
1166
1162
1167
1163
1168
1164
1169 --===* (glob)
1165 --===* (glob)
1170 Content-Type: text/x-patch; charset="us-ascii"
1166 Content-Type: text/x-patch; charset="us-ascii"
1171 MIME-Version: 1.0
1167 MIME-Version: 1.0
1172 Content-Transfer-Encoding: quoted-printable
1168 Content-Transfer-Encoding: quoted-printable
1173 Content-Disposition: attachment; filename=t2-3.patch
1169 Content-Disposition: attachment; filename=t2-3.patch
1174
1170
1175 # HG changeset patch
1171 # HG changeset patch
1176 # User test
1172 # User test
1177 # Date 4 0
1173 # Date 4 0
1178 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1174 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
1179 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
1175 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
1180 long line
1176 long line
1181
1177
1182 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
1178 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
1183 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1179 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1184 +++ b/long Thu Jan 01 00:00:04 1970 +0000
1180 +++ b/long Thu Jan 01 00:00:04 1970 +0000
1185 @@ -0,0 +1,4 @@
1181 @@ -0,0 +1,4 @@
1186 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1182 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1187 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1183 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1188 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1184 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1189 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1185 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1190 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1186 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1191 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1187 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1192 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1188 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1193 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1189 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1194 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1190 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1195 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1191 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1196 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1192 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1197 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1193 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1198 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1194 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1199 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
1195 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
1200 +foo
1196 +foo
1201 +
1197 +
1202 +bar
1198 +bar
1203
1199
1204 --===*-- (glob)
1200 --===*-- (glob)
1205
1201
1206 test intro for single patch:
1202 test intro for single patch:
1207 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
1203 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
1208 > -r 2
1204 > -r 2
1209 This patch series consists of 1 patches.
1205 This patch series consists of 1 patches.
1210
1206
1211
1207
1212 Write the introductory message for the patch series.
1208 Write the introductory message for the patch series.
1213
1209
1214
1210
1215 Displaying [PATCH 0 of 1] test ...
1211 Displaying [PATCH 0 of 1] test ...
1216 Content-Type: text/plain; charset="us-ascii"
1212 Content-Type: text/plain; charset="us-ascii"
1217 MIME-Version: 1.0
1213 MIME-Version: 1.0
1218 Content-Transfer-Encoding: 7bit
1214 Content-Transfer-Encoding: 7bit
1219 Subject: [PATCH 0 of 1] test
1215 Subject: [PATCH 0 of 1] test
1220 Message-Id: <patchbomb.60@*> (glob)
1216 Message-Id: <patchbomb.60@*> (glob)
1221 User-Agent: Mercurial-patchbomb/* (glob)
1217 User-Agent: Mercurial-patchbomb/* (glob)
1222 Date: Thu, 01 Jan 1970 00:01:00 +0000
1218 Date: Thu, 01 Jan 1970 00:01:00 +0000
1223 From: quux
1219 From: quux
1224 To: foo
1220 To: foo
1225 Cc: bar
1221 Cc: bar
1226
1222
1227
1223
1228 Displaying [PATCH 1 of 1] c ...
1224 Displaying [PATCH 1 of 1] c ...
1229 Content-Type: text/plain; charset="us-ascii"
1225 Content-Type: text/plain; charset="us-ascii"
1230 MIME-Version: 1.0
1226 MIME-Version: 1.0
1231 Content-Transfer-Encoding: 7bit
1227 Content-Transfer-Encoding: 7bit
1232 Subject: [PATCH 1 of 1] c
1228 Subject: [PATCH 1 of 1] c
1233 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1229 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1234 Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob)
1230 Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob)
1235 In-Reply-To: <patchbomb.60@*> (glob)
1231 In-Reply-To: <patchbomb.60@*> (glob)
1236 References: <patchbomb.60@*> (glob)
1232 References: <patchbomb.60@*> (glob)
1237 User-Agent: Mercurial-patchbomb/* (glob)
1233 User-Agent: Mercurial-patchbomb/* (glob)
1238 Date: Thu, 01 Jan 1970 00:01:01 +0000
1234 Date: Thu, 01 Jan 1970 00:01:01 +0000
1239 From: quux
1235 From: quux
1240 To: foo
1236 To: foo
1241 Cc: bar
1237 Cc: bar
1242
1238
1243 # HG changeset patch
1239 # HG changeset patch
1244 # User test
1240 # User test
1245 # Date 3 0
1241 # Date 3 0
1246 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1242 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1247 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1243 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1248 c
1244 c
1249
1245
1250 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1246 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1251 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1247 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1252 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1248 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1253 @@ -0,0 +1,1 @@
1249 @@ -0,0 +1,1 @@
1254 +c
1250 +c
1255
1251
1256
1252
1257 test --desc without --intro for a single patch:
1253 test --desc without --intro for a single patch:
1258 $ echo foo > intro.text
1254 $ echo foo > intro.text
1259 $ hg email --date '1970-1-1 0:1' -n --desc intro.text -f quux -t foo -c bar \
1255 $ hg email --date '1970-1-1 0:1' -n --desc intro.text -f quux -t foo -c bar \
1260 > -s test -r 2
1256 > -s test -r 2
1261 This patch series consists of 1 patches.
1257 This patch series consists of 1 patches.
1262
1258
1263
1259
1264 Displaying [PATCH 0 of 1] test ...
1260 Displaying [PATCH 0 of 1] test ...
1265 Content-Type: text/plain; charset="us-ascii"
1261 Content-Type: text/plain; charset="us-ascii"
1266 MIME-Version: 1.0
1262 MIME-Version: 1.0
1267 Content-Transfer-Encoding: 7bit
1263 Content-Transfer-Encoding: 7bit
1268 Subject: [PATCH 0 of 1] test
1264 Subject: [PATCH 0 of 1] test
1269 Message-Id: <patchbomb.60@*> (glob)
1265 Message-Id: <patchbomb.60@*> (glob)
1270 User-Agent: Mercurial-patchbomb/* (glob)
1266 User-Agent: Mercurial-patchbomb/* (glob)
1271 Date: Thu, 01 Jan 1970 00:01:00 +0000
1267 Date: Thu, 01 Jan 1970 00:01:00 +0000
1272 From: quux
1268 From: quux
1273 To: foo
1269 To: foo
1274 Cc: bar
1270 Cc: bar
1275
1271
1276 foo
1272 foo
1277
1273
1278 Displaying [PATCH 1 of 1] c ...
1274 Displaying [PATCH 1 of 1] c ...
1279 Content-Type: text/plain; charset="us-ascii"
1275 Content-Type: text/plain; charset="us-ascii"
1280 MIME-Version: 1.0
1276 MIME-Version: 1.0
1281 Content-Transfer-Encoding: 7bit
1277 Content-Transfer-Encoding: 7bit
1282 Subject: [PATCH 1 of 1] c
1278 Subject: [PATCH 1 of 1] c
1283 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1279 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1284 Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob)
1280 Message-Id: <ff2c9fa2018b15fa74b3.61@*> (glob)
1285 In-Reply-To: <patchbomb.60@*> (glob)
1281 In-Reply-To: <patchbomb.60@*> (glob)
1286 References: <patchbomb.60@*> (glob)
1282 References: <patchbomb.60@*> (glob)
1287 User-Agent: Mercurial-patchbomb/* (glob)
1283 User-Agent: Mercurial-patchbomb/* (glob)
1288 Date: Thu, 01 Jan 1970 00:01:01 +0000
1284 Date: Thu, 01 Jan 1970 00:01:01 +0000
1289 From: quux
1285 From: quux
1290 To: foo
1286 To: foo
1291 Cc: bar
1287 Cc: bar
1292
1288
1293 # HG changeset patch
1289 # HG changeset patch
1294 # User test
1290 # User test
1295 # Date 3 0
1291 # Date 3 0
1296 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1292 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1297 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1293 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1298 c
1294 c
1299
1295
1300 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1296 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1301 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1297 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1302 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1298 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1303 @@ -0,0 +1,1 @@
1299 @@ -0,0 +1,1 @@
1304 +c
1300 +c
1305
1301
1306
1302
1307 test intro for multiple patches:
1303 test intro for multiple patches:
1308 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
1304 $ hg email --date '1970-1-1 0:1' -n --intro -f quux -t foo -c bar -s test \
1309 > -r 0:1
1305 > -r 0:1
1310 This patch series consists of 2 patches.
1306 This patch series consists of 2 patches.
1311
1307
1312
1308
1313 Write the introductory message for the patch series.
1309 Write the introductory message for the patch series.
1314
1310
1315
1311
1316 Displaying [PATCH 0 of 2] test ...
1312 Displaying [PATCH 0 of 2] test ...
1317 Content-Type: text/plain; charset="us-ascii"
1313 Content-Type: text/plain; charset="us-ascii"
1318 MIME-Version: 1.0
1314 MIME-Version: 1.0
1319 Content-Transfer-Encoding: 7bit
1315 Content-Transfer-Encoding: 7bit
1320 Subject: [PATCH 0 of 2] test
1316 Subject: [PATCH 0 of 2] test
1321 Message-Id: <patchbomb.60@*> (glob)
1317 Message-Id: <patchbomb.60@*> (glob)
1322 User-Agent: Mercurial-patchbomb/* (glob)
1318 User-Agent: Mercurial-patchbomb/* (glob)
1323 Date: Thu, 01 Jan 1970 00:01:00 +0000
1319 Date: Thu, 01 Jan 1970 00:01:00 +0000
1324 From: quux
1320 From: quux
1325 To: foo
1321 To: foo
1326 Cc: bar
1322 Cc: bar
1327
1323
1328
1324
1329 Displaying [PATCH 1 of 2] a ...
1325 Displaying [PATCH 1 of 2] a ...
1330 Content-Type: text/plain; charset="us-ascii"
1326 Content-Type: text/plain; charset="us-ascii"
1331 MIME-Version: 1.0
1327 MIME-Version: 1.0
1332 Content-Transfer-Encoding: 7bit
1328 Content-Transfer-Encoding: 7bit
1333 Subject: [PATCH 1 of 2] a
1329 Subject: [PATCH 1 of 2] a
1334 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1330 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1335 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1331 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1336 In-Reply-To: <patchbomb.60@*> (glob)
1332 In-Reply-To: <patchbomb.60@*> (glob)
1337 References: <patchbomb.60@*> (glob)
1333 References: <patchbomb.60@*> (glob)
1338 User-Agent: Mercurial-patchbomb/* (glob)
1334 User-Agent: Mercurial-patchbomb/* (glob)
1339 Date: Thu, 01 Jan 1970 00:01:01 +0000
1335 Date: Thu, 01 Jan 1970 00:01:01 +0000
1340 From: quux
1336 From: quux
1341 To: foo
1337 To: foo
1342 Cc: bar
1338 Cc: bar
1343
1339
1344 # HG changeset patch
1340 # HG changeset patch
1345 # User test
1341 # User test
1346 # Date 1 0
1342 # Date 1 0
1347 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1343 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1348 # Parent 0000000000000000000000000000000000000000
1344 # Parent 0000000000000000000000000000000000000000
1349 a
1345 a
1350
1346
1351 diff -r 000000000000 -r 8580ff50825a a
1347 diff -r 000000000000 -r 8580ff50825a a
1352 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1348 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1353 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1349 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1354 @@ -0,0 +1,1 @@
1350 @@ -0,0 +1,1 @@
1355 +a
1351 +a
1356
1352
1357 Displaying [PATCH 2 of 2] b ...
1353 Displaying [PATCH 2 of 2] b ...
1358 Content-Type: text/plain; charset="us-ascii"
1354 Content-Type: text/plain; charset="us-ascii"
1359 MIME-Version: 1.0
1355 MIME-Version: 1.0
1360 Content-Transfer-Encoding: 7bit
1356 Content-Transfer-Encoding: 7bit
1361 Subject: [PATCH 2 of 2] b
1357 Subject: [PATCH 2 of 2] b
1362 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1358 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1363 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1359 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1364 In-Reply-To: <patchbomb.60@*> (glob)
1360 In-Reply-To: <patchbomb.60@*> (glob)
1365 References: <patchbomb.60@*> (glob)
1361 References: <patchbomb.60@*> (glob)
1366 User-Agent: Mercurial-patchbomb/* (glob)
1362 User-Agent: Mercurial-patchbomb/* (glob)
1367 Date: Thu, 01 Jan 1970 00:01:02 +0000
1363 Date: Thu, 01 Jan 1970 00:01:02 +0000
1368 From: quux
1364 From: quux
1369 To: foo
1365 To: foo
1370 Cc: bar
1366 Cc: bar
1371
1367
1372 # HG changeset patch
1368 # HG changeset patch
1373 # User test
1369 # User test
1374 # Date 2 0
1370 # Date 2 0
1375 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1371 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1376 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1372 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1377 b
1373 b
1378
1374
1379 diff -r 8580ff50825a -r 97d72e5f12c7 b
1375 diff -r 8580ff50825a -r 97d72e5f12c7 b
1380 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1376 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1381 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1377 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1382 @@ -0,0 +1,1 @@
1378 @@ -0,0 +1,1 @@
1383 +b
1379 +b
1384
1380
1385
1381
1386 test reply-to via config:
1382 test reply-to via config:
1387 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \
1383 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \
1388 > --config patchbomb.reply-to='baz@example.com'
1384 > --config patchbomb.reply-to='baz@example.com'
1389 This patch series consists of 1 patches.
1385 This patch series consists of 1 patches.
1390
1386
1391
1387
1392 Displaying [PATCH] test ...
1388 Displaying [PATCH] test ...
1393 Content-Type: text/plain; charset="us-ascii"
1389 Content-Type: text/plain; charset="us-ascii"
1394 MIME-Version: 1.0
1390 MIME-Version: 1.0
1395 Content-Transfer-Encoding: 7bit
1391 Content-Transfer-Encoding: 7bit
1396 Subject: [PATCH] test
1392 Subject: [PATCH] test
1397 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1393 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1398 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1394 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1399 User-Agent: Mercurial-patchbomb/* (glob)
1395 User-Agent: Mercurial-patchbomb/* (glob)
1400 Date: Thu, 01 Jan 1970 00:01:00 +0000
1396 Date: Thu, 01 Jan 1970 00:01:00 +0000
1401 From: quux
1397 From: quux
1402 To: foo
1398 To: foo
1403 Cc: bar
1399 Cc: bar
1404 Reply-To: baz@example.com
1400 Reply-To: baz@example.com
1405
1401
1406 # HG changeset patch
1402 # HG changeset patch
1407 # User test
1403 # User test
1408 # Date 3 0
1404 # Date 3 0
1409 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1405 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1410 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1406 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1411 c
1407 c
1412
1408
1413 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1409 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1414 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1410 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1415 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1411 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1416 @@ -0,0 +1,1 @@
1412 @@ -0,0 +1,1 @@
1417 +c
1413 +c
1418
1414
1419
1415
1420 test reply-to via command line:
1416 test reply-to via command line:
1421 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \
1417 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -r 2 \
1422 > --reply-to baz --reply-to fred
1418 > --reply-to baz --reply-to fred
1423 This patch series consists of 1 patches.
1419 This patch series consists of 1 patches.
1424
1420
1425
1421
1426 Displaying [PATCH] test ...
1422 Displaying [PATCH] test ...
1427 Content-Type: text/plain; charset="us-ascii"
1423 Content-Type: text/plain; charset="us-ascii"
1428 MIME-Version: 1.0
1424 MIME-Version: 1.0
1429 Content-Transfer-Encoding: 7bit
1425 Content-Transfer-Encoding: 7bit
1430 Subject: [PATCH] test
1426 Subject: [PATCH] test
1431 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1427 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1432 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1428 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1433 User-Agent: Mercurial-patchbomb/* (glob)
1429 User-Agent: Mercurial-patchbomb/* (glob)
1434 Date: Thu, 01 Jan 1970 00:01:00 +0000
1430 Date: Thu, 01 Jan 1970 00:01:00 +0000
1435 From: quux
1431 From: quux
1436 To: foo
1432 To: foo
1437 Cc: bar
1433 Cc: bar
1438 Reply-To: baz, fred
1434 Reply-To: baz, fred
1439
1435
1440 # HG changeset patch
1436 # HG changeset patch
1441 # User test
1437 # User test
1442 # Date 3 0
1438 # Date 3 0
1443 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1439 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1444 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1440 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1445 c
1441 c
1446
1442
1447 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1443 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1448 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1444 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1449 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1445 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1450 @@ -0,0 +1,1 @@
1446 @@ -0,0 +1,1 @@
1451 +c
1447 +c
1452
1448
1453
1449
1454 tagging csets:
1450 tagging csets:
1455 $ hg tag -r0 zero zero.foo
1451 $ hg tag -r0 zero zero.foo
1456 $ hg tag -r1 one one.patch
1452 $ hg tag -r1 one one.patch
1457 $ hg tag -r2 two two.diff
1453 $ hg tag -r2 two two.diff
1458
1454
1459 test inline for single named patch:
1455 test inline for single named patch:
1460 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
1456 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 2
1461 This patch series consists of 1 patches.
1457 This patch series consists of 1 patches.
1462
1458
1463
1459
1464 Displaying [PATCH] test ...
1460 Displaying [PATCH] test ...
1465 Content-Type: multipart/mixed; boundary="===*" (glob)
1461 Content-Type: multipart/mixed; boundary="===*" (glob)
1466 MIME-Version: 1.0
1462 MIME-Version: 1.0
1467 Subject: [PATCH] test
1463 Subject: [PATCH] test
1468 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1464 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1469 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1465 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1470 User-Agent: Mercurial-patchbomb/* (glob)
1466 User-Agent: Mercurial-patchbomb/* (glob)
1471 Date: Thu, 01 Jan 1970 00:01:00 +0000
1467 Date: Thu, 01 Jan 1970 00:01:00 +0000
1472 From: quux
1468 From: quux
1473 To: foo
1469 To: foo
1474 Cc: bar
1470 Cc: bar
1475
1471
1476 --===* (glob)
1472 --===* (glob)
1477 Content-Type: text/x-patch; charset="us-ascii"
1473 Content-Type: text/x-patch; charset="us-ascii"
1478 MIME-Version: 1.0
1474 MIME-Version: 1.0
1479 Content-Transfer-Encoding: 7bit
1475 Content-Transfer-Encoding: 7bit
1480 Content-Disposition: inline; filename=two.diff
1476 Content-Disposition: inline; filename=two.diff
1481
1477
1482 # HG changeset patch
1478 # HG changeset patch
1483 # User test
1479 # User test
1484 # Date 3 0
1480 # Date 3 0
1485 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1481 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1486 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1482 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1487 c
1483 c
1488
1484
1489 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1485 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1490 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1486 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1491 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1487 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1492 @@ -0,0 +1,1 @@
1488 @@ -0,0 +1,1 @@
1493 +c
1489 +c
1494
1490
1495 --===*-- (glob)
1491 --===*-- (glob)
1496
1492
1497 test inline for multiple named/unnamed patches:
1493 test inline for multiple named/unnamed patches:
1498 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1
1494 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -s test -i -r 0:1
1499 This patch series consists of 2 patches.
1495 This patch series consists of 2 patches.
1500
1496
1501
1497
1502 Write the introductory message for the patch series.
1498 Write the introductory message for the patch series.
1503
1499
1504
1500
1505 Displaying [PATCH 0 of 2] test ...
1501 Displaying [PATCH 0 of 2] test ...
1506 Content-Type: text/plain; charset="us-ascii"
1502 Content-Type: text/plain; charset="us-ascii"
1507 MIME-Version: 1.0
1503 MIME-Version: 1.0
1508 Content-Transfer-Encoding: 7bit
1504 Content-Transfer-Encoding: 7bit
1509 Subject: [PATCH 0 of 2] test
1505 Subject: [PATCH 0 of 2] test
1510 Message-Id: <patchbomb.60@*> (glob)
1506 Message-Id: <patchbomb.60@*> (glob)
1511 User-Agent: Mercurial-patchbomb/* (glob)
1507 User-Agent: Mercurial-patchbomb/* (glob)
1512 Date: Thu, 01 Jan 1970 00:01:00 +0000
1508 Date: Thu, 01 Jan 1970 00:01:00 +0000
1513 From: quux
1509 From: quux
1514 To: foo
1510 To: foo
1515 Cc: bar
1511 Cc: bar
1516
1512
1517
1513
1518 Displaying [PATCH 1 of 2] a ...
1514 Displaying [PATCH 1 of 2] a ...
1519 Content-Type: multipart/mixed; boundary="===*" (glob)
1515 Content-Type: multipart/mixed; boundary="===*" (glob)
1520 MIME-Version: 1.0
1516 MIME-Version: 1.0
1521 Subject: [PATCH 1 of 2] a
1517 Subject: [PATCH 1 of 2] a
1522 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1518 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1523 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1519 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1524 In-Reply-To: <patchbomb.60@*> (glob)
1520 In-Reply-To: <patchbomb.60@*> (glob)
1525 References: <patchbomb.60@*> (glob)
1521 References: <patchbomb.60@*> (glob)
1526 User-Agent: Mercurial-patchbomb/* (glob)
1522 User-Agent: Mercurial-patchbomb/* (glob)
1527 Date: Thu, 01 Jan 1970 00:01:01 +0000
1523 Date: Thu, 01 Jan 1970 00:01:01 +0000
1528 From: quux
1524 From: quux
1529 To: foo
1525 To: foo
1530 Cc: bar
1526 Cc: bar
1531
1527
1532 --===* (glob)
1528 --===* (glob)
1533 Content-Type: text/x-patch; charset="us-ascii"
1529 Content-Type: text/x-patch; charset="us-ascii"
1534 MIME-Version: 1.0
1530 MIME-Version: 1.0
1535 Content-Transfer-Encoding: 7bit
1531 Content-Transfer-Encoding: 7bit
1536 Content-Disposition: inline; filename=t2-1.patch
1532 Content-Disposition: inline; filename=t2-1.patch
1537
1533
1538 # HG changeset patch
1534 # HG changeset patch
1539 # User test
1535 # User test
1540 # Date 1 0
1536 # Date 1 0
1541 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1537 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1542 # Parent 0000000000000000000000000000000000000000
1538 # Parent 0000000000000000000000000000000000000000
1543 a
1539 a
1544
1540
1545 diff -r 000000000000 -r 8580ff50825a a
1541 diff -r 000000000000 -r 8580ff50825a a
1546 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1542 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1547 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1543 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1548 @@ -0,0 +1,1 @@
1544 @@ -0,0 +1,1 @@
1549 +a
1545 +a
1550
1546
1551 --===*-- (glob)
1547 --===*-- (glob)
1552 Displaying [PATCH 2 of 2] b ...
1548 Displaying [PATCH 2 of 2] b ...
1553 Content-Type: multipart/mixed; boundary="===*" (glob)
1549 Content-Type: multipart/mixed; boundary="===*" (glob)
1554 MIME-Version: 1.0
1550 MIME-Version: 1.0
1555 Subject: [PATCH 2 of 2] b
1551 Subject: [PATCH 2 of 2] b
1556 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1552 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1557 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1553 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1558 In-Reply-To: <patchbomb.60@*> (glob)
1554 In-Reply-To: <patchbomb.60@*> (glob)
1559 References: <patchbomb.60@*> (glob)
1555 References: <patchbomb.60@*> (glob)
1560 User-Agent: Mercurial-patchbomb/* (glob)
1556 User-Agent: Mercurial-patchbomb/* (glob)
1561 Date: Thu, 01 Jan 1970 00:01:02 +0000
1557 Date: Thu, 01 Jan 1970 00:01:02 +0000
1562 From: quux
1558 From: quux
1563 To: foo
1559 To: foo
1564 Cc: bar
1560 Cc: bar
1565
1561
1566 --===* (glob)
1562 --===* (glob)
1567 Content-Type: text/x-patch; charset="us-ascii"
1563 Content-Type: text/x-patch; charset="us-ascii"
1568 MIME-Version: 1.0
1564 MIME-Version: 1.0
1569 Content-Transfer-Encoding: 7bit
1565 Content-Transfer-Encoding: 7bit
1570 Content-Disposition: inline; filename=one.patch
1566 Content-Disposition: inline; filename=one.patch
1571
1567
1572 # HG changeset patch
1568 # HG changeset patch
1573 # User test
1569 # User test
1574 # Date 2 0
1570 # Date 2 0
1575 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1571 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1576 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1572 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1577 b
1573 b
1578
1574
1579 diff -r 8580ff50825a -r 97d72e5f12c7 b
1575 diff -r 8580ff50825a -r 97d72e5f12c7 b
1580 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1576 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1581 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1577 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1582 @@ -0,0 +1,1 @@
1578 @@ -0,0 +1,1 @@
1583 +b
1579 +b
1584
1580
1585 --===*-- (glob)
1581 --===*-- (glob)
1586
1582
1587
1583
1588 test inreplyto:
1584 test inreplyto:
1589 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1585 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1590 > -r tip
1586 > -r tip
1591 This patch series consists of 1 patches.
1587 This patch series consists of 1 patches.
1592
1588
1593
1589
1594 Displaying [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b ...
1590 Displaying [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b ...
1595 Content-Type: text/plain; charset="us-ascii"
1591 Content-Type: text/plain; charset="us-ascii"
1596 MIME-Version: 1.0
1592 MIME-Version: 1.0
1597 Content-Transfer-Encoding: 7bit
1593 Content-Transfer-Encoding: 7bit
1598 Subject: [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b
1594 Subject: [PATCH] Added tag two, two.diff for changeset ff2c9fa2018b
1599 X-Mercurial-Node: 7aead2484924c445ad8ce2613df91f52f9e502ed
1595 X-Mercurial-Node: 7aead2484924c445ad8ce2613df91f52f9e502ed
1600 Message-Id: <7aead2484924c445ad8c.60@*> (glob)
1596 Message-Id: <7aead2484924c445ad8c.60@*> (glob)
1601 In-Reply-To: <baz>
1597 In-Reply-To: <baz>
1602 References: <baz>
1598 References: <baz>
1603 User-Agent: Mercurial-patchbomb/* (glob)
1599 User-Agent: Mercurial-patchbomb/* (glob)
1604 Date: Thu, 01 Jan 1970 00:01:00 +0000
1600 Date: Thu, 01 Jan 1970 00:01:00 +0000
1605 From: quux
1601 From: quux
1606 To: foo
1602 To: foo
1607 Cc: bar
1603 Cc: bar
1608
1604
1609 # HG changeset patch
1605 # HG changeset patch
1610 # User test
1606 # User test
1611 # Date 0 0
1607 # Date 0 0
1612 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed
1608 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed
1613 # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e
1609 # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e
1614 Added tag two, two.diff for changeset ff2c9fa2018b
1610 Added tag two, two.diff for changeset ff2c9fa2018b
1615
1611
1616 diff -r 045ca29b1ea2 -r 7aead2484924 .hgtags
1612 diff -r 045ca29b1ea2 -r 7aead2484924 .hgtags
1617 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
1613 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
1618 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
1614 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
1619 @@ -2,3 +2,5 @@
1615 @@ -2,3 +2,5 @@
1620 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
1616 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
1621 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
1617 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
1622 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
1618 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
1623 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
1619 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
1624 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
1620 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
1625
1621
1626 no intro message in non-interactive mode
1622 no intro message in non-interactive mode
1627 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1623 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1628 > -r 0:1
1624 > -r 0:1
1629 This patch series consists of 2 patches.
1625 This patch series consists of 2 patches.
1630
1626
1631 (optional) Subject: [PATCH 0 of 2]
1627 (optional) Subject: [PATCH 0 of 2]
1632
1628
1633 Displaying [PATCH 1 of 2] a ...
1629 Displaying [PATCH 1 of 2] a ...
1634 Content-Type: text/plain; charset="us-ascii"
1630 Content-Type: text/plain; charset="us-ascii"
1635 MIME-Version: 1.0
1631 MIME-Version: 1.0
1636 Content-Transfer-Encoding: 7bit
1632 Content-Transfer-Encoding: 7bit
1637 Subject: [PATCH 1 of 2] a
1633 Subject: [PATCH 1 of 2] a
1638 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1634 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1639 Message-Id: <8580ff50825a50c8f716.60@*> (glob)
1635 Message-Id: <8580ff50825a50c8f716.60@*> (glob)
1640 In-Reply-To: <baz>
1636 In-Reply-To: <baz>
1641 References: <baz>
1637 References: <baz>
1642 User-Agent: Mercurial-patchbomb/* (glob)
1638 User-Agent: Mercurial-patchbomb/* (glob)
1643 Date: Thu, 01 Jan 1970 00:01:00 +0000
1639 Date: Thu, 01 Jan 1970 00:01:00 +0000
1644 From: quux
1640 From: quux
1645 To: foo
1641 To: foo
1646 Cc: bar
1642 Cc: bar
1647
1643
1648 # HG changeset patch
1644 # HG changeset patch
1649 # User test
1645 # User test
1650 # Date 1 0
1646 # Date 1 0
1651 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1647 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1652 # Parent 0000000000000000000000000000000000000000
1648 # Parent 0000000000000000000000000000000000000000
1653 a
1649 a
1654
1650
1655 diff -r 000000000000 -r 8580ff50825a a
1651 diff -r 000000000000 -r 8580ff50825a a
1656 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1652 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1657 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1653 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1658 @@ -0,0 +1,1 @@
1654 @@ -0,0 +1,1 @@
1659 +a
1655 +a
1660
1656
1661 Displaying [PATCH 2 of 2] b ...
1657 Displaying [PATCH 2 of 2] b ...
1662 Content-Type: text/plain; charset="us-ascii"
1658 Content-Type: text/plain; charset="us-ascii"
1663 MIME-Version: 1.0
1659 MIME-Version: 1.0
1664 Content-Transfer-Encoding: 7bit
1660 Content-Transfer-Encoding: 7bit
1665 Subject: [PATCH 2 of 2] b
1661 Subject: [PATCH 2 of 2] b
1666 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1662 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1667 Message-Id: <97d72e5f12c7e84f8506.61@*> (glob)
1663 Message-Id: <97d72e5f12c7e84f8506.61@*> (glob)
1668 In-Reply-To: <8580ff50825a50c8f716.60@*> (glob)
1664 In-Reply-To: <8580ff50825a50c8f716.60@*> (glob)
1669 References: <8580ff50825a50c8f716.60@*> (glob)
1665 References: <8580ff50825a50c8f716.60@*> (glob)
1670 User-Agent: Mercurial-patchbomb/* (glob)
1666 User-Agent: Mercurial-patchbomb/* (glob)
1671 Date: Thu, 01 Jan 1970 00:01:01 +0000
1667 Date: Thu, 01 Jan 1970 00:01:01 +0000
1672 From: quux
1668 From: quux
1673 To: foo
1669 To: foo
1674 Cc: bar
1670 Cc: bar
1675
1671
1676 # HG changeset patch
1672 # HG changeset patch
1677 # User test
1673 # User test
1678 # Date 2 0
1674 # Date 2 0
1679 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1675 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1680 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1676 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1681 b
1677 b
1682
1678
1683 diff -r 8580ff50825a -r 97d72e5f12c7 b
1679 diff -r 8580ff50825a -r 97d72e5f12c7 b
1684 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1680 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1685 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1681 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1686 @@ -0,0 +1,1 @@
1682 @@ -0,0 +1,1 @@
1687 +b
1683 +b
1688
1684
1689
1685
1690
1686
1691
1687
1692 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1688 $ hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar --in-reply-to baz \
1693 > -s test -r 0:1
1689 > -s test -r 0:1
1694 This patch series consists of 2 patches.
1690 This patch series consists of 2 patches.
1695
1691
1696
1692
1697 Write the introductory message for the patch series.
1693 Write the introductory message for the patch series.
1698
1694
1699
1695
1700 Displaying [PATCH 0 of 2] test ...
1696 Displaying [PATCH 0 of 2] test ...
1701 Content-Type: text/plain; charset="us-ascii"
1697 Content-Type: text/plain; charset="us-ascii"
1702 MIME-Version: 1.0
1698 MIME-Version: 1.0
1703 Content-Transfer-Encoding: 7bit
1699 Content-Transfer-Encoding: 7bit
1704 Subject: [PATCH 0 of 2] test
1700 Subject: [PATCH 0 of 2] test
1705 Message-Id: <patchbomb.60@*> (glob)
1701 Message-Id: <patchbomb.60@*> (glob)
1706 In-Reply-To: <baz>
1702 In-Reply-To: <baz>
1707 References: <baz>
1703 References: <baz>
1708 User-Agent: Mercurial-patchbomb/* (glob)
1704 User-Agent: Mercurial-patchbomb/* (glob)
1709 Date: Thu, 01 Jan 1970 00:01:00 +0000
1705 Date: Thu, 01 Jan 1970 00:01:00 +0000
1710 From: quux
1706 From: quux
1711 To: foo
1707 To: foo
1712 Cc: bar
1708 Cc: bar
1713
1709
1714
1710
1715 Displaying [PATCH 1 of 2] a ...
1711 Displaying [PATCH 1 of 2] a ...
1716 Content-Type: text/plain; charset="us-ascii"
1712 Content-Type: text/plain; charset="us-ascii"
1717 MIME-Version: 1.0
1713 MIME-Version: 1.0
1718 Content-Transfer-Encoding: 7bit
1714 Content-Transfer-Encoding: 7bit
1719 Subject: [PATCH 1 of 2] a
1715 Subject: [PATCH 1 of 2] a
1720 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1716 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1721 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1717 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1722 In-Reply-To: <patchbomb.60@*> (glob)
1718 In-Reply-To: <patchbomb.60@*> (glob)
1723 References: <patchbomb.60@*> (glob)
1719 References: <patchbomb.60@*> (glob)
1724 User-Agent: Mercurial-patchbomb/* (glob)
1720 User-Agent: Mercurial-patchbomb/* (glob)
1725 Date: Thu, 01 Jan 1970 00:01:01 +0000
1721 Date: Thu, 01 Jan 1970 00:01:01 +0000
1726 From: quux
1722 From: quux
1727 To: foo
1723 To: foo
1728 Cc: bar
1724 Cc: bar
1729
1725
1730 # HG changeset patch
1726 # HG changeset patch
1731 # User test
1727 # User test
1732 # Date 1 0
1728 # Date 1 0
1733 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1729 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1734 # Parent 0000000000000000000000000000000000000000
1730 # Parent 0000000000000000000000000000000000000000
1735 a
1731 a
1736
1732
1737 diff -r 000000000000 -r 8580ff50825a a
1733 diff -r 000000000000 -r 8580ff50825a a
1738 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1734 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1739 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1735 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1740 @@ -0,0 +1,1 @@
1736 @@ -0,0 +1,1 @@
1741 +a
1737 +a
1742
1738
1743 Displaying [PATCH 2 of 2] b ...
1739 Displaying [PATCH 2 of 2] b ...
1744 Content-Type: text/plain; charset="us-ascii"
1740 Content-Type: text/plain; charset="us-ascii"
1745 MIME-Version: 1.0
1741 MIME-Version: 1.0
1746 Content-Transfer-Encoding: 7bit
1742 Content-Transfer-Encoding: 7bit
1747 Subject: [PATCH 2 of 2] b
1743 Subject: [PATCH 2 of 2] b
1748 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1744 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1749 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1745 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1750 In-Reply-To: <patchbomb.60@*> (glob)
1746 In-Reply-To: <patchbomb.60@*> (glob)
1751 References: <patchbomb.60@*> (glob)
1747 References: <patchbomb.60@*> (glob)
1752 User-Agent: Mercurial-patchbomb/* (glob)
1748 User-Agent: Mercurial-patchbomb/* (glob)
1753 Date: Thu, 01 Jan 1970 00:01:02 +0000
1749 Date: Thu, 01 Jan 1970 00:01:02 +0000
1754 From: quux
1750 From: quux
1755 To: foo
1751 To: foo
1756 Cc: bar
1752 Cc: bar
1757
1753
1758 # HG changeset patch
1754 # HG changeset patch
1759 # User test
1755 # User test
1760 # Date 2 0
1756 # Date 2 0
1761 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1757 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1762 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1758 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1763 b
1759 b
1764
1760
1765 diff -r 8580ff50825a -r 97d72e5f12c7 b
1761 diff -r 8580ff50825a -r 97d72e5f12c7 b
1766 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1762 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1767 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1763 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1768 @@ -0,0 +1,1 @@
1764 @@ -0,0 +1,1 @@
1769 +b
1765 +b
1770
1766
1771
1767
1772 test single flag for single patch:
1768 test single flag for single patch:
1773 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1769 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1774 > -r 2
1770 > -r 2
1775 This patch series consists of 1 patches.
1771 This patch series consists of 1 patches.
1776
1772
1777
1773
1778 Displaying [PATCH fooFlag] test ...
1774 Displaying [PATCH fooFlag] test ...
1779 Content-Type: text/plain; charset="us-ascii"
1775 Content-Type: text/plain; charset="us-ascii"
1780 MIME-Version: 1.0
1776 MIME-Version: 1.0
1781 Content-Transfer-Encoding: 7bit
1777 Content-Transfer-Encoding: 7bit
1782 Subject: [PATCH fooFlag] test
1778 Subject: [PATCH fooFlag] test
1783 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1779 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1784 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1780 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1785 User-Agent: Mercurial-patchbomb/* (glob)
1781 User-Agent: Mercurial-patchbomb/* (glob)
1786 Date: Thu, 01 Jan 1970 00:01:00 +0000
1782 Date: Thu, 01 Jan 1970 00:01:00 +0000
1787 From: quux
1783 From: quux
1788 To: foo
1784 To: foo
1789 Cc: bar
1785 Cc: bar
1790
1786
1791 # HG changeset patch
1787 # HG changeset patch
1792 # User test
1788 # User test
1793 # Date 3 0
1789 # Date 3 0
1794 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1790 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1795 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1791 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1796 c
1792 c
1797
1793
1798 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1794 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1799 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1795 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1800 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1796 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1801 @@ -0,0 +1,1 @@
1797 @@ -0,0 +1,1 @@
1802 +c
1798 +c
1803
1799
1804
1800
1805 test single flag for multiple patches:
1801 test single flag for multiple patches:
1806 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1802 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1807 > -r 0:1
1803 > -r 0:1
1808 This patch series consists of 2 patches.
1804 This patch series consists of 2 patches.
1809
1805
1810
1806
1811 Write the introductory message for the patch series.
1807 Write the introductory message for the patch series.
1812
1808
1813
1809
1814 Displaying [PATCH 0 of 2 fooFlag] test ...
1810 Displaying [PATCH 0 of 2 fooFlag] test ...
1815 Content-Type: text/plain; charset="us-ascii"
1811 Content-Type: text/plain; charset="us-ascii"
1816 MIME-Version: 1.0
1812 MIME-Version: 1.0
1817 Content-Transfer-Encoding: 7bit
1813 Content-Transfer-Encoding: 7bit
1818 Subject: [PATCH 0 of 2 fooFlag] test
1814 Subject: [PATCH 0 of 2 fooFlag] test
1819 Message-Id: <patchbomb.60@*> (glob)
1815 Message-Id: <patchbomb.60@*> (glob)
1820 User-Agent: Mercurial-patchbomb/* (glob)
1816 User-Agent: Mercurial-patchbomb/* (glob)
1821 Date: Thu, 01 Jan 1970 00:01:00 +0000
1817 Date: Thu, 01 Jan 1970 00:01:00 +0000
1822 From: quux
1818 From: quux
1823 To: foo
1819 To: foo
1824 Cc: bar
1820 Cc: bar
1825
1821
1826
1822
1827 Displaying [PATCH 1 of 2 fooFlag] a ...
1823 Displaying [PATCH 1 of 2 fooFlag] a ...
1828 Content-Type: text/plain; charset="us-ascii"
1824 Content-Type: text/plain; charset="us-ascii"
1829 MIME-Version: 1.0
1825 MIME-Version: 1.0
1830 Content-Transfer-Encoding: 7bit
1826 Content-Transfer-Encoding: 7bit
1831 Subject: [PATCH 1 of 2 fooFlag] a
1827 Subject: [PATCH 1 of 2 fooFlag] a
1832 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1828 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1833 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1829 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1834 In-Reply-To: <patchbomb.60@*> (glob)
1830 In-Reply-To: <patchbomb.60@*> (glob)
1835 References: <patchbomb.60@*> (glob)
1831 References: <patchbomb.60@*> (glob)
1836 User-Agent: Mercurial-patchbomb/* (glob)
1832 User-Agent: Mercurial-patchbomb/* (glob)
1837 Date: Thu, 01 Jan 1970 00:01:01 +0000
1833 Date: Thu, 01 Jan 1970 00:01:01 +0000
1838 From: quux
1834 From: quux
1839 To: foo
1835 To: foo
1840 Cc: bar
1836 Cc: bar
1841
1837
1842 # HG changeset patch
1838 # HG changeset patch
1843 # User test
1839 # User test
1844 # Date 1 0
1840 # Date 1 0
1845 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1841 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1846 # Parent 0000000000000000000000000000000000000000
1842 # Parent 0000000000000000000000000000000000000000
1847 a
1843 a
1848
1844
1849 diff -r 000000000000 -r 8580ff50825a a
1845 diff -r 000000000000 -r 8580ff50825a a
1850 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1846 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1851 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1847 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1852 @@ -0,0 +1,1 @@
1848 @@ -0,0 +1,1 @@
1853 +a
1849 +a
1854
1850
1855 Displaying [PATCH 2 of 2 fooFlag] b ...
1851 Displaying [PATCH 2 of 2 fooFlag] b ...
1856 Content-Type: text/plain; charset="us-ascii"
1852 Content-Type: text/plain; charset="us-ascii"
1857 MIME-Version: 1.0
1853 MIME-Version: 1.0
1858 Content-Transfer-Encoding: 7bit
1854 Content-Transfer-Encoding: 7bit
1859 Subject: [PATCH 2 of 2 fooFlag] b
1855 Subject: [PATCH 2 of 2 fooFlag] b
1860 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1856 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1861 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1857 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1862 In-Reply-To: <patchbomb.60@*> (glob)
1858 In-Reply-To: <patchbomb.60@*> (glob)
1863 References: <patchbomb.60@*> (glob)
1859 References: <patchbomb.60@*> (glob)
1864 User-Agent: Mercurial-patchbomb/* (glob)
1860 User-Agent: Mercurial-patchbomb/* (glob)
1865 Date: Thu, 01 Jan 1970 00:01:02 +0000
1861 Date: Thu, 01 Jan 1970 00:01:02 +0000
1866 From: quux
1862 From: quux
1867 To: foo
1863 To: foo
1868 Cc: bar
1864 Cc: bar
1869
1865
1870 # HG changeset patch
1866 # HG changeset patch
1871 # User test
1867 # User test
1872 # Date 2 0
1868 # Date 2 0
1873 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1869 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1874 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1870 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1875 b
1871 b
1876
1872
1877 diff -r 8580ff50825a -r 97d72e5f12c7 b
1873 diff -r 8580ff50825a -r 97d72e5f12c7 b
1878 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1874 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1879 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1875 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1880 @@ -0,0 +1,1 @@
1876 @@ -0,0 +1,1 @@
1881 +b
1877 +b
1882
1878
1883
1879
1884 test mutiple flags for single patch:
1880 test mutiple flags for single patch:
1885 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
1881 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
1886 > -c bar -s test -r 2
1882 > -c bar -s test -r 2
1887 This patch series consists of 1 patches.
1883 This patch series consists of 1 patches.
1888
1884
1889
1885
1890 Displaying [PATCH fooFlag barFlag] test ...
1886 Displaying [PATCH fooFlag barFlag] test ...
1891 Content-Type: text/plain; charset="us-ascii"
1887 Content-Type: text/plain; charset="us-ascii"
1892 MIME-Version: 1.0
1888 MIME-Version: 1.0
1893 Content-Transfer-Encoding: 7bit
1889 Content-Transfer-Encoding: 7bit
1894 Subject: [PATCH fooFlag barFlag] test
1890 Subject: [PATCH fooFlag barFlag] test
1895 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1891 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1896 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1892 Message-Id: <ff2c9fa2018b15fa74b3.60@*> (glob)
1897 User-Agent: Mercurial-patchbomb/* (glob)
1893 User-Agent: Mercurial-patchbomb/* (glob)
1898 Date: Thu, 01 Jan 1970 00:01:00 +0000
1894 Date: Thu, 01 Jan 1970 00:01:00 +0000
1899 From: quux
1895 From: quux
1900 To: foo
1896 To: foo
1901 Cc: bar
1897 Cc: bar
1902
1898
1903 # HG changeset patch
1899 # HG changeset patch
1904 # User test
1900 # User test
1905 # Date 3 0
1901 # Date 3 0
1906 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1902 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1907 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1903 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1908 c
1904 c
1909
1905
1910 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1906 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1911 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1907 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1912 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1908 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1913 @@ -0,0 +1,1 @@
1909 @@ -0,0 +1,1 @@
1914 +c
1910 +c
1915
1911
1916
1912
1917 test multiple flags for multiple patches:
1913 test multiple flags for multiple patches:
1918 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
1914 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
1919 > -c bar -s test -r 0:1
1915 > -c bar -s test -r 0:1
1920 This patch series consists of 2 patches.
1916 This patch series consists of 2 patches.
1921
1917
1922
1918
1923 Write the introductory message for the patch series.
1919 Write the introductory message for the patch series.
1924
1920
1925
1921
1926 Displaying [PATCH 0 of 2 fooFlag barFlag] test ...
1922 Displaying [PATCH 0 of 2 fooFlag barFlag] test ...
1927 Content-Type: text/plain; charset="us-ascii"
1923 Content-Type: text/plain; charset="us-ascii"
1928 MIME-Version: 1.0
1924 MIME-Version: 1.0
1929 Content-Transfer-Encoding: 7bit
1925 Content-Transfer-Encoding: 7bit
1930 Subject: [PATCH 0 of 2 fooFlag barFlag] test
1926 Subject: [PATCH 0 of 2 fooFlag barFlag] test
1931 Message-Id: <patchbomb.60@*> (glob)
1927 Message-Id: <patchbomb.60@*> (glob)
1932 User-Agent: Mercurial-patchbomb/* (glob)
1928 User-Agent: Mercurial-patchbomb/* (glob)
1933 Date: Thu, 01 Jan 1970 00:01:00 +0000
1929 Date: Thu, 01 Jan 1970 00:01:00 +0000
1934 From: quux
1930 From: quux
1935 To: foo
1931 To: foo
1936 Cc: bar
1932 Cc: bar
1937
1933
1938
1934
1939 Displaying [PATCH 1 of 2 fooFlag barFlag] a ...
1935 Displaying [PATCH 1 of 2 fooFlag barFlag] a ...
1940 Content-Type: text/plain; charset="us-ascii"
1936 Content-Type: text/plain; charset="us-ascii"
1941 MIME-Version: 1.0
1937 MIME-Version: 1.0
1942 Content-Transfer-Encoding: 7bit
1938 Content-Transfer-Encoding: 7bit
1943 Subject: [PATCH 1 of 2 fooFlag barFlag] a
1939 Subject: [PATCH 1 of 2 fooFlag barFlag] a
1944 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1940 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
1945 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1941 Message-Id: <8580ff50825a50c8f716.61@*> (glob)
1946 In-Reply-To: <patchbomb.60@*> (glob)
1942 In-Reply-To: <patchbomb.60@*> (glob)
1947 References: <patchbomb.60@*> (glob)
1943 References: <patchbomb.60@*> (glob)
1948 User-Agent: Mercurial-patchbomb/* (glob)
1944 User-Agent: Mercurial-patchbomb/* (glob)
1949 Date: Thu, 01 Jan 1970 00:01:01 +0000
1945 Date: Thu, 01 Jan 1970 00:01:01 +0000
1950 From: quux
1946 From: quux
1951 To: foo
1947 To: foo
1952 Cc: bar
1948 Cc: bar
1953
1949
1954 # HG changeset patch
1950 # HG changeset patch
1955 # User test
1951 # User test
1956 # Date 1 0
1952 # Date 1 0
1957 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1953 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
1958 # Parent 0000000000000000000000000000000000000000
1954 # Parent 0000000000000000000000000000000000000000
1959 a
1955 a
1960
1956
1961 diff -r 000000000000 -r 8580ff50825a a
1957 diff -r 000000000000 -r 8580ff50825a a
1962 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1958 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1963 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1959 +++ b/a Thu Jan 01 00:00:01 1970 +0000
1964 @@ -0,0 +1,1 @@
1960 @@ -0,0 +1,1 @@
1965 +a
1961 +a
1966
1962
1967 Displaying [PATCH 2 of 2 fooFlag barFlag] b ...
1963 Displaying [PATCH 2 of 2 fooFlag barFlag] b ...
1968 Content-Type: text/plain; charset="us-ascii"
1964 Content-Type: text/plain; charset="us-ascii"
1969 MIME-Version: 1.0
1965 MIME-Version: 1.0
1970 Content-Transfer-Encoding: 7bit
1966 Content-Transfer-Encoding: 7bit
1971 Subject: [PATCH 2 of 2 fooFlag barFlag] b
1967 Subject: [PATCH 2 of 2 fooFlag barFlag] b
1972 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1968 X-Mercurial-Node: 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1973 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1969 Message-Id: <97d72e5f12c7e84f8506.62@*> (glob)
1974 In-Reply-To: <patchbomb.60@*> (glob)
1970 In-Reply-To: <patchbomb.60@*> (glob)
1975 References: <patchbomb.60@*> (glob)
1971 References: <patchbomb.60@*> (glob)
1976 User-Agent: Mercurial-patchbomb/* (glob)
1972 User-Agent: Mercurial-patchbomb/* (glob)
1977 Date: Thu, 01 Jan 1970 00:01:02 +0000
1973 Date: Thu, 01 Jan 1970 00:01:02 +0000
1978 From: quux
1974 From: quux
1979 To: foo
1975 To: foo
1980 Cc: bar
1976 Cc: bar
1981
1977
1982 # HG changeset patch
1978 # HG changeset patch
1983 # User test
1979 # User test
1984 # Date 2 0
1980 # Date 2 0
1985 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1981 # Node ID 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1986 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1982 # Parent 8580ff50825a50c8f716709acdf8de0deddcd6ab
1987 b
1983 b
1988
1984
1989 diff -r 8580ff50825a -r 97d72e5f12c7 b
1985 diff -r 8580ff50825a -r 97d72e5f12c7 b
1990 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1986 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1991 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1987 +++ b/b Thu Jan 01 00:00:02 1970 +0000
1992 @@ -0,0 +1,1 @@
1988 @@ -0,0 +1,1 @@
1993 +b
1989 +b
1994
1990
1995
1991
1996 test multi-address parsing:
1992 test multi-address parsing:
1997 $ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t 'spam<spam><eggs>' \
1993 $ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t 'spam<spam><eggs>' \
1998 > -t toast -c 'foo,bar@example.com' -c '"A, B <>" <a@example.com>' -s test -r 0 \
1994 > -t toast -c 'foo,bar@example.com' -c '"A, B <>" <a@example.com>' -s test -r 0 \
1999 > --config email.bcc='"Quux, A." <quux>'
1995 > --config email.bcc='"Quux, A." <quux>'
2000 This patch series consists of 1 patches.
1996 This patch series consists of 1 patches.
2001
1997
2002
1998
2003 Sending [PATCH] test ...
1999 Sending [PATCH] test ...
2004 $ cat < tmp.mbox
2000 $ cat < tmp.mbox
2005 From quux ... ... .. ..:..:.. .... (re)
2001 From quux ... ... .. ..:..:.. .... (re)
2006 Content-Type: text/plain; charset="us-ascii"
2002 Content-Type: text/plain; charset="us-ascii"
2007 MIME-Version: 1.0
2003 MIME-Version: 1.0
2008 Content-Transfer-Encoding: 7bit
2004 Content-Transfer-Encoding: 7bit
2009 Subject: [PATCH] test
2005 Subject: [PATCH] test
2010 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
2006 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
2011 Message-Id: <8580ff50825a50c8f716.315532860@*> (glob)
2007 Message-Id: <8580ff50825a50c8f716.315532860@*> (glob)
2012 User-Agent: Mercurial-patchbomb/* (glob)
2008 User-Agent: Mercurial-patchbomb/* (glob)
2013 Date: Tue, 01 Jan 1980 00:01:00 +0000
2009 Date: Tue, 01 Jan 1980 00:01:00 +0000
2014 From: quux
2010 From: quux
2015 To: spam <spam>, eggs, toast
2011 To: spam <spam>, eggs, toast
2016 Cc: foo, bar@example.com, "A, B <>" <a@example.com>
2012 Cc: foo, bar@example.com, "A, B <>" <a@example.com>
2017 Bcc: "Quux, A." <quux>
2013 Bcc: "Quux, A." <quux>
2018
2014
2019 # HG changeset patch
2015 # HG changeset patch
2020 # User test
2016 # User test
2021 # Date 1 0
2017 # Date 1 0
2022 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2018 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2023 # Parent 0000000000000000000000000000000000000000
2019 # Parent 0000000000000000000000000000000000000000
2024 a
2020 a
2025
2021
2026 diff -r 000000000000 -r 8580ff50825a a
2022 diff -r 000000000000 -r 8580ff50825a a
2027 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2023 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2028 +++ b/a Thu Jan 01 00:00:01 1970 +0000
2024 +++ b/a Thu Jan 01 00:00:01 1970 +0000
2029 @@ -0,0 +1,1 @@
2025 @@ -0,0 +1,1 @@
2030 +a
2026 +a
2031
2027
2032
2028
2033
2029
2034 test multi-byte domain parsing:
2030 test multi-byte domain parsing:
2035 $ UUML=`python -c 'import sys; sys.stdout.write("\374")'`
2031 $ UUML=`python -c 'import sys; sys.stdout.write("\374")'`
2036 $ HGENCODING=iso-8859-1
2032 $ HGENCODING=iso-8859-1
2037 $ export HGENCODING
2033 $ export HGENCODING
2038 $ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" -s test -r 0
2034 $ hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" -s test -r 0
2039 This patch series consists of 1 patches.
2035 This patch series consists of 1 patches.
2040
2036
2041 Cc:
2037 Cc:
2042
2038
2043 Sending [PATCH] test ...
2039 Sending [PATCH] test ...
2044
2040
2045 $ cat tmp.mbox
2041 $ cat tmp.mbox
2046 From quux ... ... .. ..:..:.. .... (re)
2042 From quux ... ... .. ..:..:.. .... (re)
2047 Content-Type: text/plain; charset="us-ascii"
2043 Content-Type: text/plain; charset="us-ascii"
2048 MIME-Version: 1.0
2044 MIME-Version: 1.0
2049 Content-Transfer-Encoding: 7bit
2045 Content-Transfer-Encoding: 7bit
2050 Subject: [PATCH] test
2046 Subject: [PATCH] test
2051 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
2047 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
2052 Message-Id: <8580ff50825a50c8f716.315532860@*> (glob)
2048 Message-Id: <8580ff50825a50c8f716.315532860@*> (glob)
2053 User-Agent: Mercurial-patchbomb/* (glob)
2049 User-Agent: Mercurial-patchbomb/* (glob)
2054 Date: Tue, 01 Jan 1980 00:01:00 +0000
2050 Date: Tue, 01 Jan 1980 00:01:00 +0000
2055 From: quux
2051 From: quux
2056 To: bar@xn--nicode-2ya.com
2052 To: bar@xn--nicode-2ya.com
2057
2053
2058 # HG changeset patch
2054 # HG changeset patch
2059 # User test
2055 # User test
2060 # Date 1 0
2056 # Date 1 0
2061 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2057 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
2062 # Parent 0000000000000000000000000000000000000000
2058 # Parent 0000000000000000000000000000000000000000
2063 a
2059 a
2064
2060
2065 diff -r 000000000000 -r 8580ff50825a a
2061 diff -r 000000000000 -r 8580ff50825a a
2066 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2062 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2067 +++ b/a Thu Jan 01 00:00:01 1970 +0000
2063 +++ b/a Thu Jan 01 00:00:01 1970 +0000
2068 @@ -0,0 +1,1 @@
2064 @@ -0,0 +1,1 @@
2069 +a
2065 +a
2070
2066
2071
2067
2072
2068
2073 test outgoing:
2069 test outgoing:
2074 $ hg up 1
2070 $ hg up 1
2075 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
2071 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
2076
2072
2077 $ hg branch test
2073 $ hg branch test
2078 marked working directory as branch test
2074 marked working directory as branch test
2079 (branches are permanent and global, did you want a bookmark?)
2075 (branches are permanent and global, did you want a bookmark?)
2080
2076
2081 $ echo d > d
2077 $ echo d > d
2082 $ hg add d
2078 $ hg add d
2083 $ hg ci -md -d '4 0'
2079 $ hg ci -md -d '4 0'
2084 $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t
2080 $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t
2085 comparing with ../t
2081 comparing with ../t
2086 searching for changes
2082 searching for changes
2087 From [test]: test
2083 From [test]: test
2088 This patch series consists of 8 patches.
2084 This patch series consists of 8 patches.
2089
2085
2090
2086
2091 Write the introductory message for the patch series.
2087 Write the introductory message for the patch series.
2092
2088
2093 Cc:
2089 Cc:
2094
2090
2095 Displaying [PATCH 0 of 8] test ...
2091 Displaying [PATCH 0 of 8] test ...
2096 Content-Type: text/plain; charset="us-ascii"
2092 Content-Type: text/plain; charset="us-ascii"
2097 MIME-Version: 1.0
2093 MIME-Version: 1.0
2098 Content-Transfer-Encoding: 7bit
2094 Content-Transfer-Encoding: 7bit
2099 Subject: [PATCH 0 of 8] test
2095 Subject: [PATCH 0 of 8] test
2100 Message-Id: <patchbomb.315532860@*> (glob)
2096 Message-Id: <patchbomb.315532860@*> (glob)
2101 User-Agent: Mercurial-patchbomb/* (glob)
2097 User-Agent: Mercurial-patchbomb/* (glob)
2102 Date: Tue, 01 Jan 1980 00:01:00 +0000
2098 Date: Tue, 01 Jan 1980 00:01:00 +0000
2103 From: test
2099 From: test
2104 To: foo
2100 To: foo
2105
2101
2106
2102
2107 Displaying [PATCH 1 of 8] c ...
2103 Displaying [PATCH 1 of 8] c ...
2108 Content-Type: text/plain; charset="us-ascii"
2104 Content-Type: text/plain; charset="us-ascii"
2109 MIME-Version: 1.0
2105 MIME-Version: 1.0
2110 Content-Transfer-Encoding: 7bit
2106 Content-Transfer-Encoding: 7bit
2111 Subject: [PATCH 1 of 8] c
2107 Subject: [PATCH 1 of 8] c
2112 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
2108 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
2113 Message-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob)
2109 Message-Id: <ff2c9fa2018b15fa74b3.315532861@*> (glob)
2114 In-Reply-To: <patchbomb.315532860@*> (glob)
2110 In-Reply-To: <patchbomb.315532860@*> (glob)
2115 References: <patchbomb.315532860@*> (glob)
2111 References: <patchbomb.315532860@*> (glob)
2116 User-Agent: Mercurial-patchbomb/* (glob)
2112 User-Agent: Mercurial-patchbomb/* (glob)
2117 Date: Tue, 01 Jan 1980 00:01:01 +0000
2113 Date: Tue, 01 Jan 1980 00:01:01 +0000
2118 From: test
2114 From: test
2119 To: foo
2115 To: foo
2120
2116
2121 # HG changeset patch
2117 # HG changeset patch
2122 # User test
2118 # User test
2123 # Date 3 0
2119 # Date 3 0
2124 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
2120 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
2125 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2121 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2126 c
2122 c
2127
2123
2128 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
2124 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
2129 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2125 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2130 +++ b/c Thu Jan 01 00:00:03 1970 +0000
2126 +++ b/c Thu Jan 01 00:00:03 1970 +0000
2131 @@ -0,0 +1,1 @@
2127 @@ -0,0 +1,1 @@
2132 +c
2128 +c
2133
2129
2134 Displaying [PATCH 2 of 8] utf-8 content ...
2130 Displaying [PATCH 2 of 8] utf-8 content ...
2135 Content-Type: text/plain; charset="us-ascii"
2131 Content-Type: text/plain; charset="us-ascii"
2136 MIME-Version: 1.0
2132 MIME-Version: 1.0
2137 Content-Transfer-Encoding: 8bit
2133 Content-Transfer-Encoding: 8bit
2138 Subject: [PATCH 2 of 8] utf-8 content
2134 Subject: [PATCH 2 of 8] utf-8 content
2139 X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f
2135 X-Mercurial-Node: 909a00e13e9d78b575aeee23dddbada46d5a143f
2140 Message-Id: <909a00e13e9d78b575ae.315532862@*> (glob)
2136 Message-Id: <909a00e13e9d78b575ae.315532862@*> (glob)
2141 In-Reply-To: <patchbomb.315532860@*> (glob)
2137 In-Reply-To: <patchbomb.315532860@*> (glob)
2142 References: <patchbomb.315532860@*> (glob)
2138 References: <patchbomb.315532860@*> (glob)
2143 User-Agent: Mercurial-patchbomb/* (glob)
2139 User-Agent: Mercurial-patchbomb/* (glob)
2144 Date: Tue, 01 Jan 1980 00:01:02 +0000
2140 Date: Tue, 01 Jan 1980 00:01:02 +0000
2145 From: test
2141 From: test
2146 To: foo
2142 To: foo
2147
2143
2148 # HG changeset patch
2144 # HG changeset patch
2149 # User test
2145 # User test
2150 # Date 4 0
2146 # Date 4 0
2151 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
2147 # Node ID 909a00e13e9d78b575aeee23dddbada46d5a143f
2152 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
2148 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
2153 utf-8 content
2149 utf-8 content
2154
2150
2155 diff -r ff2c9fa2018b -r 909a00e13e9d description
2151 diff -r ff2c9fa2018b -r 909a00e13e9d description
2156 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2152 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2157 +++ b/description Thu Jan 01 00:00:04 1970 +0000
2153 +++ b/description Thu Jan 01 00:00:04 1970 +0000
2158 @@ -0,0 +1,3 @@
2154 @@ -0,0 +1,3 @@
2159 +a multiline
2155 +a multiline
2160 +
2156 +
2161 +description
2157 +description
2162 diff -r ff2c9fa2018b -r 909a00e13e9d utf
2158 diff -r ff2c9fa2018b -r 909a00e13e9d utf
2163 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2159 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2164 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
2160 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
2165 @@ -0,0 +1,1 @@
2161 @@ -0,0 +1,1 @@
2166 +h\xc3\xb6mma! (esc)
2162 +h\xc3\xb6mma! (esc)
2167
2163
2168 Displaying [PATCH 3 of 8] long line ...
2164 Displaying [PATCH 3 of 8] long line ...
2169 Content-Type: text/plain; charset="us-ascii"
2165 Content-Type: text/plain; charset="us-ascii"
2170 MIME-Version: 1.0
2166 MIME-Version: 1.0
2171 Content-Transfer-Encoding: quoted-printable
2167 Content-Transfer-Encoding: quoted-printable
2172 Subject: [PATCH 3 of 8] long line
2168 Subject: [PATCH 3 of 8] long line
2173 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2169 X-Mercurial-Node: a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2174 Message-Id: <a2ea8fc83dd8b93cfd86.315532863@*> (glob)
2170 Message-Id: <a2ea8fc83dd8b93cfd86.315532863@*> (glob)
2175 In-Reply-To: <patchbomb.315532860@*> (glob)
2171 In-Reply-To: <patchbomb.315532860@*> (glob)
2176 References: <patchbomb.315532860@*> (glob)
2172 References: <patchbomb.315532860@*> (glob)
2177 User-Agent: Mercurial-patchbomb/* (glob)
2173 User-Agent: Mercurial-patchbomb/* (glob)
2178 Date: Tue, 01 Jan 1980 00:01:03 +0000
2174 Date: Tue, 01 Jan 1980 00:01:03 +0000
2179 From: test
2175 From: test
2180 To: foo
2176 To: foo
2181
2177
2182 # HG changeset patch
2178 # HG changeset patch
2183 # User test
2179 # User test
2184 # Date 4 0
2180 # Date 4 0
2185 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2181 # Node ID a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2186 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
2182 # Parent 909a00e13e9d78b575aeee23dddbada46d5a143f
2187 long line
2183 long line
2188
2184
2189 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
2185 diff -r 909a00e13e9d -r a2ea8fc83dd8 long
2190 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2186 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2191 +++ b/long Thu Jan 01 00:00:04 1970 +0000
2187 +++ b/long Thu Jan 01 00:00:04 1970 +0000
2192 @@ -0,0 +1,4 @@
2188 @@ -0,0 +1,4 @@
2193 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2189 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2194 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2190 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2195 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2191 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2196 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2192 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2197 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2193 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2198 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2194 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2199 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2195 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2200 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2196 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2201 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2197 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2202 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2198 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2203 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2199 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2204 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2200 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2205 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2201 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
2206 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
2202 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
2207 +foo
2203 +foo
2208 +
2204 +
2209 +bar
2205 +bar
2210
2206
2211 Displaying [PATCH 4 of 8] isolatin 8-bit encoding ...
2207 Displaying [PATCH 4 of 8] isolatin 8-bit encoding ...
2212 Content-Type: text/plain; charset="us-ascii"
2208 Content-Type: text/plain; charset="us-ascii"
2213 MIME-Version: 1.0
2209 MIME-Version: 1.0
2214 Content-Transfer-Encoding: 8bit
2210 Content-Transfer-Encoding: 8bit
2215 Subject: [PATCH 4 of 8] isolatin 8-bit encoding
2211 Subject: [PATCH 4 of 8] isolatin 8-bit encoding
2216 X-Mercurial-Node: 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2212 X-Mercurial-Node: 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2217 Message-Id: <240fb913fc1b7ff15ddb.315532864@*> (glob)
2213 Message-Id: <240fb913fc1b7ff15ddb.315532864@*> (glob)
2218 In-Reply-To: <patchbomb.315532860@*> (glob)
2214 In-Reply-To: <patchbomb.315532860@*> (glob)
2219 References: <patchbomb.315532860@*> (glob)
2215 References: <patchbomb.315532860@*> (glob)
2220 User-Agent: Mercurial-patchbomb/* (glob)
2216 User-Agent: Mercurial-patchbomb/* (glob)
2221 Date: Tue, 01 Jan 1980 00:01:04 +0000
2217 Date: Tue, 01 Jan 1980 00:01:04 +0000
2222 From: test
2218 From: test
2223 To: foo
2219 To: foo
2224
2220
2225 # HG changeset patch
2221 # HG changeset patch
2226 # User test
2222 # User test
2227 # Date 5 0
2223 # Date 5 0
2228 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2224 # Node ID 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2229 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2225 # Parent a2ea8fc83dd8b93cfd86ac97b28287204ab806e1
2230 isolatin 8-bit encoding
2226 isolatin 8-bit encoding
2231
2227
2232 diff -r a2ea8fc83dd8 -r 240fb913fc1b isolatin
2228 diff -r a2ea8fc83dd8 -r 240fb913fc1b isolatin
2233 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2229 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2234 +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000
2230 +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000
2235 @@ -0,0 +1,1 @@
2231 @@ -0,0 +1,1 @@
2236 +h\xf6mma! (esc)
2232 +h\xf6mma! (esc)
2237
2233
2238 Displaying [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a ...
2234 Displaying [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a ...
2239 Content-Type: text/plain; charset="us-ascii"
2235 Content-Type: text/plain; charset="us-ascii"
2240 MIME-Version: 1.0
2236 MIME-Version: 1.0
2241 Content-Transfer-Encoding: 7bit
2237 Content-Transfer-Encoding: 7bit
2242 Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a
2238 Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a
2243 X-Mercurial-Node: 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2239 X-Mercurial-Node: 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2244 Message-Id: <5d5ef15dfe5e7bd3a4ee.315532865@*> (glob)
2240 Message-Id: <5d5ef15dfe5e7bd3a4ee.315532865@*> (glob)
2245 In-Reply-To: <patchbomb.315532860@*> (glob)
2241 In-Reply-To: <patchbomb.315532860@*> (glob)
2246 References: <patchbomb.315532860@*> (glob)
2242 References: <patchbomb.315532860@*> (glob)
2247 User-Agent: Mercurial-patchbomb/* (glob)
2243 User-Agent: Mercurial-patchbomb/* (glob)
2248 Date: Tue, 01 Jan 1980 00:01:05 +0000
2244 Date: Tue, 01 Jan 1980 00:01:05 +0000
2249 From: test
2245 From: test
2250 To: foo
2246 To: foo
2251
2247
2252 # HG changeset patch
2248 # HG changeset patch
2253 # User test
2249 # User test
2254 # Date 0 0
2250 # Date 0 0
2255 # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2251 # Node ID 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2256 # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2252 # Parent 240fb913fc1b7ff15ddb9f33e73d82bf5277c720
2257 Added tag zero, zero.foo for changeset 8580ff50825a
2253 Added tag zero, zero.foo for changeset 8580ff50825a
2258
2254
2259 diff -r 240fb913fc1b -r 5d5ef15dfe5e .hgtags
2255 diff -r 240fb913fc1b -r 5d5ef15dfe5e .hgtags
2260 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2256 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2261 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2257 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2262 @@ -0,0 +1,2 @@
2258 @@ -0,0 +1,2 @@
2263 +8580ff50825a50c8f716709acdf8de0deddcd6ab zero
2259 +8580ff50825a50c8f716709acdf8de0deddcd6ab zero
2264 +8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
2260 +8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
2265
2261
2266 Displaying [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 ...
2262 Displaying [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 ...
2267 Content-Type: text/plain; charset="us-ascii"
2263 Content-Type: text/plain; charset="us-ascii"
2268 MIME-Version: 1.0
2264 MIME-Version: 1.0
2269 Content-Transfer-Encoding: 7bit
2265 Content-Transfer-Encoding: 7bit
2270 Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7
2266 Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7
2271 X-Mercurial-Node: 045ca29b1ea20e4940411e695e20e521f2f0f98e
2267 X-Mercurial-Node: 045ca29b1ea20e4940411e695e20e521f2f0f98e
2272 Message-Id: <045ca29b1ea20e494041.315532866@*> (glob)
2268 Message-Id: <045ca29b1ea20e494041.315532866@*> (glob)
2273 In-Reply-To: <patchbomb.315532860@*> (glob)
2269 In-Reply-To: <patchbomb.315532860@*> (glob)
2274 References: <patchbomb.315532860@*> (glob)
2270 References: <patchbomb.315532860@*> (glob)
2275 User-Agent: Mercurial-patchbomb/* (glob)
2271 User-Agent: Mercurial-patchbomb/* (glob)
2276 Date: Tue, 01 Jan 1980 00:01:06 +0000
2272 Date: Tue, 01 Jan 1980 00:01:06 +0000
2277 From: test
2273 From: test
2278 To: foo
2274 To: foo
2279
2275
2280 # HG changeset patch
2276 # HG changeset patch
2281 # User test
2277 # User test
2282 # Date 0 0
2278 # Date 0 0
2283 # Node ID 045ca29b1ea20e4940411e695e20e521f2f0f98e
2279 # Node ID 045ca29b1ea20e4940411e695e20e521f2f0f98e
2284 # Parent 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2280 # Parent 5d5ef15dfe5e7bd3a4ee154b5fff76c7945ec433
2285 Added tag one, one.patch for changeset 97d72e5f12c7
2281 Added tag one, one.patch for changeset 97d72e5f12c7
2286
2282
2287 diff -r 5d5ef15dfe5e -r 045ca29b1ea2 .hgtags
2283 diff -r 5d5ef15dfe5e -r 045ca29b1ea2 .hgtags
2288 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
2284 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
2289 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2285 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2290 @@ -1,2 +1,4 @@
2286 @@ -1,2 +1,4 @@
2291 8580ff50825a50c8f716709acdf8de0deddcd6ab zero
2287 8580ff50825a50c8f716709acdf8de0deddcd6ab zero
2292 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
2288 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
2293 +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
2289 +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
2294 +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
2290 +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
2295
2291
2296 Displaying [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b ...
2292 Displaying [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b ...
2297 Content-Type: text/plain; charset="us-ascii"
2293 Content-Type: text/plain; charset="us-ascii"
2298 MIME-Version: 1.0
2294 MIME-Version: 1.0
2299 Content-Transfer-Encoding: 7bit
2295 Content-Transfer-Encoding: 7bit
2300 Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b
2296 Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b
2301 X-Mercurial-Node: 7aead2484924c445ad8ce2613df91f52f9e502ed
2297 X-Mercurial-Node: 7aead2484924c445ad8ce2613df91f52f9e502ed
2302 Message-Id: <7aead2484924c445ad8c.315532867@*> (glob)
2298 Message-Id: <7aead2484924c445ad8c.315532867@*> (glob)
2303 In-Reply-To: <patchbomb.315532860@*> (glob)
2299 In-Reply-To: <patchbomb.315532860@*> (glob)
2304 References: <patchbomb.315532860@*> (glob)
2300 References: <patchbomb.315532860@*> (glob)
2305 User-Agent: Mercurial-patchbomb/* (glob)
2301 User-Agent: Mercurial-patchbomb/* (glob)
2306 Date: Tue, 01 Jan 1980 00:01:07 +0000
2302 Date: Tue, 01 Jan 1980 00:01:07 +0000
2307 From: test
2303 From: test
2308 To: foo
2304 To: foo
2309
2305
2310 # HG changeset patch
2306 # HG changeset patch
2311 # User test
2307 # User test
2312 # Date 0 0
2308 # Date 0 0
2313 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed
2309 # Node ID 7aead2484924c445ad8ce2613df91f52f9e502ed
2314 # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e
2310 # Parent 045ca29b1ea20e4940411e695e20e521f2f0f98e
2315 Added tag two, two.diff for changeset ff2c9fa2018b
2311 Added tag two, two.diff for changeset ff2c9fa2018b
2316
2312
2317 diff -r 045ca29b1ea2 -r 7aead2484924 .hgtags
2313 diff -r 045ca29b1ea2 -r 7aead2484924 .hgtags
2318 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
2314 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
2319 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2315 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
2320 @@ -2,3 +2,5 @@
2316 @@ -2,3 +2,5 @@
2321 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
2317 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
2322 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
2318 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
2323 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
2319 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
2324 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
2320 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
2325 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
2321 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
2326
2322
2327 Displaying [PATCH 8 of 8] d ...
2323 Displaying [PATCH 8 of 8] d ...
2328 Content-Type: text/plain; charset="us-ascii"
2324 Content-Type: text/plain; charset="us-ascii"
2329 MIME-Version: 1.0
2325 MIME-Version: 1.0
2330 Content-Transfer-Encoding: 7bit
2326 Content-Transfer-Encoding: 7bit
2331 Subject: [PATCH 8 of 8] d
2327 Subject: [PATCH 8 of 8] d
2332 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2328 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2333 Message-Id: <2f9fa9b998c5fe3ac2bd.315532868@*> (glob)
2329 Message-Id: <2f9fa9b998c5fe3ac2bd.315532868@*> (glob)
2334 In-Reply-To: <patchbomb.315532860@*> (glob)
2330 In-Reply-To: <patchbomb.315532860@*> (glob)
2335 References: <patchbomb.315532860@*> (glob)
2331 References: <patchbomb.315532860@*> (glob)
2336 User-Agent: Mercurial-patchbomb/* (glob)
2332 User-Agent: Mercurial-patchbomb/* (glob)
2337 Date: Tue, 01 Jan 1980 00:01:08 +0000
2333 Date: Tue, 01 Jan 1980 00:01:08 +0000
2338 From: test
2334 From: test
2339 To: foo
2335 To: foo
2340
2336
2341 # HG changeset patch
2337 # HG changeset patch
2342 # User test
2338 # User test
2343 # Date 4 0
2339 # Date 4 0
2344 # Branch test
2340 # Branch test
2345 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2341 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2346 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2342 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2347 d
2343 d
2348
2344
2349 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
2345 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
2350 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2346 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2351 +++ b/d Thu Jan 01 00:00:04 1970 +0000
2347 +++ b/d Thu Jan 01 00:00:04 1970 +0000
2352 @@ -0,0 +1,1 @@
2348 @@ -0,0 +1,1 @@
2353 +d
2349 +d
2354
2350
2355
2351
2356 dest#branch URIs:
2352 dest#branch URIs:
2357 $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test
2353 $ hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test
2358 comparing with ../t
2354 comparing with ../t
2359 searching for changes
2355 searching for changes
2360 From [test]: test
2356 From [test]: test
2361 This patch series consists of 1 patches.
2357 This patch series consists of 1 patches.
2362
2358
2363 Cc:
2359 Cc:
2364
2360
2365 Displaying [PATCH] test ...
2361 Displaying [PATCH] test ...
2366 Content-Type: text/plain; charset="us-ascii"
2362 Content-Type: text/plain; charset="us-ascii"
2367 MIME-Version: 1.0
2363 MIME-Version: 1.0
2368 Content-Transfer-Encoding: 7bit
2364 Content-Transfer-Encoding: 7bit
2369 Subject: [PATCH] test
2365 Subject: [PATCH] test
2370 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2366 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2371 Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@*> (glob)
2367 Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@*> (glob)
2372 User-Agent: Mercurial-patchbomb/* (glob)
2368 User-Agent: Mercurial-patchbomb/* (glob)
2373 Date: Tue, 01 Jan 1980 00:01:00 +0000
2369 Date: Tue, 01 Jan 1980 00:01:00 +0000
2374 From: test
2370 From: test
2375 To: foo
2371 To: foo
2376
2372
2377 # HG changeset patch
2373 # HG changeset patch
2378 # User test
2374 # User test
2379 # Date 4 0
2375 # Date 4 0
2380 # Branch test
2376 # Branch test
2381 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2377 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
2382 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2378 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
2383 d
2379 d
2384
2380
2385 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
2381 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
2386 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2382 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2387 +++ b/d Thu Jan 01 00:00:04 1970 +0000
2383 +++ b/d Thu Jan 01 00:00:04 1970 +0000
2388 @@ -0,0 +1,1 @@
2384 @@ -0,0 +1,1 @@
2389 +d
2385 +d
2390
2386
@@ -1,1227 +1,1219 b''
1 $ "$TESTDIR/hghave" execbit || exit 80
2
3 Set up a repo
1 Set up a repo
4
2
5 $ echo "[ui]" >> $HGRCPATH
3 $ echo "[ui]" >> $HGRCPATH
6 $ echo "interactive=true" >> $HGRCPATH
4 $ echo "interactive=true" >> $HGRCPATH
7 $ echo "[extensions]" >> $HGRCPATH
5 $ echo "[extensions]" >> $HGRCPATH
8 $ echo "record=" >> $HGRCPATH
6 $ echo "record=" >> $HGRCPATH
9
7
10 $ hg init a
8 $ hg init a
11 $ cd a
9 $ cd a
12
10
13 Select no files
11 Select no files
14
12
15 $ touch empty-rw
13 $ touch empty-rw
16 $ hg add empty-rw
14 $ hg add empty-rw
17
15
18 $ hg record empty-rw<<EOF
16 $ hg record empty-rw<<EOF
19 > n
17 > n
20 > EOF
18 > EOF
21 diff --git a/empty-rw b/empty-rw
19 diff --git a/empty-rw b/empty-rw
22 new file mode 100644
20 new file mode 100644
23 examine changes to 'empty-rw'? [Ynesfdaq?]
21 examine changes to 'empty-rw'? [Ynesfdaq?]
24 no changes to record
22 no changes to record
25
23
26 $ hg tip -p
24 $ hg tip -p
27 changeset: -1:000000000000
25 changeset: -1:000000000000
28 tag: tip
26 tag: tip
29 user:
27 user:
30 date: Thu Jan 01 00:00:00 1970 +0000
28 date: Thu Jan 01 00:00:00 1970 +0000
31
29
32
30
33
31
34 Select files but no hunks
32 Select files but no hunks
35
33
36 $ hg record empty-rw<<EOF
34 $ hg record empty-rw<<EOF
37 > y
35 > y
38 > n
36 > n
39 > EOF
37 > EOF
40 diff --git a/empty-rw b/empty-rw
38 diff --git a/empty-rw b/empty-rw
41 new file mode 100644
39 new file mode 100644
42 examine changes to 'empty-rw'? [Ynesfdaq?]
40 examine changes to 'empty-rw'? [Ynesfdaq?]
43 abort: empty commit message
41 abort: empty commit message
44 [255]
42 [255]
45
43
46 $ hg tip -p
44 $ hg tip -p
47 changeset: -1:000000000000
45 changeset: -1:000000000000
48 tag: tip
46 tag: tip
49 user:
47 user:
50 date: Thu Jan 01 00:00:00 1970 +0000
48 date: Thu Jan 01 00:00:00 1970 +0000
51
49
52
50
53
51
54 Record empty file
52 Record empty file
55
53
56 $ hg record -d '0 0' -m empty empty-rw<<EOF
54 $ hg record -d '0 0' -m empty empty-rw<<EOF
57 > y
55 > y
58 > y
56 > y
59 > EOF
57 > EOF
60 diff --git a/empty-rw b/empty-rw
58 diff --git a/empty-rw b/empty-rw
61 new file mode 100644
59 new file mode 100644
62 examine changes to 'empty-rw'? [Ynesfdaq?]
60 examine changes to 'empty-rw'? [Ynesfdaq?]
63
61
64 $ hg tip -p
62 $ hg tip -p
65 changeset: 0:c0708cf4e46e
63 changeset: 0:c0708cf4e46e
66 tag: tip
64 tag: tip
67 user: test
65 user: test
68 date: Thu Jan 01 00:00:00 1970 +0000
66 date: Thu Jan 01 00:00:00 1970 +0000
69 summary: empty
67 summary: empty
70
68
71
69
72
70
73 Summary shows we updated to the new cset
71 Summary shows we updated to the new cset
74
72
75 $ hg summary
73 $ hg summary
76 parent: 0:c0708cf4e46e tip
74 parent: 0:c0708cf4e46e tip
77 empty
75 empty
78 branch: default
76 branch: default
79 commit: (clean)
77 commit: (clean)
80 update: (current)
78 update: (current)
81
79
82 Rename empty file
80 Rename empty file
83
81
84 $ hg mv empty-rw empty-rename
82 $ hg mv empty-rw empty-rename
85 $ hg record -d '1 0' -m rename<<EOF
83 $ hg record -d '1 0' -m rename<<EOF
86 > y
84 > y
87 > EOF
85 > EOF
88 diff --git a/empty-rw b/empty-rename
86 diff --git a/empty-rw b/empty-rename
89 rename from empty-rw
87 rename from empty-rw
90 rename to empty-rename
88 rename to empty-rename
91 examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?]
89 examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?]
92
90
93 $ hg tip -p
91 $ hg tip -p
94 changeset: 1:d695e8dcb197
92 changeset: 1:d695e8dcb197
95 tag: tip
93 tag: tip
96 user: test
94 user: test
97 date: Thu Jan 01 00:00:01 1970 +0000
95 date: Thu Jan 01 00:00:01 1970 +0000
98 summary: rename
96 summary: rename
99
97
100
98
101
99
102 Copy empty file
100 Copy empty file
103
101
104 $ hg cp empty-rename empty-copy
102 $ hg cp empty-rename empty-copy
105 $ hg record -d '2 0' -m copy<<EOF
103 $ hg record -d '2 0' -m copy<<EOF
106 > y
104 > y
107 > EOF
105 > EOF
108 diff --git a/empty-rename b/empty-copy
106 diff --git a/empty-rename b/empty-copy
109 copy from empty-rename
107 copy from empty-rename
110 copy to empty-copy
108 copy to empty-copy
111 examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?]
109 examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?]
112
110
113 $ hg tip -p
111 $ hg tip -p
114 changeset: 2:1d4b90bea524
112 changeset: 2:1d4b90bea524
115 tag: tip
113 tag: tip
116 user: test
114 user: test
117 date: Thu Jan 01 00:00:02 1970 +0000
115 date: Thu Jan 01 00:00:02 1970 +0000
118 summary: copy
116 summary: copy
119
117
120
118
121
119
122 Delete empty file
120 Delete empty file
123
121
124 $ hg rm empty-copy
122 $ hg rm empty-copy
125 $ hg record -d '3 0' -m delete<<EOF
123 $ hg record -d '3 0' -m delete<<EOF
126 > y
124 > y
127 > EOF
125 > EOF
128 diff --git a/empty-copy b/empty-copy
126 diff --git a/empty-copy b/empty-copy
129 deleted file mode 100644
127 deleted file mode 100644
130 examine changes to 'empty-copy'? [Ynesfdaq?]
128 examine changes to 'empty-copy'? [Ynesfdaq?]
131
129
132 $ hg tip -p
130 $ hg tip -p
133 changeset: 3:b39a238f01a1
131 changeset: 3:b39a238f01a1
134 tag: tip
132 tag: tip
135 user: test
133 user: test
136 date: Thu Jan 01 00:00:03 1970 +0000
134 date: Thu Jan 01 00:00:03 1970 +0000
137 summary: delete
135 summary: delete
138
136
139
137
140
138
141 Add binary file
139 Add binary file
142
140
143 $ hg bundle --base -2 tip.bundle
141 $ hg bundle --base -2 tip.bundle
144 1 changesets found
142 1 changesets found
145 $ hg add tip.bundle
143 $ hg add tip.bundle
146 $ hg record -d '4 0' -m binary<<EOF
144 $ hg record -d '4 0' -m binary<<EOF
147 > y
145 > y
148 > EOF
146 > EOF
149 diff --git a/tip.bundle b/tip.bundle
147 diff --git a/tip.bundle b/tip.bundle
150 new file mode 100644
148 new file mode 100644
151 this is a binary file
149 this is a binary file
152 examine changes to 'tip.bundle'? [Ynesfdaq?]
150 examine changes to 'tip.bundle'? [Ynesfdaq?]
153
151
154 $ hg tip -p
152 $ hg tip -p
155 changeset: 4:ad816da3711e
153 changeset: 4:ad816da3711e
156 tag: tip
154 tag: tip
157 user: test
155 user: test
158 date: Thu Jan 01 00:00:04 1970 +0000
156 date: Thu Jan 01 00:00:04 1970 +0000
159 summary: binary
157 summary: binary
160
158
161 diff -r b39a238f01a1 -r ad816da3711e tip.bundle
159 diff -r b39a238f01a1 -r ad816da3711e tip.bundle
162 Binary file tip.bundle has changed
160 Binary file tip.bundle has changed
163
161
164
162
165 Change binary file
163 Change binary file
166
164
167 $ hg bundle --base -2 tip.bundle
165 $ hg bundle --base -2 tip.bundle
168 1 changesets found
166 1 changesets found
169 $ hg record -d '5 0' -m binary-change<<EOF
167 $ hg record -d '5 0' -m binary-change<<EOF
170 > y
168 > y
171 > EOF
169 > EOF
172 diff --git a/tip.bundle b/tip.bundle
170 diff --git a/tip.bundle b/tip.bundle
173 this modifies a binary file (all or nothing)
171 this modifies a binary file (all or nothing)
174 examine changes to 'tip.bundle'? [Ynesfdaq?]
172 examine changes to 'tip.bundle'? [Ynesfdaq?]
175
173
176 $ hg tip -p
174 $ hg tip -p
177 changeset: 5:dccd6f3eb485
175 changeset: 5:dccd6f3eb485
178 tag: tip
176 tag: tip
179 user: test
177 user: test
180 date: Thu Jan 01 00:00:05 1970 +0000
178 date: Thu Jan 01 00:00:05 1970 +0000
181 summary: binary-change
179 summary: binary-change
182
180
183 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
181 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle
184 Binary file tip.bundle has changed
182 Binary file tip.bundle has changed
185
183
186
184
187 Rename and change binary file
185 Rename and change binary file
188
186
189 $ hg mv tip.bundle top.bundle
187 $ hg mv tip.bundle top.bundle
190 $ hg bundle --base -2 top.bundle
188 $ hg bundle --base -2 top.bundle
191 1 changesets found
189 1 changesets found
192 $ hg record -d '6 0' -m binary-change-rename<<EOF
190 $ hg record -d '6 0' -m binary-change-rename<<EOF
193 > y
191 > y
194 > EOF
192 > EOF
195 diff --git a/tip.bundle b/top.bundle
193 diff --git a/tip.bundle b/top.bundle
196 rename from tip.bundle
194 rename from tip.bundle
197 rename to top.bundle
195 rename to top.bundle
198 this modifies a binary file (all or nothing)
196 this modifies a binary file (all or nothing)
199 examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?]
197 examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?]
200
198
201 $ hg tip -p
199 $ hg tip -p
202 changeset: 6:7fa44105f5b3
200 changeset: 6:7fa44105f5b3
203 tag: tip
201 tag: tip
204 user: test
202 user: test
205 date: Thu Jan 01 00:00:06 1970 +0000
203 date: Thu Jan 01 00:00:06 1970 +0000
206 summary: binary-change-rename
204 summary: binary-change-rename
207
205
208 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
206 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle
209 Binary file tip.bundle has changed
207 Binary file tip.bundle has changed
210 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
208 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle
211 Binary file top.bundle has changed
209 Binary file top.bundle has changed
212
210
213
211
214 Add plain file
212 Add plain file
215
213
216 $ for i in 1 2 3 4 5 6 7 8 9 10; do
214 $ for i in 1 2 3 4 5 6 7 8 9 10; do
217 > echo $i >> plain
215 > echo $i >> plain
218 > done
216 > done
219
217
220 $ hg add plain
218 $ hg add plain
221 $ hg record -d '7 0' -m plain plain<<EOF
219 $ hg record -d '7 0' -m plain plain<<EOF
222 > y
220 > y
223 > y
221 > y
224 > EOF
222 > EOF
225 diff --git a/plain b/plain
223 diff --git a/plain b/plain
226 new file mode 100644
224 new file mode 100644
227 examine changes to 'plain'? [Ynesfdaq?]
225 examine changes to 'plain'? [Ynesfdaq?]
228
226
229 $ hg tip -p
227 $ hg tip -p
230 changeset: 7:11fb457c1be4
228 changeset: 7:11fb457c1be4
231 tag: tip
229 tag: tip
232 user: test
230 user: test
233 date: Thu Jan 01 00:00:07 1970 +0000
231 date: Thu Jan 01 00:00:07 1970 +0000
234 summary: plain
232 summary: plain
235
233
236 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
234 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain
237 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
235 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
238 +++ b/plain Thu Jan 01 00:00:07 1970 +0000
236 +++ b/plain Thu Jan 01 00:00:07 1970 +0000
239 @@ -0,0 +1,10 @@
237 @@ -0,0 +1,10 @@
240 +1
238 +1
241 +2
239 +2
242 +3
240 +3
243 +4
241 +4
244 +5
242 +5
245 +6
243 +6
246 +7
244 +7
247 +8
245 +8
248 +9
246 +9
249 +10
247 +10
250
248
251
249
252 Modify end of plain file
250 Modify end of plain file
253
251
254 $ echo 11 >> plain
252 $ echo 11 >> plain
255 $ hg record -d '8 0' -m end plain <<EOF
253 $ hg record -d '8 0' -m end plain <<EOF
256 > y
254 > y
257 > y
255 > y
258 > EOF
256 > EOF
259 diff --git a/plain b/plain
257 diff --git a/plain b/plain
260 1 hunks, 1 lines changed
258 1 hunks, 1 lines changed
261 examine changes to 'plain'? [Ynesfdaq?]
259 examine changes to 'plain'? [Ynesfdaq?]
262 @@ -8,3 +8,4 @@
260 @@ -8,3 +8,4 @@
263 8
261 8
264 9
262 9
265 10
263 10
266 +11
264 +11
267 record this change to 'plain'? [Ynesfdaq?]
265 record this change to 'plain'? [Ynesfdaq?]
268
266
269 Modify end of plain file, no EOL
267 Modify end of plain file, no EOL
270
268
271 $ hg tip --template '{node}' >> plain
269 $ hg tip --template '{node}' >> plain
272 $ hg record -d '9 0' -m noeol plain <<EOF
270 $ hg record -d '9 0' -m noeol plain <<EOF
273 > y
271 > y
274 > y
272 > y
275 > EOF
273 > EOF
276 diff --git a/plain b/plain
274 diff --git a/plain b/plain
277 1 hunks, 1 lines changed
275 1 hunks, 1 lines changed
278 examine changes to 'plain'? [Ynesfdaq?]
276 examine changes to 'plain'? [Ynesfdaq?]
279 @@ -9,3 +9,4 @@
277 @@ -9,3 +9,4 @@
280 9
278 9
281 10
279 10
282 11
280 11
283 +7264f99c5f5ff3261504828afa4fb4d406c3af54
281 +7264f99c5f5ff3261504828afa4fb4d406c3af54
284 \ No newline at end of file
282 \ No newline at end of file
285 record this change to 'plain'? [Ynesfdaq?]
283 record this change to 'plain'? [Ynesfdaq?]
286
284
287 Modify end of plain file, add EOL
285 Modify end of plain file, add EOL
288
286
289 $ echo >> plain
287 $ echo >> plain
290 $ echo 1 > plain2
288 $ echo 1 > plain2
291 $ hg add plain2
289 $ hg add plain2
292 $ hg record -d '10 0' -m eol plain plain2 <<EOF
290 $ hg record -d '10 0' -m eol plain plain2 <<EOF
293 > y
291 > y
294 > y
292 > y
295 > y
293 > y
296 > EOF
294 > EOF
297 diff --git a/plain b/plain
295 diff --git a/plain b/plain
298 1 hunks, 1 lines changed
296 1 hunks, 1 lines changed
299 examine changes to 'plain'? [Ynesfdaq?]
297 examine changes to 'plain'? [Ynesfdaq?]
300 @@ -9,4 +9,4 @@
298 @@ -9,4 +9,4 @@
301 9
299 9
302 10
300 10
303 11
301 11
304 -7264f99c5f5ff3261504828afa4fb4d406c3af54
302 -7264f99c5f5ff3261504828afa4fb4d406c3af54
305 \ No newline at end of file
303 \ No newline at end of file
306 +7264f99c5f5ff3261504828afa4fb4d406c3af54
304 +7264f99c5f5ff3261504828afa4fb4d406c3af54
307 record change 1/2 to 'plain'? [Ynesfdaq?]
305 record change 1/2 to 'plain'? [Ynesfdaq?]
308 diff --git a/plain2 b/plain2
306 diff --git a/plain2 b/plain2
309 new file mode 100644
307 new file mode 100644
310 examine changes to 'plain2'? [Ynesfdaq?]
308 examine changes to 'plain2'? [Ynesfdaq?]
311
309
312 Modify beginning, trim end, record both, add another file to test
310 Modify beginning, trim end, record both, add another file to test
313 changes numbering
311 changes numbering
314
312
315 $ rm plain
313 $ rm plain
316 $ for i in 2 2 3 4 5 6 7 8 9 10; do
314 $ for i in 2 2 3 4 5 6 7 8 9 10; do
317 > echo $i >> plain
315 > echo $i >> plain
318 > done
316 > done
319 $ echo 2 >> plain2
317 $ echo 2 >> plain2
320
318
321 $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF
319 $ hg record -d '10 0' -m begin-and-end plain plain2 <<EOF
322 > y
320 > y
323 > y
321 > y
324 > y
322 > y
325 > y
323 > y
326 > y
324 > y
327 > EOF
325 > EOF
328 diff --git a/plain b/plain
326 diff --git a/plain b/plain
329 2 hunks, 3 lines changed
327 2 hunks, 3 lines changed
330 examine changes to 'plain'? [Ynesfdaq?]
328 examine changes to 'plain'? [Ynesfdaq?]
331 @@ -1,4 +1,4 @@
329 @@ -1,4 +1,4 @@
332 -1
330 -1
333 +2
331 +2
334 2
332 2
335 3
333 3
336 4
334 4
337 record change 1/3 to 'plain'? [Ynesfdaq?]
335 record change 1/3 to 'plain'? [Ynesfdaq?]
338 @@ -8,5 +8,3 @@
336 @@ -8,5 +8,3 @@
339 8
337 8
340 9
338 9
341 10
339 10
342 -11
340 -11
343 -7264f99c5f5ff3261504828afa4fb4d406c3af54
341 -7264f99c5f5ff3261504828afa4fb4d406c3af54
344 record change 2/3 to 'plain'? [Ynesfdaq?]
342 record change 2/3 to 'plain'? [Ynesfdaq?]
345 diff --git a/plain2 b/plain2
343 diff --git a/plain2 b/plain2
346 1 hunks, 1 lines changed
344 1 hunks, 1 lines changed
347 examine changes to 'plain2'? [Ynesfdaq?]
345 examine changes to 'plain2'? [Ynesfdaq?]
348 @@ -1,1 +1,2 @@
346 @@ -1,1 +1,2 @@
349 1
347 1
350 +2
348 +2
351 record change 3/3 to 'plain2'? [Ynesfdaq?]
349 record change 3/3 to 'plain2'? [Ynesfdaq?]
352
350
353 $ hg tip -p
351 $ hg tip -p
354 changeset: 11:21df83db12b8
352 changeset: 11:21df83db12b8
355 tag: tip
353 tag: tip
356 user: test
354 user: test
357 date: Thu Jan 01 00:00:10 1970 +0000
355 date: Thu Jan 01 00:00:10 1970 +0000
358 summary: begin-and-end
356 summary: begin-and-end
359
357
360 diff -r ddb8b281c3ff -r 21df83db12b8 plain
358 diff -r ddb8b281c3ff -r 21df83db12b8 plain
361 --- a/plain Thu Jan 01 00:00:10 1970 +0000
359 --- a/plain Thu Jan 01 00:00:10 1970 +0000
362 +++ b/plain Thu Jan 01 00:00:10 1970 +0000
360 +++ b/plain Thu Jan 01 00:00:10 1970 +0000
363 @@ -1,4 +1,4 @@
361 @@ -1,4 +1,4 @@
364 -1
362 -1
365 +2
363 +2
366 2
364 2
367 3
365 3
368 4
366 4
369 @@ -8,5 +8,3 @@
367 @@ -8,5 +8,3 @@
370 8
368 8
371 9
369 9
372 10
370 10
373 -11
371 -11
374 -7264f99c5f5ff3261504828afa4fb4d406c3af54
372 -7264f99c5f5ff3261504828afa4fb4d406c3af54
375 diff -r ddb8b281c3ff -r 21df83db12b8 plain2
373 diff -r ddb8b281c3ff -r 21df83db12b8 plain2
376 --- a/plain2 Thu Jan 01 00:00:10 1970 +0000
374 --- a/plain2 Thu Jan 01 00:00:10 1970 +0000
377 +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000
375 +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000
378 @@ -1,1 +1,2 @@
376 @@ -1,1 +1,2 @@
379 1
377 1
380 +2
378 +2
381
379
382
380
383 Trim beginning, modify end
381 Trim beginning, modify end
384
382
385 $ rm plain
383 $ rm plain
386 > for i in 4 5 6 7 8 9 10.new; do
384 > for i in 4 5 6 7 8 9 10.new; do
387 > echo $i >> plain
385 > echo $i >> plain
388 > done
386 > done
389
387
390 Record end
388 Record end
391
389
392 $ hg record -d '11 0' -m end-only plain <<EOF
390 $ hg record -d '11 0' -m end-only plain <<EOF
393 > y
391 > y
394 > n
392 > n
395 > y
393 > y
396 > EOF
394 > EOF
397 diff --git a/plain b/plain
395 diff --git a/plain b/plain
398 2 hunks, 4 lines changed
396 2 hunks, 4 lines changed
399 examine changes to 'plain'? [Ynesfdaq?]
397 examine changes to 'plain'? [Ynesfdaq?]
400 @@ -1,9 +1,6 @@
398 @@ -1,9 +1,6 @@
401 -2
399 -2
402 -2
400 -2
403 -3
401 -3
404 4
402 4
405 5
403 5
406 6
404 6
407 7
405 7
408 8
406 8
409 9
407 9
410 record change 1/2 to 'plain'? [Ynesfdaq?]
408 record change 1/2 to 'plain'? [Ynesfdaq?]
411 @@ -4,7 +1,7 @@
409 @@ -4,7 +1,7 @@
412 4
410 4
413 5
411 5
414 6
412 6
415 7
413 7
416 8
414 8
417 9
415 9
418 -10
416 -10
419 +10.new
417 +10.new
420 record change 2/2 to 'plain'? [Ynesfdaq?]
418 record change 2/2 to 'plain'? [Ynesfdaq?]
421
419
422 $ hg tip -p
420 $ hg tip -p
423 changeset: 12:99337501826f
421 changeset: 12:99337501826f
424 tag: tip
422 tag: tip
425 user: test
423 user: test
426 date: Thu Jan 01 00:00:11 1970 +0000
424 date: Thu Jan 01 00:00:11 1970 +0000
427 summary: end-only
425 summary: end-only
428
426
429 diff -r 21df83db12b8 -r 99337501826f plain
427 diff -r 21df83db12b8 -r 99337501826f plain
430 --- a/plain Thu Jan 01 00:00:10 1970 +0000
428 --- a/plain Thu Jan 01 00:00:10 1970 +0000
431 +++ b/plain Thu Jan 01 00:00:11 1970 +0000
429 +++ b/plain Thu Jan 01 00:00:11 1970 +0000
432 @@ -7,4 +7,4 @@
430 @@ -7,4 +7,4 @@
433 7
431 7
434 8
432 8
435 9
433 9
436 -10
434 -10
437 +10.new
435 +10.new
438
436
439
437
440 Record beginning
438 Record beginning
441
439
442 $ hg record -d '12 0' -m begin-only plain <<EOF
440 $ hg record -d '12 0' -m begin-only plain <<EOF
443 > y
441 > y
444 > y
442 > y
445 > EOF
443 > EOF
446 diff --git a/plain b/plain
444 diff --git a/plain b/plain
447 1 hunks, 3 lines changed
445 1 hunks, 3 lines changed
448 examine changes to 'plain'? [Ynesfdaq?]
446 examine changes to 'plain'? [Ynesfdaq?]
449 @@ -1,6 +1,3 @@
447 @@ -1,6 +1,3 @@
450 -2
448 -2
451 -2
449 -2
452 -3
450 -3
453 4
451 4
454 5
452 5
455 6
453 6
456 record this change to 'plain'? [Ynesfdaq?]
454 record this change to 'plain'? [Ynesfdaq?]
457
455
458 $ hg tip -p
456 $ hg tip -p
459 changeset: 13:bbd45465d540
457 changeset: 13:bbd45465d540
460 tag: tip
458 tag: tip
461 user: test
459 user: test
462 date: Thu Jan 01 00:00:12 1970 +0000
460 date: Thu Jan 01 00:00:12 1970 +0000
463 summary: begin-only
461 summary: begin-only
464
462
465 diff -r 99337501826f -r bbd45465d540 plain
463 diff -r 99337501826f -r bbd45465d540 plain
466 --- a/plain Thu Jan 01 00:00:11 1970 +0000
464 --- a/plain Thu Jan 01 00:00:11 1970 +0000
467 +++ b/plain Thu Jan 01 00:00:12 1970 +0000
465 +++ b/plain Thu Jan 01 00:00:12 1970 +0000
468 @@ -1,6 +1,3 @@
466 @@ -1,6 +1,3 @@
469 -2
467 -2
470 -2
468 -2
471 -3
469 -3
472 4
470 4
473 5
471 5
474 6
472 6
475
473
476
474
477 Add to beginning, trim from end
475 Add to beginning, trim from end
478
476
479 $ rm plain
477 $ rm plain
480 $ for i in 1 2 3 4 5 6 7 8 9; do
478 $ for i in 1 2 3 4 5 6 7 8 9; do
481 > echo $i >> plain
479 > echo $i >> plain
482 > done
480 > done
483
481
484 Record end
482 Record end
485
483
486 $ hg record --traceback -d '13 0' -m end-again plain<<EOF
484 $ hg record --traceback -d '13 0' -m end-again plain<<EOF
487 > y
485 > y
488 > n
486 > n
489 > y
487 > y
490 > EOF
488 > EOF
491 diff --git a/plain b/plain
489 diff --git a/plain b/plain
492 2 hunks, 4 lines changed
490 2 hunks, 4 lines changed
493 examine changes to 'plain'? [Ynesfdaq?]
491 examine changes to 'plain'? [Ynesfdaq?]
494 @@ -1,6 +1,9 @@
492 @@ -1,6 +1,9 @@
495 +1
493 +1
496 +2
494 +2
497 +3
495 +3
498 4
496 4
499 5
497 5
500 6
498 6
501 7
499 7
502 8
500 8
503 9
501 9
504 record change 1/2 to 'plain'? [Ynesfdaq?]
502 record change 1/2 to 'plain'? [Ynesfdaq?]
505 @@ -1,7 +4,6 @@
503 @@ -1,7 +4,6 @@
506 4
504 4
507 5
505 5
508 6
506 6
509 7
507 7
510 8
508 8
511 9
509 9
512 -10.new
510 -10.new
513 record change 2/2 to 'plain'? [Ynesfdaq?]
511 record change 2/2 to 'plain'? [Ynesfdaq?]
514
512
515 Add to beginning, middle, end
513 Add to beginning, middle, end
516
514
517 $ rm plain
515 $ rm plain
518 $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do
516 $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do
519 > echo $i >> plain
517 > echo $i >> plain
520 > done
518 > done
521
519
522 Record beginning, middle
520 Record beginning, middle
523
521
524 $ hg record -d '14 0' -m middle-only plain <<EOF
522 $ hg record -d '14 0' -m middle-only plain <<EOF
525 > y
523 > y
526 > y
524 > y
527 > y
525 > y
528 > n
526 > n
529 > EOF
527 > EOF
530 diff --git a/plain b/plain
528 diff --git a/plain b/plain
531 3 hunks, 7 lines changed
529 3 hunks, 7 lines changed
532 examine changes to 'plain'? [Ynesfdaq?]
530 examine changes to 'plain'? [Ynesfdaq?]
533 @@ -1,2 +1,5 @@
531 @@ -1,2 +1,5 @@
534 +1
532 +1
535 +2
533 +2
536 +3
534 +3
537 4
535 4
538 5
536 5
539 record change 1/3 to 'plain'? [Ynesfdaq?]
537 record change 1/3 to 'plain'? [Ynesfdaq?]
540 @@ -1,6 +4,8 @@
538 @@ -1,6 +4,8 @@
541 4
539 4
542 5
540 5
543 +5.new
541 +5.new
544 +5.reallynew
542 +5.reallynew
545 6
543 6
546 7
544 7
547 8
545 8
548 9
546 9
549 record change 2/3 to 'plain'? [Ynesfdaq?]
547 record change 2/3 to 'plain'? [Ynesfdaq?]
550 @@ -3,4 +8,6 @@
548 @@ -3,4 +8,6 @@
551 6
549 6
552 7
550 7
553 8
551 8
554 9
552 9
555 +10
553 +10
556 +11
554 +11
557 record change 3/3 to 'plain'? [Ynesfdaq?]
555 record change 3/3 to 'plain'? [Ynesfdaq?]
558
556
559 $ hg tip -p
557 $ hg tip -p
560 changeset: 15:f34a7937ec33
558 changeset: 15:f34a7937ec33
561 tag: tip
559 tag: tip
562 user: test
560 user: test
563 date: Thu Jan 01 00:00:14 1970 +0000
561 date: Thu Jan 01 00:00:14 1970 +0000
564 summary: middle-only
562 summary: middle-only
565
563
566 diff -r 82c065d0b850 -r f34a7937ec33 plain
564 diff -r 82c065d0b850 -r f34a7937ec33 plain
567 --- a/plain Thu Jan 01 00:00:13 1970 +0000
565 --- a/plain Thu Jan 01 00:00:13 1970 +0000
568 +++ b/plain Thu Jan 01 00:00:14 1970 +0000
566 +++ b/plain Thu Jan 01 00:00:14 1970 +0000
569 @@ -1,5 +1,10 @@
567 @@ -1,5 +1,10 @@
570 +1
568 +1
571 +2
569 +2
572 +3
570 +3
573 4
571 4
574 5
572 5
575 +5.new
573 +5.new
576 +5.reallynew
574 +5.reallynew
577 6
575 6
578 7
576 7
579 8
577 8
580
578
581
579
582 Record end
580 Record end
583
581
584 $ hg record -d '15 0' -m end-only plain <<EOF
582 $ hg record -d '15 0' -m end-only plain <<EOF
585 > y
583 > y
586 > y
584 > y
587 > EOF
585 > EOF
588 diff --git a/plain b/plain
586 diff --git a/plain b/plain
589 1 hunks, 2 lines changed
587 1 hunks, 2 lines changed
590 examine changes to 'plain'? [Ynesfdaq?]
588 examine changes to 'plain'? [Ynesfdaq?]
591 @@ -9,3 +9,5 @@
589 @@ -9,3 +9,5 @@
592 7
590 7
593 8
591 8
594 9
592 9
595 +10
593 +10
596 +11
594 +11
597 record this change to 'plain'? [Ynesfdaq?]
595 record this change to 'plain'? [Ynesfdaq?]
598
596
599 $ hg tip -p
597 $ hg tip -p
600 changeset: 16:f9900b71a04c
598 changeset: 16:f9900b71a04c
601 tag: tip
599 tag: tip
602 user: test
600 user: test
603 date: Thu Jan 01 00:00:15 1970 +0000
601 date: Thu Jan 01 00:00:15 1970 +0000
604 summary: end-only
602 summary: end-only
605
603
606 diff -r f34a7937ec33 -r f9900b71a04c plain
604 diff -r f34a7937ec33 -r f9900b71a04c plain
607 --- a/plain Thu Jan 01 00:00:14 1970 +0000
605 --- a/plain Thu Jan 01 00:00:14 1970 +0000
608 +++ b/plain Thu Jan 01 00:00:15 1970 +0000
606 +++ b/plain Thu Jan 01 00:00:15 1970 +0000
609 @@ -9,3 +9,5 @@
607 @@ -9,3 +9,5 @@
610 7
608 7
611 8
609 8
612 9
610 9
613 +10
611 +10
614 +11
612 +11
615
613
616
614
617 $ mkdir subdir
615 $ mkdir subdir
618 $ cd subdir
616 $ cd subdir
619 $ echo a > a
617 $ echo a > a
620 $ hg ci -d '16 0' -Amsubdir
618 $ hg ci -d '16 0' -Amsubdir
621 adding subdir/a
619 adding subdir/a
622
620
623 $ echo a >> a
621 $ echo a >> a
624 $ hg record -d '16 0' -m subdir-change a <<EOF
622 $ hg record -d '16 0' -m subdir-change a <<EOF
625 > y
623 > y
626 > y
624 > y
627 > EOF
625 > EOF
628 diff --git a/subdir/a b/subdir/a
626 diff --git a/subdir/a b/subdir/a
629 1 hunks, 1 lines changed
627 1 hunks, 1 lines changed
630 examine changes to 'subdir/a'? [Ynesfdaq?]
628 examine changes to 'subdir/a'? [Ynesfdaq?]
631 @@ -1,1 +1,2 @@
629 @@ -1,1 +1,2 @@
632 a
630 a
633 +a
631 +a
634 record this change to 'subdir/a'? [Ynesfdaq?]
632 record this change to 'subdir/a'? [Ynesfdaq?]
635
633
636 $ hg tip -p
634 $ hg tip -p
637 changeset: 18:61be427a9deb
635 changeset: 18:61be427a9deb
638 tag: tip
636 tag: tip
639 user: test
637 user: test
640 date: Thu Jan 01 00:00:16 1970 +0000
638 date: Thu Jan 01 00:00:16 1970 +0000
641 summary: subdir-change
639 summary: subdir-change
642
640
643 diff -r a7ffae4d61cb -r 61be427a9deb subdir/a
641 diff -r a7ffae4d61cb -r 61be427a9deb subdir/a
644 --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000
642 --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000
645 +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000
643 +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000
646 @@ -1,1 +1,2 @@
644 @@ -1,1 +1,2 @@
647 a
645 a
648 +a
646 +a
649
647
650
648
651 $ echo a > f1
649 $ echo a > f1
652 $ echo b > f2
650 $ echo b > f2
653 $ hg add f1 f2
651 $ hg add f1 f2
654
652
655 $ hg ci -mz -d '17 0'
653 $ hg ci -mz -d '17 0'
656
654
657 $ echo a >> f1
655 $ echo a >> f1
658 $ echo b >> f2
656 $ echo b >> f2
659
657
660 Help, quit
658 Help, quit
661
659
662 $ hg record <<EOF
660 $ hg record <<EOF
663 > ?
661 > ?
664 > q
662 > q
665 > EOF
663 > EOF
666 diff --git a/subdir/f1 b/subdir/f1
664 diff --git a/subdir/f1 b/subdir/f1
667 1 hunks, 1 lines changed
665 1 hunks, 1 lines changed
668 examine changes to 'subdir/f1'? [Ynesfdaq?]
666 examine changes to 'subdir/f1'? [Ynesfdaq?]
669 y - record this change
667 y - record this change
670 n - skip this change
668 n - skip this change
671 e - edit this change manually
669 e - edit this change manually
672 s - skip remaining changes to this file
670 s - skip remaining changes to this file
673 f - record remaining changes to this file
671 f - record remaining changes to this file
674 d - done, skip remaining changes and files
672 d - done, skip remaining changes and files
675 a - record all changes to all remaining files
673 a - record all changes to all remaining files
676 q - quit, recording no changes
674 q - quit, recording no changes
677 ? - display help
675 ? - display help
678 examine changes to 'subdir/f1'? [Ynesfdaq?]
676 examine changes to 'subdir/f1'? [Ynesfdaq?]
679 abort: user quit
677 abort: user quit
680 [255]
678 [255]
681
679
682 Skip
680 Skip
683
681
684 $ hg record <<EOF
682 $ hg record <<EOF
685 > s
683 > s
686 > EOF
684 > EOF
687 diff --git a/subdir/f1 b/subdir/f1
685 diff --git a/subdir/f1 b/subdir/f1
688 1 hunks, 1 lines changed
686 1 hunks, 1 lines changed
689 examine changes to 'subdir/f1'? [Ynesfdaq?]
687 examine changes to 'subdir/f1'? [Ynesfdaq?]
690 diff --git a/subdir/f2 b/subdir/f2
688 diff --git a/subdir/f2 b/subdir/f2
691 1 hunks, 1 lines changed
689 1 hunks, 1 lines changed
692 examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
690 examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
693 [255]
691 [255]
694
692
695 No
693 No
696
694
697 $ hg record <<EOF
695 $ hg record <<EOF
698 > n
696 > n
699 > EOF
697 > EOF
700 diff --git a/subdir/f1 b/subdir/f1
698 diff --git a/subdir/f1 b/subdir/f1
701 1 hunks, 1 lines changed
699 1 hunks, 1 lines changed
702 examine changes to 'subdir/f1'? [Ynesfdaq?]
700 examine changes to 'subdir/f1'? [Ynesfdaq?]
703 diff --git a/subdir/f2 b/subdir/f2
701 diff --git a/subdir/f2 b/subdir/f2
704 1 hunks, 1 lines changed
702 1 hunks, 1 lines changed
705 examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
703 examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected
706 [255]
704 [255]
707
705
708 f, quit
706 f, quit
709
707
710 $ hg record <<EOF
708 $ hg record <<EOF
711 > f
709 > f
712 > q
710 > q
713 > EOF
711 > EOF
714 diff --git a/subdir/f1 b/subdir/f1
712 diff --git a/subdir/f1 b/subdir/f1
715 1 hunks, 1 lines changed
713 1 hunks, 1 lines changed
716 examine changes to 'subdir/f1'? [Ynesfdaq?]
714 examine changes to 'subdir/f1'? [Ynesfdaq?]
717 diff --git a/subdir/f2 b/subdir/f2
715 diff --git a/subdir/f2 b/subdir/f2
718 1 hunks, 1 lines changed
716 1 hunks, 1 lines changed
719 examine changes to 'subdir/f2'? [Ynesfdaq?]
717 examine changes to 'subdir/f2'? [Ynesfdaq?]
720 abort: user quit
718 abort: user quit
721 [255]
719 [255]
722
720
723 s, all
721 s, all
724
722
725 $ hg record -d '18 0' -mx <<EOF
723 $ hg record -d '18 0' -mx <<EOF
726 > s
724 > s
727 > a
725 > a
728 > EOF
726 > EOF
729 diff --git a/subdir/f1 b/subdir/f1
727 diff --git a/subdir/f1 b/subdir/f1
730 1 hunks, 1 lines changed
728 1 hunks, 1 lines changed
731 examine changes to 'subdir/f1'? [Ynesfdaq?]
729 examine changes to 'subdir/f1'? [Ynesfdaq?]
732 diff --git a/subdir/f2 b/subdir/f2
730 diff --git a/subdir/f2 b/subdir/f2
733 1 hunks, 1 lines changed
731 1 hunks, 1 lines changed
734 examine changes to 'subdir/f2'? [Ynesfdaq?]
732 examine changes to 'subdir/f2'? [Ynesfdaq?]
735
733
736 $ hg tip -p
734 $ hg tip -p
737 changeset: 20:b3df3dda369a
735 changeset: 20:b3df3dda369a
738 tag: tip
736 tag: tip
739 user: test
737 user: test
740 date: Thu Jan 01 00:00:18 1970 +0000
738 date: Thu Jan 01 00:00:18 1970 +0000
741 summary: x
739 summary: x
742
740
743 diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2
741 diff -r 6e02d6c9906d -r b3df3dda369a subdir/f2
744 --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000
742 --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000
745 +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000
743 +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000
746 @@ -1,1 +1,2 @@
744 @@ -1,1 +1,2 @@
747 b
745 b
748 +b
746 +b
749
747
750
748
751 f
749 f
752
750
753 $ hg record -d '19 0' -my <<EOF
751 $ hg record -d '19 0' -my <<EOF
754 > f
752 > f
755 > EOF
753 > EOF
756 diff --git a/subdir/f1 b/subdir/f1
754 diff --git a/subdir/f1 b/subdir/f1
757 1 hunks, 1 lines changed
755 1 hunks, 1 lines changed
758 examine changes to 'subdir/f1'? [Ynesfdaq?]
756 examine changes to 'subdir/f1'? [Ynesfdaq?]
759
757
760 $ hg tip -p
758 $ hg tip -p
761 changeset: 21:38ec577f126b
759 changeset: 21:38ec577f126b
762 tag: tip
760 tag: tip
763 user: test
761 user: test
764 date: Thu Jan 01 00:00:19 1970 +0000
762 date: Thu Jan 01 00:00:19 1970 +0000
765 summary: y
763 summary: y
766
764
767 diff -r b3df3dda369a -r 38ec577f126b subdir/f1
765 diff -r b3df3dda369a -r 38ec577f126b subdir/f1
768 --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000
766 --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000
769 +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000
767 +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000
770 @@ -1,1 +1,2 @@
768 @@ -1,1 +1,2 @@
771 a
769 a
772 +a
770 +a
773
771
774
772
775 #if execbit
773 #if execbit
776
774
777 Preserve chmod +x
775 Preserve chmod +x
778
776
779 $ chmod +x f1
777 $ chmod +x f1
780 $ echo a >> f1
778 $ echo a >> f1
781 $ hg record -d '20 0' -mz <<EOF
779 $ hg record -d '20 0' -mz <<EOF
782 > y
780 > y
783 > y
781 > y
784 > y
782 > y
785 > EOF
783 > EOF
786 diff --git a/subdir/f1 b/subdir/f1
784 diff --git a/subdir/f1 b/subdir/f1
787 old mode 100644
785 old mode 100644
788 new mode 100755
786 new mode 100755
789 1 hunks, 1 lines changed
787 1 hunks, 1 lines changed
790 examine changes to 'subdir/f1'? [Ynesfdaq?]
788 examine changes to 'subdir/f1'? [Ynesfdaq?]
791 @@ -1,2 +1,3 @@
789 @@ -1,2 +1,3 @@
792 a
790 a
793 a
791 a
794 +a
792 +a
795 record this change to 'subdir/f1'? [Ynesfdaq?]
793 record this change to 'subdir/f1'? [Ynesfdaq?]
796
794
797 $ hg tip --config diff.git=True -p
795 $ hg tip --config diff.git=True -p
798 changeset: 22:3261adceb075
796 changeset: 22:3261adceb075
799 tag: tip
797 tag: tip
800 user: test
798 user: test
801 date: Thu Jan 01 00:00:20 1970 +0000
799 date: Thu Jan 01 00:00:20 1970 +0000
802 summary: z
800 summary: z
803
801
804 diff --git a/subdir/f1 b/subdir/f1
802 diff --git a/subdir/f1 b/subdir/f1
805 old mode 100644
803 old mode 100644
806 new mode 100755
804 new mode 100755
807 --- a/subdir/f1
805 --- a/subdir/f1
808 +++ b/subdir/f1
806 +++ b/subdir/f1
809 @@ -1,2 +1,3 @@
807 @@ -1,2 +1,3 @@
810 a
808 a
811 a
809 a
812 +a
810 +a
813
811
814
812
815 Preserve execute permission on original
813 Preserve execute permission on original
816
814
817 $ echo b >> f1
815 $ echo b >> f1
818 $ hg record -d '21 0' -maa <<EOF
816 $ hg record -d '21 0' -maa <<EOF
819 > y
817 > y
820 > y
818 > y
821 > y
819 > y
822 > EOF
820 > EOF
823 diff --git a/subdir/f1 b/subdir/f1
821 diff --git a/subdir/f1 b/subdir/f1
824 1 hunks, 1 lines changed
822 1 hunks, 1 lines changed
825 examine changes to 'subdir/f1'? [Ynesfdaq?]
823 examine changes to 'subdir/f1'? [Ynesfdaq?]
826 @@ -1,3 +1,4 @@
824 @@ -1,3 +1,4 @@
827 a
825 a
828 a
826 a
829 a
827 a
830 +b
828 +b
831 record this change to 'subdir/f1'? [Ynesfdaq?]
829 record this change to 'subdir/f1'? [Ynesfdaq?]
832
830
833 $ hg tip --config diff.git=True -p
831 $ hg tip --config diff.git=True -p
834 changeset: 23:b429867550db
832 changeset: 23:b429867550db
835 tag: tip
833 tag: tip
836 user: test
834 user: test
837 date: Thu Jan 01 00:00:21 1970 +0000
835 date: Thu Jan 01 00:00:21 1970 +0000
838 summary: aa
836 summary: aa
839
837
840 diff --git a/subdir/f1 b/subdir/f1
838 diff --git a/subdir/f1 b/subdir/f1
841 --- a/subdir/f1
839 --- a/subdir/f1
842 +++ b/subdir/f1
840 +++ b/subdir/f1
843 @@ -1,3 +1,4 @@
841 @@ -1,3 +1,4 @@
844 a
842 a
845 a
843 a
846 a
844 a
847 +b
845 +b
848
846
849
847
850 Preserve chmod -x
848 Preserve chmod -x
851
849
852 $ chmod -x f1
850 $ chmod -x f1
853 $ echo c >> f1
851 $ echo c >> f1
854 $ hg record -d '22 0' -mab <<EOF
852 $ hg record -d '22 0' -mab <<EOF
855 > y
853 > y
856 > y
854 > y
857 > y
855 > y
858 > EOF
856 > EOF
859 diff --git a/subdir/f1 b/subdir/f1
857 diff --git a/subdir/f1 b/subdir/f1
860 old mode 100755
858 old mode 100755
861 new mode 100644
859 new mode 100644
862 1 hunks, 1 lines changed
860 1 hunks, 1 lines changed
863 examine changes to 'subdir/f1'? [Ynesfdaq?]
861 examine changes to 'subdir/f1'? [Ynesfdaq?]
864 @@ -2,3 +2,4 @@
862 @@ -2,3 +2,4 @@
865 a
863 a
866 a
864 a
867 b
865 b
868 +c
866 +c
869 record this change to 'subdir/f1'? [Ynesfdaq?]
867 record this change to 'subdir/f1'? [Ynesfdaq?]
870
868
871 $ hg tip --config diff.git=True -p
869 $ hg tip --config diff.git=True -p
872 changeset: 24:0b082130c20a
870 changeset: 24:0b082130c20a
873 tag: tip
871 tag: tip
874 user: test
872 user: test
875 date: Thu Jan 01 00:00:22 1970 +0000
873 date: Thu Jan 01 00:00:22 1970 +0000
876 summary: ab
874 summary: ab
877
875
878 diff --git a/subdir/f1 b/subdir/f1
876 diff --git a/subdir/f1 b/subdir/f1
879 old mode 100755
877 old mode 100755
880 new mode 100644
878 new mode 100644
881 --- a/subdir/f1
879 --- a/subdir/f1
882 +++ b/subdir/f1
880 +++ b/subdir/f1
883 @@ -2,3 +2,4 @@
881 @@ -2,3 +2,4 @@
884 a
882 a
885 a
883 a
886 b
884 b
887 +c
885 +c
888
886
889
887
890 #else
888 #else
891
889
892 Slightly bogus tests to get almost same repo structure as when x bit is used
890 Slightly bogus tests to get almost same repo structure as when x bit is used
893 - but with different hashes.
891 - but with different hashes.
894
892
895 Mock "Preserve chmod +x"
893 Mock "Preserve chmod +x"
896
894
897 $ echo a >> f1
895 $ echo a >> f1
898 $ hg record -d '20 0' -mz <<EOF
896 $ hg record -d '20 0' -mz <<EOF
899 > y
897 > y
900 > y
898 > y
901 > y
899 > y
902 > EOF
900 > EOF
903 diff --git a/subdir/f1 b/subdir/f1
901 diff --git a/subdir/f1 b/subdir/f1
904 1 hunks, 1 lines changed
902 1 hunks, 1 lines changed
905 examine changes to 'subdir/f1'? [Ynesfdaq?]
903 examine changes to 'subdir/f1'? [Ynesfdaq?]
906 @@ -1,2 +1,3 @@
904 @@ -1,2 +1,3 @@
907 a
905 a
908 a
906 a
909 +a
907 +a
910 record this change to 'subdir/f1'? [Ynesfdaq?]
908 record this change to 'subdir/f1'? [Ynesfdaq?]
911
909
912 $ hg tip --config diff.git=True -p
910 $ hg tip --config diff.git=True -p
913 changeset: 22:0d463bd428f5
911 changeset: 22:0d463bd428f5
914 tag: tip
912 tag: tip
915 user: test
913 user: test
916 date: Thu Jan 01 00:00:20 1970 +0000
914 date: Thu Jan 01 00:00:20 1970 +0000
917 summary: z
915 summary: z
918
916
919 diff --git a/subdir/f1 b/subdir/f1
917 diff --git a/subdir/f1 b/subdir/f1
920 --- a/subdir/f1
918 --- a/subdir/f1
921 +++ b/subdir/f1
919 +++ b/subdir/f1
922 @@ -1,2 +1,3 @@
920 @@ -1,2 +1,3 @@
923 a
921 a
924 a
922 a
925 +a
923 +a
926
924
927
925
928 Mock "Preserve execute permission on original"
926 Mock "Preserve execute permission on original"
929
927
930 $ echo b >> f1
928 $ echo b >> f1
931 $ hg record -d '21 0' -maa <<EOF
929 $ hg record -d '21 0' -maa <<EOF
932 > y
930 > y
933 > y
931 > y
934 > y
932 > y
935 > EOF
933 > EOF
936 diff --git a/subdir/f1 b/subdir/f1
934 diff --git a/subdir/f1 b/subdir/f1
937 1 hunks, 1 lines changed
935 1 hunks, 1 lines changed
938 examine changes to 'subdir/f1'? [Ynesfdaq?]
936 examine changes to 'subdir/f1'? [Ynesfdaq?]
939 @@ -1,3 +1,4 @@
937 @@ -1,3 +1,4 @@
940 a
938 a
941 a
939 a
942 a
940 a
943 +b
941 +b
944 record this change to 'subdir/f1'? [Ynesfdaq?]
942 record this change to 'subdir/f1'? [Ynesfdaq?]
945
943
946 $ hg tip --config diff.git=True -p
944 $ hg tip --config diff.git=True -p
947 changeset: 23:0eab41a3e524
945 changeset: 23:0eab41a3e524
948 tag: tip
946 tag: tip
949 user: test
947 user: test
950 date: Thu Jan 01 00:00:21 1970 +0000
948 date: Thu Jan 01 00:00:21 1970 +0000
951 summary: aa
949 summary: aa
952
950
953 diff --git a/subdir/f1 b/subdir/f1
951 diff --git a/subdir/f1 b/subdir/f1
954 --- a/subdir/f1
952 --- a/subdir/f1
955 +++ b/subdir/f1
953 +++ b/subdir/f1
956 @@ -1,3 +1,4 @@
954 @@ -1,3 +1,4 @@
957 a
955 a
958 a
956 a
959 a
957 a
960 +b
958 +b
961
959
962
960
963 Mock "Preserve chmod -x"
961 Mock "Preserve chmod -x"
964
962
965 $ chmod -x f1
963 $ chmod -x f1
966 $ echo c >> f1
964 $ echo c >> f1
967 $ hg record -d '22 0' -mab <<EOF
965 $ hg record -d '22 0' -mab <<EOF
968 > y
966 > y
969 > y
967 > y
970 > y
968 > y
971 > EOF
969 > EOF
972 diff --git a/subdir/f1 b/subdir/f1
970 diff --git a/subdir/f1 b/subdir/f1
973 1 hunks, 1 lines changed
971 1 hunks, 1 lines changed
974 examine changes to 'subdir/f1'? [Ynesfdaq?]
972 examine changes to 'subdir/f1'? [Ynesfdaq?]
975 @@ -2,3 +2,4 @@
973 @@ -2,3 +2,4 @@
976 a
974 a
977 a
975 a
978 b
976 b
979 +c
977 +c
980 record this change to 'subdir/f1'? [Ynesfdaq?]
978 record this change to 'subdir/f1'? [Ynesfdaq?]
981
979
982 $ hg tip --config diff.git=True -p
980 $ hg tip --config diff.git=True -p
983 changeset: 24:f4f718f27b7c
981 changeset: 24:f4f718f27b7c
984 tag: tip
982 tag: tip
985 user: test
983 user: test
986 date: Thu Jan 01 00:00:22 1970 +0000
984 date: Thu Jan 01 00:00:22 1970 +0000
987 summary: ab
985 summary: ab
988
986
989 diff --git a/subdir/f1 b/subdir/f1
987 diff --git a/subdir/f1 b/subdir/f1
990 --- a/subdir/f1
988 --- a/subdir/f1
991 +++ b/subdir/f1
989 +++ b/subdir/f1
992 @@ -2,3 +2,4 @@
990 @@ -2,3 +2,4 @@
993 a
991 a
994 a
992 a
995 b
993 b
996 +c
994 +c
997
995
998
996
999 #endif
997 #endif
1000
998
1001 $ cd ..
999 $ cd ..
1002
1000
1003
1001
1004 Abort early when a merge is in progress
1002 Abort early when a merge is in progress
1005
1003
1006 $ hg up 4
1004 $ hg up 4
1007 1 files updated, 0 files merged, 6 files removed, 0 files unresolved
1005 1 files updated, 0 files merged, 6 files removed, 0 files unresolved
1008
1006
1009 $ touch iwillmergethat
1007 $ touch iwillmergethat
1010 $ hg add iwillmergethat
1008 $ hg add iwillmergethat
1011
1009
1012 $ hg branch thatbranch
1010 $ hg branch thatbranch
1013 marked working directory as branch thatbranch
1011 marked working directory as branch thatbranch
1014 (branches are permanent and global, did you want a bookmark?)
1012 (branches are permanent and global, did you want a bookmark?)
1015
1013
1016 $ hg ci -m'new head'
1014 $ hg ci -m'new head'
1017
1015
1018 $ hg up default
1016 $ hg up default
1019 6 files updated, 0 files merged, 2 files removed, 0 files unresolved
1017 6 files updated, 0 files merged, 2 files removed, 0 files unresolved
1020
1018
1021 $ hg merge thatbranch
1019 $ hg merge thatbranch
1022 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1020 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1023 (branch merge, don't forget to commit)
1021 (branch merge, don't forget to commit)
1024
1022
1025 $ hg record -m'will abort'
1023 $ hg record -m'will abort'
1026 abort: cannot partially commit a merge (use "hg commit" instead)
1024 abort: cannot partially commit a merge (use "hg commit" instead)
1027 [255]
1025 [255]
1028
1026
1029 $ hg up -C
1027 $ hg up -C
1030 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1028 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1031
1029
1032 Editing patch
1030 Editing patch
1033
1031
1034 $ cat > editor << '__EOF__'
1032 $ cat > editor.sh << '__EOF__'
1035 > #!/bin/sh
1036 > sed -e 7d -e '5s/^-/ /' "$1" > tmp
1033 > sed -e 7d -e '5s/^-/ /' "$1" > tmp
1037 > mv tmp "$1"
1034 > mv tmp "$1"
1038 > __EOF__
1035 > __EOF__
1039 $ chmod +x editor
1040 $ cat > editedfile << '__EOF__'
1036 $ cat > editedfile << '__EOF__'
1041 > This is the first line
1037 > This is the first line
1042 > This is the second line
1038 > This is the second line
1043 > This is the third line
1039 > This is the third line
1044 > __EOF__
1040 > __EOF__
1045 $ hg add editedfile
1041 $ hg add editedfile
1046 $ hg commit -medit-patch-1
1042 $ hg commit -medit-patch-1
1047 $ cat > editedfile << '__EOF__'
1043 $ cat > editedfile << '__EOF__'
1048 > This line has changed
1044 > This line has changed
1049 > This change will be committed
1045 > This change will be committed
1050 > This is the third line
1046 > This is the third line
1051 > __EOF__
1047 > __EOF__
1052 $ HGEDITOR="'`pwd`'"/editor hg record -d '23 0' -medit-patch-2 <<EOF
1048 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record -d '23 0' -medit-patch-2 <<EOF
1053 > y
1049 > y
1054 > e
1050 > e
1055 > EOF
1051 > EOF
1056 diff --git a/editedfile b/editedfile
1052 diff --git a/editedfile b/editedfile
1057 1 hunks, 2 lines changed
1053 1 hunks, 2 lines changed
1058 examine changes to 'editedfile'? [Ynesfdaq?]
1054 examine changes to 'editedfile'? [Ynesfdaq?]
1059 @@ -1,3 +1,3 @@
1055 @@ -1,3 +1,3 @@
1060 -This is the first line
1056 -This is the first line
1061 -This is the second line
1057 -This is the second line
1062 +This line has changed
1058 +This line has changed
1063 +This change will be committed
1059 +This change will be committed
1064 This is the third line
1060 This is the third line
1065 record this change to 'editedfile'? [Ynesfdaq?]
1061 record this change to 'editedfile'? [Ynesfdaq?]
1066 $ cat editedfile
1062 $ cat editedfile
1067 This line has changed
1063 This line has changed
1068 This change will be committed
1064 This change will be committed
1069 This is the third line
1065 This is the third line
1070 $ hg cat -r tip editedfile
1066 $ hg cat -r tip editedfile
1071 This is the first line
1067 This is the first line
1072 This change will be committed
1068 This change will be committed
1073 This is the third line
1069 This is the third line
1074 $ hg revert editedfile
1070 $ hg revert editedfile
1075
1071
1076 Trying to edit patch for whole file
1072 Trying to edit patch for whole file
1077
1073
1078 $ echo "This is the fourth line" >> editedfile
1074 $ echo "This is the fourth line" >> editedfile
1079 $ hg record <<EOF
1075 $ hg record <<EOF
1080 > e
1076 > e
1081 > q
1077 > q
1082 > EOF
1078 > EOF
1083 diff --git a/editedfile b/editedfile
1079 diff --git a/editedfile b/editedfile
1084 1 hunks, 1 lines changed
1080 1 hunks, 1 lines changed
1085 examine changes to 'editedfile'? [Ynesfdaq?]
1081 examine changes to 'editedfile'? [Ynesfdaq?]
1086 cannot edit patch for whole file
1082 cannot edit patch for whole file
1087 examine changes to 'editedfile'? [Ynesfdaq?]
1083 examine changes to 'editedfile'? [Ynesfdaq?]
1088 abort: user quit
1084 abort: user quit
1089 [255]
1085 [255]
1090 $ hg revert editedfile
1086 $ hg revert editedfile
1091
1087
1092 Removing changes from patch
1088 Removing changes from patch
1093
1089
1094 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
1090 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
1095 $ mv tmp editedfile
1091 $ mv tmp editedfile
1096 $ echo "This line has been added" >> editedfile
1092 $ echo "This line has been added" >> editedfile
1097 $ cat > editor << '__EOF__'
1093 $ cat > editor.sh << '__EOF__'
1098 > #!/bin/sh
1099 > sed -e 's/^[-+]/ /' "$1" > tmp
1094 > sed -e 's/^[-+]/ /' "$1" > tmp
1100 > mv tmp "$1"
1095 > mv tmp "$1"
1101 > __EOF__
1096 > __EOF__
1102 $ chmod +x editor
1097 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
1103 $ HGEDITOR="'`pwd`'"/editor hg record <<EOF
1104 > y
1098 > y
1105 > e
1099 > e
1106 > EOF
1100 > EOF
1107 diff --git a/editedfile b/editedfile
1101 diff --git a/editedfile b/editedfile
1108 1 hunks, 3 lines changed
1102 1 hunks, 3 lines changed
1109 examine changes to 'editedfile'? [Ynesfdaq?]
1103 examine changes to 'editedfile'? [Ynesfdaq?]
1110 @@ -1,3 +1,3 @@
1104 @@ -1,3 +1,3 @@
1111 -This is the first line
1105 -This is the first line
1112 -This change will be committed
1106 -This change will be committed
1113 -This is the third line
1107 -This is the third line
1114 +This change will not be committed
1108 +This change will not be committed
1115 +This is the second line
1109 +This is the second line
1116 +This line has been added
1110 +This line has been added
1117 record this change to 'editedfile'? [Ynesfdaq?]
1111 record this change to 'editedfile'? [Ynesfdaq?]
1118 no changes to record
1112 no changes to record
1119 $ cat editedfile
1113 $ cat editedfile
1120 This change will not be committed
1114 This change will not be committed
1121 This is the second line
1115 This is the second line
1122 This line has been added
1116 This line has been added
1123 $ hg cat -r tip editedfile
1117 $ hg cat -r tip editedfile
1124 This is the first line
1118 This is the first line
1125 This change will be committed
1119 This change will be committed
1126 This is the third line
1120 This is the third line
1127 $ hg revert editedfile
1121 $ hg revert editedfile
1128
1122
1129 Invalid patch
1123 Invalid patch
1130
1124
1131 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
1125 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp
1132 $ mv tmp editedfile
1126 $ mv tmp editedfile
1133 $ echo "This line has been added" >> editedfile
1127 $ echo "This line has been added" >> editedfile
1134 $ cat > editor << '__EOF__'
1128 $ cat > editor.sh << '__EOF__'
1135 > #!/bin/sh
1136 > sed s/This/That/ "$1" > tmp
1129 > sed s/This/That/ "$1" > tmp
1137 > mv tmp "$1"
1130 > mv tmp "$1"
1138 > __EOF__
1131 > __EOF__
1139 $ chmod +x editor
1132 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg record <<EOF
1140 $ HGEDITOR="'`pwd`'"/editor hg record <<EOF
1141 > y
1133 > y
1142 > e
1134 > e
1143 > EOF
1135 > EOF
1144 diff --git a/editedfile b/editedfile
1136 diff --git a/editedfile b/editedfile
1145 1 hunks, 3 lines changed
1137 1 hunks, 3 lines changed
1146 examine changes to 'editedfile'? [Ynesfdaq?]
1138 examine changes to 'editedfile'? [Ynesfdaq?]
1147 @@ -1,3 +1,3 @@
1139 @@ -1,3 +1,3 @@
1148 -This is the first line
1140 -This is the first line
1149 -This change will be committed
1141 -This change will be committed
1150 -This is the third line
1142 -This is the third line
1151 +This change will not be committed
1143 +This change will not be committed
1152 +This is the second line
1144 +This is the second line
1153 +This line has been added
1145 +This line has been added
1154 record this change to 'editedfile'? [Ynesfdaq?]
1146 record this change to 'editedfile'? [Ynesfdaq?]
1155 patching file editedfile
1147 patching file editedfile
1156 Hunk #1 FAILED at 0
1148 Hunk #1 FAILED at 0
1157 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
1149 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej
1158 abort: patch failed to apply
1150 abort: patch failed to apply
1159 [255]
1151 [255]
1160 $ cat editedfile
1152 $ cat editedfile
1161 This change will not be committed
1153 This change will not be committed
1162 This is the second line
1154 This is the second line
1163 This line has been added
1155 This line has been added
1164 $ hg cat -r tip editedfile
1156 $ hg cat -r tip editedfile
1165 This is the first line
1157 This is the first line
1166 This change will be committed
1158 This change will be committed
1167 This is the third line
1159 This is the third line
1168 $ cat editedfile.rej
1160 $ cat editedfile.rej
1169 --- editedfile
1161 --- editedfile
1170 +++ editedfile
1162 +++ editedfile
1171 @@ -1,3 +1,3 @@
1163 @@ -1,3 +1,3 @@
1172 -That is the first line
1164 -That is the first line
1173 -That change will be committed
1165 -That change will be committed
1174 -That is the third line
1166 -That is the third line
1175 +That change will not be committed
1167 +That change will not be committed
1176 +That is the second line
1168 +That is the second line
1177 +That line has been added
1169 +That line has been added
1178 $ hg up -C
1170 $ hg up -C
1179 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1171 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1180
1172
1181 With win32text
1173 With win32text
1182
1174
1183 $ echo '[extensions]' >> .hg/hgrc
1175 $ echo '[extensions]' >> .hg/hgrc
1184 $ echo 'win32text = ' >> .hg/hgrc
1176 $ echo 'win32text = ' >> .hg/hgrc
1185 $ echo '[decode]' >> .hg/hgrc
1177 $ echo '[decode]' >> .hg/hgrc
1186 $ echo '** = cleverdecode:' >> .hg/hgrc
1178 $ echo '** = cleverdecode:' >> .hg/hgrc
1187 $ echo '[encode]' >> .hg/hgrc
1179 $ echo '[encode]' >> .hg/hgrc
1188 $ echo '** = cleverencode:' >> .hg/hgrc
1180 $ echo '** = cleverencode:' >> .hg/hgrc
1189 $ echo '[patch]' >> .hg/hgrc
1181 $ echo '[patch]' >> .hg/hgrc
1190 $ echo 'eol = crlf' >> .hg/hgrc
1182 $ echo 'eol = crlf' >> .hg/hgrc
1191
1183
1192 Ignore win32text deprecation warning for now:
1184 Ignore win32text deprecation warning for now:
1193
1185
1194 $ echo '[win32text]' >> .hg/hgrc
1186 $ echo '[win32text]' >> .hg/hgrc
1195 $ echo 'warn = no' >> .hg/hgrc
1187 $ echo 'warn = no' >> .hg/hgrc
1196
1188
1197 $ echo d >> subdir/f1
1189 $ echo d >> subdir/f1
1198 $ hg record -d '24 0' -mw1 <<EOF
1190 $ hg record -d '24 0' -mw1 <<EOF
1199 > y
1191 > y
1200 > y
1192 > y
1201 > EOF
1193 > EOF
1202 diff --git a/subdir/f1 b/subdir/f1
1194 diff --git a/subdir/f1 b/subdir/f1
1203 1 hunks, 1 lines changed
1195 1 hunks, 1 lines changed
1204 examine changes to 'subdir/f1'? [Ynesfdaq?]
1196 examine changes to 'subdir/f1'? [Ynesfdaq?]
1205 @@ -3,3 +3,4 @@
1197 @@ -3,3 +3,4 @@
1206 a
1198 a
1207 b
1199 b
1208 c
1200 c
1209 +d
1201 +d
1210 record this change to 'subdir/f1'? [Ynesfdaq?]
1202 record this change to 'subdir/f1'? [Ynesfdaq?]
1211
1203
1212 $ hg tip -p
1204 $ hg tip -p
1213 changeset: 28:* (glob)
1205 changeset: 28:* (glob)
1214 tag: tip
1206 tag: tip
1215 user: test
1207 user: test
1216 date: Thu Jan 01 00:00:24 1970 +0000
1208 date: Thu Jan 01 00:00:24 1970 +0000
1217 summary: w1
1209 summary: w1
1218
1210
1219 diff -r ???????????? -r ???????????? subdir/f1 (glob)
1211 diff -r ???????????? -r ???????????? subdir/f1 (glob)
1220 --- a/subdir/f1 Thu Jan 01 00:00:23 1970 +0000
1212 --- a/subdir/f1 Thu Jan 01 00:00:23 1970 +0000
1221 +++ b/subdir/f1 Thu Jan 01 00:00:24 1970 +0000
1213 +++ b/subdir/f1 Thu Jan 01 00:00:24 1970 +0000
1222 @@ -3,3 +3,4 @@
1214 @@ -3,3 +3,4 @@
1223 a
1215 a
1224 b
1216 b
1225 c
1217 c
1226 +d
1218 +d
1227
1219
@@ -1,187 +1,185 b''
1 $ "$TESTDIR/hghave" serve || exit 80
1 $ "$TESTDIR/hghave" serve || exit 80
2
2
3 setup repo
3 setup repo
4 $ hg init t
4 $ hg init t
5 $ cd t
5 $ cd t
6 $ echo a > a
6 $ echo a > a
7 $ hg commit -Am'add a'
7 $ hg commit -Am'add a'
8 adding a
8 adding a
9 $ hg verify
9 $ hg verify
10 checking changesets
10 checking changesets
11 checking manifests
11 checking manifests
12 crosschecking files in changesets and manifests
12 crosschecking files in changesets and manifests
13 checking files
13 checking files
14 1 files, 1 changesets, 1 total revisions
14 1 files, 1 changesets, 1 total revisions
15 $ hg parents
15 $ hg parents
16 changeset: 0:1f0dee641bb7
16 changeset: 0:1f0dee641bb7
17 tag: tip
17 tag: tip
18 user: test
18 user: test
19 date: Thu Jan 01 00:00:00 1970 +0000
19 date: Thu Jan 01 00:00:00 1970 +0000
20 summary: add a
20 summary: add a
21
21
22
22
23 rollback to null revision
23 rollback to null revision
24 $ hg status
24 $ hg status
25 $ hg rollback
25 $ hg rollback
26 repository tip rolled back to revision -1 (undo commit)
26 repository tip rolled back to revision -1 (undo commit)
27 working directory now based on revision -1
27 working directory now based on revision -1
28 $ hg verify
28 $ hg verify
29 checking changesets
29 checking changesets
30 checking manifests
30 checking manifests
31 crosschecking files in changesets and manifests
31 crosschecking files in changesets and manifests
32 checking files
32 checking files
33 0 files, 0 changesets, 0 total revisions
33 0 files, 0 changesets, 0 total revisions
34 $ hg parents
34 $ hg parents
35 $ hg status
35 $ hg status
36 A a
36 A a
37
37
38 Two changesets this time so we rollback to a real changeset
38 Two changesets this time so we rollback to a real changeset
39 $ hg commit -m'add a again'
39 $ hg commit -m'add a again'
40 $ echo a >> a
40 $ echo a >> a
41 $ hg commit -m'modify a'
41 $ hg commit -m'modify a'
42
42
43 Test issue 902 (current branch is preserved)
43 Test issue 902 (current branch is preserved)
44 $ hg branch test
44 $ hg branch test
45 marked working directory as branch test
45 marked working directory as branch test
46 (branches are permanent and global, did you want a bookmark?)
46 (branches are permanent and global, did you want a bookmark?)
47 $ hg rollback
47 $ hg rollback
48 repository tip rolled back to revision 0 (undo commit)
48 repository tip rolled back to revision 0 (undo commit)
49 working directory now based on revision 0
49 working directory now based on revision 0
50 $ hg branch
50 $ hg branch
51 default
51 default
52
52
53 Test issue 1635 (commit message saved)
53 Test issue 1635 (commit message saved)
54 $ cat .hg/last-message.txt ; echo
54 $ cat .hg/last-message.txt ; echo
55 modify a
55 modify a
56
56
57 Test rollback of hg before issue 902 was fixed
57 Test rollback of hg before issue 902 was fixed
58
58
59 $ hg commit -m "test3"
59 $ hg commit -m "test3"
60 $ hg branch test
60 $ hg branch test
61 marked working directory as branch test
61 marked working directory as branch test
62 (branches are permanent and global, did you want a bookmark?)
62 (branches are permanent and global, did you want a bookmark?)
63 $ rm .hg/undo.branch
63 $ rm .hg/undo.branch
64 $ hg rollback
64 $ hg rollback
65 repository tip rolled back to revision 0 (undo commit)
65 repository tip rolled back to revision 0 (undo commit)
66 named branch could not be reset: current branch is still 'test'
66 named branch could not be reset: current branch is still 'test'
67 working directory now based on revision 0
67 working directory now based on revision 0
68 $ hg branch
68 $ hg branch
69 test
69 test
70
70
71 working dir unaffected by rollback: do not restore dirstate et. al.
71 working dir unaffected by rollback: do not restore dirstate et. al.
72 $ hg log --template '{rev} {branch} {desc|firstline}\n'
72 $ hg log --template '{rev} {branch} {desc|firstline}\n'
73 0 default add a again
73 0 default add a again
74 $ hg status
74 $ hg status
75 M a
75 M a
76 $ hg bookmark foo
76 $ hg bookmark foo
77 $ hg commit -m'modify a again'
77 $ hg commit -m'modify a again'
78 $ echo b > b
78 $ echo b > b
79 $ hg commit -Am'add b'
79 $ hg commit -Am'add b'
80 adding b
80 adding b
81 $ hg log --template '{rev} {branch} {desc|firstline}\n'
81 $ hg log --template '{rev} {branch} {desc|firstline}\n'
82 2 test add b
82 2 test add b
83 1 test modify a again
83 1 test modify a again
84 0 default add a again
84 0 default add a again
85 $ hg update default
85 $ hg update default
86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
87 $ hg bookmark bar
87 $ hg bookmark bar
88 $ cat .hg/undo.branch ; echo
88 $ cat .hg/undo.branch ; echo
89 test
89 test
90 $ hg rollback -f
90 $ hg rollback -f
91 repository tip rolled back to revision 1 (undo commit)
91 repository tip rolled back to revision 1 (undo commit)
92 $ hg id -n
92 $ hg id -n
93 0
93 0
94 $ hg branch
94 $ hg branch
95 default
95 default
96 $ cat .hg/bookmarks.current ; echo
96 $ cat .hg/bookmarks.current ; echo
97 bar
97 bar
98 $ hg bookmark --delete foo
98 $ hg bookmark --delete foo
99
99
100 rollback by pretxncommit saves commit message (issue 1635)
100 rollback by pretxncommit saves commit message (issue 1635)
101
101
102 $ echo a >> a
102 $ echo a >> a
103 $ hg --config hooks.pretxncommit=false commit -m"precious commit message"
103 $ hg --config hooks.pretxncommit=false commit -m"precious commit message"
104 transaction abort!
104 transaction abort!
105 rollback completed
105 rollback completed
106 abort: pretxncommit hook exited with status * (glob)
106 abort: pretxncommit hook exited with status * (glob)
107 [255]
107 [255]
108 $ cat .hg/last-message.txt ; echo
108 $ cat .hg/last-message.txt ; echo
109 precious commit message
109 precious commit message
110
110
111 same thing, but run $EDITOR
111 same thing, but run $EDITOR
112
112
113 $ cat > editor << '__EOF__'
113 $ cat > editor.sh << '__EOF__'
114 > #!/bin/sh
115 > echo "another precious commit message" > "$1"
114 > echo "another precious commit message" > "$1"
116 > __EOF__
115 > __EOF__
117 $ chmod +x editor
116 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
118 $ HGEDITOR="'`pwd`'"/editor hg --config hooks.pretxncommit=false commit 2>&1
119 transaction abort!
117 transaction abort!
120 rollback completed
118 rollback completed
121 note: commit message saved in .hg/last-message.txt
119 note: commit message saved in .hg/last-message.txt
122 abort: pretxncommit hook exited with status * (glob)
120 abort: pretxncommit hook exited with status * (glob)
123 [255]
121 [255]
124 $ cat .hg/last-message.txt
122 $ cat .hg/last-message.txt
125 another precious commit message
123 another precious commit message
126
124
127 test rollback on served repository
125 test rollback on served repository
128
126
129 $ hg commit -m "precious commit message"
127 $ hg commit -m "precious commit message"
130 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
128 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
131 $ cat hg.pid >> $DAEMON_PIDS
129 $ cat hg.pid >> $DAEMON_PIDS
132 $ cd ..
130 $ cd ..
133 $ hg clone http://localhost:$HGPORT u
131 $ hg clone http://localhost:$HGPORT u
134 requesting all changes
132 requesting all changes
135 adding changesets
133 adding changesets
136 adding manifests
134 adding manifests
137 adding file changes
135 adding file changes
138 added 3 changesets with 2 changes to 1 files (+1 heads)
136 added 3 changesets with 2 changes to 1 files (+1 heads)
139 updating to branch default
137 updating to branch default
140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
138 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
141 $ cd u
139 $ cd u
142 $ hg id default
140 $ hg id default
143 068774709090
141 068774709090
144
142
145 now rollback and observe that 'hg serve' reloads the repository and
143 now rollback and observe that 'hg serve' reloads the repository and
146 presents the correct tip changeset:
144 presents the correct tip changeset:
147
145
148 $ hg -R ../t rollback
146 $ hg -R ../t rollback
149 repository tip rolled back to revision 1 (undo commit)
147 repository tip rolled back to revision 1 (undo commit)
150 working directory now based on revision 0
148 working directory now based on revision 0
151 $ hg id default
149 $ hg id default
152 791dd2169706
150 791dd2169706
153
151
154 update to older changeset and then refuse rollback, because
152 update to older changeset and then refuse rollback, because
155 that would lose data (issue2998)
153 that would lose data (issue2998)
156 $ cd ../t
154 $ cd ../t
157 $ hg -q update
155 $ hg -q update
158 $ rm `hg status -un`
156 $ rm `hg status -un`
159 $ template='{rev}:{node|short} [{branch}] {desc|firstline}\n'
157 $ template='{rev}:{node|short} [{branch}] {desc|firstline}\n'
160 $ echo 'valuable new file' > b
158 $ echo 'valuable new file' > b
161 $ echo 'valuable modification' >> a
159 $ echo 'valuable modification' >> a
162 $ hg commit -A -m'a valuable change'
160 $ hg commit -A -m'a valuable change'
163 adding b
161 adding b
164 $ hg update 0
162 $ hg update 0
165 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
163 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
166 $ hg rollback
164 $ hg rollback
167 abort: rollback of last commit while not checked out may lose data
165 abort: rollback of last commit while not checked out may lose data
168 (use -f to force)
166 (use -f to force)
169 [255]
167 [255]
170 $ hg tip -q
168 $ hg tip -q
171 2:4d9cd3795eea
169 2:4d9cd3795eea
172 $ hg rollback -f
170 $ hg rollback -f
173 repository tip rolled back to revision 1 (undo commit)
171 repository tip rolled back to revision 1 (undo commit)
174 $ hg status
172 $ hg status
175 $ hg log --removed b # yep, it's gone
173 $ hg log --removed b # yep, it's gone
176
174
177 same again, but emulate an old client that doesn't write undo.desc
175 same again, but emulate an old client that doesn't write undo.desc
178 $ hg -q update
176 $ hg -q update
179 $ echo 'valuable modification redux' >> a
177 $ echo 'valuable modification redux' >> a
180 $ hg commit -m'a valuable change redux'
178 $ hg commit -m'a valuable change redux'
181 $ rm .hg/undo.desc
179 $ rm .hg/undo.desc
182 $ hg update 0
180 $ hg update 0
183 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
181 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
184 $ hg rollback
182 $ hg rollback
185 rolling back unknown transaction
183 rolling back unknown transaction
186 $ cat a
184 $ cat a
187 a
185 a
@@ -1,315 +1,311 b''
1 $ "$TESTDIR/hghave" system-sh || exit 80
2
3 $ hg init test
1 $ hg init test
4 $ cd test
2 $ cd test
5
3
6 $ echo a > a
4 $ echo a > a
7 $ hg add a
5 $ hg add a
8 $ hg commit -m "test"
6 $ hg commit -m "test"
9 $ hg history
7 $ hg history
10 changeset: 0:acb14030fe0a
8 changeset: 0:acb14030fe0a
11 tag: tip
9 tag: tip
12 user: test
10 user: test
13 date: Thu Jan 01 00:00:00 1970 +0000
11 date: Thu Jan 01 00:00:00 1970 +0000
14 summary: test
12 summary: test
15
13
16
14
17 $ hg tag ' '
15 $ hg tag ' '
18 abort: tag names cannot consist entirely of whitespace
16 abort: tag names cannot consist entirely of whitespace
19 [255]
17 [255]
20
18
21 $ hg tag "bleah"
19 $ hg tag "bleah"
22 $ hg history
20 $ hg history
23 changeset: 1:d4f0d2909abc
21 changeset: 1:d4f0d2909abc
24 tag: tip
22 tag: tip
25 user: test
23 user: test
26 date: Thu Jan 01 00:00:00 1970 +0000
24 date: Thu Jan 01 00:00:00 1970 +0000
27 summary: Added tag bleah for changeset acb14030fe0a
25 summary: Added tag bleah for changeset acb14030fe0a
28
26
29 changeset: 0:acb14030fe0a
27 changeset: 0:acb14030fe0a
30 tag: bleah
28 tag: bleah
31 user: test
29 user: test
32 date: Thu Jan 01 00:00:00 1970 +0000
30 date: Thu Jan 01 00:00:00 1970 +0000
33 summary: test
31 summary: test
34
32
35
33
36 $ echo foo >> .hgtags
34 $ echo foo >> .hgtags
37 $ hg tag "bleah2"
35 $ hg tag "bleah2"
38 abort: working copy of .hgtags is changed (please commit .hgtags manually)
36 abort: working copy of .hgtags is changed (please commit .hgtags manually)
39 [255]
37 [255]
40
38
41 $ hg revert .hgtags
39 $ hg revert .hgtags
42 $ hg tag -r 0 x y z y y z
40 $ hg tag -r 0 x y z y y z
43 abort: tag names must be unique
41 abort: tag names must be unique
44 [255]
42 [255]
45 $ hg tag tap nada dot tip null .
43 $ hg tag tap nada dot tip null .
46 abort: the name 'tip' is reserved
44 abort: the name 'tip' is reserved
47 [255]
45 [255]
48 $ hg tag "bleah"
46 $ hg tag "bleah"
49 abort: tag 'bleah' already exists (use -f to force)
47 abort: tag 'bleah' already exists (use -f to force)
50 [255]
48 [255]
51 $ hg tag "blecch" "bleah"
49 $ hg tag "blecch" "bleah"
52 abort: tag 'bleah' already exists (use -f to force)
50 abort: tag 'bleah' already exists (use -f to force)
53 [255]
51 [255]
54
52
55 $ hg tag --remove "blecch"
53 $ hg tag --remove "blecch"
56 abort: tag 'blecch' does not exist
54 abort: tag 'blecch' does not exist
57 [255]
55 [255]
58 $ hg tag --remove "bleah" "blecch" "blough"
56 $ hg tag --remove "bleah" "blecch" "blough"
59 abort: tag 'blecch' does not exist
57 abort: tag 'blecch' does not exist
60 [255]
58 [255]
61
59
62 $ hg tag -r 0 "bleah0"
60 $ hg tag -r 0 "bleah0"
63 $ hg tag -l -r 1 "bleah1"
61 $ hg tag -l -r 1 "bleah1"
64 $ hg tag gack gawk gorp
62 $ hg tag gack gawk gorp
65 $ hg tag -f gack
63 $ hg tag -f gack
66 $ hg tag --remove gack gorp
64 $ hg tag --remove gack gorp
67
65
68 $ hg tag "bleah "
66 $ hg tag "bleah "
69 abort: tag 'bleah' already exists (use -f to force)
67 abort: tag 'bleah' already exists (use -f to force)
70 [255]
68 [255]
71 $ hg tag " bleah"
69 $ hg tag " bleah"
72 abort: tag 'bleah' already exists (use -f to force)
70 abort: tag 'bleah' already exists (use -f to force)
73 [255]
71 [255]
74 $ hg tag " bleah"
72 $ hg tag " bleah"
75 abort: tag 'bleah' already exists (use -f to force)
73 abort: tag 'bleah' already exists (use -f to force)
76 [255]
74 [255]
77 $ hg tag -r 0 " bleahbleah "
75 $ hg tag -r 0 " bleahbleah "
78 $ hg tag -r 0 " bleah bleah "
76 $ hg tag -r 0 " bleah bleah "
79
77
80 $ cat .hgtags
78 $ cat .hgtags
81 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
79 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
82 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
80 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
83 336fccc858a4eb69609a291105009e484a6b6b8d gack
81 336fccc858a4eb69609a291105009e484a6b6b8d gack
84 336fccc858a4eb69609a291105009e484a6b6b8d gawk
82 336fccc858a4eb69609a291105009e484a6b6b8d gawk
85 336fccc858a4eb69609a291105009e484a6b6b8d gorp
83 336fccc858a4eb69609a291105009e484a6b6b8d gorp
86 336fccc858a4eb69609a291105009e484a6b6b8d gack
84 336fccc858a4eb69609a291105009e484a6b6b8d gack
87 799667b6f2d9b957f73fa644a918c2df22bab58f gack
85 799667b6f2d9b957f73fa644a918c2df22bab58f gack
88 799667b6f2d9b957f73fa644a918c2df22bab58f gack
86 799667b6f2d9b957f73fa644a918c2df22bab58f gack
89 0000000000000000000000000000000000000000 gack
87 0000000000000000000000000000000000000000 gack
90 336fccc858a4eb69609a291105009e484a6b6b8d gorp
88 336fccc858a4eb69609a291105009e484a6b6b8d gorp
91 0000000000000000000000000000000000000000 gorp
89 0000000000000000000000000000000000000000 gorp
92 acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah
90 acb14030fe0a21b60322c440ad2d20cf7685a376 bleahbleah
93 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah
91 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah bleah
94
92
95 $ cat .hg/localtags
93 $ cat .hg/localtags
96 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
94 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
97
95
98 tagging on a non-head revision
96 tagging on a non-head revision
99
97
100 $ hg update 0
98 $ hg update 0
101 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
99 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
102 $ hg tag -l localblah
100 $ hg tag -l localblah
103 $ hg tag "foobar"
101 $ hg tag "foobar"
104 abort: not at a branch head (use -f to force)
102 abort: not at a branch head (use -f to force)
105 [255]
103 [255]
106 $ hg tag -f "foobar"
104 $ hg tag -f "foobar"
107 $ cat .hgtags
105 $ cat .hgtags
108 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
106 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
109 $ cat .hg/localtags
107 $ cat .hg/localtags
110 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
108 d4f0d2909abc9290e2773c08837d70c1794e3f5a bleah1
111 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
109 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
112
110
113 $ hg tag -l 'xx
111 $ hg tag -l 'xx
114 > newline'
112 > newline'
115 abort: '\n' cannot be used in a tag name
113 abort: '\n' cannot be used in a tag name
116 [255]
114 [255]
117 $ hg tag -l 'xx:xx'
115 $ hg tag -l 'xx:xx'
118 abort: ':' cannot be used in a tag name
116 abort: ':' cannot be used in a tag name
119 [255]
117 [255]
120
118
121 cloning local tags
119 cloning local tags
122
120
123 $ cd ..
121 $ cd ..
124 $ hg -R test log -r0:5
122 $ hg -R test log -r0:5
125 changeset: 0:acb14030fe0a
123 changeset: 0:acb14030fe0a
126 tag: bleah
124 tag: bleah
127 tag: bleah bleah
125 tag: bleah bleah
128 tag: bleah0
126 tag: bleah0
129 tag: bleahbleah
127 tag: bleahbleah
130 tag: foobar
128 tag: foobar
131 tag: localblah
129 tag: localblah
132 user: test
130 user: test
133 date: Thu Jan 01 00:00:00 1970 +0000
131 date: Thu Jan 01 00:00:00 1970 +0000
134 summary: test
132 summary: test
135
133
136 changeset: 1:d4f0d2909abc
134 changeset: 1:d4f0d2909abc
137 tag: bleah1
135 tag: bleah1
138 user: test
136 user: test
139 date: Thu Jan 01 00:00:00 1970 +0000
137 date: Thu Jan 01 00:00:00 1970 +0000
140 summary: Added tag bleah for changeset acb14030fe0a
138 summary: Added tag bleah for changeset acb14030fe0a
141
139
142 changeset: 2:336fccc858a4
140 changeset: 2:336fccc858a4
143 tag: gawk
141 tag: gawk
144 user: test
142 user: test
145 date: Thu Jan 01 00:00:00 1970 +0000
143 date: Thu Jan 01 00:00:00 1970 +0000
146 summary: Added tag bleah0 for changeset acb14030fe0a
144 summary: Added tag bleah0 for changeset acb14030fe0a
147
145
148 changeset: 3:799667b6f2d9
146 changeset: 3:799667b6f2d9
149 user: test
147 user: test
150 date: Thu Jan 01 00:00:00 1970 +0000
148 date: Thu Jan 01 00:00:00 1970 +0000
151 summary: Added tag gack, gawk, gorp for changeset 336fccc858a4
149 summary: Added tag gack, gawk, gorp for changeset 336fccc858a4
152
150
153 changeset: 4:154eeb7c0138
151 changeset: 4:154eeb7c0138
154 user: test
152 user: test
155 date: Thu Jan 01 00:00:00 1970 +0000
153 date: Thu Jan 01 00:00:00 1970 +0000
156 summary: Added tag gack for changeset 799667b6f2d9
154 summary: Added tag gack for changeset 799667b6f2d9
157
155
158 changeset: 5:b4bb47aaff09
156 changeset: 5:b4bb47aaff09
159 user: test
157 user: test
160 date: Thu Jan 01 00:00:00 1970 +0000
158 date: Thu Jan 01 00:00:00 1970 +0000
161 summary: Removed tag gack, gorp
159 summary: Removed tag gack, gorp
162
160
163 $ hg clone -q -rbleah1 test test1
161 $ hg clone -q -rbleah1 test test1
164 $ hg -R test1 parents --style=compact
162 $ hg -R test1 parents --style=compact
165 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test
163 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test
166 Added tag bleah for changeset acb14030fe0a
164 Added tag bleah for changeset acb14030fe0a
167
165
168 $ hg clone -q -r5 test#bleah1 test2
166 $ hg clone -q -r5 test#bleah1 test2
169 $ hg -R test2 parents --style=compact
167 $ hg -R test2 parents --style=compact
170 5[tip] b4bb47aaff09 1970-01-01 00:00 +0000 test
168 5[tip] b4bb47aaff09 1970-01-01 00:00 +0000 test
171 Removed tag gack, gorp
169 Removed tag gack, gorp
172
170
173 $ hg clone -q -U test#bleah1 test3
171 $ hg clone -q -U test#bleah1 test3
174 $ hg -R test3 parents --style=compact
172 $ hg -R test3 parents --style=compact
175
173
176 $ cd test
174 $ cd test
177
175
178 Issue601: hg tag doesn't do the right thing if .hgtags or localtags
176 Issue601: hg tag doesn't do the right thing if .hgtags or localtags
179 doesn't end with EOL
177 doesn't end with EOL
180
178
181 $ python << EOF
179 $ python << EOF
182 > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close()
180 > f = file('.hg/localtags'); last = f.readlines()[-1][:-1]; f.close()
183 > f = file('.hg/localtags', 'w'); f.write(last); f.close()
181 > f = file('.hg/localtags', 'w'); f.write(last); f.close()
184 > EOF
182 > EOF
185 $ cat .hg/localtags; echo
183 $ cat .hg/localtags; echo
186 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
184 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
187 $ hg tag -l localnewline
185 $ hg tag -l localnewline
188 $ cat .hg/localtags; echo
186 $ cat .hg/localtags; echo
189 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
187 acb14030fe0a21b60322c440ad2d20cf7685a376 localblah
190 c2899151f4e76890c602a2597a650a72666681bf localnewline
188 c2899151f4e76890c602a2597a650a72666681bf localnewline
191
189
192
190
193 $ python << EOF
191 $ python << EOF
194 > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
192 > f = file('.hgtags'); last = f.readlines()[-1][:-1]; f.close()
195 > f = file('.hgtags', 'w'); f.write(last); f.close()
193 > f = file('.hgtags', 'w'); f.write(last); f.close()
196 > EOF
194 > EOF
197 $ hg ci -m'broken manual edit of .hgtags'
195 $ hg ci -m'broken manual edit of .hgtags'
198 $ cat .hgtags; echo
196 $ cat .hgtags; echo
199 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
197 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
200 $ hg tag newline
198 $ hg tag newline
201 $ cat .hgtags; echo
199 $ cat .hgtags; echo
202 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
200 acb14030fe0a21b60322c440ad2d20cf7685a376 foobar
203 a0eea09de1eeec777b46f2085260a373b2fbc293 newline
201 a0eea09de1eeec777b46f2085260a373b2fbc293 newline
204
202
205
203
206 tag and branch using same name
204 tag and branch using same name
207
205
208 $ hg branch tag-and-branch-same-name
206 $ hg branch tag-and-branch-same-name
209 marked working directory as branch tag-and-branch-same-name
207 marked working directory as branch tag-and-branch-same-name
210 (branches are permanent and global, did you want a bookmark?)
208 (branches are permanent and global, did you want a bookmark?)
211 $ hg ci -m"discouraged"
209 $ hg ci -m"discouraged"
212 $ hg tag tag-and-branch-same-name
210 $ hg tag tag-and-branch-same-name
213 warning: tag tag-and-branch-same-name conflicts with existing branch name
211 warning: tag tag-and-branch-same-name conflicts with existing branch name
214
212
215 test custom commit messages
213 test custom commit messages
216
214
217 $ cat > editor << '__EOF__'
215 $ cat > editor.sh << '__EOF__'
218 > #!/bin/sh
219 > echo "custom tag message" > "$1"
216 > echo "custom tag message" > "$1"
220 > echo "second line" >> "$1"
217 > echo "second line" >> "$1"
221 > __EOF__
218 > __EOF__
222 $ chmod +x editor
219 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e
223 $ HGEDITOR="'`pwd`'"/editor hg tag custom-tag -e
224 $ hg log -l1 --template "{desc}\n"
220 $ hg log -l1 --template "{desc}\n"
225 custom tag message
221 custom tag message
226 second line
222 second line
227
223
228
224
229 local tag with .hgtags modified
225 local tag with .hgtags modified
230
226
231 $ hg tag hgtags-modified
227 $ hg tag hgtags-modified
232 $ hg rollback
228 $ hg rollback
233 repository tip rolled back to revision 13 (undo commit)
229 repository tip rolled back to revision 13 (undo commit)
234 working directory now based on revision 13
230 working directory now based on revision 13
235 $ hg st
231 $ hg st
236 M .hgtags
232 M .hgtags
237 ? .hgtags.orig
233 ? .hgtags.orig
238 ? editor
234 ? editor.sh
239 $ hg tag --local baz
235 $ hg tag --local baz
240 $ hg revert --no-backup .hgtags
236 $ hg revert --no-backup .hgtags
241
237
242
238
243 tagging when at named-branch-head that's not a topo-head
239 tagging when at named-branch-head that's not a topo-head
244
240
245 $ hg up default
241 $ hg up default
246 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
247 $ hg merge -t internal:local
243 $ hg merge -t internal:local
248 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
244 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
249 (branch merge, don't forget to commit)
245 (branch merge, don't forget to commit)
250 $ hg ci -m 'merge named branch'
246 $ hg ci -m 'merge named branch'
251 $ hg up 13
247 $ hg up 13
252 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
248 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
253 $ hg tag new-topo-head
249 $ hg tag new-topo-head
254
250
255
251
256 tagging on null rev
252 tagging on null rev
257
253
258 $ hg up null
254 $ hg up null
259 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
255 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
260 $ hg tag nullrev
256 $ hg tag nullrev
261 abort: not at a branch head (use -f to force)
257 abort: not at a branch head (use -f to force)
262 [255]
258 [255]
263
259
264 $ hg init empty
260 $ hg init empty
265 $ hg tag -R empty nullrev
261 $ hg tag -R empty nullrev
266
262
267 $ cd ..
263 $ cd ..
268
264
269 tagging on an uncommitted merge (issue2542)
265 tagging on an uncommitted merge (issue2542)
270
266
271 $ hg init repo-tag-uncommitted-merge
267 $ hg init repo-tag-uncommitted-merge
272 $ cd repo-tag-uncommitted-merge
268 $ cd repo-tag-uncommitted-merge
273 $ echo c1 > f1
269 $ echo c1 > f1
274 $ hg ci -Am0
270 $ hg ci -Am0
275 adding f1
271 adding f1
276 $ echo c2 > f2
272 $ echo c2 > f2
277 $ hg ci -Am1
273 $ hg ci -Am1
278 adding f2
274 adding f2
279 $ hg co -q 0
275 $ hg co -q 0
280 $ hg branch b1
276 $ hg branch b1
281 marked working directory as branch b1
277 marked working directory as branch b1
282 (branches are permanent and global, did you want a bookmark?)
278 (branches are permanent and global, did you want a bookmark?)
283 $ hg ci -m2
279 $ hg ci -m2
284 $ hg up default
280 $ hg up default
285 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
286 $ hg merge b1
282 $ hg merge b1
287 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
283 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
288 (branch merge, don't forget to commit)
284 (branch merge, don't forget to commit)
289
285
290 $ hg tag t1
286 $ hg tag t1
291 abort: uncommitted merge
287 abort: uncommitted merge
292 [255]
288 [255]
293 $ hg status
289 $ hg status
294 $ hg tag --rev 1 t2
290 $ hg tag --rev 1 t2
295 abort: uncommitted merge
291 abort: uncommitted merge
296 [255]
292 [255]
297 $ hg tag --rev 1 --local t3
293 $ hg tag --rev 1 --local t3
298 $ hg tags -v
294 $ hg tags -v
299 tip 2:2a156e8887cc
295 tip 2:2a156e8887cc
300 t3 1:c3adabd1a5f4 local
296 t3 1:c3adabd1a5f4 local
301
297
302 $ cd ..
298 $ cd ..
303
299
304 commit hook on tag used to be run without write lock - issue3344
300 commit hook on tag used to be run without write lock - issue3344
305
301
306 $ hg init repo-tag
302 $ hg init repo-tag
307 $ hg init repo-tag-target
303 $ hg init repo-tag-target
308 $ hg -R repo-tag --config hooks.commit="hg push \"`pwd`/repo-tag-target\"" tag tag
304 $ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag
309 pushing to $TESTTMP/repo-tag-target
305 pushing to $TESTTMP/repo-tag-target
310 searching for changes
306 searching for changes
311 adding changesets
307 adding changesets
312 adding manifests
308 adding manifests
313 adding file changes
309 adding file changes
314 added 1 changesets with 1 changes to 1 files
310 added 1 changesets with 1 changes to 1 files
315
311
General Comments 0
You need to be logged in to leave comments. Login now