# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1290117675 -3600
# Node ID 5de3deae264be689e2862bd30b81e15dcca8eb70
# Parent  c63f0686c3b9b7971b950c5e3f485eafc7ff7859
Handle hg >= 1.6 hg.parseurl()

diff -r c63f0686c3b9 -r 5de3deae264b forest.py
--- a/forest.py	Thu Nov 18 22:27:22 2010 +0100
+++ b/forest.py	Thu Nov 18 23:01:15 2010 +0100
@@ -98,7 +98,13 @@
     parseurl = cmdutil.parseurl
 except:
     try:
-        parseurl = hg.parseurl
+        _parseurl = hg.parseurl
+        def parseurl(url, branches=None):
+            url, revs = _parseurl(url, branches)
+            if isinstance(revs, tuple):
+                # hg >= 1.6
+                return url, revs[1]
+            return url, revs
     except:
         def parseurl(url, revs):
             """Mercurial <= 0.9.3 doesn't have this feature."""
@@ -662,7 +668,7 @@
         elif 'rev' in opts:
             revs = opts['rev']
         else:
-            revs = None
+            revs = []
         die_on_numeric_revs(revs)
         for tree in self.trees:
             rpath = relpath(self.top().root, tree.root)