view tests/test-remotefilelog-blame.t @ 45167:796b63b0f0dd

merge: refactor code to advise fsmonitor in separate function

merge.update() is quite hard to understand, found this an easy win.

The end goal is to have better organized merge and mergestate handling and then
fix some related bugs.

Differential Revision: https://phab.mercurial-scm.org/D8740

#require no-windows

  $ . "$TESTDIR/remotefilelog-library.sh"

  $ hg init master
  $ cd master
  $ cat >> .hg/hgrc <<EOF
  > [remotefilelog]
  > server=True
  > EOF
  $ echo x > x
  $ hg commit -qAm x
  $ echo y >> x
  $ hg commit -qAm y
  $ echo z >> x
  $ hg commit -qAm z
  $ echo a > a
  $ hg commit -qAm a

  $ cd ..

  $ hgcloneshallow ssh://user@dummy/master shallow -q
  2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
  $ cd shallow

Test blame

  $ hg blame x
  0: x
  1: y
  2: z
  2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)

Test grepping the working directory.

  $ hg grep --all-files x
  x:x
  $ echo foo >> x
  $ hg grep --all-files x
  x:x