| martinvonz | |
| durin42 |
| hg-reviewers |
We want to store copies information in sidedata, the logic will be quite similar
to the one used for extra, but sightly different (not in extra, no hash impact).
We start with small refactoring to make our work easier and the coming changesets
cleaners.
| 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 (24 lines) | |||
| M | mercurial/localrepo.py (5 lines) |
| # chains. | # chains. | ||||
| self._storedeltachains = False | self._storedeltachains = False | ||||
| self._realopener = opener | self._realopener = opener | ||||
| self._delayed = False | self._delayed = False | ||||
| self._delaybuf = None | self._delaybuf = None | ||||
| self._divert = False | self._divert = False | ||||
| self.filteredrevs = frozenset() | self.filteredrevs = frozenset() | ||||
| self._copiesstorage = opener.options.get('copies-storage') | |||||
| def tiprev(self): | def tiprev(self): | ||||
| for i in pycompat.xrange(len(self) -1, -2, -1): | for i in pycompat.xrange(len(self) -1, -2, -1): | ||||
| if i not in self.filteredrevs: | if i not in self.filteredrevs: | ||||
| return i | return i | ||||
| def tip(self): | def tip(self): | ||||
| """filtered version of revlog.tip""" | """filtered version of revlog.tip""" | ||||
| parseddate = "%d %d" % dateutil.makedate() | parseddate = "%d %d" % dateutil.makedate() | ||||
| if extra: | if extra: | ||||
| branch = extra.get("branch") | branch = extra.get("branch") | ||||
| if branch in ("default", ""): | if branch in ("default", ""): | ||||
| del extra["branch"] | del extra["branch"] | ||||
| elif branch in (".", "null", "tip"): | elif branch in (".", "null", "tip"): | ||||
| raise error.StorageError(_('the name \'%s\' is reserved') | raise error.StorageError(_('the name \'%s\' is reserved') | ||||
| % branch) | % branch) | ||||
| extrasentries = p1copies, p2copies, filesadded, filesremoved | |||||
| if extra is None and any(x is not None for x in extrasentries): | |||||
| extra = {} | |||||
| sortedfiles = sorted(files) | sortedfiles = sorted(files) | ||||
| if extra is not None: | if extra is not None: | ||||
| for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'): | for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'): | ||||
| extra.pop(name, None) | extra.pop(name, None) | ||||
| if self._copiesstorage == 'extra': | |||||
| extrasentries = p1copies, p2copies, filesadded, filesremoved | |||||
| if extra is None and any(x is not None for x in extrasentries): | |||||
| extra = {} | |||||
| if p1copies is not None: | if p1copies is not None: | ||||
| extra['p1copies'] = encodecopies(sortedfiles, p1copies) | extra['p1copies'] = encodecopies(sortedfiles, p1copies) | ||||
| if p2copies is not None: | if p2copies is not None: | ||||
| extra['p2copies'] = encodecopies(sortedfiles, p2copies) | extra['p2copies'] = encodecopies(sortedfiles, p2copies) | ||||
| if filesadded is not None: | if filesadded is not None: | ||||
| extra['filesadded'] = encodefileindices(sortedfiles, filesadded) | extra['filesadded'] = encodefileindices(sortedfiles, filesadded) | ||||
| if filesremoved is not None: | if filesremoved is not None: | ||||
| extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved) | extra['filesremoved'] = encodefileindices(sortedfiles, filesremoved) | ||||
| if extra: | if extra: | ||||
| extra = encodeextra(extra) | extra = encodeextra(extra) | ||||
| parseddate = "%s %s" % (parseddate, extra) | parseddate = "%s %s" % (parseddate, extra) | ||||
| l = [hex(manifest), user, parseddate] + sortedfiles + ["", desc] | l = [hex(manifest), user, parseddate] + sortedfiles + ["", desc] | ||||
| text = "\n".join(l) | text = "\n".join(l) | ||||
| return self.addrevision(text, transaction, len(self), p1, p2) | return self.addrevision(text, transaction, len(self), p1, p2) | ||||
| # This revlog format is super old and we don't bother trying to parse | # This revlog format is super old and we don't bother trying to parse | ||||
| # opener options for it because those options wouldn't do anything | # opener options for it because those options wouldn't do anything | ||||
| # meaningful on such old repos. | # meaningful on such old repos. | ||||
| if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements: | if b'revlogv1' in requirements or REVLOGV2_REQUIREMENT in requirements: | ||||
| options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | options.update(resolverevlogstorevfsoptions(ui, requirements, features)) | ||||
| else: # explicitly mark repo as using revlogv0 | else: # explicitly mark repo as using revlogv0 | ||||
| options['revlogv0'] = True | options['revlogv0'] = True | ||||
| writecopiesto = ui.config('experimental', 'copies.write-to') | |||||
| copiesextramode = ('changeset-only', 'compatibility') | |||||
| if (writecopiesto in copiesextramode): | |||||
| options['copies-storage'] = 'extra' | |||||
| return options | return options | ||||
| def resolverevlogstorevfsoptions(ui, requirements, features): | def resolverevlogstorevfsoptions(ui, requirements, features): | ||||
| """Resolve opener options specific to revlogs.""" | """Resolve opener options specific to revlogs.""" | ||||
| options = {} | options = {} | ||||
| options[b'flagprocessors'] = {} | options[b'flagprocessors'] = {} | ||||