filemerge: move check for identical sides out of filemerge() `filemerge.filemerge()` returns `None` if no merge was necessary because the two sides were identical. I don't think it should be that function's responsibility to handle that case; we should ideally not even call `filemerge.filemerge()` if the two inputs identical. This patch therefore moves the check out to the caller (`mergestate.py`). The largefiles test changed because we now notice that the two sides made the same change, so we don't consider it a merge. Also note that the new message better matches the line above it in the test output. Differential Revision: https://phab.mercurial-scm.org/D12154

     1

{

     2

    // Enforcing

     3

    "eqeqeq"        : true,     // true: Require triple equals (===) for comparison

     4

    "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()

     5

    "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.

     6

    "nonbsp"        : true,     // true: Prohibit "non-breaking whitespace" characters.

     7

    "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)

     8

     9

    // Environments

    10

    "browser"       : true      // Web Browser (window, document, etc)

    11

}