( )⚙ D4932 push:Added keyword remote to 'repository changed while pushing' error(Issue5971)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4932

push:Added keyword remote to 'repository changed while pushing' error(Issue5971)
AbandonedPublic

Authored by indygreg on Oct 10 2018, 11:14 AM.

Details

Reviewers
taapas1128
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Oct 10 2018, 11:14 AM
pulkit added a subscriber: pulkit.Oct 10 2018, 12:02 PM

Hi Taapas, thanks for taking time and preparing this patch. This patch contains unrelated whitespace changes, can you undo them.

There is not much left to do in this patch but still I will be happy to mentor you on this if required. I am pulkit25 on #mercurial on IRC. Feel free to ping me if you need any help.

indygreg added a reviewer: taapas1128.Oct 11 2018, 7:37 AM
indygreg commandeered this revision.
indygreg added a subscriber: indygreg.

This is a dupe of D4933. Commandeering so I can close it.

indygreg abandoned this revision.Oct 11 2018, 7:37 AM

Revision Contents
Changeset List

Diff 11792

mercurial/bundle2.py

"""check location of bookmarks """check location of bookmarks
This part is to be used to detect push race regarding bookmark, it This part is to be used to detect push race regarding bookmark, it
contains binary encoded (bookmark, node) tuple. If the local state does contains binary encoded (bookmark, node) tuple. If the local state does
not marks the one in the part, a PushRaced exception is raised not marks the one in the part, a PushRaced exception is raised
""" """
bookdata = bookmarks.binarydecode(inpart) bookdata = bookmarks.binarydecode(inpart)
msgstandard = ('repository changed while pushing - please try again ' msgstandard = ('remote repository changed while pushing - please try again '
'(bookmark "%s" move from %s to %s)') '(bookmark "%s" move from %s to %s)')
msgmissing = ('repository changed while pushing - please try again ' msgmissing = ('remote repository changed while pushing - please try again '
'(bookmark "%s" is missing, expected %s)') '(bookmark "%s" is missing, expected %s)')
msgexist = ('repository changed while pushing - please try again ' msgexist = ('remote repository changed while pushing - please try again '
'(bookmark "%s" set on %s, expected missing)') '(bookmark "%s" set on %s, expected missing)')
for book, node in bookdata: for book, node in bookdata:
currentnode = op.repo._bookmarks.get(book) currentnode = op.repo._bookmarks.get(book)
if currentnode != node: if currentnode != node:
if node is None: if node is None:
finalmsg = msgexist % (book, nodemod.short(currentnode)) finalmsg = msgexist % (book, nodemod.short(currentnode))
elif currentnode is None: elif currentnode is None:
finalmsg = msgmissing % (book, nodemod.short(node)) finalmsg = msgmissing % (book, nodemod.short(node))
while len(h) == 20: while len(h) == 20:
heads.append(h) heads.append(h)
h = inpart.read(20) h = inpart.read(20)
assert not h assert not h
# Trigger a transaction so that we are guaranteed to have the lock now. # Trigger a transaction so that we are guaranteed to have the lock now.
if op.ui.configbool('experimental', 'bundle2lazylocking'): if op.ui.configbool('experimental', 'bundle2lazylocking'):
op.gettransaction() op.gettransaction()
if sorted(heads) != sorted(op.repo.heads()): if sorted(heads) != sorted(op.repo.heads()):
raise error.PushRaced('repository changed while pushing - ' raise error.PushRaced('remote repository changed while pushing - '
'please try again') 'please try again')
@parthandler('check:updated-heads') @parthandler('check:updated-heads')
def handlecheckupdatedheads(op, inpart): def handlecheckupdatedheads(op, inpart):
"""check for race on the heads touched by a push """check for race on the heads touched by a push
This is similar to 'check:heads' but focus on the heads actually updated This is similar to 'check:heads' but focus on the heads actually updated
during the push. If other activities happen on unrelated heads, it is during the push. If other activities happen on unrelated heads, it is
op.gettransaction() op.gettransaction()
currentheads = set() currentheads = set()
for ls in op.repo.branchmap().itervalues(): for ls in op.repo.branchmap().itervalues():
currentheads.update(ls) currentheads.update(ls)
for h in heads: for h in heads:
if h not in currentheads: if h not in currentheads:
raise error.PushRaced('repository changed while pushing - ' raise error.PushRaced('remote repository changed while pushing - '
'please try again') 'please try again')
@parthandler('check:phases') @parthandler('check:phases')
def handlecheckphases(op, inpart): def handlecheckphases(op, inpart):
"""check that phase boundaries of the repository did not change """check that phase boundaries of the repository did not change
This is used to detect a push race. This is used to detect a push race.
""" """
phasetonodes = phases.binarydecode(inpart) phasetonodes = phases.binarydecode(inpart)
unfi = op.repo.unfiltered() unfi = op.repo.unfiltered()
cl = unfi.changelog cl = unfi.changelog
phasecache = unfi._phasecache phasecache = unfi._phasecache
msg = ('repository changed while pushing - please try again ' msg = ('remote repository changed while pushing - please try again '
'(%s is %s expected %s)') '(%s is %s expected %s)')
for expectedphase, nodes in enumerate(phasetonodes): for expectedphase, nodes in enumerate(phasetonodes):
for n in nodes: for n in nodes:
actualphase = phasecache.phase(unfi, cl.rev(n)) actualphase = phasecache.phase(unfi, cl.rev(n))
if actualphase != expectedphase: if actualphase != expectedphase:
finalmsg = msg % (nodemod.short(n), finalmsg = msg % (nodemod.short(n),
phases.phasenames[actualphase], phases.phasenames[actualphase],
phases.phasenames[expectedphase]) phases.phasenames[expectedphase])

tests/test-bundle2-exchange.t

