Merge remote-tracking branch 'felipec/master' into felipec

These remaining changes have been mostly superseded
(e.g. revwalk iso gitrange, no more fetch-first error).
This commit is contained in:
Mark Nauwelaerts
2020-06-01 12:57:40 +02:00

View File

@@ -534,6 +534,7 @@ def revwalk(repo, name, b):
pending.add(b.rev()) pending.add(b.rev())
interval = b.rev() / 10 interval = b.rev() / 10
interval = interval if interval > 1000 else 1000 interval = interval if interval > 1000 else 1000
pfunc = repo.changelog.parentrevs
for cur in xrange(b.rev(), -1, -1): for cur in xrange(b.rev(), -1, -1):
if not pending: if not pending:
break break
@@ -541,7 +542,7 @@ def revwalk(repo, name, b):
if cur in pending: if cur in pending:
positive.append(cur) positive.append(cur)
pending.remove(cur) pending.remove(cur)
parents = [p for p in repo.changelog.parentrevs(cur) if p >= 0] parents = [p for p in pfunc(cur) if p >= 0]
for p in parents: for p in parents:
if not marks.is_marked(repo[p].hex()): if not marks.is_marked(repo[p].hex()):
pending.add(p) pending.add(p)