schemes: url parts are counted from 1

hgext/schemes.py

@@ -1,82 +1,82 b''
 # Copyright 2009, Alexander Solovyov <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 """extend schemes with shortcuts to repository swarms
 
 This extension allows you to specify shortcuts for parent URLs with a
 lot of repositories to act like a scheme, for example::
 
   [schemes]
   py = http://code.python.org/hg/
 
 After that you can use it like::
 
   hg clone py://trunk/
 
 Additionally there is support for some more complex schemas, for
 example used by Google Code::
 
   [schemes]
   gcode = http://{1}.googlecode.com/hg/
 
 The syntax is taken from Mercurial templates, and you have unlimited
 number of variables, starting with ``{1}`` and continuing with
 ``{2}``, ``{3}`` and so on. This variables will receive parts of URL
 supplied, split by ``/``. Anything not specified as ``{part}`` will be
 just appended to an URL.
 
 For convenience, the extension adds these schemes by default::
 
   [schemes]
   py = http://hg.python.org/
   bb = https://bitbucket.org/
   bb+ssh = ssh://[e-mail]/
   gcode = https://{1}.googlecode.com/hg/
 
 You can override a predefined scheme by defining a new scheme with the
 same name.
 """
 
 import re
 from mercurial import hg, templater
 
 
 class ShortRepository(object):
     def __init__(self, url, scheme, templater):
         self.scheme = scheme
         self.templater = templater
         self.url = url
         try:
             self.parts = max(map(int, re.findall(r'\{(\d+)\}', self.url)))
         except ValueError:
             self.parts = 0
 
     def __repr__(self):
         return '<ShortRepository: %s>' % self.scheme
 
     def instance(self, ui, url, create):
         url = url.split('://', 1)[1]
         parts = url.split('/', self.parts)
         if len(parts) > self.parts:
             tail = parts[-1]
             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)
 
 schemes = {
     'py': 'http://hg.python.org/',
     'bb': 'https://bitbucket.org/',
     'bb+ssh': 'ssh://[e-mail]/',
     'gcode': 'https://{1}.googlecode.com/hg/'
     }
 
 def extsetup(ui):
     schemes.update(dict(ui.configitems('schemes')))
     t = templater.engine(lambda x: x)
     for scheme, url in schemes.items():
         hg.schemes[scheme] = ShortRepository(url, scheme, t)

tests/test-schemes

@@ -1,22 +1,26 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 schemes=
 
 [schemes]
 l = http://localhost:$HGPORT/
+parts = http://{1}:$HGPORT/
 EOF
 
 hg init test
 cd test
 echo a > a
 hg ci -Am initial
 
 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 hg incoming l://
 
+echo % check that {1} syntax works
+hg incoming --debug parts://localhost | sed 's/[0-9]//g'
+
 echo % errors
 cat errors.log

tests/test-schemes.out

@@ -1,5 +1,12 b''
 adding a
 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