##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

shrink-revlog: factor out suboptimal computation
Benoit Boissinot -
r10626:3fc95c3b default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -56,7 +56,6 b' def toposort_reversepostorder(ui, rl):'
56 visit = list(heads)
56 visit = list(heads)
57 visit.sort(reverse=True)
57 visit.sort(reverse=True)
58 finished = set()
58 finished = set()
59 suboptimal = 0
60
59
61 while visit:
60 while visit:
62 cur = visit[-1]
61 cur = visit[-1]
@@ -65,16 +64,10 b' def toposort_reversepostorder(ui, rl):'
65 visit.append(p)
64 visit.append(p)
66 break
65 break
67 else:
66 else:
68 curparents = rl.parentrevs(cur)
69 if result and result[-1] != curparents[0]:
70 suboptimal += 1
71
72 result.append(cur)
67 result.append(cur)
73 finished.add(cur)
68 finished.add(cur)
74 visit.pop()
69 visit.pop()
75
70
76 ui.note(_('%d suboptimal nodes\n') % suboptimal)
77
78 return result
71 return result
79
72
80 def toposort_postorderreverse(ui, rl):
73 def toposort_postorderreverse(ui, rl):
@@ -104,7 +97,6 b' def toposort_postorderreverse(ui, rl):'
104 visit = list(roots)
97 visit = list(roots)
105 visit.sort()
98 visit.sort()
106 finished = set()
99 finished = set()
107 suboptimal = 0
108
100
109 while visit:
101 while visit:
110 cur = visit[-1]
102 cur = visit[-1]
@@ -113,19 +105,10 b' def toposort_postorderreverse(ui, rl):'
113 visit.append(p)
105 visit.append(p)
114 break
106 break
115 else:
107 else:
116 # if cur is not the first parent of its successor, then the
117 # successor is a suboptimal node
118 if result:
119 succparents = rl.parentrevs(result[-1])
120 if succparents[0] != cur:
121 suboptimal += 1
122
123 result.append(cur)
108 result.append(cur)
124 finished.add(cur)
109 finished.add(cur)
125 visit.pop()
110 visit.pop()
126
111
127 ui.note(_('%d suboptimal nodes\n') % suboptimal)
128
129 result.reverse()
112 result.reverse()
130 return result
113 return result
131
114
@@ -259,6 +242,15 b' def shrink(ui, repo, **opts):'
259 try:
242 try:
260 try:
243 try:
261 order = toposort(ui, r1)
244 order = toposort(ui, r1)
245
246 suboptimal = 0
247 for i in xrange(1, len(order)):
248 parents = [p for p in r1.parentrevs(order[i])
249 if p != node.nullrev]
250 if parents and order[i-1] not in parents:
251 suboptimal += 1
252 ui.note(_('%d suboptimal nodes\n') % suboptimal)
253
262 writerevs(ui, r1, r2, order, tr)
254 writerevs(ui, r1, r2, order, tr)
263 report(ui, r1, r2)
255 report(ui, r1, r2)
264 tr.close()
256 tr.close()
General Comments 0
You need to be logged in to leave comments. Login now