##// END OF EJS Templates
tests: don't use stdout redirection for test data...
Mads Kiilerich -
r15522:cf0f3cb8 default
parent child Browse files
Show More
@@ -10,7 +10,7 b' Prepare repo a:'
10
10
11 Create a non-inlined filelog:
11 Create a non-inlined filelog:
12
12
13 $ python -c 'for x in range(10000): print x' >> data1
13 $ python -c 'file("data1", "wb").write("".join("%s\n" % x for x in range(10000)))'
14 $ for j in 0 1 2 3 4 5 6 7 8 9; do
14 $ for j in 0 1 2 3 4 5 6 7 8 9; do
15 > cat data1 >> b
15 > cat data1 >> b
16 > hg commit -m test
16 > hg commit -m test
@@ -1,6 +1,6 b''
1 $ hg init
1 $ hg init
2
2
3 $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
3 $ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
4 $ hg ci -Ama -d '1 0'
4 $ hg ci -Ama -d '1 0'
5 adding a
5 adding a
6
6
@@ -233,7 +233,7 b' override commit message'
233 > msg.set_payload('email commit message\n' + patch)
233 > msg.set_payload('email commit message\n' + patch)
234 > msg['Subject'] = 'email patch'
234 > msg['Subject'] = 'email patch'
235 > msg['From'] = 'email patcher'
235 > msg['From'] = 'email patcher'
236 > sys.stdout.write(msg.as_string())
236 > file(sys.argv[2], 'wb').write(msg.as_string())
237 > EOF
237 > EOF
238
238
239
239
@@ -246,7 +246,7 b' plain diff in email, subject, message bo'
246 added 1 changesets with 2 changes to 2 files
246 added 1 changesets with 2 changes to 2 files
247 updating to branch default
247 updating to branch default
248 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
248 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
249 $ python mkmsg.py diffed-tip.patch > msg.patch
249 $ python mkmsg.py diffed-tip.patch msg.patch
250 $ hg --cwd b import ../msg.patch
250 $ hg --cwd b import ../msg.patch
251 applying ../msg.patch
251 applying ../msg.patch
252 $ hg --cwd b tip | grep email
252 $ hg --cwd b tip | grep email
@@ -308,7 +308,8 b' hg export in email, should use patch hea'
308 added 1 changesets with 2 changes to 2 files
308 added 1 changesets with 2 changes to 2 files
309 updating to branch default
309 updating to branch default
310 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
310 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
311 $ python mkmsg.py exported-tip.patch | hg --cwd b import -
311 $ python mkmsg.py exported-tip.patch msg.patch
312 $ cat msg.patch | hg --cwd b import -
312 applying patch from stdin
313 applying patch from stdin
313 $ hg --cwd b tip | grep second
314 $ hg --cwd b tip | grep second
314 summary: second change
315 summary: second change
@@ -325,7 +326,7 b" The '---' tests the gitsendmail handling"
325 > msg.set_payload('email patch\n\nnext line\n---\n' + patch)
326 > msg.set_payload('email patch\n\nnext line\n---\n' + patch)
326 > msg['Subject'] = '[PATCH] email patch'
327 > msg['Subject'] = '[PATCH] email patch'
327 > msg['From'] = 'email patcher'
328 > msg['From'] = 'email patcher'
328 > sys.stdout.write(msg.as_string())
329 > file(sys.argv[2], 'wb').write(msg.as_string())
329 > EOF
330 > EOF
330
331
331
332
@@ -338,7 +339,8 b' plain diff in email, [PATCH] subject, me'
338 added 1 changesets with 2 changes to 2 files
339 added 1 changesets with 2 changes to 2 files
339 updating to branch default
340 updating to branch default
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
341 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
341 $ python mkmsg2.py diffed-tip.patch | hg --cwd b import -
342 $ python mkmsg2.py diffed-tip.patch msg.patch
343 $ cat msg.patch | hg --cwd b import -
342 applying patch from stdin
344 applying patch from stdin
343 $ hg --cwd b tip --template '{desc}\n'
345 $ hg --cwd b tip --template '{desc}\n'
344 email patch
346 email patch
General Comments 0
You need to be logged in to leave comments. Login now