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

Same with share-safe

     2

     3

  $ echo "[format]"         >> $HGRCPATH

     4

  $ echo "use-share-safe = True" >> $HGRCPATH

     5

     6

  $ cd $TESTTMP

     7

     8

  $ hg init myrepo

     9

  $ cd myrepo

    10

  $ cat > .hg/hgrc <<EOF

    11

  > [extensions]

    12

  > sparse=

    13

  > EOF

    14

    15

  $ echo a > show

    16

  $ echo x > hide

    17

  $ hg ci -Aqm 'initial'

    18

    19

Regression test: checks that this command correctly locks the store

    20

before updating the store [requirements] config.

    21

    22

  $ hg up -q 0

    23

  $ hg debugsparse --include 'hide'