Rev 2019: Merge fix for 299490. in file:///data/jelmer/bzr-svn/0.5/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.5/

------------------------------------------------------------
revno: 2019
revision-id: jelmer at samba.org-20081118173318-4lzshg0z1o7dtsub
parent: jelmer at samba.org-20081118150220-8lzrpjh6fscjqdr3
parent: jelmer at samba.org-20081118170305-37bo3sgmbufxr4kl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Tue 2008-11-18 18:33:18 +0100
message:
  Merge fix for 299490.
modified:
  mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
    ------------------------------------------------------------
    revno: 1669.10.1
    revision-id: jelmer at samba.org-20081118170305-37bo3sgmbufxr4kl
    parent: jelmer at samba.org-20081111164040-trao8l0gf2jjmzf3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2008-11-18 18:03:05 +0100
    message:
      Fix argument count.
    modified:
      mapping3/scheme.py             scheme.py-20060516195850-95181aae6b272f9e
=== modified file 'mapping3/scheme.py'
--- a/mapping3/scheme.py	2008-11-12 11:05:31 +0000
+++ b/mapping3/scheme.py	2008-11-18 17:33:18 +0000
@@ -66,14 +66,14 @@
         """
         raise NotImplementedError
 
-    def get_tag_path(self, name):
+    def get_tag_path(self, name, project=""):
         """Find the path for a tag.
 
         :param name: Tag name.
         """
         raise NotImplementedError
 
-    def get_branch_path(self, name):
+    def get_branch_path(self, name, project=""):
         """Find the path for a named branch.
 
         :param name: Branch name.