# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1260895450 21600
# Node ID ad5ef62b5a983d934af5872f8d841366ab641122
# Parent  661980567246b250c7bcab529c24943036b8c08b# Parent  8f14f749f47113da7091d9a78c8d35d05a1b3d1d
Merge -stable heads

diff -r 8f14f749f471 -r ad5ef62b5a98 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Mon Dec 14 15:01:13 2009 -0600
+++ b/hgext/convert/subversion.py	Tue Dec 15 10:44:10 2009 -0600
@@ -912,7 +912,11 @@
         cmd = '%s debugsvnlog' % util.shellquote(hgexe)
         stdin, stdout = util.popen2(cmd)
         stdin.write(arg)
-        stdin.close()
+        try:
+            stdin.close()
+        except IOError:
+            raise util.Abort(_('Mercurial failed to run itself, check'
+                               ' hg executable is in PATH'))
         return logstream(stdout)
 
 pre_revprop_change = '''#!/bin/sh
diff -r 8f14f749f471 -r ad5ef62b5a98 hgext/schemes.py
--- a/hgext/schemes.py	Mon Dec 14 15:01:13 2009 -0600
+++ b/hgext/schemes.py	Tue Dec 15 10:44:10 2009 -0600
@@ -64,7 +64,7 @@
             parts = parts[:-1]
         else:
             tail = ''
-        context = dict((str(i), v) for i, v in enumerate(parts))
+        context = dict((str(i+1), v) for i, v in enumerate(parts))
         url = ''.join(self.templater.process(self.url, context)) + tail
         return hg._lookup(url).instance(ui, url, create)
 
diff -r 8f14f749f471 -r ad5ef62b5a98 tests/test-schemes
--- a/tests/test-schemes	Mon Dec 14 15:01:13 2009 -0600
+++ b/tests/test-schemes	Tue Dec 15 10:44:10 2009 -0600
@@ -6,6 +6,7 @@
 
 [schemes]
 l = http://localhost:$HGPORT/
+parts = http://{1}:$HGPORT/
 EOF
 
 hg init test
@@ -18,5 +19,8 @@
 
 hg incoming l://
 
+echo % check that {1} syntax works
+hg incoming --debug parts://localhost | sed 's/[0-9]//g'
+
 echo % errors
 cat errors.log
diff -r 8f14f749f471 -r ad5ef62b5a98 tests/test-schemes.out
--- a/tests/test-schemes.out	Mon Dec 14 15:01:13 2009 -0600
+++ b/tests/test-schemes.out	Tue Dec 15 10:44:10 2009 -0600
@@ -2,4 +2,11 @@
 comparing with l://
 searching for changes
 no changes found
+% check that {1} syntax works
+using http://localhost:/
+sending between command
+comparing with parts://localhost
+sending heads command
+searching for changes
+no changes found
 % errors