Mercurial > hg

changeset 6427:6b704ef9ed06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ancestors: simplify symmetric difference - n_wanted/wanted -> interesting - scan colors rather than managing ret
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Mar 2008 12:39:47 -0500
parents e2c49ef2dd6e
children cbdefda439b6
files mercurial/ancestor.py
diffstat 1 files changed, 8 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/ancestor.py	Sat Mar 29 12:39:47 2008 -0500
+++ b/mercurial/ancestor.py	Sat Mar 29 12:39:47 2008 -0500
@@ -107,28 +107,24 @@
 
     visit = [-a, -b]
     heapq.heapify(visit)
-    n_wanted = len(visit)
-    ret = []
+    interesting = len(visit)
 
-    while n_wanted:
+    while interesting:
         r = -heapq.heappop(visit)
-        wanted = colors[r] != ALLCOLORS
-        n_wanted -= wanted
-        if wanted:
-            ret.append(r)
+        if colors[r] != ALLCOLORS:
+            interesting -= 1
 
         for p in pfunc(r):
             if p not in colors:
                 # first time we see p; add it to visit
-                n_wanted += wanted
                 colors[p] = colors[r]
+                if colors[p] != ALLCOLORS:
+                    interesting += 1
                 heapq.heappush(visit, -p)
             elif colors[p] != ALLCOLORS and colors[p] != colors[r]:
                 # at first we thought we wanted p, but now
                 # we know we don't really want it
-                n_wanted -= 1
                 colors[p] |= colors[r]
+                interesting -= 1
 
-        del colors[r]
-
-    return ret
+    return [r for r in colors if colors[r] != ALLCOLORS]