This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6366

context: let caller pass in branch to committablectx.__init__()
ClosedPublic

Authored by martinvonz on May 11 2019, 2:11 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdf2f22befdc8: context: let caller pass in branch to committablectx.__init__()
Summary

committablectx.init() currently looks up the branch from the
dirstate unless it's passed in the extras. memctx.init() has a
branch argument, but since committablectx.init() doesn't accept
it, it lets that constructor look up the branch from the dirstate
before it overwrites it, which seems awkward.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (11 lines)

Diff 15108

mercurial/context.py

c = self._filelog.children(self._filenode) c = self._filelog.children(self._filenode)
return [filectx(self._repo, self._path, fileid=x, return [filectx(self._repo, self._path, fileid=x,
filelog=self._filelog) for x in c] filelog=self._filelog) for x in c]
class committablectx(basectx): class committablectx(basectx):
"""A committablectx object provides common functionality for a context that """A committablectx object provides common functionality for a context that
wants the ability to commit, e.g. workingctx or memctx.""" wants the ability to commit, e.g. workingctx or memctx."""
def __init__(self, repo, text="", user=None, date=None, extra=None, def __init__(self, repo, text="", user=None, date=None, extra=None,
changes=None): changes=None, branch=None):
super(committablectx, self).__init__(repo) super(committablectx, self).__init__(repo)
self._rev = None self._rev = None
self._node = None self._node = None
self._text = text self._text = text
if date: if date:
self._date = dateutil.parsedate(date) self._date = dateutil.parsedate(date)
if user: if user:
self._user = user self._user = user
if changes: if changes:
self._status = changes self._status = changes
self._extra = {} self._extra = {}
if extra: if extra:
self._extra = extra.copy() self._extra = extra.copy()
if 'branch' not in self._extra: if branch is not None:
self._extra['branch'] = encoding.fromlocal(branch)
elif 'branch' not in self._extra:
try: try:
branch = encoding.fromlocal(self._repo.dirstate.branch()) branch = encoding.fromlocal(self._repo.dirstate.branch())
except UnicodeDecodeError: except UnicodeDecodeError:
raise error.Abort(_('branch name not in UTF-8!')) raise error.Abort(_('branch name not in UTF-8!'))
self._extra['branch'] = branch self._extra['branch'] = branch
if self._extra['branch'] == '': if self._extra['branch'] == '':
self._extra['branch'] = 'default' self._extra['branch'] = 'default'
# Mercurial <= 3.1 expects the filectxfn to raise IOError for missing files. # Mercurial <= 3.1 expects the filectxfn to raise IOError for missing files.
# Extensions that need to retain compatibility across Mercurial 3.1 can use # Extensions that need to retain compatibility across Mercurial 3.1 can use
# this field to determine what to do in filectxfn. # this field to determine what to do in filectxfn.
_returnnoneformissingfiles = True _returnnoneformissingfiles = True
def __init__(self, repo, parents, text, files, filectxfn, user=None, def __init__(self, repo, parents, text, files, filectxfn, user=None,
date=None, extra=None, branch=None, editor=False): date=None, extra=None, branch=None, editor=False):
super(memctx, self).__init__(repo, text, user, date, extra) super(memctx, self).__init__(repo, text, user, date, extra,
branch=branch)
self._rev = None self._rev = None
self._node = None self._node = None
parents = [(p or nullid) for p in parents] parents = [(p or nullid) for p in parents]
p1, p2 = parents p1, p2 = parents
self._parents = [self._repo[p] for p in (p1, p2)] self._parents = [self._repo[p] for p in (p1, p2)]
files = sorted(set(files)) files = sorted(set(files))
self._files = files self._files = files
if branch is not None:
self._extra['branch'] = encoding.fromlocal(branch)
self.substate = {} self.substate = {}
if isinstance(filectxfn, patch.filestore): if isinstance(filectxfn, patch.filestore):
filectxfn = memfilefrompatch(filectxfn) filectxfn = memfilefrompatch(filectxfn)
elif not callable(filectxfn): elif not callable(filectxfn):
# if store is not callable, wrap it in a function # if store is not callable, wrap it in a function
filectxfn = memfilefromctx(filectxfn) filectxfn = memfilefromctx(filectxfn)