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, 27 deletions

diff --git a/tests/test-tag.t b/tests/test-tag.t
index 3731802..d087d18 100644
--- a/tests/test-tag.t
+++ b/tests/test-tag.t
@@ -205,18 +205,19 @@ tag and branch using same name
 
   $ hg branch tag-and-branch-same-name
   marked working directory as branch tag-and-branch-same-name
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m"discouraged"
   $ hg tag tag-and-branch-same-name
   warning: tag tag-and-branch-same-name conflicts with existing branch name
 
 test custom commit messages
 
-  $ cat > editor.sh << '__EOF__'
+  $ cat > editor << '__EOF__'
+  > #!/bin/sh
   > echo "custom tag message" > "$1"
   > echo "second line" >> "$1"
   > __EOF__
-  $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e
+  $ chmod +x editor
+  $ HGEDITOR="'`pwd`'"/editor hg tag custom-tag -e
   $ hg log -l1 --template "{desc}\n"
   custom tag message
   second line
@@ -231,7 +232,7 @@ local tag with .hgtags modified
   $ hg st
   M .hgtags
   ? .hgtags.orig
-  ? editor.sh
+  ? editor
   $ hg tag --local baz
   $ hg revert --no-backup .hgtags
 
@@ -248,6 +249,7 @@ tagging when at named-branch-head that's not a topo-head
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tag new-topo-head
 
+
 tagging on null rev
 
   $ hg up null
@@ -258,12 +260,6 @@ tagging on null rev
 
   $ hg init empty
   $ hg tag -R empty nullrev
-  abort: null revision specified
-  [255]
-
-  $ hg tag -R empty -r 00000000000 -f nulltag
-  abort: null revision specified
-  [255]
 
   $ cd ..
 
@@ -280,7 +276,6 @@ tagging on an uncommitted merge (issue2542)
   $ hg co -q 0
   $ hg branch b1
   marked working directory as branch b1
-  (branches are permanent and global, did you want a bookmark?)
   $ hg ci -m2
   $ hg up default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -301,19 +296,3 @@ tagging on an uncommitted merge (issue2542)
   t3                                 1:c3adabd1a5f4 local
 
   $ cd ..
-
-commit hook on tag used to be run without write lock - issue3344
-
-  $ hg init repo-tag
-  $ touch repo-tag/test
-  $ hg -R repo-tag commit -A -m "test"
-  adding test
-  $ hg init repo-tag-target
-  $ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag
-  pushing to $TESTTMP/repo-tag-target
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 2 changes to 2 files
-