view tests/test-branch-option @ 11638:79231258503b stable

transplant: crash if repo.commit() finds nothing to commit

(makes issue2135, issue2264 more obvious, but does nothing to fix
either one)

This seems to happen in two distinct cases:
  * patch.patch() claims success but changes nothing (e.g.
    the transplanted changeset adds an empty file that already
    exists)
  * patch.patch() makes changes, but repo.status() fails to report them

Both of these seem like bugs in other parts of Mercurial, so arguably
it's not transplant's job to detect the failure to commit.  However:
  * detecting the problem as soon as possible is desirable
  * it prevents a more obscure crash later, in transplants.write()
  * there might be other lurking (or future) bugs that cause
    repo.commit() to do nothing

Also, in the case of issue2264 (source changesets silently dropped by
transplant), the only way to spot the problem currently is the crash
in transplants.write().  Failure to transplant a patch should abort
immediately, whether it's user error (patch does not apply) or a
Mercurial bug (e.g. repo.status() failing to report changes).

#!/bin/sh

# test branch selection options
hg init branch
cd branch
hg branch a
echo a > foo
hg ci -d '0 0' -Ama
echo a2 > foo
hg ci -d '0 0' -ma2
hg up 0
hg branch c
echo c > foo
hg ci -d '0 0' -mc
hg tag -l z
cd ..
hg clone -r 0 branch branch2
cd branch2
hg up 0
hg branch b
echo b > foo
hg ci -d '0 0' -mb
hg up 0
hg --encoding utf-8 branch æ
echo ae1 > foo
hg ci -d '0 0' -mae1
hg up 0
hg --encoding utf-8 branch -f æ
echo ae2 > foo
hg ci -d '0 0' -mae2
hg up 0
hg branch -f b
echo b2 > foo
hg ci -d '0 0' -mb2

echo unknown branch and fallback
hg in -qbz
hg in -q ../branch#z
hg out -qbz
echo in rev c branch a
hg in -qr c ../branch#a
hg in -qr c -b a
echo out branch .
hg out -q ../branch#.
hg out -q -b .
echo out branch . non-ascii
hg --encoding utf-8 up æ
hg --encoding latin1 out -q ../branch#.
hg --encoding latin1 out -q -b .
echo clone branch b
cd ..
hg clone branch2#b branch3
hg -q -R branch3 heads b
hg -q -R branch3 parents
rm -rf branch3
echo clone rev a branch b
hg clone -r a branch2#b branch3
hg -q -R branch3 heads b
hg -q -R branch3 parents
rm -rf branch3