##// END OF EJS Templates
ancestors: remove unnecessary handling of 'left'...
Mads Kiilerich -
r20555:4add4386 default
parent child Browse files
Show More
@@ -31,7 +31,7 b' def ancestors(pfunc, *orignodes):'
31 31 poison = 1 << (i + 1)
32 32
33 33 gca = set()
34 interesting = left = len(nodes)
34 interesting = len(nodes)
35 35 nv = len(seen) - 1
36 36 while nv >= 0 and interesting:
37 37 v = nv
@@ -45,10 +45,8 b' def ancestors(pfunc, *orignodes):'
45 45 gca.add(v)
46 46 sv |= poison
47 47 if v in nodes:
48 left -= 1
49 if left <= 1:
50 # history is linear
51 return set([v])
48 # history is linear
49 return set([v])
52 50 if sv < poison:
53 51 for p in pfunc(v):
54 52 sp = seen[p]
@@ -1208,7 +1208,7 b' static PyObject *find_gca_candidates(ind'
1208 1208 const bitmask allseen = (1ull << revcount) - 1;
1209 1209 const bitmask poison = 1ull << revcount;
1210 1210 PyObject *gca = PyList_New(0);
1211 int i, v, interesting, left;
1211 int i, v, interesting;
1212 1212 int maxrev = -1;
1213 1213 long sp;
1214 1214 bitmask *seen;
@@ -1230,7 +1230,7 b' static PyObject *find_gca_candidates(ind'
1230 1230 for (i = 0; i < revcount; i++)
1231 1231 seen[revs[i]] = 1ull << i;
1232 1232
1233 interesting = left = revcount;
1233 interesting = revcount;
1234 1234
1235 1235 for (v = maxrev; v >= 0 && interesting; v--) {
1236 1236 long sv = seen[v];
@@ -1251,11 +1251,8 b' static PyObject *find_gca_candidates(ind'
1251 1251 }
1252 1252 sv |= poison;
1253 1253 for (i = 0; i < revcount; i++) {
1254 if (revs[i] == v) {
1255 if (--left <= 1)
1256 goto done;
1257 break;
1258 }
1254 if (revs[i] == v)
1255 goto done;
1259 1256 }
1260 1257 }
1261 1258 }
General Comments 0
You need to be logged in to leave comments. Login now