Rev 2295: Implement BzrDir.is_control_filename. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

Jelmer Vernooij jelmer at samba.org
Tue Jan 13 00:10:44 GMT 2009


At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2295
revision-id: jelmer at samba.org-20090113001039-740n3f3lpvc8a4io
parent: jelmer at samba.org-20090112234255-t9z7rdv089kmdsvs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Tue 2009-01-13 01:10:39 +0100
message:
  Implement BzrDir.is_control_filename.
modified:
  tests/test_workingtree.py      test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py	2008-11-19 12:22:38 +0000
+++ b/tests/test_workingtree.py	2009-01-13 00:10:39 +0000
@@ -95,6 +95,13 @@
         self.assertTrue(inv.has_filename("bl"))
         self.assertFalse(inv.has_filename("aa"))
 
+    def test_is_control_filename(self):
+        self.make_client('a', 'dc')
+        bzrdir = BzrDir.open("dc")
+        self.assertTrue(bzrdir.is_control_filename(".svn"))
+        self.assertTrue(bzrdir.is_control_filename(".svn/lock"))
+        self.assertFalse(bzrdir.is_control_filename("lock"))
+
     def test_smart_add_recurse(self):
         self.make_client('a', 'dc')
         self.build_tree({"dc/bl/foo": "data"})

=== modified file 'workingtree.py'
--- a/workingtree.py	2009-01-11 13:54:35 +0000
+++ b/workingtree.py	2009-01-13 00:10:39 +0000
@@ -798,6 +798,9 @@
         return (self.root_transport.abspath(".svn"),
                 self.root_transport.abspath(".svn.backup"))
 
+    def is_control_filename(self, filename):
+        return filename == '.svn' or filename.startswith('.svn/')
+
     def get_remote_bzrdir(self):
         if self._remote_bzrdir is None:
             self._remote_bzrdir = SvnRemoteAccess(self.get_remote_transport())




More information about the bazaar-commits mailing list