comparison tests/test-largefiles-misc.t @ 34158:9e4f82bc2b0b

scmutil: don't append .orig to backups in origbackuppath (BC)

When ui.origbackuppath is set, .orig files are stored outside of the working
copy, however they still have a .orig suffix appended to them.  This can cause
unexpected conflicts, particularly when tracked files or directories have .orig
at the end.

This change removes the .orig suffix from files stored in an out-of-tree
origbackuppath.

Test Plan:
Update and run unit tests.

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

34157:24bf823377fc

Test orig files go where we want them
  $ echo moremore >> anotherlarge
  $ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups'
  creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub (glob)
  saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge.orig (glob)
  reverting ../.hglf/sub/anotherlarge (glob)
  creating directory: $TESTTMP/addrm2/.hg/origbackups/sub (glob)
  found 90c622cf65cebe75c5842f9136c459333faf392e in store
  found 90c622cf65cebe75c5842f9136c459333faf392e in store
  $ ls ../.hg/origbackups/sub
  anotherlarge.orig
  $ cd ..

Test glob logging from the root dir
  $ hg log glob:**another*
  changeset:   1:9627a577c5e9

34158:9e4f82bc2b0b

Test orig files go where we want them
  $ echo moremore >> anotherlarge
  $ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups'
  creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub (glob)
  saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge (glob)
  reverting ../.hglf/sub/anotherlarge (glob)
  creating directory: $TESTTMP/addrm2/.hg/origbackups/sub (glob)
  found 90c622cf65cebe75c5842f9136c459333faf392e in store
  found 90c622cf65cebe75c5842f9136c459333faf392e in store
  $ ls ../.hg/origbackups/sub
  anotherlarge
  $ cd ..

Test glob logging from the root dir
  $ hg log glob:**another*
  changeset:   1:9627a577c5e9