Rev 528: Add docstring, no longer default to TrunkBranchingScheme() but to the scheme specified in ~/.bazaar/subversion.conf. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 528
revision-id: jelmer at samba.org-20070713101734-yvgxs558lh7lcvu2
parent: jelmer at samba.org-20070713101121-mor3bvltp2pyjheo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:17:34 +0300
message:
  Add docstring, no longer default to TrunkBranchingScheme() but to the scheme specified in ~/.bazaar/subversion.conf.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
  scheme.py                      scheme.py-20060516195850-95181aae6b272f9e
=== modified file '__init__.py'
--- a/__init__.py	2007-07-12 08:50:12 +0000
+++ b/__init__.py	2007-07-13 10:17:34 +0000
@@ -118,7 +118,7 @@
                          help='Convert all revisions, even those not in '
                               'current branch history (forbids --standalone)'),
                      Option('scheme', type=get_scheme,
-                         help='Branching scheme (none, trunk, or trunk-INT)')]
+                         help='Branching scheme (none, trunk, ...)')]
 
     @display_command
     def run(self, from_location, to_location=None, trees=False, 
@@ -126,9 +126,6 @@
         from convert import convert_repository
         from scheme import TrunkBranchingScheme
 
-        if scheme is None:
-            scheme = TrunkBranchingScheme()
-
         if to_location is None:
             to_location = os.path.basename(from_location.rstrip("/\\"))
 

=== modified file 'convert.py'
--- a/convert.py	2007-06-25 00:34:58 +0000
+++ b/convert.py	2007-07-13 10:17:34 +0000
@@ -97,7 +97,8 @@
             dirs[path] = format.initialize_on_transport(nt)
         return dirs[path]
 
-    source_repos.set_branching_scheme(scheme)
+    if scheme is not None:
+        source_repos.set_branching_scheme(scheme)
 
     if create_shared_repo:
         try:

=== modified file 'scheme.py'
--- a/scheme.py	2007-07-13 10:11:21 +0000
+++ b/scheme.py	2007-07-13 10:17:34 +0000
@@ -89,6 +89,12 @@
         raise NotImplementedError
 
     def is_tag(self, path):
+        """Check whether the specified path is a tag 
+        according to this branching scheme.
+
+        :param path: path to check
+        :return: boolean
+        """
         raise NotImplementedError