The extension requires a repo (currently unused) The extension requires a repo (currently unused)
$ hg init main $ hg init main
$ cd main $ cd main
$ touch a $ touch a
$ hg add a $ hg add a
$ hg commit -m 'a' $ hg commit -m 'a'
pre-close-tip:3903775176ed draft pre-close-tip:3903775176ed draft
postclose-tip:3903775176ed draft postclose-tip:3903775176ed draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=commit txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
$ hg unbundle $TESTDIR/bundles/rebase.hg $ hg unbundle $TESTDIR/bundles/rebase.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 8 changesets with 7 changes to 7 files (+3 heads) added 8 changesets with 7 changes to 7 files (+3 heads)
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
new changesets cd010b8cd998:02de42196ebe new changesets cd010b8cd998:02de42196ebe
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle
bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob) bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ cd .. $ cd ..
Real world exchange Real world exchange
===================== =====================
Add more obsolescence information Add more obsolescence information
$ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc` $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc`
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
$ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c` $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c`
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
clone --pull clone --pull
$ hg -R main phase --public cd010b8cd998 $ hg -R main phase --public cd010b8cd998
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
$ hg clone main other --pull --rev 9520eea781bc $ hg clone main other --pull --rev 9520eea781bc
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
1 new obsolescence markers 1 new obsolescence markers
pre-close-tip:9520eea781bc draft pre-close-tip:9520eea781bc draft
new changesets cd010b8cd998:9520eea781bc new changesets cd010b8cd998:9520eea781bc
postclose-tip:9520eea781bc draft postclose-tip:9520eea781bc draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R other log -G $ hg -R other log -G
@ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
| |
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
pull pull
$ hg -R main phase --public 9520eea781bc $ hg -R main phase --public 9520eea781bc
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
$ hg -R other pull -r 24b6387c8c8c $ hg -R other pull -r 24b6387c8c8c
pulling from $TESTTMP/main pulling from $TESTTMP/main
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
pre-close-tip:24b6387c8c8c draft pre-close-tip:24b6387c8c8c draft
new changesets 24b6387c8c8c new changesets 24b6387c8c8c
postclose-tip:24b6387c8c8c draft postclose-tip:24b6387c8c8c draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R other log -G $ hg -R other log -G
o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/ |/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
pull empty (with phase movement) pull empty (with phase movement)
$ hg -R main phase --public 24b6387c8c8c $ hg -R main phase --public 24b6387c8c8c
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
$ hg -R other pull -r 24b6387c8c8c $ hg -R other pull -r 24b6387c8c8c
pulling from $TESTTMP/main pulling from $TESTTMP/main
no changes found no changes found
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
1 local changesets published 1 local changesets published
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
$ hg -R other log -G $ hg -R other log -G
o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/ |/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
pull empty pull empty
$ hg -R other pull -r 24b6387c8c8c $ hg -R other pull -r 24b6387c8c8c
pulling from $TESTTMP/main pulling from $TESTTMP/main
no changes found no changes found
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
$ hg -R other log -G $ hg -R other log -G
o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| |
| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/ |/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
add extra data to test their exchange during push add extra data to test their exchange during push
$ hg -R main bookmark --rev eea13746799a book_eea1 $ hg -R main bookmark --rev eea13746799a book_eea1
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a` $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a`
pre-close-tip:02de42196ebe draft pre-close-tip:02de42196ebe draft
postclose-tip:02de42196ebe draft postclose-tip:02de42196ebe draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
$ hg -R main bookmark --rev 02de42196ebe book_02de $ hg -R main bookmark --rev 02de42196ebe book_02de
pre-close-tip:02de42196ebe draft book_02de pre-close-tip:02de42196ebe draft book_02de
postclose-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe` $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe`
pre-close-tip:02de42196ebe draft book_02de pre-close-tip:02de42196ebe draft book_02de
postclose-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
postclose-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403` $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403`
pre-close-tip:02de42196ebe draft book_02de pre-close-tip:02de42196ebe draft book_02de
postclose-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
$ hg -R other bookmark --rev cd010b8cd998 book_eea1 $ hg -R other bookmark --rev cd010b8cd998 book_eea1
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R other bookmark --rev cd010b8cd998 book_02de $ hg -R other bookmark --rev cd010b8cd998 book_02de
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R other bookmark --rev cd010b8cd998 book_42cc $ hg -R other bookmark --rev cd010b8cd998 book_42cc
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R other bookmark --rev cd010b8cd998 book_5fdd $ hg -R other bookmark --rev cd010b8cd998 book_5fdd
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R other bookmark --rev cd010b8cd998 book_32af $ hg -R other bookmark --rev cd010b8cd998 book_32af
pre-close-tip:24b6387c8c8c public pre-close-tip:24b6387c8c8c public
postclose-tip:24b6387c8c8c public postclose-tip:24b6387c8c8c public
txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
$ hg -R main phase --public eea13746799a $ hg -R main phase --public eea13746799a
pre-close-tip:02de42196ebe draft book_02de pre-close-tip:02de42196ebe draft book_02de
postclose-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
push push
$ hg -R other log -G $ hg -R other log -G
o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G
|\ |\
| o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
| | | |
@ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E @ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/ |/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
pull over ssh pull over ssh
$ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de $ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de
| | | |
| | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G
| |/| | |/|
| o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
|/ / |/ /
| @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/ |/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
| | | |
| | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G
| |/| | |/|
| o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
|/ / |/ /
| @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
|/ |/
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
$ hg -R other debugobsolete $ hg -R other debugobsolete
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
============== ==============
Check that errors are properly returned to the client during push. Check that errors are properly returned to the client during push.
Setting up Setting up
$ cat > failpush.py << EOF $ cat > failpush.py << EOF
> """A small extension that makes push fails when using bundle2 > """A small extension that makes push fails when using bundle2
> >
> used to test error handling in bundle2 > used to test error handling in bundle2
> """ > """
> >
> from mercurial import error > from mercurial import error
> from mercurial import bundle2 > from mercurial import bundle2
> from mercurial import exchange > from mercurial import exchange
> from mercurial import extensions > from mercurial import extensions
> from mercurial import registrar > from mercurial import registrar
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> >
> configtable = {} > configtable = {}
> configitem = registrar.configitem(configtable) > configitem = registrar.configitem(configtable)
> configitem(b'failpush', b'reason', > configitem(b'failpush', b'reason',
> default=None, > default=None,
> ) > )
> >
> def _pushbundle2failpart(pushop, bundler): > def _pushbundle2failpart(pushop, bundler):
> reason = pushop.ui.config(b'failpush', b'reason') > reason = pushop.ui.config(b'failpush', b'reason')
> part = None > part = None
> if reason == b'abort': > if reason == b'abort':
> bundler.newpart(b'test:abort') > bundler.newpart(b'test:abort')
> if reason == b'unknown': > if reason == b'unknown':
> bundler.newpart(b'test:unknown') > bundler.newpart(b'test:unknown')
> if reason == b'race': > if reason == b'race':
> # 20 Bytes of crap > # 20 Bytes of crap
> bundler.newpart(b'check:heads', data=b'01234567890123456789') > bundler.newpart(b'check:heads', data=b'01234567890123456789')
> >
> @bundle2.parthandler(b"test:abort") > @bundle2.parthandler(b"test:abort")
> def handleabort(op, part): > def handleabort(op, part):
> raise error.Abort(b'Abandon ship!', hint=b"don't panic") > raise error.Abort(b'Abandon ship!', hint=b"don't panic")
> >
> def uisetup(ui): > def uisetup(ui):
> exchange.b2partsgenmapping[b'failpart'] = _pushbundle2failpart > exchange.b2partsgenmapping[b'failpart'] = _pushbundle2failpart
> exchange.b2partsgenorder.insert(0, b'failpart') > exchange.b2partsgenorder.insert(0, b'failpart')
> >
> EOF > EOF
$ cd main $ cd main
$ hg up tip $ hg up tip
3 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo 'I' > I $ echo 'I' > I
$ hg add I $ hg add I
$ hg ci -m 'I' $ hg ci -m 'I'
pre-close-tip:e7ec4e813ba6 draft pre-close-tip:e7ec4e813ba6 draft
postclose-tip:e7ec4e813ba6 draft postclose-tip:e7ec4e813ba6 draft
txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=commit txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
$ hg id $ hg id
e7ec4e813ba6 tip e7ec4e813ba6 tip
$ cd .. $ cd ..
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> failpush=$TESTTMP/failpush.py > failpush=$TESTTMP/failpush.py
> [failpush] > [failpush]
> reason = race > reason = race
> EOF > EOF
$ hg -R main push other -r e7ec4e813ba6 $ hg -R main push other -r e7ec4e813ba6
pushing to other pushing to other
searching for changes searching for changes
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
[255] [255]
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
pushing to ssh://user@dummy/other pushing to ssh://user@dummy/other
searching for changes searching for changes
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
[255] [255]
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
pushing to http://localhost:$HGPORT2/ pushing to http://localhost:$HGPORT2/
searching for changes searching for changes
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
[255] [255]
Doing the actual push: hook abort Doing the actual push: hook abort
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [failpush] > [failpush]
> reason = > reason =
> [hooks] > [hooks]
> pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false"
> txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'"
> EOF > EOF
$ killdaemons.py $ killdaemons.py
$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
$ cat other.pid >> $DAEMON_PIDS $ cat other.pid >> $DAEMON_PIDS
$ hg -R main push other -r e7ec4e813ba6 $ hg -R main push other -r e7ec4e813ba6
pushing to other pushing to other
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
remote: pre-close-tip:e7ec4e813ba6 draft remote: pre-close-tip:e7ec4e813ba6 draft
remote: You shall not pass! remote: You shall not pass!
remote: transaction abort! remote: transaction abort!
remote: Cleaning up the mess... remote: Cleaning up the mess...
remote: rollback completed remote: rollback completed
abort: pretxnclose.failpush hook exited with status 1 abort: pretxnclose.failpush hook exited with status 1
[255] [255]
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
pushing to ssh://user@dummy/other pushing to ssh://user@dummy/other
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
remote: pre-close-tip:e7ec4e813ba6 draft remote: pre-close-tip:e7ec4e813ba6 draft
remote: You shall not pass! remote: You shall not pass!
remote: transaction abort! remote: transaction abort!
remote: Cleaning up the mess... remote: Cleaning up the mess...
remote: rollback completed remote: rollback completed
remote: pretxnclose.failpush hook exited with status 1 remote: pretxnclose.failpush hook exited with status 1
abort: push failed on remote abort: push failed on remote
[255] [255]
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
pushing to http://localhost:$HGPORT2/ pushing to http://localhost:$HGPORT2/
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files remote: added 1 changesets with 1 changes to 1 files
remote: pre-close-tip:e7ec4e813ba6 draft remote: pre-close-tip:e7ec4e813ba6 draft
remote: You shall not pass! remote: You shall not pass!
remote: transaction abort! remote: transaction abort!
remote: Cleaning up the mess... remote: Cleaning up the mess...
remote: rollback completed remote: rollback completed
remote: pretxnclose.failpush hook exited with status 1 remote: pretxnclose.failpush hook exited with status 1
abort: push failed on remote abort: push failed on remote
[255] [255]

