This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9779

changelog: move branchinfo to changelogrevision
ClosedPublic

Authored by joerg.sonnenberger on Jan 14 2021, 8:19 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGcad17d50736c: changelog: move branchinfo to changelogrevision
Summary

The function parses the extra dictionary after looking up the
changelogrevision. To avoid duplicated look up, it is better to provide
it as property of changelogrevision instead. Keep the function for a
release cycle as at least the topic extension depends on it.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute accepted this revision.Jan 18 2021, 12:08 PM

(this is otherwise great), and we can probably turn this in a property cache as a follow up.

pulkit added a subscriber: pulkit.Jan 21 2021, 6:22 AM
pulkit added inline comments.
relnotes/next
66

Hm, this needs to be updated now.

joerg.sonnenberger added a commit: rHGcad17d50736c: changelog: move branchinfo to changelogrevision.Jan 22 2021, 3:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGcad17d50736c: changelog: move branchinfo to changelogrevision (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (9 lines)
Mrelnotes/next (3 lines)

Diff 24865

mercurial/changelog.py

user = attr.ib(default=b'') user = attr.ib(default=b'')
date = attr.ib(default=(0, 0)) date = attr.ib(default=(0, 0))
files = attr.ib(default=attr.Factory(list)) files = attr.ib(default=attr.Factory(list))
filesadded = attr.ib(default=None) filesadded = attr.ib(default=None)
filesremoved = attr.ib(default=None) filesremoved = attr.ib(default=None)
p1copies = attr.ib(default=None) p1copies = attr.ib(default=None)
p2copies = attr.ib(default=None) p2copies = attr.ib(default=None)
description = attr.ib(default=b'') description = attr.ib(default=b'')
branchinfo = attr.ib(default=(_defaultextra[b'branch'], False))
class changelogrevision(object): class changelogrevision(object):
"""Holds results of a parsed changelog revision. """Holds results of a parsed changelog revision.
Changelog revisions consist of multiple pieces of data, including Changelog revisions consist of multiple pieces of data, including
the manifest node, user, and date. This object exposes a view into the manifest node, user, and date. This object exposes a view into
the parsed object. the parsed object.
if rawcopies is None: if rawcopies is None:
return None return None
return metadata.decodecopies(self.files, rawcopies) return metadata.decodecopies(self.files, rawcopies)
@property @property
def description(self): def description(self):
return encoding.tolocal(self._text[self._offsets[3] + 2 :]) return encoding.tolocal(self._text[self._offsets[3] + 2 :])
@property
def branchinfo(self):
extra = self.extra
return encoding.tolocal(extra.get(b"branch")), b'close' in extra
class changelog(revlog.revlog): class changelog(revlog.revlog):
def __init__(self, opener, trypending=False): def __init__(self, opener, trypending=False):
"""Load a changelog revlog using an opener. """Load a changelog revlog using an opener.
If ``trypending`` is true, we attempt to load the index from a If ``trypending`` is true, we attempt to load the index from a
``00changelog.i.a`` file instead of the default ``00changelog.i``. ``00changelog.i.a`` file instead of the default ``00changelog.i``.
The ``00changelog.i.a`` file contains index (and possibly inline The ``00changelog.i.a`` file contains index (and possibly inline
text, transaction, len(self), p1, p2, sidedata=sidedata, flags=flags text, transaction, len(self), p1, p2, sidedata=sidedata, flags=flags
) )
def branchinfo(self, rev): def branchinfo(self, rev):
"""return the branch name and open/close state of a revision """return the branch name and open/close state of a revision
This function exists because creating a changectx object This function exists because creating a changectx object
just to access this is costly.""" just to access this is costly."""
extra = self.changelogrevision(rev).extra return self.changelogrevision(rev).branchinfo
return encoding.tolocal(extra.get(b"branch")), b'close' in extra
def _nodeduplicatecallback(self, transaction, node): def _nodeduplicatecallback(self, transaction, node):
# keep track of revisions that got "re-added", eg: unbunde of know rev. # keep track of revisions that got "re-added", eg: unbunde of know rev.
# #
# We track them in a list to preserve their order from the source bundle # We track them in a list to preserve their order from the source bundle
duplicates = transaction.changes.setdefault(b'revduplicates', []) duplicates = transaction.changes.setdefault(b'revduplicates', [])
duplicates.append(self.rev(node)) duplicates.append(self.rev(node))

relnotes/next

== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* `--force-lock` and `--force-wlock` options on `hg debuglock` command are * `--force-lock` and `--force-wlock` options on `hg debuglock` command are
renamed to `--force-free-lock` and `--force-free-wlock` respectively. renamed to `--force-free-lock` and `--force-free-wlock` respectively.
== Internal API Changes == == Internal API Changes ==
* `changelog.branchinfo` is deprecated and will be removed after 5.7.
pulkitUnsubmitted
Not Done

Hm, this needs to be updated now.

pulkit: Hm, this needs to be updated now.
It is superseded by `changelogrevision.branchinfo`.