phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
`filecmp` follows symlinks by default, which a `filectx.cmp()` call should not
be doing as it should only compare the requested entry. After this patch,
only
t
ryanmce accepted this revision.
ryanmce added a comment.
This revision is now accepted and ready to land.
queued
INLINE COMMENTS
> context.py:2578
> +# Note that filecmp uses the opposite return values (True if
> same)
> +# as our ``cmp`` functions (True if different)
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG14c87708f432: arbitraryfilecontext: skip the cmp fast path
if any side is a symlink (authored by phillco, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D1165?vs=2942&id=2954#to
phillco added inline comments.
INLINE COMMENTS
> ryanmce wrote in test-arbitraryfilectx.t:4-5
> --- /data/users/rmcelroy/mercurial/hg/tests/test-check-module-imports.t
> +++ /data/users/rmcelroy/mercurial/hg/tests/test-check-module-imports.t.err
> @@ -42,3 +42,6 @@
> > -X tests/test-lo
phillco added inline comments.
INLINE COMMENTS
> ryanmce wrote in context.py:2578
> I will remove the backticks in-flight; I think this are discouraged in
> comments still
>
> Excellent comment overall, nonetheless
Is there one standard for indicating code snippets? I've seen backticks, double
phillco added inline comments.
INLINE COMMENTS
> phillco wrote in test-arbitraryfilectx.t:4-5
> hm, something might be up with my setup, definitely got a green on
> everything. I'll look into it.
Ah, mea culpa. I had exempted those from my test system while on the long-lived
in-memory merge br
