push: put phase in the same bundle2 than changegroup and obsmarkers
Note that the usual phase push from core will be performed in all case. But the
discovery should find already in sync phase at that time. The old ways sync will
be properly skipped when this logic is introduced into core.
$ cat >> $HGRCPATH <<EOF
> [defaults]
> amend=-d "0 0"
> [ui]
> ssh=python "$TESTDIR/dummyssh"
> [phases]
> publish = False
> [extensions]
> hgext.rebase=
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "add $1"
> }
setup repo
$ hg init server
$ hg clone ssh://user@dummy/server client
no changes found
OBSEXC: pull obsolescence markers
OBSEXC: looking for common markers in 0 nodes
OBSEXC: no unknown remote markers
OBSEXC: DONE
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cp -r client other
Smoke testing
===============
$ cd client
$ mkcommit 0
$ mkcommit a
$ hg push
pushing to ssh://user@dummy/server
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 ssh://user@dummy/server
searching for changes
no changes found
OBSEXC: pull obsolescence markers
OBSEXC: looking for common markers in 2 nodes
OBSEXC: no unknown remote markers
OBSEXC: DONE
$ hg pull -R ../other
pulling from ssh://user@dummy/server
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
OBSEXC: pull obsolescence markers
OBSEXC: looking for common markers in 2 nodes
OBSEXC: no unknown remote markers
OBSEXC: DONE
(run 'hg update' to get a working copy)
$ hg push -R ../other
pushing to ssh://user@dummy/server
searching for changes
no changes found
[1]
Push
=============
$ echo 'A' > a
$ hg amend
$ hg push
pushing to ssh://user@dummy/server
searching for changes
OBSEXC: computing relevant nodes
OBSEXC: looking for common markers in 2 nodes
OBSEXC: computing markers relevant to 1 nodes
OBSEXC: pushing 2 markers (171 bytes)
OBSEXC: DONE
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg push
pushing to ssh://user@dummy/server
searching for changes
no changes found
OBSEXC: computing relevant nodes
OBSEXC: looking for common markers in [23] nodes (re)
OBSEXC: markers already in sync
OBSEXC: no marker to push
OBSEXC: DONE
[1]
Pull
=============
$ hg -R ../other pull
pulling from ssh://user@dummy/server
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
OBSEXC: pull obsolescence markers
OBSEXC: looking for common markers in [23] nodes (re)
OBSEXC: merging obsolescence markers (171 bytes)
OBSEXC: 2 markers added
OBSEXC: DONE
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from ssh://user@dummy/server
searching for changes
no changes found
OBSEXC: pull obsolescence markers
OBSEXC: looking for common markers in [23] nodes (re)
OBSEXC: no unknown remote markers
OBSEXC: DONE
$ cd ..