Mercurial > evolve
changeset 4194:cae466b70bf1
branching: merge stable into default
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 25 Oct 2018 12:49:48 +0200 |
| parents | 326c043bf89c (diff) e527df0f2a68 (current diff) |
| children | 7d4c80c3f386 |
| files | CHANGELOG hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/evolvecmd.py hgext3rd/evolve/rewind.py hgext3rd/topic/__init__.py hgext3rd/topic/discovery.py |
| diffstat | 54 files changed, 124 insertions(+), 189 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/evolve/cmdrewrite.py Thu Oct 25 12:49:48 2018 +0200 @@ -105,7 +105,7 @@ ('', 'close-branch', None, _('mark a branch as closed, hiding it from the branch list')), ('s', 'secret', None, _('use the secret phase for committing')), - ('n', 'note', '', _('store a note on amend')), + ('n', 'note', '', _('store a note on amend'), _('TEXT')), ] + walkopts + commitopts + commitopts2 + commitopts3 + interactiveopt, _('[OPTION]... [FILE]...'), helpbasic=True) @@ -462,9 +462,9 @@ 'uncommit', [('a', 'all', None, _('uncommit all changes when no arguments given')), ('i', 'interactive', False, _('interactive mode to uncommit (EXPERIMENTAL)')), - ('r', 'rev', '', _('revert commit content to REV instead')), + ('r', 'rev', '', _('revert commit content to REV instead'), _('REV')), ('', 'revert', False, _('discard working directory changes after uncommit')), - ('n', 'note', '', _('store a note on uncommit')), + ('n', 'note', '', _('store a note on uncommit'), _('TEXT')), ] + commands.walkopts + commitopts + commitopts2 + commitopts3, _('[OPTION]... [NAME]')) def uncommit(ui, repo, *pats, **opts): @@ -662,10 +662,10 @@ @eh.command( 'fold|squash', - [('r', 'rev', [], _("revision to fold")), + [('r', 'rev', [], _("revision to fold"), _('REV')), ('', 'exact', None, _("only fold specified revisions")), ('', 'from', None, _("fold revisions linearly to working copy parent")), - ('n', 'note', '', _('store a note on fold')), + ('n', 'note', '', _('store a note on fold'), _('TEXT')), ] + commitopts + commitopts2 + commitopts3, _('hg fold [OPTION]... [-r] REV'), helpbasic=True) @@ -791,9 +791,9 @@ @eh.command( 'metaedit', - [('r', 'rev', [], _("revision to edit")), + [('r', 'rev', [], _("revision to edit"), _('REV')), ('', 'fold', None, _("also fold specified revisions into one")), - ('n', 'note', '', _('store a note on metaedit')), + ('n', 'note', '', _('store a note on metaedit'), _('TEXT')), ] + commitopts + commitopts2 + commitopts3, _('hg metaedit [OPTION]... [-r] [REV]')) def metaedit(ui, repo, *revs, **opts): @@ -941,10 +941,10 @@ @eh.command( 'prune|obsolete', [('n', 'new', [], _("successor changeset (DEPRECATED)")), - ('s', 'succ', [], _("successor changeset")), - ('r', 'rev', [], _("revisions to prune")), + ('s', 'succ', [], _("successor changeset"), _('REV')), + ('r', 'rev', [], _("revisions to prune"), _('REV')), ('k', 'keep', None, _("does not modify working copy during prune")), - ('n', 'note', '', _('store a note on prune')), + ('n', 'note', '', _('store a note on prune'), _('TEXT')), ('', 'pair', False, _("record a pairing, such as a rebase or divergence resolution " "(pairing multiple precursors to multiple successors)")), ('', 'biject', False, _("alias to --pair (DEPRECATED)")), @@ -953,7 +953,7 @@ ('', 'split', False, _("record a split (on precursor, multiple successors)")), ('B', 'bookmark', [], _("remove revs only reachable from given" - " bookmark"))] + metadataopts, + " bookmark"), _('BOOKMARK'))] + metadataopts, _('[OPTION] [-r] REV...'), helpbasic=True) # XXX -U --noupdate option to prevent wc update and or bookmarks update ? @@ -1132,8 +1132,8 @@ @eh.command( 'split', - [('r', 'rev', [], _("revision to split")), - ('n', 'note', '', _("store a note on split")), + [('r', 'rev', [], _("revision to split"), _('REV')), + ('n', 'note', '', _("store a note on split"), _('TEXT')), ] + commitopts + commitopts2 + commitopts3, _('hg split [OPTION]... [-r] REV'), helpbasic=True) @@ -1229,8 +1229,8 @@ @eh.command( 'touch', - [('r', 'rev', [], 'revision to update'), - ('n', 'note', '', _('store a note on touch')), + [('r', 'rev', [], _('revision to update'), _('REV')), + ('n', 'note', '', _('store a note on touch'), _('TEXT')), ('D', 'duplicate', False, 'do not mark the new revision as successor of the old one'), ('A', 'allowdivergence', False, @@ -1322,7 +1322,7 @@ @eh.command( 'pick|grab', - [('r', 'rev', '', 'revision to pick'), + [('r', 'rev', '', _('revision to pick'), _('REV')), ('c', 'continue', False, 'continue interrupted pick'), ('a', 'abort', False, 'abort interrupted pick'), ],
--- a/hgext3rd/evolve/evolvecmd.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/evolve/evolvecmd.py Thu Oct 25 12:49:48 2018 +0200 @@ -1340,7 +1340,7 @@ ('A', 'any', False, _('also consider troubled changesets unrelated to current working ' 'directory')), - ('r', 'rev', [], _('solves troubles of these revisions')), + ('r', 'rev', [], _('solves troubles of these revisions'), _('REV')), ('', 'bumped', False, _('solves only bumped changesets (DEPRECATED)')), ('', 'phase-divergent', False, _('solves only phase-divergent changesets')), ('', 'divergent', False, _('solves only divergent changesets (DEPRECATED)')),
--- a/hgext3rd/evolve/metadata.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/evolve/metadata.py Thu Oct 25 12:49:48 2018 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '8.3.1.dev' +__version__ = '8.4.0.dev' testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7' minimumhgversion = '4.3' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/evolve/rewind.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/evolve/rewind.py Thu Oct 25 12:49:48 2018 +0200 @@ -27,10 +27,11 @@ @eh.command( 'rewind|undo', - [('', 'to', [], _("rewind to these revisions")), + [('', 'to', [], _("rewind to these revisions"), _('REV')), ('', 'as-divergence', None, _("preserve current latest successors")), ('', 'exact', None, _("only rewind explicitly selected revisions")), - ('', 'from', [], _("rewind these revisions to their predecessors")), + ('', 'from', [], + _("rewind these revisions to their predecessors"), _('REV')), ], _(''), helpbasic=True)
--- a/hgext3rd/pullbundle.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/pullbundle.py Thu Oct 25 12:49:48 2018 +0200 @@ -480,7 +480,7 @@ partdata = (cachedata, nbchanges, pversion) return _makepartfromstream(newpart, repo, *partdata) -@command('^debugpullbundlecacheoverlap', +@command('debugpullbundlecacheoverlap', [('', 'count', 100, _('of "client" pulling')), ('', 'min-cache', 1, _('minimum size of cached bundle')), ],
--- a/hgext3rd/topic/__init__.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/topic/__init__.py Thu Oct 25 12:49:48 2018 +0200 @@ -177,7 +177,7 @@ 'topic.active': 'green', } -__version__ = '0.12.1.dev' +__version__ = '0.13.0.dev' testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7' minimumhgversion = '4.3'
--- a/hgext3rd/topic/randomname.py Sun Oct 21 00:08:27 2018 +0300 +++ b/hgext3rd/topic/randomname.py Thu Oct 25 12:49:48 2018 +0200 @@ -189,7 +189,6 @@ 'pony', 'porcupine', 'porpoise', - 'prairie', 'puffin', 'pug', 'quagga',
--- a/tests/test-amend.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-amend.t Thu Oct 25 12:49:48 2018 +0200 @@ -153,7 +153,7 @@ --close-branch mark a branch as closed, hiding it from the branch list -s --secret use the secret phase for committing - -n --note VALUE store a note on amend + -n --note TEXT store a note on amend -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns -m --message TEXT use text as commit message
--- a/tests/test-corrupt.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-corrupt.t Thu Oct 25 12:49:48 2018 +0200 @@ -60,7 +60,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 13 files, 3 changesets, 13 total revisions + checked 3 changesets with 13 changes to 13 files $ mkcommit D $ mkcommit E $ hg up -q .^^ @@ -115,7 +115,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 15 files, 4 changesets, 15 total revisions + checked 4 changesets with 15 changes to 15 files
--- a/tests/test-discovery-obshashrange.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-discovery-obshashrange.t Thu Oct 25 12:49:48 2018 +0200 @@ -319,7 +319,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
--- a/tests/test-evolve-content-divergence.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-evolve-content-divergence.t Thu Oct 25 12:49:48 2018 +0200 @@ -793,7 +793,7 @@ adding manifests adding file changes added 5 changesets with 5 changes to 5 files - new changesets 8fa14d15e168:c41c793e0ef1 + new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts) (run 'hg update' to get a working copy) $ hg glog o 4:c41c793e0ef1 added d @@ -865,7 +865,7 @@ added 4 changesets with 0 changes to 4 files (+1 heads) 5 new obsolescence markers 8 new content-divergent changesets - new changesets 82b74d5dc678:15c781f93cac + new changesets 82b74d5dc678:15c781f93cac (4 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog
--- a/tests/test-evolve-obshistory.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-evolve-obshistory.t Thu Oct 25 12:49:48 2018 +0200 @@ -126,7 +126,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 + new changesets 7a230b46bf61 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61)
--- a/tests/test-evolve-phase-divergence.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-evolve-phase-divergence.t Thu Oct 25 12:49:48 2018 +0200 @@ -80,7 +80,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 4d1169d82e47 + new changesets 4d1169d82e47 (1 drafts) (run 'hg update' to get a working copy) $ hg glog @@ -260,7 +260,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets aa071e5554e3 + new changesets aa071e5554e3 (1 drafts) (run 'hg update' to get a working copy) $ hg push ../public @@ -414,7 +414,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets b756eb10ea73 + new changesets b756eb10ea73 (1 drafts) 1 local changesets published (run 'hg update' to get a working copy) @@ -545,7 +545,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 2 new obsolescence markers - new changesets 502e73736632:2352021b3785 + new changesets 502e73736632:2352021b3785 (1 drafts) (run 'hg update' to get a working copy) $ hg push ../public pushing to ../public
--- a/tests/test-evolve-serveronly-bundle2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-evolve-serveronly-bundle2.t Thu Oct 25 12:49:48 2018 +0200 @@ -72,7 +72,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e + new changesets 8685c6d34325:4957bfdac07e (2 drafts) (run 'hg update' to get a working copy) $ cat ../errors.log $ hg push -R ../other @@ -130,7 +130,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 + new changesets 9d1c114e7797 (1 drafts) (run 'hg heads' to see heads) $ cat ../errors.log $ hg -R ../other pull
--- a/tests/test-evolve-templates.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-evolve-templates.t Thu Oct 25 12:49:48 2018 +0200 @@ -1004,7 +1004,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 + new changesets 7a230b46bf61 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61)
--- a/tests/test-evolve.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-evolve.t Thu Oct 25 12:49:48 2018 +0200 @@ -380,8 +380,8 @@ $ hg up -r "desc('a nifty feature')" 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg revert -r "desc('another feature')" --all + reverting main-file-1 adding file-from-B - reverting main-file-1 $ sed -i'' -e s/Zwei/deux/ main-file-1 $ hg commit -m 'another feature that rox' -o 5 created new head @@ -507,7 +507,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 702e4d0a6d86 + new changesets 702e4d0a6d86 (1 drafts) $ cd alpha $ cat << EOF > A @@ -540,7 +540,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 3 files $ hg --config extensions.hgext.mq= strip 'extinct()' abort: empty revision set [255] @@ -552,7 +552,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ cd .. Clone just this branch @@ -566,7 +566,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets c6dda801837c + new changesets c6dda801837c (1 drafts) (run 'hg update' to get a working copy) $ hg up 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -1163,55 +1163,11 @@ > EOF $ hg next hg: unknown command 'next' - Mercurial Distributed SCM - - basic commands: - - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge another revision into working directory - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) - - (use 'hg help' for the full list of commands or 'hg -v' for details) + (use 'hg help' for a list of commands) [255] $ hg fold hg: unknown command 'fold' - Mercurial Distributed SCM - - basic commands: - - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge another revision into working directory - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) - - (use 'hg help' for the full list of commands or 'hg -v' for details) + (use 'hg help' for a list of commands) [255] Enabling commands selectively, only fold enabled, next is still unknown $ cat >> $HGRCPATH <<EOF @@ -1224,30 +1180,7 @@ [255] $ hg next hg: unknown command 'next' - Mercurial Distributed SCM - - basic commands: - - add add the specified files on the next commit - annotate show changeset information by line for each file - clone make a copy of an existing repository - commit commit the specified files or all outstanding changes - diff diff repository (or selected files) - export dump the header and diffs for one or more changesets - fold fold multiple revisions into a single one - forget forget the specified files on the next commit - init create a new repository in the given directory - log show revision history of entire repository or files - merge merge another revision into working directory - pull pull changes from the specified source - push push changes to the specified destination - remove remove the specified files on the next commit - serve start stand-alone webserver - status show changed files in the working directory - summary summarize working directory state - update update working directory (or switch revisions) - - (use 'hg help' for the full list of commands or 'hg -v' for details) + (use 'hg help' for a list of commands) [255] Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
--- a/tests/test-exchange-obsmarkers-case-A1.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-A1.t Thu Oct 25 12:49:48 2018 +0200 @@ -113,7 +113,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -155,7 +155,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -269,7 +269,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 + new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -311,7 +311,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets f5bc6836db60:f6fbb35d8ac9 + new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-A2.t Thu Oct 25 12:49:48 2018 +0200 @@ -124,7 +124,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A3.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-A3.t Thu Oct 25 12:49:48 2018 +0200 @@ -146,7 +146,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -268,7 +268,7 @@ 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A4.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-A4.t Thu Oct 25 12:49:48 2018 +0200 @@ -134,7 +134,7 @@ adding file changes added 2 changesets with 2 changes to 2 files 1 new obsolescence markers - new changesets 28b51eb45704:06055a7959d4 + new changesets 28b51eb45704:06055a7959d4 (2 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A5.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-A5.t Thu Oct 25 12:49:48 2018 +0200 @@ -141,7 +141,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets f6298a8ac3a4 + new changesets f6298a8ac3a4 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-B3.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-B3.t Thu Oct 25 12:49:48 2018 +0200 @@ -120,7 +120,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets f5bc6836db60 + new changesets f5bc6836db60 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-B5.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-B5.t Thu Oct 25 12:49:48 2018 +0200 @@ -158,7 +158,7 @@ adding file changes added 3 changesets with 3 changes to 3 files 1 new obsolescence markers - new changesets 28b51eb45704:1d0f3cd25300 + new changesets 28b51eb45704:1d0f3cd25300 (3 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-C2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-C2.t Thu Oct 25 12:49:48 2018 +0200 @@ -131,7 +131,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -179,7 +179,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-D1.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-D1.t Thu Oct 25 12:49:48 2018 +0200 @@ -128,7 +128,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main @@ -176,7 +176,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-exchange-obsmarkers-case-D4.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-exchange-obsmarkers-case-D4.t Thu Oct 25 12:49:48 2018 +0200 @@ -141,7 +141,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers - new changesets e5ea8f9c7314 + new changesets e5ea8f9c7314 (1 drafts) (run 'hg update' to get a working copy) ## post pull state # obstore: main
--- a/tests/test-grab.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-grab.t Thu Oct 25 12:49:48 2018 +0200 @@ -25,9 +25,9 @@ options: - -r --rev VALUE revision to pick - -c --continue continue interrupted pick - -a --abort abort interrupted pick + -r --rev REV revision to pick + -c --continue continue interrupted pick + -a --abort abort interrupted pick (some details hidden, use --verbose to show complete help)
--- a/tests/test-obsolete.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-obsolete.t Thu Oct 25 12:49:48 2018 +0200 @@ -194,7 +194,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 5 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 5 files $ qlog -R ../other-new -r 'obsolete()' 2 - 0d3f46688ccc @@ -284,7 +284,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 909a0fb57e5d + new changesets 909a0fb57e5d (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 @@ -377,7 +377,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 159dfc9fa5d3 + new changesets 159dfc9fa5d3 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior
--- a/tests/test-options.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-options.t Thu Oct 25 12:49:48 2018 +0200 @@ -24,7 +24,7 @@ > allowunstable > exchange > EOF - $ hg prune | head -n 2 + $ hg prune hg: unknown command 'prune' - Mercurial Distributed SCM - + (use 'hg help' for a list of commands) + [255]
--- a/tests/test-prev-next.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-prev-next.t Thu Oct 25 12:49:48 2018 +0200 @@ -460,7 +460,8 @@ XXX: things are broken! $ hg prev --merge --config commands.update.check=abort - local [working copy] changed bar which other [destination] deleted + file 'bar' was deleted in other [destination] but was modified in local [working copy]. + What do you want to do? use (c)hanged version, (d)elete, or leave (u)nresolved? 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges
--- a/tests/test-push-checkheads-partial-C1.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-partial-C1.t Thu Oct 25 12:49:48 2018 +0200 @@ -51,7 +51,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-partial-C2.t Thu Oct 25 12:49:48 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C3.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-partial-C3.t Thu Oct 25 12:49:48 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C4.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-partial-C4.t Thu Oct 25 12:49:48 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-pruned-B2.t Thu Oct 25 12:49:48 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B3.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-pruned-B3.t Thu Oct 25 12:49:48 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B4.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-pruned-B4.t Thu Oct 25 12:49:48 2018 +0200 @@ -54,7 +54,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B5.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-pruned-B5.t Thu Oct 25 12:49:48 2018 +0200 @@ -57,7 +57,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets d73caddc5533:821fb21d0dd2 + new changesets d73caddc5533:821fb21d0dd2 (2 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B8.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-pruned-B8.t Thu Oct 25 12:49:48 2018 +0200 @@ -55,7 +55,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-superceed-A2.t Thu Oct 25 12:49:48 2018 +0200 @@ -52,7 +52,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A3.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-superceed-A3.t Thu Oct 25 12:49:48 2018 +0200 @@ -55,7 +55,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A6.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-superceed-A6.t Thu Oct 25 12:49:48 2018 +0200 @@ -59,7 +59,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A7.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-superceed-A7.t Thu Oct 25 12:49:48 2018 +0200 @@ -59,7 +59,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 'desc(C0)' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D2.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-unpushed-D2.t Thu Oct 25 12:49:48 2018 +0200 @@ -57,7 +57,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D3.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-unpushed-D3.t Thu Oct 25 12:49:48 2018 +0200 @@ -56,7 +56,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets d73caddc5533 + new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D4.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-unpushed-D4.t Thu Oct 25 12:49:48 2018 +0200 @@ -73,7 +73,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D5.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-push-checkheads-unpushed-D5.t Thu Oct 25 12:49:48 2018 +0200 @@ -62,7 +62,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) - new changesets d73caddc5533:0f88766e02d6 + new changesets d73caddc5533:0f88766e02d6 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 'desc(C0)' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-sharing.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-sharing.t Thu Oct 25 12:49:48 2018 +0200 @@ -88,7 +88,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets - new changesets 60ffde5765c5 + new changesets 60ffde5765c5 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "60ffde5765c5: fix bug 37" 1 other heads for branch "default" @@ -457,7 +457,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 2fe6c4bd32d0 + new changesets 2fe6c4bd32d0 (1 drafts) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 'better fix (alice)' >> file1 $ hg amend -u alice -m 'fix bug 24 (v2 by alice)' @@ -486,7 +486,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers 2 new content-divergent changesets - new changesets e3f99ce9d9cd + new changesets e3f99ce9d9cd (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) Figure SG09: multiple heads! divergence! oh my!
--- a/tests/test-topic-dest.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-topic-dest.t Thu Oct 25 12:49:48 2018 +0200 @@ -276,7 +276,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files - new changesets 13ec05df14e1:6482f08916a5 + new changesets 13ec05df14e1:6482f08916a5 (3 drafts) updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd other @@ -290,7 +290,7 @@ adding manifests adding file changes added 3 changesets with 3 changes to 3 files (+1 heads) - new changesets 6f5edd7450bb:c9c03b99196b + new changesets 6f5edd7450bb:c9c03b99196b (3 drafts) rebasing 3:dbc48dd9e743 "c_other" $ hg log -G @ 7 () c_other
--- a/tests/test-topic-tutorial.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-topic-tutorial.t Thu Oct 25 12:49:48 2018 +0200 @@ -1845,7 +1845,7 @@ adding file changes added 4 changesets with 4 changes to 1 files (+1 heads) 8 new obsolescence markers - new changesets b7509bd417f8:2d084ac00115 + new changesets b7509bd417f8:2d084ac00115 (4 drafts) (run 'hg heads' to see heads) $ hg topics --verbose @@ -1889,7 +1889,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 0d409663a1fd + new changesets 0d409663a1fd (1 drafts) (run 'hg update' to get a working copy) $ hg update
--- a/tests/test-topic.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-topic.t Thu Oct 25 12:49:48 2018 +0200 @@ -164,11 +164,12 @@ options ([+] can be repeated): - --clear clear active topic if any - -r --rev REV [+] revset of existing revisions - -l --list show the stack of changeset in the topic - --age show when you last touched the topics - --current display the current topic only + --clear clear active topic if any + -r --rev REV [+] revset of existing revisions + -l --list show the stack of changeset in the topic + --age show when you last touched the topics + --current display the current topic only + -T --template TEMPLATE display with template (some details hidden, use --verbose to show complete help) $ hg topics @@ -614,7 +615,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 0469d521db49 + new changesets 0469d521db49 (1 drafts) (run 'hg heads' to see heads) $ hg topics fran (1 changesets)
--- a/tests/test-tutorial.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-tutorial.t Thu Oct 25 12:49:48 2018 +0200 @@ -934,9 +934,9 @@ options ([+] can be repeated): -a --all uncommit all changes when no arguments given - -r --rev VALUE revert commit content to REV instead + -r --rev REV revert commit content to REV instead --revert discard working directory changes after uncommit - -n --note VALUE store a note on uncommit + -n --note TEXT store a note on uncommit -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns -m --message TEXT use text as commit message @@ -973,16 +973,16 @@ options ([+] can be repeated): - -r --rev VALUE [+] revision to fold - --exact only fold specified revisions - --from fold revisions linearly to working copy parent - -n --note VALUE store a note on fold - -m --message TEXT use text as commit message - -l --logfile FILE read commit message from file - -d --date DATE record the specified date as commit date - -u --user USER record the specified user as committer - -D --current-date record the current date as commit date - -U --current-user record the current user as committer + -r --rev REV [+] revision to fold + --exact only fold specified revisions + --from fold revisions linearly to working copy parent + -n --note TEXT store a note on fold + -m --message TEXT use text as commit message + -l --logfile FILE read commit message from file + -d --date DATE record the specified date as commit date + -u --user USER record the specified user as committer + -D --current-date record the current date as commit date + -U --current-user record the current user as committer (some details hidden, use --verbose to show complete help) @@ -1070,7 +1070,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 4710c0968793 + new changesets 4710c0968793 (1 drafts) (run 'hg update' to get a working copy) $ hg log -G o 4710c0968793 (draft): bathroom stuff @@ -1212,7 +1212,7 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new orphan changesets - new changesets e4e4fa805d92 + new changesets e4e4fa805d92 (1 drafts) (run 'hg update' to get a working copy) The new changeset "animal" is based on an old changeset of "bathroom". You can @@ -1543,7 +1543,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets fc41faf45288 + new changesets fc41faf45288 (1 drafts) (run 'hg update' to get a working copy) $ hg log -G o fc41faf45288 (draft): SPAM SPAM SPAM
--- a/tests/test-wireproto-bundle1.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-wireproto-bundle1.t Thu Oct 25 12:49:48 2018 +0200 @@ -50,7 +50,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e + new changesets 8685c6d34325:4957bfdac07e (2 drafts) (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -90,7 +90,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 + new changesets 9d1c114e7797 (1 drafts) (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server
--- a/tests/test-wireproto.t Sun Oct 21 00:08:27 2018 +0300 +++ b/tests/test-wireproto.t Thu Oct 25 12:49:48 2018 +0200 @@ -53,7 +53,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - new changesets 8685c6d34325:4957bfdac07e + new changesets 8685c6d34325:4957bfdac07e (2 drafts) (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -95,7 +95,7 @@ obsmarker-exchange: 92 bytes received 1 new obsolescence markers obsoleted 1 changesets - new changesets 9d1c114e7797 + new changesets 9d1c114e7797 (1 drafts) (run 'hg heads' to see heads) $ hg -R ../other pull pulling from ssh://user@dummy/server @@ -128,7 +128,7 @@ added 1 changesets with 1 changes to 1 files obsmarker-exchange: 92 bytes received 1 new obsolescence markers - new changesets a5687ec59dd4 + new changesets a5687ec59dd4 (1 drafts) (run 'hg update' to get a working copy) some common hidden @@ -195,7 +195,7 @@ $ cat hg.pid >> $DAEMON_PIDS $ curl -s http://localhost:$HGPORT/?cmd=capabilities - _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob) + _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob) Check we cannot use pushkey for marker exchange anymore