comparison tests/test-log.t @ 51144:9ff3d5395d6b

templatekw: fix inconsistency of diffstat with diff.merge

Previously, `-T'{diffstat}'` was giving stats from the diff against p1,
regardless of whether `--config diff.merge=yes` is set.

This was inconsistent with `log --patch` which is aware of that option.

51143:d6e5bec550f1

  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,1 @@
  +b
  

Test that diff.merge is respected (file b was added on one side and
and therefore merged cleanly)

  $ hg log -pr 3 --config diff.merge=yes

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
  @@ -1,1 +1,1 @@
  -b
  +c
  
  $ cd ..

'hg log -r rev fn' when last(filelog(fn)) != rev

  $ hg init simplelog

51144:9ff3d5395d6b

  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,1 @@
  +b
  
  $ hg log -r 3 -T'{diffstat}\n'
  2: +2/-1

Test that diff.merge is respected (file b was added on one side and
and therefore merged cleanly)

  $ hg log -pr 3 --config diff.merge=yes

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
  @@ -1,1 +1,1 @@
  -b
  +c
  
  $ hg log -r 3 -T'{diffstat}\n' --config diff.merge=yes
  1: +1/-1

  $ cd ..

'hg log -r rev fn' when last(filelog(fn)) != rev

  $ hg init simplelog