Rev 988: Move scheme code to mapping3 package. in file:///data/jelmer/bzr-svn/layout/
Jelmer Vernooij
jelmer at samba.org
Fri May 2 19:34:45 BST 2008
At file:///data/jelmer/bzr-svn/layout/
------------------------------------------------------------
revno: 988
revision-id: jelmer at samba.org-20080502183443-h9a40ecdxwawpwmp
parent: jelmer at samba.org-20080502182700-te13wsp7ebhsu60c
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: layout
timestamp: Fri 2008-05-02 20:34:43 +0200
message:
Move scheme code to mapping3 package.
renamed:
scheme.py => mappingv3 scheme.py-20060516195850-95181aae6b272f9e
modified:
__init__.py __init__.py-20051008155114-eae558e6cf149e1d
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_blackbox.py test_blackbox.py-20070325150839-d10llf8arptpcfl6-1
tests/test_branch.py test_branch.py-20060508162215-74ffeb5d608f8e20
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_fetch.py test_fetch.py-20070624210302-luvgwjmlfysk5qeq-1
tests/test_fileids.py test_fileids.py-20060622131341-19gyrlgqy8yl2od5-1
tests/test_mapping.py test_mapping.py-20080201131338-0zd86eznn4bojtee-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_scheme.py test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
tests/test_upgrade.py test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file '__init__.py'
--- a/__init__.py 2008-05-02 17:42:52 +0000
+++ b/__init__.py 2008-05-02 18:34:43 +0000
@@ -370,7 +370,7 @@
from bzrlib.repository import Repository
from bzrlib.trace import info
from repository import SvnRepository
- from scheme import scheme_from_branch_list
+ from mapping3.scheme import scheme_from_branch_list
def scheme_str(scheme):
if scheme is None:
return ""
=== modified file 'config.py'
--- a/config.py 2008-04-12 15:23:48 +0000
+++ b/config.py 2008-05-02 18:34:43 +0000
@@ -20,7 +20,7 @@
import os
-from scheme import BranchingScheme
+from mapping3.scheme import BranchingScheme
import svn.core
# Settings are stored by UUID.
=== modified file 'mapping.py'
--- a/mapping.py 2008-05-02 18:27:00 +0000
+++ b/mapping.py 2008-05-02 18:34:43 +0000
@@ -22,7 +22,6 @@
from bzrlib.plugins.svn import version_info
import calendar
import errors
-from scheme import BranchingScheme, guess_scheme_from_branch_path
import sha
import svn
import time
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-05-02 18:27:00 +0000
+++ b/mapping3/__init__.py 2008-05-02 18:34:43 +0000
@@ -14,6 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import mapping
+from mapping3.scheme import BranchingScheme, guess_scheme_from_branch_path
class BzrSvnMappingv3(mapping.BzrSvnMapping):
"""The third version of the mappings as used in the 0.4.x series.
=== renamed file 'scheme.py' => 'mappingv3'
=== modified file 'repository.py'
--- a/repository.py 2008-05-02 18:27:00 +0000
+++ b/repository.py 2008-05-02 18:34:43 +0000
@@ -48,7 +48,7 @@
get_default_mapping, parse_revision_id)
from mapping3 import BzrSvnMappingv3FileProps
from revids import CachingRevidMap, RevidMap
-from scheme import (BranchingScheme, ListBranchingScheme,
+from mapping3.scheme import (ListBranchingScheme,
parse_list_scheme_text, guess_scheme_from_history)
from svk import (SVN_PROP_SVK_MERGE, svk_features_merged_since,
parse_svk_feature)
=== modified file 'revids.py'
--- a/revids.py 2008-05-02 18:27:00 +0000
+++ b/revids.py 2008-05-02 18:34:43 +0000
@@ -27,7 +27,7 @@
from mapping import (parse_revision_id, BzrSvnMapping,
SVN_PROP_BZR_REVISION_ID, parse_revid_property)
from mapping3 import BzrSvnMappingv3FileProps
-from scheme import BranchingScheme
+from mapping3.scheme import BranchingScheme
class RevidMap(object):
def __init__(self, repos):
=== modified file 'tests/test_blackbox.py'
--- a/tests/test_blackbox.py 2008-05-02 18:27:00 +0000
+++ b/tests/test_blackbox.py 2008-05-02 18:34:43 +0000
@@ -20,7 +20,7 @@
from bzrlib.trace import mutter
from mapping3 import BzrSvnMappingv3FileProps
-from scheme import NoBranchingScheme
+from mapping3.scheme import NoBranchingScheme
from tests import TestCaseWithSubversionRepository
import os
=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py 2008-05-02 18:27:00 +0000
+++ b/tests/test_branch.py 2008-05-02 18:34:43 +0000
@@ -30,7 +30,7 @@
from convert import load_dumpfile
from mapping import SVN_PROP_BZR_REVISION_ID
from mapping3 import BzrSvnMappingv3FileProps
-from scheme import TrunkBranchingScheme
+from mapping3.scheme import TrunkBranchingScheme
from tests import TestCaseWithSubversionRepository
class WorkingSubversionBranch(TestCaseWithSubversionRepository):
=== modified file 'tests/test_config.py'
--- a/tests/test_config.py 2008-04-12 15:23:48 +0000
+++ b/tests/test_config.py 2008-05-02 18:34:43 +0000
@@ -18,7 +18,7 @@
from bzrlib.branch import Branch
from config import SvnRepositoryConfig, BranchConfig
-from scheme import TrunkBranchingScheme
+from mapping3.scheme import TrunkBranchingScheme
from tests import TestCaseWithSubversionRepository
from bzrlib.tests import TestCaseInTempDir
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-03-27 00:31:59 +0000
+++ b/tests/test_convert.py 2008-05-02 18:34:43 +0000
@@ -27,7 +27,7 @@
import os, sys
from convert import convert_repository, NotDumpFile, load_dumpfile
from format import get_rich_root_format
-from scheme import TrunkBranchingScheme, NoBranchingScheme
+from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
import svn.repos
=== modified file 'tests/test_fetch.py'
--- a/tests/test_fetch.py 2008-03-24 04:52:30 +0000
+++ b/tests/test_fetch.py 2008-05-02 18:34:43 +0000
@@ -30,7 +30,7 @@
from bzrlib.plugins.svn.errors import InvalidFileName
import format
import remote
-from scheme import TrunkBranchingScheme, NoBranchingScheme
+from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
from transport import SvnRaTransport
=== modified file 'tests/test_fileids.py'
--- a/tests/test_fileids.py 2008-05-02 18:27:00 +0000
+++ b/tests/test_fileids.py 2008-05-02 18:34:43 +0000
@@ -23,7 +23,7 @@
from fileids import simple_apply_changes
from mapping3 import BzrSvnMappingv3FileProps
-from scheme import TrunkBranchingScheme, NoBranchingScheme
+from mapping3.scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
class MockRepo(object):
=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py 2008-05-02 18:27:00 +0000
+++ b/tests/test_mapping.py 2008-05-02 18:34:43 +0000
@@ -24,7 +24,7 @@
BzrSvnMappingv4, parse_revision_id)
from mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps,
BzrSvnMappingv3Hybrid)
-from scheme import NoBranchingScheme
+from mapping3.scheme import NoBranchingScheme
from bzrlib.errors import InvalidRevisionId
from bzrlib.tests import (TestCase, adapt_tests, TestNotApplicable)
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2008-05-02 14:18:41 +0000
+++ b/tests/test_repos.py 2008-05-02 18:34:43 +0000
@@ -36,7 +36,7 @@
import format
from mapping import (escape_svn_path, unescape_svn_path,
SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_BRANCHING_SCHEME)
-from scheme import (TrunkBranchingScheme, NoBranchingScheme,
+from mapping3.scheme import (TrunkBranchingScheme, NoBranchingScheme,
ListBranchingScheme, SingleBranchingScheme)
from transport import SvnRaTransport
from tests import TestCaseWithSubversionRepository
=== modified file 'tests/test_scheme.py'
--- a/tests/test_scheme.py 2008-03-31 01:21:48 +0000
+++ b/tests/test_scheme.py 2008-05-02 18:34:43 +0000
@@ -19,7 +19,7 @@
from bzrlib.errors import NotBranchError, BzrError
from bzrlib.tests import TestCase
-from scheme import (ListBranchingScheme, NoBranchingScheme,
+from mapping3.scheme import (ListBranchingScheme, NoBranchingScheme,
BranchingScheme, TrunkBranchingScheme,
SingleBranchingSchemev0,
SingleBranchingScheme,
=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py 2008-05-02 18:27:00 +0000
+++ b/tests/test_upgrade.py 2008-05-02 18:34:43 +0000
@@ -25,7 +25,7 @@
from format import get_rich_root_format
from mapping import (BzrSvnMappingv2, BzrSvnMappingv1)
from mapping3 import BzrSvnMappingv3FileProps
-from scheme import TrunkBranchingScheme
+from mapping3.scheme import TrunkBranchingScheme
from tests import TestCaseWithSubversionRepository
from upgrade import (upgrade_repository, upgrade_branch,
upgrade_workingtree, UpgradeChangesContent,
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-05-02 12:30:29 +0000
+++ b/workingtree.py 2008-05-02 18:34:43 +0000
@@ -43,7 +43,6 @@
from repository import SvnRepository
from svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
from mapping import escape_svn_path
-from scheme import BranchingScheme
from transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
svn_config)
from tree import SvnBasisTree
More information about the bazaar-commits
mailing list