comparison tests/test-fix.t @ 42008:7f6b375a8903

fix: allow fixing untracked files when given as arguments

It's more useful to fix the file than to silently avoid it when the user does
this:

  hg fix --working-dir untracked-file

We will still do nothing to ignored files, even if they are specified. This may
be safer, given that such files can unexpectedly slip into the arguments via a
shell glob or fileset.

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

42007:b5511845f9d5

  MODIFIED!!!
  unknown

  $ printf "modified!!!\n" > modified.whole
  $ printf "added\n" > added.whole
  $ hg fix --working-dir *.whole

  $ hg status --all
  M clean.whole
  M modified.whole

  ! deleted.whole
  ? unknown.whole
  I ignored.whole
  C .hgignore

It would be better if this also fixed the unknown file.
  $ cat *.whole
  ADDED
  CLEAN
  ignored
  MODIFIED!!!
  unknown

  $ cd ..

Test that incremental fixing works on files with additions, deletions, and
changes in multiple line ranges. Note that deletions do not generally cause

42008:7f6b375a8903

  MODIFIED!!!
  unknown

  $ printf "modified!!!\n" > modified.whole
  $ printf "added\n" > added.whole

Listing the files explicitly causes untracked files to also be fixed, but
ignored files are still unaffected.

  $ hg fix --working-dir *.whole

  $ hg status --all
  M clean.whole
  M modified.whole

  ! deleted.whole
  ? unknown.whole
  I ignored.whole
  C .hgignore

  $ cat *.whole
  ADDED
  CLEAN
  ignored
  MODIFIED!!!
  UNKNOWN

  $ cd ..

Test that incremental fixing works on files with additions, deletions, and
changes in multiple line ranges. Note that deletions do not generally cause