Page MenuHomePhabricator

localrepo: get mergestate via context
Needs ReviewPublic

Authored by durin42 on Mon, May 18, 6:08 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers

Diff Detail

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

Event Timeline

durin42 created this revision.Mon, May 18, 6:08 PM

It looks like the latter two hunks in this file will need to be able to read the merge state from an overlayworkingctx. Maybe that's coming in a later patch, but I think it would be easier to follow if this code was changed only then (very much related to my comment on an earlier patch).

Yeah, I'm happy to reorder patches, this is still a bit "work-in-progress unfortunately.

durin42 updated this revision to Diff 21509.Thu, May 28, 4:26 PM