evolve: handle relocation during divergence resolution producing no changes
When resolving divergence and the two divergent commits have different
parents, we start by rebasing one of them to have the same parent as
the other. That step can result in no changes to commit. When it does,
we would crash with a TypeError before this patch.
This patch fixes it by instead creating an empty commit in that
scenario. The existing code then continues to attempt to merge it,
which produces no changes, and no commit is created on top. The other
side of the divergence is marked as successor as usual, so orphans
from the side that became empty will be evolved to the right place
(see test).
$ . ${TESTDIR}/testlib/pythonpath.sh
$ cat >> $HGRCPATH <<EOF
> [defaults]
> amend=-d "0 0"
> [web]
> push_ssl = false
> allow_push = *
> [ui]
> ssh = "$PYTHON" "$RUNTESTDIR/dummyssh"
> [phases]
> publish = False
> [experimental]
> bundle2-exp=True
> EOF
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "add $1"
> }
$ hg init server
Try the multiple ways to setup the extension
$ hg -R server log --config 'extensions.evolve.serveronly='
$ hg -R server log --config "extensions.evolve.serveronly=${SRCDIR}/hgext3rd/evolve/serveronly.py"
$ PYTHONPATH=$HGTEST_ORIG_PYTHONPATH hg -R server log --config "extensions.evolve.serveronly=${SRCDIR}/hgext3rd/evolve/serveronly.py"
setup repo
$ echo "[extensions]" >> ./server/.hg/hgrc
$ echo "evolve.serveronly=" >> ./server/.hg/hgrc
$ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ client
no changes found
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat ./errors.log
$ echo "[extensions]" >> ./client/.hg/hgrc
$ echo "evolve=" >> ./client/.hg/hgrc
$ echo "[paths]" >> ./client/.hg/hgrc
$ echo "ssh=ssh://user@dummy/server/" >> ./client/.hg/hgrc
$ cp -r client other
Smoke testing
===============
$ cd client
$ mkcommit 0
$ mkcommit a
$ hg push
pushing to http://localhost:$HGPORT/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 2 changesets with 2 changes to 2 files
$ hg pull
pulling from http://localhost:$HGPORT/
searching for changes
no changes found
$ cat ../errors.log
$ hg pull -R ../other
pulling from http://localhost:$HGPORT/
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
new changesets 8685c6d34325:4957bfdac07e (2 drafts)
(run 'hg update' to get a working copy)
$ cat ../errors.log
$ hg push -R ../other
pushing to http://localhost:$HGPORT/
searching for changes
no changes found
[1]
$ cat ../errors.log
Capacity testing
===================
$ curl -s http://localhost:$HGPORT/?cmd=hello
capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
$ curl -s http://localhost:$HGPORT/?cmd=capabilities
_evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (no-eol) (glob)
$ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
bookmarks
namespaces
obsolete
phases
Push
=============
$ echo 'A' > a
$ hg amend
$ hg push
pushing to http://localhost:$HGPORT/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
remote: 1 new obsolescence markers
remote: obsoleted 1 changesets
$ cat ../errors.log
$ hg push
pushing to http://localhost:$HGPORT/
searching for changes
no changes found
[1]
$ cat ../errors.log
Pull
=============
$ hg -R ../other pull
pulling from http://localhost:$HGPORT/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1 new obsolescence markers
obsoleted 1 changesets
new changesets 9d1c114e7797 (1 drafts)
(run 'hg heads' to see heads)
$ cat ../errors.log
$ hg -R ../other pull
pulling from http://localhost:$HGPORT/
searching for changes
no changes found
$ cat ../errors.log
$ cd ..
Test disabling obsolete advertisement
===========================================
(used by bitbucket to select which repo use evolve)
$ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
bookmarks
namespaces
obsolete
phases
$ curl -s http://localhost:$HGPORT/?cmd=hello
capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
$ curl -s http://localhost:$HGPORT/?cmd=capabilities
_evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (no-eol) (glob)
$ echo '[experimental]' >> server/.hg/hgrc
$ echo 'evolution=!' >> server/.hg/hgrc
$ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
$ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
bookmarks
namespaces
phases
$ echo 'evolution=all' >> server/.hg/hgrc
$ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
$ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
bookmarks
namespaces
obsolete
phases
$ curl -s http://localhost:$HGPORT/?cmd=hello
capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
$ curl -s http://localhost:$HGPORT/?cmd=capabilities
_evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (no-eol) (glob)
Test obshashrange discover
===========================================
$ cat >> $HGRCPATH <<EOF
> [experimental]
> obshashrange = True
> EOF
$ cd client
$ hg pull ssh
pulling from ssh://user@dummy/server/
searching for changes
no changes found