| quark | |
| yuja |
| hg-reviewers |
Revisions are added consecutively, so a range can easily represent them
in the changes list. This saves around 45 Bytes / revision on 64bit
platforms and reduces the memory footprint of issue5691 by 15MB.
Don't copy changes['revs'] in getobsoleted. Ranges have a very efficient
contains implementation already.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changelog.py (7 lines) | |||
| M | mercurial/localrepo.py (2 lines) | |||
| M | mercurial/obsutil.py (4 lines) | |||
| M | mercurial/scmutil.py (2 lines) |
| def _addrevision(self, node, rawtext, transaction, *args, **kwargs): | def _addrevision(self, node, rawtext, transaction, *args, **kwargs): | ||||
| # overlay over the standard revlog._addrevision to track the new | # overlay over the standard revlog._addrevision to track the new | ||||
| # revision on the transaction. | # revision on the transaction. | ||||
| rev = len(self) | rev = len(self) | ||||
| node = super(changelog, self)._addrevision(node, rawtext, transaction, | node = super(changelog, self)._addrevision(node, rawtext, transaction, | ||||
| *args, **kwargs) | *args, **kwargs) | ||||
| revs = transaction.changes.get('revs') | revs = transaction.changes.get('revs') | ||||
| if revs is not None: | if revs is not None: | ||||
| revs.add(rev) | if revs: | ||||
| assert revs[-1] + 1 == rev | |||||
| revs = xrange(revs[0], rev + 1) | |||||
| else: | |||||
| revs = xrange(rev, rev + 1) | |||||
| transaction.changes['revs'] = revs | |||||
| return node | return node | ||||
| tr = transaction.transaction(rp, self.svfs, vfsmap, | tr = transaction.transaction(rp, self.svfs, vfsmap, | ||||
| "journal", | "journal", | ||||
| "undo", | "undo", | ||||
| aftertrans(renames), | aftertrans(renames), | ||||
| self.store.createmode, | self.store.createmode, | ||||
| validator=validate, | validator=validate, | ||||
| releasefn=releasefn, | releasefn=releasefn, | ||||
| checkambigfiles=_cachedfiles) | checkambigfiles=_cachedfiles) | ||||
| tr.changes['revs'] = set() | tr.changes['revs'] = xrange(0, 0) | ||||
| tr.changes['obsmarkers'] = set() | tr.changes['obsmarkers'] = set() | ||||
| tr.changes['phases'] = {} | tr.changes['phases'] = {} | ||||
| tr.changes['bookmarks'] = {} | tr.changes['bookmarks'] = {} | ||||
| tr.hookargs['txnid'] = txnid | tr.hookargs['txnid'] = txnid | ||||
| # note: writing the fncache only during finalize mean that the file is | # note: writing the fncache only during finalize mean that the file is | ||||
| # outdated when running hooks. As fncache is used for streaming clone, | # outdated when running hooks. As fncache is used for streaming clone, | ||||
| # this is not expected to break anything that happen during the hooks. | # this is not expected to break anything that happen during the hooks. | ||||
| def getobsoleted(repo, tr): | def getobsoleted(repo, tr): | ||||
| """return the set of pre-existing revisions obsoleted by a transaction""" | """return the set of pre-existing revisions obsoleted by a transaction""" | ||||
| torev = repo.unfiltered().changelog.nodemap.get | torev = repo.unfiltered().changelog.nodemap.get | ||||
| phase = repo._phasecache.phase | phase = repo._phasecache.phase | ||||
| succsmarkers = repo.obsstore.successors.get | succsmarkers = repo.obsstore.successors.get | ||||
| public = phases.public | public = phases.public | ||||
| addedmarkers = tr.changes.get('obsmarkers') | addedmarkers = tr.changes.get('obsmarkers') | ||||
| addedrevs = tr.changes.get('revs') | addedrevs = tr.changes.get('revs') | ||||
| seenrevs = set(addedrevs) | seenrevs = set() | ||||
| obsoleted = set() | obsoleted = set() | ||||
| for mark in addedmarkers: | for mark in addedmarkers: | ||||
| node = mark[0] | node = mark[0] | ||||
| rev = torev(node) | rev = torev(node) | ||||
| if rev is None or rev in seenrevs: | if rev is None or rev in seenrevs or rev in addedrevs: | ||||
| continue | continue | ||||
| seenrevs.add(rev) | seenrevs.add(rev) | ||||
| if phase(repo, rev) == public: | if phase(repo, rev) == public: | ||||
| continue | continue | ||||
| if set(succsmarkers(node) or []).issubset(addedmarkers): | if set(succsmarkers(node) or []).issubset(addedmarkers): | ||||
| obsoleted.add(rev) | obsoleted.add(rev) | ||||
| return obsoleted | return obsoleted | ||||
| if obsoleted: | if obsoleted: | ||||
| repo.ui.status(_('obsoleted %i changesets\n') | repo.ui.status(_('obsoleted %i changesets\n') | ||||
| % len(obsoleted)) | % len(obsoleted)) | ||||
| if txmatch(_reportnewcssource): | if txmatch(_reportnewcssource): | ||||
| @reportsummary | @reportsummary | ||||
| def reportnewcs(repo, tr): | def reportnewcs(repo, tr): | ||||
| """Report the range of new revisions pulled/unbundled.""" | """Report the range of new revisions pulled/unbundled.""" | ||||
| newrevs = list(tr.changes.get('revs', set())) | newrevs = tr.changes.get('revs', xrange(0, 0)) | ||||
| if not newrevs: | if not newrevs: | ||||
| return | return | ||||
| # Compute the bounds of new revisions' range, excluding obsoletes. | # Compute the bounds of new revisions' range, excluding obsoletes. | ||||
| unfi = repo.unfiltered() | unfi = repo.unfiltered() | ||||
| revs = unfi.revs('%ld and not obsolete()', newrevs) | revs = unfi.revs('%ld and not obsolete()', newrevs) | ||||
| if not revs: | if not revs: | ||||
| # Got only obsoletes. | # Got only obsoletes. | ||||