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

  $ hg commit -Am "revision 0"

  adding f

revision 1

  $ echo "revision 1" > f

  $ echo "space" >> f

  $ hg commit -Am "revision 1"

  $ hg update 0 > /dev/null

revision 2

  $ echo "revision 2" > f

  $ echo "space" >> f

  $ hg commit -Am "revision 2"

  created new head

  $ hg update 0 > /dev/null

revision 3 - simple to merge

  $ echo "revision 3" >> f

  $ hg commit -Am "revision 3"

  created new head

  $ echo "[merge-tools]" > .hg/hgrc

  $ beforemerge() {

  >   cat .hg/hgrc

  >   echo "# hg update -C 1"

  >   hg update -C 1 > /dev/null

  > }

  $ aftermerge() {

  >   echo "# cat f"

  >   cat f

  >   echo "# hg stat"

  >   hg stat

  >   rm -f f.orig

  > }

Tool selection

default is internal merge:

  $ beforemerge

  [merge-tools]

  # hg update -C 1

hg merge -r 2

override $PATH to ensure hgmerge not visible; use $PYTHON in case we're

running from a devel copy, not a temp installation

  $ PATH="$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2

  merging f

  warning: conflicts during merge.

  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  <<<<<<< local

  revision 1

  =======

  revision 2

  >>>>>>> other

  space

  # hg stat

  M f

  ? f.orig

simplest hgrc using false for merge:

  $ echo "false.whatever=" >> .hg/hgrc

  $ beforemerge

  [merge-tools]

  false.whatever=

  # hg update -C 1

  $ hg merge -r 2

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

unexecutable file in $PATH shouldn't be found:

  $ touch false

  $ hg up -qC 1

  $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2

  merging f

  warning: conflicts during merge.

  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ rm false

executable directory in $PATH shouldn't be found:

  $ mkdir false

  $ hg up -qC 1

  $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2

  merging f

  warning: conflicts during merge.

  merging f incomplete! (edit conflicts, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ rmdir false

true with higher .priority gets precedence:

  $ echo "true.priority=1" >> .hg/hgrc

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  # hg update -C 1

  $ hg merge -r 2

  merging f

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

unless lowered on command line:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  # hg update -C 1

  $ hg merge -r 2 --config merge-tools.true.priority=-7

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

or false set higher on command line:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  # hg update -C 1

  $ hg merge -r 2 --config merge-tools.false.priority=117

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

or true.executable not found in PATH:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  # hg update -C 1

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

or true.executable with bogus path:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  # hg update -C 1

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

but true.executable set to cat found in PATH works:

  $ echo "true.executable=cat" >> .hg/hgrc

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  $ hg merge -r 2

  merging f

  revision 1

  space

  revision 0

  space

  revision 2

  space

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

and true.executable set to cat with path works:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  $ hg merge -r 2 --config merge-tools.true.executable=cat

  merging f

  revision 1

  space

  revision 0

  space

  revision 2

  space

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

#if unix-permissions

environment variables in true.executable are handled:

  $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh"

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  $ hg --config merge-tools.true.executable='sh' \

  >    --config merge-tools.true.args="$HGTMP/merge.sh" \

  >    merge -r 2

  merging f

  custom merge tool

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

  (branch merge, don't forget to commit)

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

#endif

Tool selection and merge-patterns

merge-patterns specifies new tool false:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  $ hg merge -r 2 --config merge-patterns.f=false

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

merge-patterns specifies executable not found in PATH and gets warning:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  couldn't find merge tool true specified for f

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

merge-patterns specifies executable with bogus path and gets warning:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  couldn't find merge tool true specified for f

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

ui.merge overrules priority

ui.merge specifies false:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  $ hg merge -r 2 --config ui.merge=false

  merging f

  merging f failed!

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat

  M f

  ? f.orig

ui.merge specifies internal:fail:

  $ beforemerge

  [merge-tools]

  false.whatever=

  true.priority=1

  true.executable=cat

  # hg update -C 1

  $ hg merge -r 2 --config ui.merge=internal:fail

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

  [1]

  $ aftermerge

  # cat f

  revision 1

  space

  # hg stat