tests/test-dispatch.t

subrepos: prompt on conflicts on update with dirty subrepos

Consider a repository with a single subrepository. The changesets in
the main repository reference the subrepository changesets like this:

  m0 -> s0
  m1 -> s1
  m2 -> s2

Starting from a state (m1, s0), doing 'hg update m2' in the main
repository will yield a conflict: the subrepo is at revision s0 but
the target revision says it should be at revision s2.

Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus
ignore the conflict between the working copy and the target revision.

With this change, the user is prompted to resolve the conflict by
choosing which revision he wants. This is consistent with 'hg merge',
which also prompts the user when it detects conflicts in the merged
.hgsubstate files.

The prompt looks like this:

  $ hg update tip
   subrepository sources for my-subrepo differ
  use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?

test command parsing and dispatch

  $ "$TESTDIR/hghave" no-outer-repo || exit 80

  $ dir=`pwd`

  $ hg init a
  $ cd a
  $ echo a > a
  $ hg ci -Ama
  adding a

Missing arg:

  $ hg cat
  hg cat: invalid arguments
  hg cat [OPTION]... FILE...
  
  output the current or given revision of files
  
      Print the specified files as they were at the given revision. If no
      revision is given, the parent of the working directory is used, or tip if
      no revision is checked out.
  
      Output may be to a file, in which case the name of the file is given using
      a format string. The formatting rules are the same as for the export
      command, with the following additions:
  
      "%s"  basename of file being printed
      "%d"  dirname of file being printed, or '.' if in repository root
      "%p"  root-relative path name of file being printed
  
      Returns 0 on success.
  
  options:
  
   -o --output FORMAT        print output to file with formatted name
   -r --rev REV              print the given revision
      --decode               apply any matching decode filter
   -I --include PATTERN [+]  include names matching the given patterns
   -X --exclude PATTERN [+]  exclude names matching the given patterns
  
  [+] marked option can be specified multiple times
  
  use "hg -v help cat" to show global options
  [255]

[defaults]

  $ hg cat a
  a
  $ cat >> $HGRCPATH <<EOF
  > [defaults]
  > cat = -r null
  > EOF
  $ hg cat a
  a: no such file in rev 000000000000
  [1]

No repo:

  $ cd $dir
  $ hg cat
  abort: There is no Mercurial repository here (.hg not found)!
  [255]