This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2940

workingctx: build _manifest on filenode() or flags() request
ClosedPublic

Authored by yuja on Mar 25 2018, 5:53 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG067e8d1178a2: workingctx: build _manifest on filenode() or flags() request
Summary

I'm not sure if this is the best workaround, but this fixes the following
exception:

AttributeError: 'workingctx' object has no attribute '_manifestdelta'

The short hash '303030303030' seen in the test is node.modifiednodeid.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

yuja created this revision.Mar 25 2018, 5:53 AM
durin42 accepted this revision.Apr 6 2018, 9:35 PM
This revision is now accepted and ready to land.Apr 6 2018, 9:35 PM
Closed by commit rHG067e8d1178a2: workingctx: build _manifest on filenode() or flags() request (authored by yuja). · Explain WhyApr 6 2018, 9:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (5 lines)
Mtests/test-grep.t (11 lines)

Diff 7281

mercurial/context.py

@propertycache @propertycache
def _parents(self): def _parents(self):
p = self._repo.dirstate.parents() p = self._repo.dirstate.parents()
if p[1] == nullid: if p[1] == nullid:
p = p[:-1] p = p[:-1]
return [changectx(self._repo, x) for x in p] return [changectx(self._repo, x) for x in p]
def _fileinfo(self, path):
# populate __dict__['_manifest'] as workingctx has no _manifestdelta
self._manifest
return super(workingctx, self)._fileinfo(path)
def filectx(self, path, filelog=None): def filectx(self, path, filelog=None):
"""get a file context from the working directory""" """get a file context from the working directory"""
return workingfilectx(self._repo, path, workingctx=self, return workingfilectx(self._repo, path, workingctx=self,
filelog=filelog) filelog=filelog)
def dirty(self, missing=False, merge=True, branch=True): def dirty(self, missing=False, merge=True, branch=True):
"check whether a working directory is modified" "check whether a working directory is modified"
# check subrepos first # check subrepos first

tests/test-grep.t

port:2:3:+:spam:import/export port:2:3:+:spam:import/export
port:1:2:+:eggs:export port:1:2:+:eggs:export
port:0:1:+:spam:import port:0:1:+:spam:import
$ hg up -q null $ hg up -q null
$ hg grep -f port $ hg grep -f port
[1] [1]
Test wdir
(at least, this shouldn't crash)
$ hg up -q
$ echo wport >> port2
$ hg stat
M port2
$ hg grep -r 'wdir()' port
abort: data/port2.i@303030303030: no node!
[255]
$ cd .. $ cd ..
$ hg init t2 $ hg init t2
$ cd t2 $ cd t2
$ hg grep foobar foo $ hg grep foobar foo
[1] [1]
$ hg grep foobar $ hg grep foobar
[1] [1]
$ echo blue >> color $ echo blue >> color