Changeset 1120 in tailor

Timestamp:

05/11/06 17:49:51 (7 years ago)

Author:

lele@…

Hash name:

20060511154951-97f81-ef1fca78a5e97b145152e67f1fc0a98ed32bcf2e

Message:

Emit a warning message whenever the SVN backend skips a file out of scope

Location:

vcpx

Files:

• svn.py (modified) (6 diffs)
• tests/svn.py (modified) (12 diffs)

vcpx/svn.py

@@ -18 +18 @@
 from config import ConfigurationError
 
-def changesets_from_svnlog(log, repository, module, chunksize=2**15):
+def changesets_from_svnlog(log, repository, chunksize=2**15):
     from xml.sax import make_parser
     from xml.sax.handler import ContentHandler, ErrorHandler
@@ -24 +24 @@
     from datetime import datetime
 
-    def get_entry_from_path(path, module=module):
+    def get_entry_from_path(path, module=repository.module):
         # Given the repository url of this wc, say
         #   "http://server/plone/CMFPlone/branches/Plone-2_0-branch"
@@ -40 +40 @@
 
         # The path is outside our tracked tree...
+        repository.log.warning('Ignoring %r since it is not under %r',
+                               path, module)
         return None
 
@@ -238 +240 @@
             log = StringIO(log.read().translate(tt))
 
-        return changesets_from_svnlog(log,
-                                      self.repository.repository,
-                                      self.repository.module)
+        return changesets_from_svnlog(log, self.repository)
 
     def _applyChangeset(self, changeset):
@@ -351 +351 @@
                     (str(svnlog), svnlog.exit_status, err.read()))
 
-            csets = changesets_from_svnlog(out,
-                                           self.repository.repository,
-                                           self.repository.module)
+            csets = changesets_from_svnlog(out, self.repository)
             last = csets.next()
             revision = last.revision
@@ -393 +391 @@
                     (str(svnlog), svnlog.exit_status, err.read()))
 
-            csets = changesets_from_svnlog(out,
-                                           self.repository.repository,
-                                           self.repository.module)
+            csets = changesets_from_svnlog(out, self.repository)
             last = csets.next()
 

vcpx/tests/svn.py

@@ -11 +11 @@
 from vcpx.svn import changesets_from_svnlog
 
+class FakeLogger:
+    def warning(self, *args):
+        pass
+
+class FakeRepository:
+    def __init__(self, repo, module):
+        self.repository = repo
+        self.module = module
+        self.log = FakeLogger()
+FR = FakeRepository
+
 class SvnLogParser(TestCase):
     """Ensure the svn log parser does its job"""
@@ -24 +35 @@
 
         log = self.getSvnLog('svn-simple_rename_test')
-        csets = changesets_from_svnlog(log, 'file:///tmp/t/repo', '/trunk')
+        csets = changesets_from_svnlog(log, FR('file:///tmp/t/repo', '/trunk'))
 
         cset = csets.next()
@@ -57 +68 @@
 
         log = self.getSvnLog('svn-rename_out_test')
-        csets = changesets_from_svnlog(log, 'http://srv/svn/Shtoom', '/trunk')
+        csets = changesets_from_svnlog(log,
+                                       FR('http://srv/svn/Shtoom', '/trunk'))
 
         cset = csets.next()
@@ -75 +87 @@
 
         log = self.getSvnLog('svn-copy_and_rename_test')
-        csets = list(changesets_from_svnlog(log, 'file:///tmp/rep', '/test'))
+        csets = list(changesets_from_svnlog(log,
+                                            FR('file:///tmp/rep', '/test')))
         self.assertEqual(len(csets), 4)
 
@@ -112 +125 @@
 
         log = self.getSvnLog('svn-svn_r_event_test')
-        csets = changesets_from_svnlog(log, 'file:///tmp/rep', '/trunk')
+        csets = changesets_from_svnlog(log, FR('file:///tmp/rep', '/trunk'))
 
         cset = csets.next()
@@ -152 +165 @@
 
         log = self.getSvnLog('svn-svn_repos_root_test')
-        csets = list(changesets_from_svnlog(log, 'svn+ssh://caia/tmp/svn', '/'))
+        csets = list(changesets_from_svnlog(log,
+                                            FR('svn+ssh://caia/tmp/svn', '/')))
         self.assertEqual(len(csets), 4)
 
@@ -174 +188 @@
 
         log = self.getSvnLog('svn-pydist_strange_case')
-        csets = changesets_from_svnlog(log, 'http://srv/svn', '/py/dist')
+        csets = changesets_from_svnlog(log, FR('http://srv/svn', '/py/dist'))
 
         cset = csets.next()
@@ -198 +212 @@
 
         log = self.getSvnLog('svn-encoding_test')
-        csets = changesets_from_svnlog(log, 'http://srv/plone/CMFPlone',
-                                       '/branches/2.1')
+        csets = changesets_from_svnlog(log, FR('http://srv/plone/CMFPlone',
+                                               '/branches/2.1'))
 
         log = csets.next().log
@@ -213 +227 @@
 
         log = self.getSvnLog('svn-copy_and_replace_test')
-        csets = changesets_from_svnlog(log, 'http://srv/repos/trac', '/trunk')
+        csets = changesets_from_svnlog(log,
+                                       FR('http://srv/repos/trac', '/trunk'))
 
         cset = csets.next()
@@ -243 +258 @@
 
         log = self.getSvnLog('svn-copyfrom_and_remove_test')
-        csets = changesets_from_svnlog(log, 'http://srv/samba',
-                                       '/branches/SAMBA_4_0')
+        csets = changesets_from_svnlog(log, FR('http://srv/samba',
+                                               '/branches/SAMBA_4_0'))
 
         cset = csets.next()
@@ -265 +280 @@
 
         log = self.getSvnLog('svn-svn_repos_root_test')
-        csets = list(changesets_from_svnlog(log, 'svn+ssh://caia/tmp/svn', '/',
+        csets = list(changesets_from_svnlog(log,
+                                            FR('svn+ssh://caia/tmp/svn', '/'),
                                             chunksize=100))
         self.assertEqual(len(csets), 4)
@@ -273 +289 @@
 
         log = self.getSvnLog('svn-external_copies_test')
-        csets = changesets_from_svnlog(log, 'svn+ssh://caia/tmp/svn', '/trunk')
+        csets = changesets_from_svnlog(log,
+                                       FR('svn+ssh://caia/tmp/svn', '/trunk'))
 
         cset = csets.next()