view tests/test-narrow-merge-tree.t @ 36079:a2a6e724d61a

narrow: import experimental extension from narrowhg revision cb51d673e9c5

Adjustments:
 * renamed src to hgext/narrow
 * marked extension experimental
 * added correct copyright header where it was missing
 * updated hgrc extension enable line in library.sh
 * renamed library.sh to narrow-library.sh
 * dropped all files from repo root as they're not interesting
 * dropped test-pyflakes.t, test-check-code.t and test-check-py3-compat.t
 * renamed remaining tests to all be test-narrow-* when they didn't already
 * fixed test-narrow-expanddirstate.t to refer to narrow and not narrowhg
 * fixed tests that wanted `update -C .` instead of `merge --abort`
 * corrected a two-space indent in narrowspec.py
 * added a missing _() in narrowcommands.py
 * fixed imports to pass the import checker
 * narrow only adds its --include and --exclude to clone if sparse isn't
   enabled to avoid breaking test-duplicateoptions.py. This is a kludge,
   and we'll need to come up with a better solution in the future.

These were more or less the minimum to import something that would
pass tests and not create a bunch of files we'll never use.

Changes I intend to make as followups:
 * rework the test-narrow-*-tree.t tests to use the new testcases
   functionality in run-tests.py
 * remove lots of monkeypatches of core things

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

  $ cd $TESTDIR && python $RUNTESTDIR/run-tests.py \
  >   --extra-config-opt experimental.treemanifest=1 test-narrow-merge.t 2>&1 | \
  > grep -v 'unexpected mercurial lib' | egrep -v '\(expected'
  
  --- */tests/test-narrow-merge.t (glob)
  +++ */tests/test-narrow-merge.t.err (glob)
  @@ -\d+,\d+ \+\d+,\d+ @@ (re)
   
     $ hg update -q 'desc("modify inside/f1")'
     $ hg merge 'desc("modify outside/f1")'
  -  abort: merge affects file 'outside/f1' outside narrow, which is not yet supported
  +  abort: merge affects file 'outside/' outside narrow, which is not yet supported
     (merging in the other direction may work)
     [255]
   
  @@ -\d+,\d+ \+\d+,\d+ @@ (re)
   
     $ hg update -q 'desc("modify outside/f1")'
     $ hg merge 'desc("conflicting outside/f1")'
  -  abort: conflict in file 'outside/f1' is outside narrow clone
  +  abort: conflict in file 'outside/' is outside narrow clone
     [255]
  
  ERROR: test-narrow-merge.t output changed
  !
  Failed test-narrow-merge.t: output changed
  # Ran 1 tests, 0 skipped, 1 failed.
  python hash seed: * (glob)