Rev 1691: Move VirtualVersionedFiles and FakeControlFiles to bzr-foreign. in file:///data/jelmer/bzr-svn/trunk/
Jelmer Vernooij
jelmer at samba.org
Fri Aug 29 16:06:53 BST 2008
At file:///data/jelmer/bzr-svn/trunk/
------------------------------------------------------------
revno: 1691
revision-id: jelmer at samba.org-20080829150651-55maog3c0srdsrsx
parent: jelmer at samba.org-20080829114307-9xdaatlh4697e3vy
parent: jelmer at samba.org-20080829150547-98hpxtt3k52vlwz8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 17:06:51 +0200
message:
Move VirtualVersionedFiles and FakeControlFiles to bzr-foreign.
added:
foreign/.bzrignore bzrignore-20080829145519-ui1mi6gzh50ol7wv-1
foreign/TODO todo-20080829114504-q5cgsdfdxefd6paf-1
foreign/test_versionedfiles.py test_versionedfiles.-20080829145632-midkv3h7msuyoibq-1
foreign/versionedfiles.py versionedfiles.py-20080829145632-midkv3h7msuyoibq-2
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
foreign/__init__.py foreign.py-20080827193306-rxeku2c2obec90c4-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_versionedfiles.py test_versionedfiles.-20080626153242-v0c6uolklpux67a1-1
versionedfiles.py versionedfiles.py-20080626134117-j8g0ntz1pj228iox-1
------------------------------------------------------------
revno: 0.5.6
revision-id: jelmer at samba.org-20080829150547-98hpxtt3k52vlwz8
parent: jelmer at samba.org-20080829145637-f7z73y580w4ztcym
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 17:05:47 +0200
message:
Import FakeControlFiles.
modified:
__init__.py foreign.py-20080827193306-rxeku2c2obec90c4-1
------------------------------------------------------------
revno: 0.5.5
revision-id: jelmer at samba.org-20080829145637-f7z73y580w4ztcym
parent: jelmer at samba.org-20080829114507-49rej6wo95z5c001
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 16:56:37 +0200
message:
Import virtual versionedfiles code.
added:
.bzrignore bzrignore-20080829145519-ui1mi6gzh50ol7wv-1
test_versionedfiles.py test_versionedfiles.-20080829145632-midkv3h7msuyoibq-1
versionedfiles.py versionedfiles.py-20080829145632-midkv3h7msuyoibq-2
------------------------------------------------------------
revno: 0.5.4
revision-id: jelmer at samba.org-20080829114507-49rej6wo95z5c001
parent: jelmer at samba.org-20080827194301-mok29r5330g0boex
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-08-29 13:45:07 +0200
message:
Import TODO.
added:
TODO todo-20080829114504-q5cgsdfdxefd6paf-1
=== modified file 'branch.py'
--- a/branch.py 2008-08-25 02:03:39 +0000
+++ b/branch.py 2008-08-29 15:06:51 +0000
@@ -28,6 +28,7 @@
from bzrlib.plugins.svn.config import BranchConfig
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import NotSvnBranchPath, ERR_FS_NO_SUCH_REVISION
+from bzrlib.plugins.svn.foreign import FakeControlFiles
from bzrlib.plugins.svn.format import get_rich_root_format
from bzrlib.plugins.svn.repository import SvnRepository
from bzrlib.plugins.svn.tags import SubversionTags
@@ -35,21 +36,6 @@
import os
-class FakeControlFiles(object):
- """Dummy implementation of ControlFiles.
-
- This is required as some code relies on controlfiles being
- available."""
- def get_utf8(self, name):
- raise NoSuchFile(name)
-
- def get(self, name):
- raise NoSuchFile(name)
-
- def break_lock(self):
- pass
-
-
class SvnBranch(Branch):
"""Maps to a Branch in a Subversion repository """
def __init__(self, repository, branch_path, _skip_check=False):
=== added file 'foreign/.bzrignore'
--- a/foreign/.bzrignore 1970-01-01 00:00:00 +0000
+++ b/foreign/.bzrignore 2008-08-29 14:56:37 +0000
@@ -0,0 +1,1 @@
+_trial_temp
=== added file 'foreign/TODO'
--- a/foreign/TODO 1970-01-01 00:00:00 +0000
+++ b/foreign/TODO 2008-08-29 11:45:07 +0000
@@ -0,0 +1,3 @@
+- Import VirtualRevisionTexts, VirtualInventoryTexts, VirtualSignatureTexts
+- Import dpush command
+- Import CommitBuilder-based fetcher
=== modified file 'foreign/__init__.py'
--- a/foreign/__init__.py 2008-08-27 19:43:01 +0000
+++ b/foreign/__init__.py 2008-08-29 15:05:47 +0000
@@ -16,7 +16,7 @@
"""Foreign branch utilities."""
-from bzrlib import registry
+from bzrlib import errors, registry
class VcsMapping(object):
@@ -53,3 +53,18 @@
"""Convenience function for obtaining the default mapping to use."""
return self.get(self._get_default_key())
+
+class FakeControlFiles(object):
+ """Dummy implementation of ControlFiles.
+
+ This is required as some code relies on controlfiles being
+ available."""
+ def get_utf8(self, name):
+ raise errors.NoSuchFile(name)
+
+ def get(self, name):
+ raise errors.NoSuchFile(name)
+
+ def break_lock(self):
+ pass
+
=== added file 'foreign/test_versionedfiles.py'
--- a/foreign/test_versionedfiles.py 1970-01-01 00:00:00 +0000
+++ b/foreign/test_versionedfiles.py 2008-08-29 14:56:37 +0000
@@ -0,0 +1,77 @@
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from bzrlib import osutils
+from bzrlib.tests import TestCase
+
+from versionedfiles import (VirtualRevisionTexts, VirtualInventoryTexts,
+ VirtualSignatureTexts)
+
+
+class BasicTextsTests:
+ def test_add_lines(self):
+ self.assertRaises(NotImplementedError,
+ self.texts.add_lines, "foo", [], [])
+
+ def test_add_mpdiffs(self):
+ self.assertRaises(NotImplementedError,
+ self.texts.add_mpdiffs, [])
+
+ def test_check(self):
+ self.assertTrue(self.texts.check())
+
+ def test_insert_record_stream(self):
+ self.assertRaises(NotImplementedError, self.texts.insert_record_stream,
+ [])
+
+
+class VirtualRevisionTextsTests(TestCase, BasicTextsTests):
+ def _make_parents_provider(self):
+ return self
+
+ def setUp(self):
+ self.texts = VirtualRevisionTexts(self)
+
+ def get_parent_map(self, keys):
+ raise NotImplementedError
+
+
+class VirtualInventoryTextsTests(TestCase, BasicTextsTests):
+ def _make_parents_provider(self):
+ return self
+
+ def get_inventory_xml(self, key):
+ return "FOO"
+
+ def get_parent_map(self, keys):
+ return {("A",): (("B",))}
+
+ def setUp(self):
+ self.texts = VirtualInventoryTexts(self)
+
+ def test_get_sha1s(self):
+ self.assertEquals({("A",): osutils.sha_strings(["FOO"])}, self.texts.get_sha1s([("A",)]))
+
+
+class VirtualSignatureTextsTests(TestCase, BasicTextsTests):
+ def _make_parents_provider(self):
+ return self
+
+ def setUp(self):
+ self.texts = VirtualSignatureTexts(self)
+
+ def get_parent_map(self, keys):
+ raise NotImplementedError
+
=== added file 'foreign/versionedfiles.py'
--- a/foreign/versionedfiles.py 1970-01-01 00:00:00 +0000
+++ b/foreign/versionedfiles.py 2008-08-29 14:56:37 +0000
@@ -0,0 +1,56 @@
+# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from bzrlib import osutils, urlutils
+from bzrlib.versionedfile import FulltextContentFactory, VersionedFiles, VirtualVersionedFiles
+
+from cStringIO import StringIO
+
+
+class VirtualRevisionTexts(VirtualVersionedFiles):
+ """Virtual revisions backend."""
+ def __init__(self, repository):
+ self.repository = repository
+ super(VirtualRevisionTexts, self).__init__(self.repository._make_parents_provider().get_parent_map, self.get_lines)
+
+ def get_lines(self, key):
+ return osutils.split_lines(self.repository.get_revision_xml(key))
+
+ # TODO: annotate, iter_lines_added_or_present_in_keys, keys
+
+
+class VirtualInventoryTexts(VirtualVersionedFiles):
+ """Virtual inventories backend."""
+ def __init__(self, repository):
+ self.repository = repository
+ super(VirtualInventoryTexts, self).__init__(self.repository._make_parents_provider().get_parent_map, self.get_lines)
+
+ def get_lines(self, key):
+ return osutils.split_lines(self.repository.get_inventory_xml(key))
+
+ # TODO: annotate, iter_lines_added_or_present_in_keys, keys
+
+
+class VirtualSignatureTexts(VirtualVersionedFiles):
+ """Virtual signatures backend."""
+ def __init__(self, repository):
+ self.repository = repository
+ super(VirtualSignatureTexts, self).__init__(self.repository._make_parents_provider().get_parent_map, self.get_lines)
+
+ def get_lines(self, key):
+ return osutils.split_lines(self.repository.get_signature_text(key))
+
+ # TODO: annotate, iter_lines_added_or_present_in_keys, keys
+
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2008-08-23 15:38:17 +0000
+++ b/tests/__init__.py 2008-08-29 15:06:51 +0000
@@ -343,5 +343,6 @@
'test_workingtree',
'test_blackbox']
suite.addTest(loader.loadTestsFromModuleNames(["%s.%s" % (__name__, i) for i in testmod_names]))
+ suite.addTest(loader.loadTestsFromModuleNames(["bzrlib.plugins.svn.foreign.test_versionedfiles"]))
return suite
=== modified file 'tests/test_versionedfiles.py'
--- a/tests/test_versionedfiles.py 2008-08-23 17:55:26 +0000
+++ b/tests/test_versionedfiles.py 2008-08-29 15:06:51 +0000
@@ -16,67 +16,11 @@
from bzrlib import osutils
from bzrlib.tests import TestCase
-from bzrlib.plugins.svn.versionedfiles import (SvnTexts, VirtualRevisionTexts,
- VirtualInventoryTexts, VirtualSignatureTexts)
-
-
-class BasicSvnTextsTests:
- def test_add_lines(self):
- self.assertRaises(NotImplementedError,
- self.texts.add_lines, "foo", [], [])
-
- def test_add_mpdiffs(self):
- self.assertRaises(NotImplementedError,
- self.texts.add_mpdiffs, [])
-
- def test_check(self):
- self.assertTrue(self.texts.check())
-
- def test_insert_record_stream(self):
- self.assertRaises(NotImplementedError, self.texts.insert_record_stream,
- [])
-
-
-class SvnTextsTests(TestCase, BasicSvnTextsTests):
+from bzrlib.plugins.svn.foreign.test_versionedfiles import BasicTextsTests
+from bzrlib.plugins.svn.versionedfiles import SvnTexts
+
+
+class SvnTextsTests(TestCase, BasicTextsTests):
def setUp(self):
self.texts = SvnTexts(self)
-
-class VirtualRevisionTextsTests(TestCase, BasicSvnTextsTests):
- def _make_parents_provider(self):
- return self
-
- def setUp(self):
- self.texts = VirtualRevisionTexts(self)
-
- def get_parent_map(self, keys):
- raise NotImplementedError
-
-
-class VirtualInventoryTextsTests(TestCase, BasicSvnTextsTests):
- def _make_parents_provider(self):
- return self
-
- def get_inventory_xml(self, key):
- return "FOO"
-
- def get_parent_map(self, keys):
- return {("A",): (("B",))}
-
- def setUp(self):
- self.texts = VirtualInventoryTexts(self)
-
- def test_get_sha1s(self):
- self.assertEquals({("A",): osutils.sha_strings(["FOO"])}, self.texts.get_sha1s([("A",)]))
-
-
-class VirtualSignatureTextsTests(TestCase, BasicSvnTextsTests):
- def _make_parents_provider(self):
- return self
-
- def setUp(self):
- self.texts = VirtualSignatureTexts(self)
-
- def get_parent_map(self, keys):
- raise NotImplementedError
-
=== modified file 'versionedfiles.py'
--- a/versionedfiles.py 2008-08-28 15:59:55 +0000
+++ b/versionedfiles.py 2008-08-29 15:06:51 +0000
@@ -18,6 +18,7 @@
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import ERR_FS_NOT_FILE
+from bzrlib.plugins.svn.foreign.versionedfiles import VirtualSignatureTexts, VirtualRevisionTexts, VirtualInventoryTexts
from cStringIO import StringIO
@@ -76,38 +77,4 @@
# TODO: annotate, get_sha1s, iter_lines_added_or_present_in_keys, keys
-class VirtualRevisionTexts(VirtualVersionedFiles):
- """Virtual revisions backend."""
- def __init__(self, repository):
- self.repository = repository
- super(VirtualRevisionTexts, self).__init__(self.repository._make_parents_provider().get_parent_map, self.get_lines)
-
- def get_lines(self, key):
- return osutils.split_lines(self.repository.get_revision_xml(key))
-
- # TODO: annotate, iter_lines_added_or_present_in_keys, keys
-
-
-class VirtualInventoryTexts(VirtualVersionedFiles):
- """Virtual inventories backend."""
- def __init__(self, repository):
- self.repository = repository
- super(VirtualInventoryTexts, self).__init__(self.repository._make_parents_provider().get_parent_map, self.get_lines)
-
- def get_lines(self, key):
- return osutils.split_lines(self.repository.get_inventory_xml(key))
-
- # TODO: annotate, iter_lines_added_or_present_in_keys, keys
-
-
-class VirtualSignatureTexts(VirtualVersionedFiles):
- """Virtual signatures backend."""
- def __init__(self, repository):
- self.repository = repository
- super(VirtualSignatureTexts, self).__init__(self.repository._make_parents_provider().get_parent_map, self.get_lines)
-
- def get_lines(self, key):
- return osutils.split_lines(self.repository.get_signature_text(key))
-
- # TODO: annotate, iter_lines_added_or_present_in_keys, keys
More information about the bazaar-commits
mailing list