tests/test-bundle2-format.t

This test is dedicated to test the bundle2 container format This test is dedicated to test the bundle2 container format
It test multiple existing parts to test different feature of the container. You It test multiple existing parts to test different feature of the container. You
probably do not need to touch this test unless you change the binary encoding probably do not need to touch this test unless you change the binary encoding
of the bundle2 format itself. of the bundle2 format itself.
Create an extension to test bundle2 API Create an extension to test bundle2 API
$ cat > bundle2.py << EOF $ cat > bundle2.py << EOF
> """A small extension to test bundle2 implementation > """A small extension to test bundle2 implementation
> >
> This extension allows detailed testing of the various bundle2 API and > This extension allows detailed testing of the various bundle2 API and
> behaviors. > behaviors.
> """ > """
> import gc > import gc
> import os > import os
> import sys > import sys
> from mercurial import util > from mercurial import util
> from mercurial import bundle2 > from mercurial import bundle2
> from mercurial import scmutil > from mercurial import scmutil
> from mercurial import discovery > from mercurial import discovery
> from mercurial import changegroup > from mercurial import changegroup
> from mercurial import error > from mercurial import error
> from mercurial import obsolete > from mercurial import obsolete
> from mercurial import pycompat > from mercurial import pycompat
> from mercurial import registrar > from mercurial import registrar
> >
> >
> try: > try:
> import msvcrt > import msvcrt
> msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
> except ImportError: > except ImportError:
> pass > pass
> >
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> >
> ELEPHANTSSONG = b"""Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko > ELEPHANTSSONG = b"""Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko
> Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko > Bokoro Dipoulito, Rondi Rondi Pepino, Pata Pata, Ko Ko Ko
> Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko.""" > Emana Karassoli, Loucra Loucra Ponponto, Pata Pata, Ko Ko Ko."""
> assert len(ELEPHANTSSONG) == 178 # future test say 178 bytes, trust it. > assert len(ELEPHANTSSONG) == 178 # future test say 178 bytes, trust it.
> >
> @bundle2.parthandler(b'test:song') > @bundle2.parthandler(b'test:song')
> def songhandler(op, part): > def songhandler(op, part):
> """handle a "test:song" bundle2 part, printing the lyrics on stdin""" > """handle a "test:song" bundle2 part, printing the lyrics on stdin"""
> op.ui.write(b'The choir starts singing:\n') > op.ui.write(b'The choir starts singing:\n')
> verses = 0 > verses = 0
> for line in part.read().split(b'\n'): > for line in part.read().split(b'\n'):
> op.ui.write(b' %s\n' % line) > op.ui.write(b' %s\n' % line)
> verses += 1 > verses += 1
> op.records.add(b'song', {b'verses': verses}) > op.records.add(b'song', {b'verses': verses})
> >
> @bundle2.parthandler(b'test:ping') > @bundle2.parthandler(b'test:ping')
> def pinghandler(op, part): > def pinghandler(op, part):
> op.ui.write(b'received ping request (id %i)\n' % part.id) > op.ui.write(b'received ping request (id %i)\n' % part.id)
> if op.reply is not None and b'ping-pong' in op.reply.capabilities: > if op.reply is not None and b'ping-pong' in op.reply.capabilities:
> op.ui.write_err(b'replying to ping request (id %i)\n' % part.id) > op.ui.write_err(b'replying to ping request (id %i)\n' % part.id)
> op.reply.newpart(b'test:pong', [(b'in-reply-to', b'%d' % part.id)], > op.reply.newpart(b'test:pong', [(b'in-reply-to', b'%d' % part.id)],
> mandatory=False) > mandatory=False)
> >
> @bundle2.parthandler(b'test:debugreply') > @bundle2.parthandler(b'test:debugreply')
> def debugreply(op, part): > def debugreply(op, part):
> """print data about the capacity of the bundle reply""" > """print data about the capacity of the bundle reply"""
> if op.reply is None: > if op.reply is None:
> op.ui.write(b'debugreply: no reply\n') > op.ui.write(b'debugreply: no reply\n')
> else: > else:
> op.ui.write(b'debugreply: capabilities:\n') > op.ui.write(b'debugreply: capabilities:\n')
> for cap in sorted(op.reply.capabilities): > for cap in sorted(op.reply.capabilities):
> op.ui.write(b"debugreply: '%s'\n" % cap) > op.ui.write(b"debugreply: '%s'\n" % cap)
> for val in op.reply.capabilities[cap]: > for val in op.reply.capabilities[cap]:
> op.ui.write(b"debugreply: '%s'\n" % val) > op.ui.write(b"debugreply: '%s'\n" % val)
> >
> @command(b'bundle2', > @command(b'bundle2',
> [(b'', b'param', [], b'stream level parameter'), > [(b'', b'param', [], b'stream level parameter'),
> (b'', b'unknown', False, b'include an unknown mandatory part in the bundle'), > (b'', b'unknown', False, b'include an unknown mandatory part in the bundle'),
> (b'', b'unknownparams', False, b'include an unknown part parameters in the bundle'), > (b'', b'unknownparams', False, b'include an unknown part parameters in the bundle'),
> (b'', b'parts', False, b'include some arbitrary parts to the bundle'), > (b'', b'parts', False, b'include some arbitrary parts to the bundle'),
> (b'', b'reply', False, b'produce a reply bundle'), > (b'', b'reply', False, b'produce a reply bundle'),
> (b'', b'pushrace', False, b'includes a check:head part with unknown nodes'), > (b'', b'pushrace', False, b'includes a check:head part with unknown nodes'),
> (b'', b'genraise', False, b'includes a part that raise an exception during generation'), > (b'', b'genraise', False, b'includes a part that raise an exception during generation'),
> (b'', b'timeout', False, b'emulate a timeout during bundle generation'), > (b'', b'timeout', False, b'emulate a timeout during bundle generation'),
> (b'r', b'rev', [], b'includes those changeset in the bundle'), > (b'r', b'rev', [], b'includes those changeset in the bundle'),
> (b'', b'compress', b'', b'compress the stream'),], > (b'', b'compress', b'', b'compress the stream'),],
> b'[OUTPUTFILE]') > b'[OUTPUTFILE]')
> def cmdbundle2(ui, repo, path=None, **opts): > def cmdbundle2(ui, repo, path=None, **opts):
> """write a bundle2 container on standard output""" > """write a bundle2 container on standard output"""
> bundler = bundle2.bundle20(ui) > bundler = bundle2.bundle20(ui)
> for p in opts['param']: > for p in opts['param']:
> p = p.split(b'=', 1) > p = p.split(b'=', 1)
> try: > try:
> bundler.addparam(*p) > bundler.addparam(*p)
> except error.ProgrammingError as exc: > except error.ProgrammingError as exc:
> raise error.Abort(b'%s' % exc) > raise error.Abort(b'%s' % exc)
> >
> if opts['compress']: > if opts['compress']:
> bundler.setcompression(opts['compress']) > bundler.setcompression(opts['compress'])
> >
> if opts['reply']: > if opts['reply']:
> capsstring = b'ping-pong\nelephants=babar,celeste\ncity%3D%21=celeste%2Cville' > capsstring = b'ping-pong\nelephants=babar,celeste\ncity%3D%21=celeste%2Cville'
> bundler.newpart(b'replycaps', data=capsstring) > bundler.newpart(b'replycaps', data=capsstring)
> >
> if opts['pushrace']: > if opts['pushrace']:
> # also serve to test the assignement of data outside of init > # also serve to test the assignement of data outside of init
> part = bundler.newpart(b'check:heads') > part = bundler.newpart(b'check:heads')
> part.data = b'01234567890123456789' > part.data = b'01234567890123456789'
> >
> revs = opts['rev'] > revs = opts['rev']
> if 'rev' in opts: > if 'rev' in opts:
> revs = scmutil.revrange(repo, opts['rev']) > revs = scmutil.revrange(repo, opts['rev'])
> if revs: > if revs:
> # very crude version of a changegroup part creation > # very crude version of a changegroup part creation
> bundled = repo.revs('%ld::%ld', revs, revs) > bundled = repo.revs('%ld::%ld', revs, revs)
> headmissing = [c.node() for c in repo.set('heads(%ld)', revs)] > headmissing = [c.node() for c in repo.set('heads(%ld)', revs)]
> headcommon = [c.node() for c in repo.set('parents(%ld) - %ld', revs, revs)] > headcommon = [c.node() for c in repo.set('parents(%ld) - %ld', revs, revs)]
> outgoing = discovery.outgoing(repo, headcommon, headmissing) > outgoing = discovery.outgoing(repo, headcommon, headmissing)
> cg = changegroup.makechangegroup(repo, outgoing, b'01', > cg = changegroup.makechangegroup(repo, outgoing, b'01',
> b'test:bundle2') > b'test:bundle2')
> bundler.newpart(b'changegroup', data=cg.getchunks(), > bundler.newpart(b'changegroup', data=cg.getchunks(),
> mandatory=False) > mandatory=False)
> >
> if opts['parts']: > if opts['parts']:
> bundler.newpart(b'test:empty', mandatory=False) > bundler.newpart(b'test:empty', mandatory=False)
> # add a second one to make sure we handle multiple parts > # add a second one to make sure we handle multiple parts
> bundler.newpart(b'test:empty', mandatory=False) > bundler.newpart(b'test:empty', mandatory=False)
> bundler.newpart(b'test:song', data=ELEPHANTSSONG, mandatory=False) > bundler.newpart(b'test:song', data=ELEPHANTSSONG, mandatory=False)
> bundler.newpart(b'test:debugreply', mandatory=False) > bundler.newpart(b'test:debugreply', mandatory=False)
> mathpart = bundler.newpart(b'test:math') > mathpart = bundler.newpart(b'test:math')
> mathpart.addparam(b'pi', b'3.14') > mathpart.addparam(b'pi', b'3.14')
> bundler.newpart(b'test:song', [(b'randomparams', b'')]) > bundler.newpart(b'test:song', [(b'randomparams', b'')])
> if opts['parts']: > if opts['parts']:
> bundler.newpart(b'test:ping', mandatory=False) > bundler.newpart(b'test:ping', mandatory=False)
> if opts['genraise']: > if opts['genraise']:
> def genraise(): > def genraise():
> yield b'first line\n' > yield b'first line\n'
> raise RuntimeError('Someone set up us the bomb!') > raise RuntimeError('Someone set up us the bomb!')
> bundler.newpart(b'output', data=genraise(), mandatory=False) > bundler.newpart(b'output', data=genraise(), mandatory=False)
> >
> if path is None: > if path is None:
> file = pycompat.stdout > file = pycompat.stdout
> else: > else:
> file = open(path, 'wb') > file = open(path, 'wb')
> >
> if opts['timeout']: > if opts['timeout']:
> bundler.newpart(b'test:song', data=ELEPHANTSSONG, mandatory=False) > bundler.newpart(b'test:song', data=ELEPHANTSSONG, mandatory=False)
> for idx, junk in enumerate(bundler.getchunks()): > for idx, junk in enumerate(bundler.getchunks()):
> ui.write(b'%d chunk\n' % idx) > ui.write(b'%d chunk\n' % idx)
> if idx > 4: > if idx > 4:
> # This throws a GeneratorExit inside the generator, which > # This throws a GeneratorExit inside the generator, which
> # can cause problems if the exception-recovery code is > # can cause problems if the exception-recovery code is
> # too zealous. It's important for this test that the break > # too zealous. It's important for this test that the break
> # occur while we're in the middle of a part. > # occur while we're in the middle of a part.
> break > break
> gc.collect() > gc.collect()
> ui.write(b'fake timeout complete.\n') > ui.write(b'fake timeout complete.\n')
> return > return
> try: > try:
> for chunk in bundler.getchunks(): > for chunk in bundler.getchunks():
> file.write(chunk) > file.write(chunk)
> except RuntimeError as exc: > except RuntimeError as exc:
> raise error.Abort(exc) > raise error.Abort(exc)
> finally: > finally:
> file.flush() > file.flush()
> >
> @command(b'unbundle2', [], b'') > @command(b'unbundle2', [], b'')
> def cmdunbundle2(ui, repo, replypath=None): > def cmdunbundle2(ui, repo, replypath=None):
> """process a bundle2 stream from stdin on the current repo""" > """process a bundle2 stream from stdin on the current repo"""
> try: > try:
> tr = None > tr = None
> lock = repo.lock() > lock = repo.lock()
> tr = repo.transaction(b'processbundle') > tr = repo.transaction(b'processbundle')
> try: > try:
> totalverses = sum(r[b'verses'] for r in op.records[b'song']) > totalverses = sum(r[b'verses'] for r in op.records[b'song'])
> ui.write(b'%i total verses sung\n' % totalverses) > ui.write(b'%i total verses sung\n' % totalverses)
> for rec in op.records[b'changegroup']: > for rec in op.records[b'changegroup']:
> ui.write(b'addchangegroup return: %i\n' % rec[b'return']) > ui.write(b'addchangegroup return: %i\n' % rec[b'return'])
> if op.reply is not None and replypath is not None: > if op.reply is not None and replypath is not None:
> with open(replypath, 'wb') as file: > with open(replypath, 'wb') as file:
> for chunk in op.reply.getchunks(): > for chunk in op.reply.getchunks():
> file.write(chunk) > file.write(chunk)
> >
> @command(b'statbundle2', [], b'') > @command(b'statbundle2', [], b'')
> def cmdstatbundle2(ui, repo): > def cmdstatbundle2(ui, repo):
> """print statistic on the bundle2 container read from stdin""" > """print statistic on the bundle2 container read from stdin"""
> unbundler = bundle2.getunbundler(ui, pycompat.stdin) > unbundler = bundle2.getunbundler(ui, pycompat.stdin)
> try: > try:
> params = unbundler.params > params = unbundler.params
> except error.BundleValueError as exc: > except error.BundleValueError as exc:
> raise error.Abort(b'unknown parameters: %s' % exc) > raise error.Abort(b'unknown parameters: %s' % exc)
================= =================
- no option - no option
- no parts - no parts
Test bundling Test bundling
$ hg bundle2 | f --hexdump $ hg bundle2 | f --hexdump
0000: 48 47 32 30 00 00 00 00 00 00 00 00 |HG20........| 0000: 48 47 32 30 00 00 00 00 00 00 00 00 |HG20........|
Test timeouts during bundling Test timeouts during bundling
$ hg bundle2 --timeout --debug --config devel.bundle2.debug=yes $ hg bundle2 --timeout --debug --config devel.bundle2.debug=yes
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output: start emission of HG20 stream bundle2-output: start emission of HG20 stream
0 chunk 0 chunk
bundle2-output: bundle parameter: bundle2-output: bundle parameter:
1 chunk 1 chunk
bundle2-output: start of parts bundle2-output: start of parts
bundle2-output: bundle part: "test:song" bundle2-output: bundle part: "test:song"
bundle2-output-part: "test:song" (advisory) 178 bytes payload bundle2-output-part: "test:song" (advisory) 178 bytes payload
bundle2-output: part 0: "test:song" bundle2-output: part 0: "test:song"
bundle2-output: header chunk size: 16 bundle2-output: header chunk size: 16
2 chunk 2 chunk
3 chunk 3 chunk
advisory parameters, no value advisory parameters, no value
------------------------------- -------------------------------
Simplest possible parameters form Simplest possible parameters form
Test generation simple option Test generation simple option
$ hg bundle2 --param 'caution' | f --hexdump $ hg bundle2 --param 'caution' | f --hexdump
0000: 48 47 32 30 00 00 00 07 63 61 75 74 69 6f 6e 00 |HG20....caution.| 0000: 48 47 32 30 00 00 00 07 63 61 75 74 69 6f 6e 00 |HG20....caution.|
0010: 00 00 00 |...| 0010: 00 00 00 |...|
Test unbundling Test unbundling
$ hg bundle2 --param 'caution' | hg statbundle2 $ hg bundle2 --param 'caution' | hg statbundle2
options count: 1 options count: 1
- caution - caution
parts count: 0 parts count: 0
Test generation multiple option Test generation multiple option
$ hg bundle2 --param 'caution' --param 'meal' | f --hexdump $ hg bundle2 --param 'caution' --param 'meal' | f --hexdump
0000: 48 47 32 30 00 00 00 0c 63 61 75 74 69 6f 6e 20 |HG20....caution | 0000: 48 47 32 30 00 00 00 0c 63 61 75 74 69 6f 6e 20 |HG20....caution |
0010: 6d 65 61 6c 00 00 00 00 |meal....| 0010: 6d 65 61 6c 00 00 00 00 |meal....|
Test unbundling Test unbundling
$ hg bundle2 --param 'caution' --param 'meal' | hg statbundle2 $ hg bundle2 --param 'caution' --param 'meal' | hg statbundle2
options count: 2 options count: 2
- caution - caution
- meal - meal
parts count: 0 parts count: 0
advisory parameters, with value advisory parameters, with value
------------------------------- -------------------------------
Test generation Test generation
$ hg bundle2 --param 'caution' --param 'meal=vegan' --param 'elephants' | f --hexdump $ hg bundle2 --param 'caution' --param 'meal=vegan' --param 'elephants' | f --hexdump
0000: 48 47 32 30 00 00 00 1c 63 61 75 74 69 6f 6e 20 |HG20....caution | 0000: 48 47 32 30 00 00 00 1c 63 61 75 74 69 6f 6e 20 |HG20....caution |
0010: 6d 65 61 6c 3d 76 65 67 61 6e 20 65 6c 65 70 68 |meal=vegan eleph| 0010: 6d 65 61 6c 3d 76 65 67 61 6e 20 65 6c 65 70 68 |meal=vegan eleph|
0020: 61 6e 74 73 00 00 00 00 |ants....| 0020: 61 6e 74 73 00 00 00 00 |ants....|
Test unbundling Test unbundling
$ hg bundle2 --param 'caution' --param 'meal=vegan' --param 'elephants' | hg statbundle2 $ hg bundle2 --param 'caution' --param 'meal=vegan' --param 'elephants' | hg statbundle2
options count: 3 options count: 3
- caution - caution
- elephants - elephants
- meal - meal
vegan vegan
parts count: 0 parts count: 0
parameter with special char in value parameter with special char in value
--------------------------------------------------- ---------------------------------------------------
Test generation Test generation
$ hg bundle2 --param 'e|! 7/=babar%#==tutu' --param simple | f --hexdump $ hg bundle2 --param 'e|! 7/=babar%#==tutu' --param simple | f --hexdump
0000: 48 47 32 30 00 00 00 29 65 25 37 43 25 32 31 25 |HG20...)e%7C%21%| 0000: 48 47 32 30 00 00 00 29 65 25 37 43 25 32 31 25 |HG20...)e%7C%21%|
0010: 32 30 37 2f 3d 62 61 62 61 72 25 32 35 25 32 33 |207/=babar%25%23| 0010: 32 30 37 2f 3d 62 61 62 61 72 25 32 35 25 32 33 |207/=babar%25%23|
0020: 25 33 44 25 33 44 74 75 74 75 20 73 69 6d 70 6c |%3D%3Dtutu simpl| 0020: 25 33 44 25 33 44 74 75 74 75 20 73 69 6d 70 6c |%3D%3Dtutu simpl|
0030: 65 00 00 00 00 |e....| 0030: 65 00 00 00 00 |e....|
Test unbundling Test unbundling
$ hg bundle2 --param 'e|! 7/=babar%#==tutu' --param simple | hg statbundle2 $ hg bundle2 --param 'e|! 7/=babar%#==tutu' --param simple | hg statbundle2
Test part Test part
================= =================
$ hg bundle2 --parts ../parts.hg2 --debug --config progress.debug=true --config devel.bundle2.debug=true $ hg bundle2 --parts ../parts.hg2 --debug --config progress.debug=true --config devel.bundle2.debug=true
bundle2-output-bundle: "HG20", 7 parts total bundle2-output-bundle: "HG20", 7 parts total
bundle2-output: start emission of HG20 stream bundle2-output: start emission of HG20 stream
bundle2-output: bundle parameter: bundle2-output: bundle parameter:
bundle2-output: start of parts bundle2-output: start of parts
bundle2-output: bundle part: "test:empty" bundle2-output: bundle part: "test:empty"
bundle2-output-part: "test:empty" (advisory) empty payload bundle2-output-part: "test:empty" (advisory) empty payload
bundle2-output: part 0: "test:empty" bundle2-output: part 0: "test:empty"
bundle2-output: header chunk size: 17 bundle2-output: header chunk size: 17
bundle2-output: closing payload chunk bundle2-output: closing payload chunk
bundle2-output: bundle part: "test:empty" bundle2-output: bundle part: "test:empty"
bundle2-output-part: "test:empty" (advisory) empty payload bundle2-output-part: "test:empty" (advisory) empty payload
0 unread bytes 0 unread bytes
Test push race detection Test push race detection
$ hg bundle2 --pushrace ../part-race.hg2 $ hg bundle2 --pushrace ../part-race.hg2
$ hg unbundle2 < ../part-race.hg2 $ hg unbundle2 < ../part-race.hg2
0 unread bytes 0 unread bytes
abort: push race: repository changed while pushing - please try again abort: push race: remote repository changed while pushing - please try again
[255] [255]
Support for changegroup Support for changegroup
=================================== ===================================
$ hg unbundle $TESTDIR/bundles/rebase.hg $ hg unbundle $TESTDIR/bundles/rebase.hg
adding changesets adding changesets
adding manifests adding manifests
|/ |/
| o 4:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D | o 4:32af7686d403 draft Nicolas Dumazet <nicdumz.commits@gmail.com> D
| | | |
| o 3:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C | o 3:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> C
| | | |
| o 2:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B | o 2:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> B
|/ |/
o 1:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A o 1:cd010b8cd998 draft Nicolas Dumazet <nicdumz.commits@gmail.com> A
@ 0:3903775176ed draft test a @ 0:3903775176ed draft test a
$ hg bundle2 --debug --config progress.debug=true --config devel.bundle2.debug=true --rev '8+7+5+4' ../rev.hg2 $ hg bundle2 --debug --config progress.debug=true --config devel.bundle2.debug=true --rev '8+7+5+4' ../rev.hg2
4 changesets found 4 changesets found
list of changesets: list of changesets:
32af7686d403cf45b5d95f2d70cebea587ac806a 32af7686d403cf45b5d95f2d70cebea587ac806a
9520eea781bcca16c1e15acc0ba14335a0e8e5ba 9520eea781bcca16c1e15acc0ba14335a0e8e5ba
eea13746799a9e0bfd88f29d3c2e9dc9389f524f eea13746799a9e0bfd88f29d3c2e9dc9389f524f
02de42196ebee42ef284b6780a87cdc96e8eaab6 02de42196ebee42ef284b6780a87cdc96e8eaab6
bundle2-output-bundle: "HG20", 1 parts total bundle2-output-bundle: "HG20", 1 parts total
bundle2-output: start emission of HG20 stream bundle2-output: start emission of HG20 stream
bundle2-output: bundle parameter: bundle2-output: bundle parameter:
bundle2-output: start of parts bundle2-output: start of parts
bundle2-output: bundle part: "changegroup" bundle2-output: bundle part: "changegroup"
bundle2-output-part: "changegroup" (advisory) streamed payload bundle2-output-part: "changegroup" (advisory) streamed payload
bundle2-output: part 0: "changegroup" bundle2-output: part 0: "changegroup"
bundle2-output: header chunk size: 18 bundle2-output: header chunk size: 18
bundling: 1/4 changesets (25.00%) bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%) bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%) bundling: 3/4 changesets (75.00%)

