Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph

This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.

We also undo the setup.py change because python now supports bz2

1 files changed, 6 insertions, 9 deletions

diff --git a/tests/test-diffstat.t b/tests/test-diffstat.t
index 5d03cdc..2f20d3d 100644
--- a/tests/test-diffstat.t
+++ b/tests/test-diffstat.t
@@ -35,32 +35,30 @@ Narrow diffstat:
 
   $ hg ci -m appenda
 
-  >>> open("c", "wb").write("\0")
-  $ touch d
-  $ hg add c d
+  $ printf '\0' > c
+  $ hg add c
 
 Binary diffstat:
 
   $ hg diff --stat
-   c |  Bin 
+   c |    0 
    1 files changed, 0 insertions(+), 0 deletions(-)
 
 Binary git diffstat:
 
   $ hg diff --stat --git
    c |  Bin 
-   d |    0 
-   2 files changed, 0 insertions(+), 0 deletions(-)
+   1 files changed, 0 insertions(+), 0 deletions(-)
 
   $ hg ci -m createb
 
-  >>> open("file with spaces", "wb").write("\0")
+  $ printf '\0' > "file with spaces"
   $ hg add "file with spaces"
 
 Filename with spaces diffstat:
 
   $ hg diff --stat
-   file with spaces |  Bin 
+   file with spaces |    0 
    1 files changed, 0 insertions(+), 0 deletions(-)
 
 Filename with spaces git diffstat:
@@ -69,4 +67,3 @@ Filename with spaces git diffstat:
    file with spaces |  Bin 
    1 files changed, 0 insertions(+), 0 deletions(-)
 	
-  $ cd ..