[Checkins] SVN: z3c.vcsync/trunk/ Fix a bug concerning return of revision number.

Martijn Faassen faassen at infrae.com
Wed Dec 12 16:14:13 EST 2007


Log message for revision 82266:
  Fix a bug concerning return of revision number.
  

Changed:
  U   z3c.vcsync/trunk/CHANGES.txt
  U   z3c.vcsync/trunk/src/z3c/vcsync/svn.py

-=-
Modified: z3c.vcsync/trunk/CHANGES.txt
===================================================================
--- z3c.vcsync/trunk/CHANGES.txt	2007-12-12 15:15:38 UTC (rev 82265)
+++ z3c.vcsync/trunk/CHANGES.txt	2007-12-12 21:14:12 UTC (rev 82266)
@@ -12,6 +12,13 @@
   attribute and also contains some information on what happened during
   the synchronization process.
 
+Bugs fixed
+~~~~~~~~~~
+
+* revision number after synchronization was not always updated
+  properly to the latest number of the repository. Now retrieve this
+  number from ``commit()`` where possible.
+
 0.9.1 (2007-11-29)
 ------------------
 

Modified: z3c.vcsync/trunk/src/z3c/vcsync/svn.py
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/svn.py	2007-12-12 15:15:38 UTC (rev 82265)
+++ z3c.vcsync/trunk/src/z3c/vcsync/svn.py	2007-12-12 21:14:12 UTC (rev 82266)
@@ -11,6 +11,7 @@
         self.path = path
         self._files = set()
         self._removed = set()
+        self._revision_nr = None
         self._updated_revision_nr = None
     
     def _repository_url(self):
@@ -36,8 +37,11 @@
         _resolve_helper(self.path)
 
     def commit(self, message):
-        self.path.commit(message)
-
+        revision_nr = self.path.commit(message)
+        if revision_nr is None:
+            revision_nr = int(self.path.status().rev)
+        self._revision_nr = revision_nr
+        
     def files(self, revision_nr):
         self._update_files(revision_nr)
         return list(self._files)
@@ -47,7 +51,7 @@
         return list(self._removed)
 
     def revision_nr(self):
-        return int(self.path.status().rev)
+        return self._revision_nr
     
     def _update_files(self, revision_nr):
         """Go through svn log and update self._files and self._removed.



More information about the Checkins mailing list