comparison tests/test-merge-tools.t @ 38029:a4a5c3085ea9

test-merge-tools: create repo directory to free $TESTTMP for temporary files

38028:d1134ca5b1a3

test merge-tools configuration - mostly exercising filemerge.py

  $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
  $ hg init

revision 0

  $ echo "revision 0" > f
  $ echo "space" >> f

  >    --config ui.mergemarkers=detailed \
  >    merge -r 2
  merging f
  labellocal: "working copy"
  labelother: "merge rev"
  output (arg): "$TESTTMP/f"
  output (contents):
  <<<<<<< working copy: uitmpl 1
  revision 1
  =======
  revision 2

  >    --config ui.mergemarkers=detailed \
  >    merge -r 2
  merging f
  labellocal: "working copy: tooltmpl ef83787e2614"
  labelother: "merge rev: tooltmpl 0185f4e0cf02"
  output (arg): "$TESTTMP/f"
  output (contents):
  <<<<<<< working copy: tooltmpl ef83787e2614
  revision 1
  =======
  revision 2

  $ hg mv f f.txt
  $ hg ci -qm "f.txt"
  $ hg update -q -C 2
  $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
  merging f and f.txt to f.txt
  */f~base.* */f~local.*.txt */f~other.*.txt $TESTTMP/f.txt (glob)
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Verify naming of temporary files and that extension is preserved
(experimental.mergetempdirprefix version):

  $ hg update -q -C 2
  $ hg merge -y -r tip --tool echo \
  >    --config merge-tools.echo.args='$base $local $other $output' \
  >    --config experimental.mergetempdirprefix=$TESTTMP/hgmerge.
  merging f and f.txt to f.txt
  $TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/f.txt (glob)
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Check that debugpicktool examines which merge tool is chosen for
specified file as expected

  $ hg debugpickmergetool --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool --debug f
  couldn't find merge tool true (for pattern f)
  couldn't find merge tool true
  f = false

38029:a4a5c3085ea9

test merge-tools configuration - mostly exercising filemerge.py

  $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
  $ hg init repo
  $ cd repo

revision 0

  $ echo "revision 0" > f
  $ echo "space" >> f

  >    --config ui.mergemarkers=detailed \
  >    merge -r 2
  merging f
  labellocal: "working copy"
  labelother: "merge rev"
  output (arg): "$TESTTMP/repo/f"
  output (contents):
  <<<<<<< working copy: uitmpl 1
  revision 1
  =======
  revision 2

  >    --config ui.mergemarkers=detailed \
  >    merge -r 2
  merging f
  labellocal: "working copy: tooltmpl ef83787e2614"
  labelother: "merge rev: tooltmpl 0185f4e0cf02"
  output (arg): "$TESTTMP/repo/f"
  output (contents):
  <<<<<<< working copy: tooltmpl ef83787e2614
  revision 1
  =======
  revision 2

  $ hg mv f f.txt
  $ hg ci -qm "f.txt"
  $ hg update -q -C 2
  $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
  merging f and f.txt to f.txt
  */f~base.* */f~local.*.txt */f~other.*.txt $TESTTMP/repo/f.txt (glob)
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Verify naming of temporary files and that extension is preserved
(experimental.mergetempdirprefix version):

  $ hg update -q -C 2
  $ hg merge -y -r tip --tool echo \
  >    --config merge-tools.echo.args='$base $local $other $output' \
  >    --config experimental.mergetempdirprefix=$TESTTMP/hgmerge.
  merging f and f.txt to f.txt
  $TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob)
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Check that debugpicktool examines which merge tool is chosen for
specified file as expected

  $ hg debugpickmergetool --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool --debug f
  couldn't find merge tool true (for pattern f)
  couldn't find merge tool true
  f = false

  $ cd ..