view tests/test-eol-patch @ 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

cat > $HGRCPATH <<EOF
[diff]
git = 1
EOF

seteol () {
    if [ $1 = "LF" ]; then
        EOL='\n'
    else
        EOL='\r\n'
    fi
}

makerepo () {
    seteol $1
    echo
    echo "# ==== setup $1 repository ===="
    echo '% hg init'
    hg init repo
    cd repo

    cat > .hgeol <<EOF
[repository]
native = $1

[patterns]
unix.txt = LF
win.txt = CRLF
**.txt = native
EOF

    printf "first\r\nsecond\r\nthird\r\n" > win.txt
    printf "first\nsecond\nthird\n" > unix.txt
    printf "first${EOL}second${EOL}third${EOL}" > native.txt
    hg commit --addremove -m 'checkin'
    cd ..
}

dotest () {
    seteol $1

    echo
    echo "% hg clone repo repo-$1"
    hg clone --noupdate repo repo-$1
    cd repo-$1

    cat > .hg/hgrc <<EOF
[extensions]
eol =

[eol]
native = $1
EOF

    hg update
    echo '% printrepr.py native.txt'
    python $TESTDIR/printrepr.py < native.txt

    echo '% printrepr.py unix.txt'
    python $TESTDIR/printrepr.py < unix.txt

    echo '% printrepr.py win.txt'
    python $TESTDIR/printrepr.py < win.txt

    printf "first${EOL}third${EOL}" > native.txt
    printf "first\r\nthird\r\n" > win.txt
    printf "first\nthird\n" > unix.txt

    echo '% hg diff'
    hg diff > p
    python $TESTDIR/printrepr.py < p

    echo '% hg revert'
    hg revert --all

    echo '% hg import'
    hg import -m 'patch' p

    echo '% printrepr.py native.txt'
    python $TESTDIR/printrepr.py < native.txt
    echo '% printrepr.py unix.txt'
    python $TESTDIR/printrepr.py < unix.txt
    echo '% printrepr.py win.txt'
    python $TESTDIR/printrepr.py < win.txt

    echo '% hg diff -c tip'
    hg diff -c tip | python $TESTDIR/printrepr.py

    cd ..
    rm -r repo-$1
}

makerepo LF
dotest LF
dotest CRLF
rm -r repo

makerepo CRLF
dotest LF
dotest CRLF
rm -r repo