This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3019

subrepo: use repo['.'] instead of repo['']
ClosedPublic

Authored by martinvonz on Apr 2 2018, 1:15 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG32857300846c: subrepo: use repo['.'] instead of repo['']
rHG78e9e63c13f5: subrepo: use repo['.'] instead of repo['']
Summary

The "state" value (a revision) passed to abstractsubrepo.phase() can
be '' to represent the currently checked out revisions. Let's convert
that to the more common '.'.

I think this is the last of use of repo['.'] in core.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 2 2018, 1:15 PM
pulkit accepted this revision.Apr 2 2018, 2:29 PM
Closed by commit rHG78e9e63c13f5: subrepo: use repo['.'] instead of repo[''] (authored by martinvonz). · Explain WhyApr 2 2018, 2:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (2 lines)

Diff 7510

mercurial/subrepo.py

self.ui.debug("committing subrepo %s\n" % subrelpath(self)) self.ui.debug("committing subrepo %s\n" % subrelpath(self))
n = self._repo.commit(text, user, date) n = self._repo.commit(text, user, date)
if not n: if not n:
return self._repo['.'].hex() # different version checked out return self._repo['.'].hex() # different version checked out
return node.hex(n) return node.hex(n)
@annotatesubrepoerror @annotatesubrepoerror
def phase(self, state): def phase(self, state):
return self._repo[state].phase() return self._repo[state or '.'].phase()
@annotatesubrepoerror @annotatesubrepoerror
def remove(self): def remove(self):
# we can't fully delete the repository as it may contain # we can't fully delete the repository as it may contain
# local-only history # local-only history
self.ui.note(_('removing subrepo %s\n') % subrelpath(self)) self.ui.note(_('removing subrepo %s\n') % subrelpath(self))
hg.clean(self._repo, node.nullid, False) hg.clean(self._repo, node.nullid, False)