Closed by commit rHGd5ce99a6db52: filemerge: fix a missing attribute usage
(authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs
Review".
REPOSITORY
rHG Mercurial
CHANGES
mharbison72 updated this revision to Diff 18415.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7465?vs=18255=18415
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7465/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7465
AFFECTED
dlax added inline comments.
INLINE COMMENTS
> mharbison72 wrote in filemerge.py:122
> I’m not sure how this works, but this was enough to make pytype happy. Does
> it make any sense to compare an absent file to an absent file?
>
> Maybe the right thing is to add a ctx attribute here?
> Does
mharbison72 added inline comments.
INLINE COMMENTS
> dlax wrote in filemerge.py:122
> What about `fctx`? It could also lack the `ctx()` method if an instance of
> `absentfilectx`.
> I wonder if the intent was not `fctx.changectx() == self.changectx()`.
I’m not sure how this works, but this was
dlax added inline comments.
INLINE COMMENTS
> filemerge.py:122
> fctx.isabsent()
> -and fctx.ctx() == self.ctx()
> +and fctx.ctx() == self._ctx
> and fctx.path() == self.path()
What about `fctx`? It could also lack the `ctx()` method if an
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Flagged by both pytype and VSCode.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D7465
AFFECTED FILES
mercurial/filemerge.py
