Changeset 885 in tailor

Timestamp:

10/05/05 10:32:48 (8 years ago)

Author:

Aaron Kaplan <kaplan@…>

Hash name:

20051005083248-d21f0-8f92e53d5d5eb7c79537e5aa6081541b7014f5c6

Message:

Normalize CVS revision to make simpler the recognition of branches

File:

• vcpx/cvs.py (modified) (1 diff)

vcpx/cvs.py

@@ -17 +17 @@
 from config import ConfigurationError
 
-def compare_cvs_revs(rev1, rev2):
-    """Compare two CVS revision numerically, not alphabetically."""
-
-    if not rev1: rev1 = '0'
-    if not rev2: rev2 = '0'
+def normalize_cvs_rev(rev):
+    """Convert a revision string to a tuple of numbers, eliminating the
+    penultimate zero in a 'magic branch number' if there is one.
+    1.1.1.1 is converted to (1,1). """
+    if not rev: rev = '0'
 
     # handle locked files by taking only the first part of the
     # revision string to handle gracefully lines like "1.1 locked"
-    rev1 = rev1.split(' ')[0]
-    rev2 = rev2.split(' ')[0]
-    r1 = [int(n) for n in rev1.split('.')]
-    r2 = [int(n) for n in rev2.split('.')]
+    rev = rev.split(' ')[0]
+
+    r = [int(n) for n in rev.split('.')]
+    # convert "magic branch numbers" like 1.2.0.2 to regular
+    # branch numbers like 1.2.2.
+    if len(r) > 2 and r[-2] == 0:
+        r = r[0:-2] + r[-1:]
+
+    if r == [1,1,1,1]:
+        r = [1,1]
+
+    return tuple(r)
+
+def compare_cvs_revs(revstr1, revstr2):
+    """Compare two CVS revision strings numerically, not alphabetically."""
+
+    r1 = normalize_cvs_rev(revstr1)
+    r2 = normalize_cvs_rev(revstr2)
 
     return cmp(r1, r2)