Changeset 1000

Timestamp:

08/17/06 16:54:20 (7 years ago)

Author:

mglb1

Message:

Don't include revisions which only touched directory properties when
finding the youngest revision

File:

• ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py (modified) (2 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_cfengine.py

@@ -1889 +1889 @@
     def getYoungestRevision(self, path=""):
         """Returns the number of the youngest revision in the repository"""
+        revno = -1
 
         if path != "":
@@ -1897 +1898 @@
         try:
             self.lock.acquire()
+            t = mkdtemp("", "ccsd")
             try:
                 l = self.mSvn.log(path)
-                revno = l[0]["revision"].number
+                for entry in l:
+                    # Discard revisions which touched only the directory
+                    r1 = pysvn.Revision(pysvn.opt_revision_kind.number, \
+                            entry["revision"].number-1)
+                    r2 = pysvn.Revision(pysvn.opt_revision_kind.number, \
+                            entry["revision"].number)
+                    try:
+                        diff = self.mSvn.diff(t, path, r1, r2).strip()
+                    except:
+                        (type, value, tb) = sys.exc_info()
+                        if str(value).find("was not found") != -1:
+                            # Earlier revision not found, must be added 
+                            revno = entry["revision"].number
+                            break
+                    ignore = True
+                    for line in diff.split("\n"):
+                        if line.strip() == "Property changes on:":
+                            continue
+                        if line.startswith("Property changes on:"):
+                            ignore = False
+                            break
+                    if ignore:
+                        continue
+                    # Found a revision which touched inside the directory
+                    revno = entry["revision"].number
+                    break
             finally:
                 self.lock.release()
+                removeDir(t)
         except:
             log_warn("Could not determine youngest revision", sys.exc_info())
-            revno = -1
 
         return revno