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, 2 insertions, 5 deletions

diff --git a/hgext/extdiff.py b/hgext/extdiff.py
index bae60e8..8c2519e 100644
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -33,8 +33,7 @@ you do not need to type :hg:`extdiff -p kdiff3` always. ::
   # (see http://www.vim.org/scripts/script.php?script_id=102) Non
   # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in
   # your .vimrc
-  vimdiff = gvim -f "+next" \\
-            "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))"
+  vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)'
 
 Tool arguments can include variables that are expanded at runtime::
 
@@ -66,8 +65,6 @@ from mercurial.node import short, nullid
 from mercurial import scmutil, scmutil, util, commands, encoding
 import os, shlex, shutil, tempfile, re
 
-testedwith = 'internal'
-
 def snapshot(ui, repo, files, node, tmproot):
     '''snapshot files as of some revision
     if not using snapshot, -I/-X does not work and recursive diff
@@ -90,7 +87,7 @@ def snapshot(ui, repo, files, node, tmproot):
     ctx = repo[node]
     for fn in files:
         wfn = util.pconvert(fn)
-        if wfn not in ctx:
+        if not wfn in ctx:
             # File doesn't exist; could be a bogus modify
             continue
         ui.note('  %s\n' % wfn)