annotate tests/test-merge2 @ 508:42a660abaf75

[PATCH] Harden os.system -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Harden os.system From: Bryan O'Sullivan <bos@serpentine.com> Add util.system function. This is similar to os.system, but will either succeed (if the process finishes with a zero exit code) or raise a util.CommandError (if the process exits uncleanly or is killed by a signal). Add util.explain_exit function. This tends to be ubiquitous in code that calls other processes, and must describe what has gone wrong. Change some uses of os.system over to util.system. manifest hash: e3bf4adcac5b915432ec0af00efdbcef86bea4b1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwSipywK+sNU5EO8RAr0RAJkBDt8XQ7mYQAWNHNgTOVt1eyWU1QCfe1oO 2OwxyWqpbRNACVJHHfZ3/Xw= =OaRX -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 02:38:33 -0800
parents feadc9697b43
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh -x
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
3 mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
4 cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
5 hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
6 echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
7 hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
8 hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
9 echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
10 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
11 hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
12 rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
13 hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
14 echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
15 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
16 hg commit -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
17 cd ..; /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
18
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
19 mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
20 cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
21 hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
22 echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
23 hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
24 hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
25 echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
26 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
27 hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
28 rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
29 hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
30 echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
31 hg commit -A -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
32 cd ..; /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
33
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
34 mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
35 cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
36 hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
37 echo This is file a1 > a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
38 hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
39 hg commit -t "commit #0" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
40 echo This is file b1 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
41 hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
42 hg commit -t "commit #1" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
43 rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
44 hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
45 hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
46 echo This is file b2 > b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
47 hg commit -A -t "commit #2" -d "0 0" -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
48 cd ..; /bin/rm -rf t