filemerge: when using in-memory merge, always put backup files in temp dir
Before calling a merge tool, we create a backup of the local side of
the merge. That file can be put in the working copy or in a temporary
directory, depending on the user's config. When we're merging in
memory, we don't want to write to the actual, on-disk working copy, so
we write the file to the in-memory working copy instead. However,
since we don't support external merge tools with in-memory merge, it
makes no difference where the file is actually stored (and if we ever
do add support for external merge tools, then the file clearly can't
live in the in-memory working-copy object anyway). So, since it
doesn't matter where the file is stored, we can simplify by always
putting them in the system's temp directory.
Differential Revision: https://phab.mercurial-scm.org/D12187
Tests that the exit code is as expected when ui.detailed-exit-code is *not*
enabled.
$ cat >> $HGRCPATH << EOF
> [ui]
> detailed-exit-code=no
> EOF
$ hg init
$ echo a > a
Expect exit code 0 on success
$ hg ci -Aqm initial
$ hg co nonexistent
abort: unknown revision 'nonexistent'
[255]
$ hg co 'none()'
abort: empty revision set
[255]
$ hg co 'invalid('
hg: parse error at 8: not a prefix: end
(invalid(
^ here)
[255]
$ hg co 'invalid('
hg: parse error at 8: not a prefix: end
(invalid(
^ here)
[255]
$ hg continue
abort: no operation in progress
[255]
$ hg st --config a=b
abort: malformed --config option: 'a=b' (use --config section.name=value)
[255]
$ echo b > a
$ hg ci -m second
$ echo c > a
$ hg ci -m third
$ hg --config extensions.rebase= rebase -r . -d 0 -q
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[1]