Changeset 8 in tailor

Timestamp:

06/03/04 00:57:51 (9 years ago)

Author:

lele@…

Hash name:

20040602225751-97f81-1c36a93fad42a806dc78c71fb57407335ad81be1

Message:

Better tests for new return of merge and update

Location:

cvsync

Files:

• svn.py (modified) (4 diffs)
• tailor.py (modified) (5 diffs)
• tests/svn.py (modified) (3 diffs)

cvsync/svn.py

@@ -19 +19 @@
 
 class SvnUpdate(SystemCommand):
-    COMMAND = "svn update --quiet --revision %(revision)s %(entry)s"
+    COMMAND = "svn update --revision %(revision)s %(entry)s"
 
 
@@ -248 +248 @@
         
     def update(self, revision="HEAD"):
-        """Bring this directory up to its HEAD revision in the repository."""
+        """
+        Bring this directory up to its HEAD revision in the
+        repository.  Return a dictionary of changed items, grouped by
+        kind of change.
+        """
 
         svnup = SvnUpdate()
-        svnup(entry=self.root, revision=revision)
+        out = svnup(output=True, entry=self.root, revision=revision)
+        
+        result = {}
+        for line in out:
+            if len(line)>2 and line[0] in 'ADUCG' and line[1] == ' ':
+                try: result[line[0]].append(line[2:-1])
+                except KeyError: result[line[0]] = [line[2:-1]]
+            
+        return result
     
     def commit(self, logfile=None, message=None):
@@ -342 +354 @@
 
     def merge(self, uri, startrev, endrev, dest, dry_run=False):
-        """Perform the merge."""
+        """
+        Perform the merge and return a dictionary of changed items,
+        grouped by kind of change."""
 
         svnm = SvnMerge()
@@ -348 +362 @@
                    source=uri, dest=dest, dry_run=dry_run)
 
-        merged = False
+        result = {}
         if not dry_run:
             for line in out:
-                if line.startswith('C '):
-                    print "CONFLICT:", line
-                merged = True
-            
-        return merged
+                if len(line)>2 and line[0] in 'ADUCG' and line[1] == ' ':
+                    try: result[line[0]].append(line[2:-1])
+                    except KeyError: result[line[0]] = [line[2:-1]]
+            
+        return result
 
     def diff(self, uri, rev):

cvsync/tailor.py

@@ -140 +140 @@
         if options.svn_update and not options.dry_run:
             self.wc.update()
+            
         return self.merge(options)
 
@@ -179 +180 @@
                 path,action = event
                 oldpath = action[1]
-                if pathactions.get(oldpath) == u'D':
+                if pathactions.get(oldpath) == 'D':
                     dwc.rename(oldpath, path)
                     done[path] = done[oldpath] = True
@@ -190 +191 @@
                 if done.get(path): continue
                 
-                if action == u'D':
+                if action == 'D':
                     dwc.remove(path)
 
@@ -308 +309 @@
         Fetch the upstream info and perform a merge of the eventual changes,
         then update the properties.
+
+        Return True if there something to commit, False otherwise.
         """
 
@@ -317 +320 @@
         head = getHeadRevision(uri, rev)
         if rev <> head:
-            merged = self.wc.merge(uri, rev, head,
-                                   self.project, dry_run=options.dry_run)
+            changes = self.wc.merge(uri, rev, head,
+                                    self.project, dry_run=options.dry_run)
+
+            conflicts = changes.get('C')
+            if conflicts:
+                print "CONFLICT:", conflicts
+
+            merged = len(changes)<>0
             if merged:
                 self.updateUpstreamInfo(rev=head)

cvsync/tests/svn.py

@@ -26 +26 @@
 
     def __init__(self, path):
-        from os.path import abspath, join, exists
+        from os.path import abspath, exists
 
         self.repospath = path
@@ -51 +51 @@
         TestCase.__init__(self, methodName)
 
-        repos = '/tmp/cvsync.test'
+        repos = '/tmp/basic.rep'
         self.repos = TestRepository(repos)
-        wc = '/tmp/cvsync.wc'
+        wc = '/tmp/basic.wc'
         self.wc = SvnWorkingDir(wc)
 
+    def __del__(self):
+        from shutil import rmtree
+        from os.path import exists
+        
+        if exists(self.repos.repospath): rmtree(self.repos.repospath)
+        if exists(self.wc.root): rmtree(self.wc.root)
+        
     def testCheckout(self):
         """Verify that svn checkout returns right info"""
@@ -62 +69 @@
         self.assertEqual(info['URL'], self.repos.reposurl)
         self.assertEqual(info['Revision'], '0')
-    
+
+    def testInfoA_update(self):
+        """Verify update return right info"""
+
+        changes = self.wc.update(revision='1')
+        self.assertEqual(len(changes), 1)
+        self.assertEqual(len(changes['A']), 6)
+        
+    def testInfoB_merge(self):
+        """Verify merge return right info"""
+
+        changes = self.wc.merge(self.repos.reposurl, '1', '2', self.wc.root)
+        self.assertEqual(len(changes), 1)
+        self.assertEqual(len(changes['U']), 3)
+
+    def testInfoC_update(self):
+        """Verify update after merge return right info"""
+
+        changes = self.wc.update(revision='2')
+        self.assertEqual(len(changes), 1)
+        self.assertEqual(len(changes['G']), 3)
+        
 class SvnLogTest(TestCase):
     """Test `svn log` parse functionality."""
 
     def __init__(self, methodName):
+        TestCase.__init__(self, methodName)
+
+        repos = '/tmp/log.rep'
+        self.repos = TestRepository(repos)
+        wc = '/tmp/log.wc'
+        self.wc = SvnWorkingDir(wc)
+        self.wc.checkout(self.repos.reposurl + '@0')
+
+    def __del__(self):
+        from shutil import rmtree
         from os.path import exists
         
-        TestCase.__init__(self, methodName)
-
-        repos = '/tmp/cvsync.test'
-        self.repos = TestRepository(repos)
-        wc = '/tmp/cvsync.wc'
-        self.wc = SvnWorkingDir(wc)
-        if not exists(wc):
-            self.wc.checkout(self.repos.reposurl + '@0')
+        if exists(self.repos.repospath): rmtree(self.repos.repospath)
+        if exists(self.wc.root): rmtree(self.wc.root)
         
     def testLogParser(self):