tests/test-push-race.t

============================================================================================ ============================================================================================
Test cases where there are race condition between two clients pushing to the same repository Test cases where there are race condition between two clients pushing to the same repository
============================================================================================ ============================================================================================
This file tests cases where two clients push to a server at the same time. The This file tests cases where two clients push to a server at the same time. The
"raced" client is done preparing it push bundle when the "racing" client "raced" client is done preparing it push bundle when the "racing" client
perform its push. The "raced" client starts its actual push after the "racing" perform its push. The "raced" client starts its actual push after the "racing"
client push is fully complete. client push is fully complete.
A set of extension and shell functions ensures this scheduling. A set of extension and shell functions ensures this scheduling.
$ cat >> delaypush.py << EOF $ cat >> delaypush.py << EOF
> """small extension orchestrate push race > """small extension orchestrate push race
> >
> Client with the extensions will create a file when ready and get stuck until > Client with the extensions will create a file when ready and get stuck until
> a file is created.""" > a file is created."""
> >
> import errno > import errno
> import os > import os
> import time > import time
> >
> from mercurial import ( > from mercurial import (
> exchange, > exchange,
> extensions, > extensions,
> registrar, > registrar,
> ) > )
> >
> configtable = {} > configtable = {}
> configitem = registrar.configitem(configtable) > configitem = registrar.configitem(configtable)
> >
> configitem('delaypush', 'ready-path', > configitem('delaypush', 'ready-path',
> default=None, > default=None,
> ) > )
> configitem('delaypush', 'release-path', > configitem('delaypush', 'release-path',
> default=None, > default=None,
> ) > )
> >
> def delaypush(orig, pushop): > def delaypush(orig, pushop):
> # notify we are done preparing > # notify we are done preparing
> ui = pushop.repo.ui > ui = pushop.repo.ui
> readypath = ui.config('delaypush', 'ready-path') > readypath = ui.config('delaypush', 'ready-path')
> if readypath is not None: > if readypath is not None:
> with open(readypath, 'w') as r: > with open(readypath, 'w') as r:
> r.write('foo') > r.write('foo')
> ui.status('wrote ready: %s\n' % readypath) > ui.status('wrote ready: %s\n' % readypath)
> def delete(): > def delete():
> try: > try:
> os.unlink(watchpath) > os.unlink(watchpath)
> except OSError as exc: > except OSError as exc:
> if exc.errno != errno.ENOENT: > if exc.errno != errno.ENOENT:
> raise > raise
> ui.atexit(delete) > ui.atexit(delete)
> return orig(pushop) > return orig(pushop)
> >
> def uisetup(ui): > def uisetup(ui):
> extensions.wrapfunction(exchange, '_pushbundle2', delaypush) > extensions.wrapfunction(exchange, '_pushbundle2', delaypush)
> EOF > EOF
$ waiton () { $ waiton () {
> # wait for a file to be created (then delete it) > # wait for a file to be created (then delete it)
> count=100 > count=100
> while [ ! -f $1 ] ; > while [ ! -f $1 ] ;
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Pushing on two different heads Pushing on two different heads
------------------------------ ------------------------------
Both try to replace a different head Both try to replace a different head
# a b # a b
# | | # | |
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R server graph $ hg -R server graph
o a9149a1428e2 C-B (default) o a9149a1428e2 C-B (default)
| |
| o 98217d5a1659 C-A (default) | o 98217d5a1659 C-A (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
$ echo aa >> client-other/a $ echo aa >> client-other/a
$ hg -R client-other/ commit -m "C-C" $ hg -R client-other/ commit -m "C-C"
$ echo bb >> client-racy/b $ echo bb >> client-racy/b
$ hg -R client-racy/ commit -m "C-D" $ hg -R client-racy/ commit -m "C-D"
#if strict #if strict
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o 51c544a58128 C-C (default) o 51c544a58128 C-C (default)
| |
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
| |
o a9149a1428e2 C-B (default) o a9149a1428e2 C-B (default)
| |
| o 51c544a58128 C-C (default) | o 51c544a58128 C-C (default)
| | | |
| o 98217d5a1659 C-A (default) | o 98217d5a1659 C-A (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
Pushing while someone creates a new head Pushing while someone creates a new head
----------------------------------------- -----------------------------------------
Pushing a new changeset while someone creates a new branch. Pushing a new changeset while someone creates a new branch.
# a (raced) # a (raced)
| |
o a9149a1428e2 C-B (default) o a9149a1428e2 C-B (default)
| |
| o 51c544a58128 C-C (default) | o 51c544a58128 C-C (default)
| | | |
| o 98217d5a1659 C-A (default) | o 98217d5a1659 C-A (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(new head) (new head)
$ hg -R client-other/ up 'desc("C-A")' $ hg -R client-other/ up 'desc("C-A")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
#if strict #if strict
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o d603e2c0cdd7 C-E (default) o d603e2c0cdd7 C-E (default)
| |
| o 51c544a58128 C-C (default) | o 51c544a58128 C-C (default)
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
#if unrelated #if unrelated
(The racing new head do not affect existing heads, push should go through) (The racing new head do not affect existing heads, push should go through)
$ cat ./push-log $ cat ./push-log
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
Pushing touching different named branch (same topo): new branch raced Pushing touching different named branch (same topo): new branch raced
--------------------------------------------------------------------- ---------------------------------------------------------------------
Pushing two children on the same head, one is a different named branch Pushing two children on the same head, one is a different named branch
# a (raced, branch-a) # a (raced, branch-a)
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(update existing head) (update existing head)
$ hg -R client-other/ up 'desc("C-F")' $ hg -R client-other/ up 'desc("C-F")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
#if strict #if strict
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o 75d69cba5402 C-G (default) o 75d69cba5402 C-G (default)
| |
o d9e379a8c432 C-F (default) o d9e379a8c432 C-F (default)
| |
o 51c544a58128 C-C (default) o 51c544a58128 C-C (default)
| |
| o d603e2c0cdd7 C-E (default) | o d603e2c0cdd7 C-E (default)
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
#if unrelated #if unrelated
(unrelated named branches are unrelated) (unrelated named branches are unrelated)
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
The racing new head do not affect existing heads, push should go through The racing new head do not affect existing heads, push should go through
pushing touching different named branch (same topo): old branch raced pushing touching different named branch (same topo): old branch raced
--------------------------------------------------------------------- ---------------------------------------------------------------------
Pushing two children on the same head, one is a different named branch Pushing two children on the same head, one is a different named branch
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(new named branch from one head) (new named branch from one head)
$ hg -R client-other/ up 'desc("C-G")' $ hg -R client-other/ up 'desc("C-G")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
#if strict #if strict
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o b35ed749f288 C-I (my-second-test-branch) o b35ed749f288 C-I (my-second-test-branch)
| |
o 75d69cba5402 C-G (default) o 75d69cba5402 C-G (default)
| |
| o 833be552cfe6 C-H (my-first-test-branch) | o 833be552cfe6 C-H (my-first-test-branch)
|/ |/
o d9e379a8c432 C-F (default) o d9e379a8c432 C-F (default)
| |
o 51c544a58128 C-C (default) o 51c544a58128 C-C (default)
| |
| o d603e2c0cdd7 C-E (default) | o d603e2c0cdd7 C-E (default)
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
#if unrelated #if unrelated
(unrelated named branches are unrelated) (unrelated named branches are unrelated)
$ cat ./push-log $ cat ./push-log
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
#endif #endif
pushing racing push touch multiple heads pushing racing push touch multiple heads
---------------------------------------- ----------------------------------------
There are multiple heads, but the racing push touch all of them There are multiple heads, but the racing push touch all of them
|/ |/
o 98217d5a1659 C-A (default) o 98217d5a1659 C-A (default)
| |
| o 59e76faf78bd C-D (default) | o 59e76faf78bd C-D (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(merges heads) (merges heads)
$ hg -R client-other/ up 'desc("C-E")' $ hg -R client-other/ up 'desc("C-E")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R client-other/ merge 'desc("C-D")' $ hg -R client-other/ merge 'desc("C-D")'
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o be705100c623 C-K (default) o be705100c623 C-K (default)
|\ |\
| o d603e2c0cdd7 C-E (default) | o d603e2c0cdd7 C-E (default)
| | | |
o | 59e76faf78bd C-D (default) o | 59e76faf78bd C-D (default)
| | | |
| | | | | |
| | o 51c544a58128 C-C (default) | | o 51c544a58128 C-C (default)
| |/ | |/
o | a9149a1428e2 C-B (default) o | a9149a1428e2 C-B (default)
| | | |
| o 98217d5a1659 C-A (default) | o 98217d5a1659 C-A (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
pushing raced push touch multiple heads pushing raced push touch multiple heads
--------------------------------------- ---------------------------------------
There are multiple heads, the raced push touch all of them There are multiple heads, the raced push touch all of them
# b # b
# | a (raced) # | a (raced)
| | | | | |
| | o 51c544a58128 C-C (default) | | o 51c544a58128 C-C (default)
| |/ | |/
o | a9149a1428e2 C-B (default) o | a9149a1428e2 C-B (default)
| | | |
| o 98217d5a1659 C-A (default) | o 98217d5a1659 C-A (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(update existing head) (update existing head)
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
$ hg -R client-other/ commit -m "C-M" $ hg -R client-other/ commit -m "C-M"
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o 6fd3090135df C-M (default) o 6fd3090135df C-M (default)
| |
o be705100c623 C-K (default) o be705100c623 C-K (default)
|\ |\
| o d603e2c0cdd7 C-E (default) | o d603e2c0cdd7 C-E (default)
| | | |
| | | | | |
| | o 51c544a58128 C-C (default) | | o 51c544a58128 C-C (default)
| |/ | |/
o | a9149a1428e2 C-B (default) o | a9149a1428e2 C-B (default)
| | | |
| o 98217d5a1659 C-A (default) | o 98217d5a1659 C-A (default)
|/ |/
@ 842e2fac6304 C-ROOT (default) @ 842e2fac6304 C-ROOT (default)
racing commit push a new head behind another named branch racing commit push a new head behind another named branch
--------------------------------------------------------- ---------------------------------------------------------
non-continuous branch are valid case, we tests for them. non-continuous branch are valid case, we tests for them.
# b (branch default) # b (branch default)
# | # |
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(update default head through another named branch one) (update default head through another named branch one)
$ hg -R client-other/ up 'desc("C-Z")' $ hg -R client-other/ up 'desc("C-Z")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o 1b58ee3f79e5 C-P (default) o 1b58ee3f79e5 C-P (default)
| |
o d0a85b2252a9 C-O (other) o d0a85b2252a9 C-O (other)
| |
o 55a6f1c01b48 C-Z (other) o 55a6f1c01b48 C-Z (other)
| |
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
raced commit push a new head behind another named branch raced commit push a new head behind another named branch
--------------------------------------------------------- ---------------------------------------------------------
non-continuous branch are valid case, we tests for them. non-continuous branch are valid case, we tests for them.
# b (raced branch default) # b (raced branch default)
# | # |
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
Creating changesets Creating changesets
(update 'other' named branch head) (update 'other' named branch head)
$ hg -R client-other/ up 'desc("C-P")' $ hg -R client-other/ up 'desc("C-P")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server graph $ hg -R server graph
o de7b9e2ba3f6 C-R (other) o de7b9e2ba3f6 C-R (other)
| |
o 1b58ee3f79e5 C-P (default) o 1b58ee3f79e5 C-P (default)
| |
o d0a85b2252a9 C-O (other) o d0a85b2252a9 C-O (other)
| |
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
raced commit push a new head obsoleting the one touched by the racing push raced commit push a new head obsoleting the one touched by the racing push
-------------------------------------------------------------------------- --------------------------------------------------------------------------
# b (racing) # b (racing)
# | # |
# ø⇠◔ a (raced) # ø⇠◔ a (raced)
# |/ # |/
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
Creating changesets and markers Creating changesets and markers
(continue existing head) (continue existing head)
$ hg -R client-other/ up 'desc("C-Q")' $ hg -R client-other/ up 'desc("C-Q")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa >> client-other/a $ echo aaa >> client-other/a
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server debugobsolete $ hg -R server debugobsolete
$ hg -R server graph $ hg -R server graph
o a98a47d8b85b C-U (default) o a98a47d8b85b C-U (default)
| |
o b0ee3d6f51bc C-Q (default) o b0ee3d6f51bc C-Q (default)
| |
| o 3d57ed3c1091 C-T (other) | o 3d57ed3c1091 C-T (other)
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
racing commit push a new head obsoleting the one touched by the raced push racing commit push a new head obsoleting the one touched by the raced push
-------------------------------------------------------------------------- --------------------------------------------------------------------------
(mirror test case of the previous one (mirror test case of the previous one
# a (raced branch default) # a (raced branch default)
# | # |
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)
Creating changesets and markers Creating changesets and markers
(new topo branch obsoleting that same head) (new topo branch obsoleting that same head)
$ hg -R client-other/ up 'desc("C-Q")' $ hg -R client-other/ up 'desc("C-Q")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo bbb >> client-other/a $ echo bbb >> client-other/a
Check the result of the push Check the result of the push
$ cat ./push-log $ cat ./push-log
pushing to ssh://user@dummy/server pushing to ssh://user@dummy/server
searching for changes searching for changes
wrote ready: $TESTTMP/readyfile wrote ready: $TESTTMP/readyfile
waiting on: $TESTTMP/watchfile waiting on: $TESTTMP/watchfile
abort: push failed: abort: push failed:
'repository changed while pushing - please try again' 'remote repository changed while pushing - please try again'
$ hg -R server debugobsolete $ hg -R server debugobsolete
b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 720c5163ecf64dcc6216bee2d62bf3edb1882499 39bc0598afe90ab18da460bafecc0fa953b77596 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ hg -R server graph --hidden $ hg -R server graph --hidden
* 39bc0598afe9 C-W (default) * 39bc0598afe9 C-W (default)
| |
| * a98a47d8b85b C-U (default) | * a98a47d8b85b C-U (default)
| | | | | |
+---o 51c544a58128 C-C (default) +---o 51c544a58128 C-C (default)
| | | |
| o a9149a1428e2 C-B (default) | o a9149a1428e2 C-B (default)
| | | |
o | 98217d5a1659 C-A (default) o | 98217d5a1659 C-A (default)
|/ |/
o 842e2fac6304 C-ROOT (default) o 842e2fac6304 C-ROOT (default)