support for mercurial 2.6, thanks Vlad

2012-05-28 13:08:15 -05:00
parent b48be44134
commit 68b5581eb5
3 changed files with 7 additions and 3 deletions
@@ -12,7 +12,11 @@ import socket
 from textwrap import dedent

 try:
-    from mercurial import ui, hg, cmdutil, scmutil
+    from mercurial import ui, hg, cmdutil
+    try:
+        from mercurial.scmutil import addremove
+    except:
+        from mercurial.cmdutil import addremove
    have_mercurial = True
 except ImportError:
    have_mercurial = False