martinvonz added inline comments.
INLINE COMMENTS
> context.py:700
>
> -class basefilectx(object):
> +class abstractfilectx(object):
> + def data(self):
Feel like checking out the "abc" module and see if that's helpful here?
> context.py:854
> """
> if fctx._customcmp:
> return fctx.cmp(self)
Looks like either _customcmp should be part of abstractfilectx or checked for
here (util.safehasattr())
> filemerge.py:744
> _toollist(ui, tool, "check")):
> - if back is not None and filecmp.cmp(_workingpath(repo, fcd), back):
> if ui.promptchoice(_(" output file %s appears unchanged\n"
The documentation for filecmp.cmp() says
Unless shallow is given and is false, files with identical os.stat()
signatures are taken to be equal.
Are we losing out on that optimization with this patch (when not doing
in-memory merge). Do you have any sense of how relevant that optimization is?
> test-dirstate-race.t:85
> ! dir1/c
> + ! e
> $ hg debugdirstate
Why did this change?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D674
To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
