| pulkit |
| hg-reviewers |
Although it looks like this code was micro-optimized, I could not
measure any slow-down.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (28 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | D3806 lfs: use progess helper | |
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # experimental config: bundle.reorder | # experimental config: bundle.reorder | ||||
| reorder = repo.ui.config('bundle', 'reorder') | reorder = repo.ui.config('bundle', 'reorder') | ||||
| if reorder == 'auto': | if reorder == 'auto': | ||||
| reorder = None | reorder = None | ||||
| else: | else: | ||||
| reorder = stringutil.parsebool(reorder) | reorder = stringutil.parsebool(reorder) | ||||
| self._repo = repo | self._repo = repo | ||||
| self._reorder = reorder | self._reorder = reorder | ||||
| self._progress = repo.ui.progress | |||||
| if self._repo.ui.verbose and not self._repo.ui.debugflag: | if self._repo.ui.verbose and not self._repo.ui.debugflag: | ||||
| self._verbosenote = self._repo.ui.note | self._verbosenote = self._repo.ui.note | ||||
| else: | else: | ||||
| self._verbosenote = lambda s: None | self._verbosenote = lambda s: None | ||||
| def close(self): | def close(self): | ||||
| return closechunk() | return closechunk() | ||||
| revs = self._sortgroup(revlog, nodelist, lookup) | revs = self._sortgroup(revlog, nodelist, lookup) | ||||
| # add the parent of the first rev | # add the parent of the first rev | ||||
| p = revlog.parentrevs(revs[0])[0] | p = revlog.parentrevs(revs[0])[0] | ||||
| revs.insert(0, p) | revs.insert(0, p) | ||||
| # build deltas | # build deltas | ||||
| total = len(revs) - 1 | progress = None | ||||
| msgbundling = _('bundling') | |||||
| for r in xrange(len(revs) - 1): | |||||
| if units is not None: | if units is not None: | ||||
| self._progress(msgbundling, r + 1, unit=units, total=total) | progress = self._repo.ui.makeprogress(_('bundling'), unit=units, | ||||
| total=(len(revs) - 1)) | |||||
| for r in xrange(len(revs) - 1): | |||||
| if progress: | |||||
| progress.update(r + 1) | |||||
| prev, curr = revs[r], revs[r + 1] | prev, curr = revs[r], revs[r + 1] | ||||
| linknode = lookup(revlog.node(curr)) | linknode = lookup(revlog.node(curr)) | ||||
| for c in self.revchunk(revlog, curr, prev, linknode): | for c in self.revchunk(revlog, curr, prev, linknode): | ||||
| yield c | yield c | ||||
| if units is not None: | if progress: | ||||
| self._progress(msgbundling, None) | progress.complete() | ||||
| yield self.close() | yield self.close() | ||||
| # filter any nodes that claim to be part of the known set | # filter any nodes that claim to be part of the known set | ||||
| def prune(self, revlog, missing, commonrevs): | def prune(self, revlog, missing, commonrevs): | ||||
| rr, rl = revlog.rev, revlog.linkrev | rr, rl = revlog.rev, revlog.linkrev | ||||
| return [n for n in missing if rl(rr(n)) not in commonrevs] | return [n for n in missing if rl(rr(n)) not in commonrevs] | ||||
| def _packmanifests(self, dir, mfnodes, lookuplinknode): | def _packmanifests(self, dir, mfnodes, lookuplinknode): | ||||
| size += len(x) | size += len(x) | ||||
| yield x | yield x | ||||
| self._verbosenote(_('%8.i (manifests)\n') % size) | self._verbosenote(_('%8.i (manifests)\n') % size) | ||||
| yield self._manifestsdone() | yield self._manifestsdone() | ||||
| # The 'source' parameter is useful for extensions | # The 'source' parameter is useful for extensions | ||||
| def generatefiles(self, changedfiles, linknodes, commonrevs, source): | def generatefiles(self, changedfiles, linknodes, commonrevs, source): | ||||
| repo = self._repo | repo = self._repo | ||||
| progress = self._progress | progress = repo.ui.makeprogress(_('bundling'), unit=_('files'), | ||||
| msgbundling = _('bundling') | total=len(changedfiles)) | ||||
| total = len(changedfiles) | |||||
| # for progress output | |||||
| msgfiles = _('files') | |||||
| for i, fname in enumerate(sorted(changedfiles)): | for i, fname in enumerate(sorted(changedfiles)): | ||||
| filerevlog = repo.file(fname) | filerevlog = repo.file(fname) | ||||
| if not filerevlog: | if not filerevlog: | ||||
| raise error.Abort(_("empty or missing file data for %s") % | raise error.Abort(_("empty or missing file data for %s") % | ||||
| fname) | fname) | ||||
| linkrevnodes = linknodes(filerevlog, fname) | linkrevnodes = linknodes(filerevlog, fname) | ||||
| # Lookup for filenodes, we collected the linkrev nodes above in the | # Lookup for filenodes, we collected the linkrev nodes above in the | ||||
| # fastpath case and with lookupmf in the slowpath case. | # fastpath case and with lookupmf in the slowpath case. | ||||
| def lookupfilelog(x): | def lookupfilelog(x): | ||||
| return linkrevnodes[x] | return linkrevnodes[x] | ||||
| filenodes = self.prune(filerevlog, linkrevnodes, commonrevs) | filenodes = self.prune(filerevlog, linkrevnodes, commonrevs) | ||||
| if filenodes: | if filenodes: | ||||
| progress(msgbundling, i + 1, item=fname, unit=msgfiles, | progress.update(i + 1, item=fname) | ||||
| total=total) | |||||
| h = self.fileheader(fname) | h = self.fileheader(fname) | ||||
| size = len(h) | size = len(h) | ||||
| yield h | yield h | ||||
| for chunk in self.group(filenodes, filerevlog, lookupfilelog): | for chunk in self.group(filenodes, filerevlog, lookupfilelog): | ||||
| size += len(chunk) | size += len(chunk) | ||||
| yield chunk | yield chunk | ||||
| self._verbosenote(_('%8.i %s\n') % (size, fname)) | self._verbosenote(_('%8.i %s\n') % (size, fname)) | ||||
| progress(msgbundling, None) | progress.complete() | ||||
| def deltaparent(self, revlog, rev, p1, p2, prev): | def deltaparent(self, revlog, rev, p1, p2, prev): | ||||
| if not revlog.candelta(prev, rev): | if not revlog.candelta(prev, rev): | ||||
| raise error.ProgrammingError('cg1 should not be used in this case') | raise error.ProgrammingError('cg1 should not be used in this case') | ||||
| return prev | return prev | ||||
| def revchunk(self, revlog, rev, prev, linknode): | def revchunk(self, revlog, rev, prev, linknode): | ||||
| node = revlog.node(rev) | node = revlog.node(rev) | ||||