##// END OF EJS Templates
transaction: build changes['revs'] as range instead of a set...
Joerg Sonnenberger -
r35309:137a08d8 default
parent child Browse files
Show More
@@ -541,5 +541,10 b' class changelog(revlog.revlog):'
541 *args, **kwargs)
541 *args, **kwargs)
542 revs = transaction.changes.get('revs')
542 revs = transaction.changes.get('revs')
543 if revs is not None:
543 if revs is not None:
544 revs.add(rev)
544 if revs:
545 assert revs[-1] + 1 == rev
546 revs = xrange(revs[0], rev + 1)
547 else:
548 revs = xrange(rev, rev + 1)
549 transaction.changes['revs'] = revs
545 return node
550 return node
@@ -1275,7 +1275,7 b' class localrepository(object):'
1275 validator=validate,
1275 validator=validate,
1276 releasefn=releasefn,
1276 releasefn=releasefn,
1277 checkambigfiles=_cachedfiles)
1277 checkambigfiles=_cachedfiles)
1278 tr.changes['revs'] = set()
1278 tr.changes['revs'] = xrange(0, 0)
1279 tr.changes['obsmarkers'] = set()
1279 tr.changes['obsmarkers'] = set()
1280 tr.changes['phases'] = {}
1280 tr.changes['phases'] = {}
1281 tr.changes['bookmarks'] = {}
1281 tr.changes['bookmarks'] = {}
@@ -441,12 +441,12 b' def getobsoleted(repo, tr):'
441 public = phases.public
441 public = phases.public
442 addedmarkers = tr.changes.get('obsmarkers')
442 addedmarkers = tr.changes.get('obsmarkers')
443 addedrevs = tr.changes.get('revs')
443 addedrevs = tr.changes.get('revs')
444 seenrevs = set(addedrevs)
444 seenrevs = set()
445 obsoleted = set()
445 obsoleted = set()
446 for mark in addedmarkers:
446 for mark in addedmarkers:
447 node = mark[0]
447 node = mark[0]
448 rev = torev(node)
448 rev = torev(node)
449 if rev is None or rev in seenrevs:
449 if rev is None or rev in seenrevs or rev in addedrevs:
450 continue
450 continue
451 seenrevs.add(rev)
451 seenrevs.add(rev)
452 if phase(repo, rev) == public:
452 if phase(repo, rev) == public:
@@ -1262,7 +1262,7 b' def registersummarycallback(repo, otr, t'
1262 @reportsummary
1262 @reportsummary
1263 def reportnewcs(repo, tr):
1263 def reportnewcs(repo, tr):
1264 """Report the range of new revisions pulled/unbundled."""
1264 """Report the range of new revisions pulled/unbundled."""
1265 newrevs = list(tr.changes.get('revs', set()))
1265 newrevs = tr.changes.get('revs', xrange(0, 0))
1266 if not newrevs:
1266 if not newrevs:
1267 return
1267 return
1268
1268
General Comments 0
You need to be logged in to leave comments. Login now