[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-----

     1

+ hg init

     2

+ echo nothing

     3

+ hg add a

     4

+ hg commit -t ancestor -u test -d '0 0'

     5

+ echo something

     6

+ hg commit -t branch1 -u test -d '0 0'

     7

+ hg co 0

     8

+ echo 'something else'

     9

+ hg commit -t branch2 -u test -d '0 0'

    10

+ export HGMERGE=merge

    11

+ HGMERGE=merge

    12

+ hg -d up -m 1

    13

merge: warning: conflicts during merge

    14

resolving manifests

    15

 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc

    16

 a versions differ, resolve

    17

working dir created .out, keeping

    18

merging a

    19

resolving a

    20

file a: other d7250518cb1b ancestor 68ba9db7a9e4

    21

merging a failed!

    22

+ hg id

    23

32e80765d7fe+75234512624c+ tip

    24

+ grep -Ev '>>>|<<<' a

    25

something else

    26

=======

    27

something

    28

+ hg status

    29

C a

    30

? .out