diff --git a/hgext/infinitepush/__init__.py b/hgext/infinitepush/__init__.py --- a/hgext/infinitepush/__init__.py +++ b/hgext/infinitepush/__init__.py @@ -154,6 +154,18 @@ configitem = registrar.configitem(config configitem( b'infinitepush', + b'deprecation-message', + default=True, +) + +configitem( + b'infinitepush', + b'deprecation-abort', + default=True, +) + +configitem( + b'infinitepush', b'server', default=False, ) @@ -317,7 +329,20 @@ def _isserver(ui): return ui.configbool(b'infinitepush', b'server') +WARNING_MSG = b"""IMPORTANT: if you use this extension, please contact +mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be +unused and barring learning of users of this functionality, we drop this +extension in Mercurial 6.6. +""" + + def reposetup(ui, repo): + if ui.configbool(b'infinitepush', b'deprecation-message'): + ui.write_err(WARNING_MSG) + if ui.configbool(b'infinitepush', b'deprecation-abort'): + msg = b"USING EXTENSION INFINITE PUSH DESPITE PENDING DROP" + hint = b"contact mercurial-devel@mercurial-scm.org" + raise error.Abort(msg, hint=hint) if _isserver(ui) and repo.local(): repo.bundlestore = bundlestore(repo) diff --git a/tests/library-infinitepush.sh b/tests/library-infinitepush.sh --- a/tests/library-infinitepush.sh +++ b/tests/library-infinitepush.sh @@ -16,6 +16,9 @@ setupcommon() { infinitepush= [infinitepush] branchpattern=re:scratch/.* +deprecation-abort=no +deprecation-message=yes + EOF } diff --git a/tests/test-infinitepush-bundlestore.t b/tests/test-infinitepush-bundlestore.t --- a/tests/test-infinitepush-bundlestore.t +++ b/tests/test-infinitepush-bundlestore.t @@ -17,6 +17,10 @@ Create an ondisk bundlestore in .hg/scra > hg ci -m "$1" > } $ hg init repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd repo Check that we can send a scratch on the server and it does not show there in @@ -24,22 +28,82 @@ the history but is stored on disk $ setupserver $ cd .. $ hg clone ssh://user@dummy/repo client -q + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd client $ mkcommit initialcommit + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files $ mkcommit scratchcommit + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . -B scratch/mybranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 1 commit: remote: 20759b6926ce scratchcommit $ hg log -G + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ changeset: 1:20759b6926ce | bookmark: scratch/mybranch | tag: tip @@ -53,6 +117,10 @@ the history but is stored on disk summary: initialcommit $ hg log -G -R ../repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o changeset: 0:67145f466344 tag: tip user: test @@ -76,10 +144,46 @@ From another client we can get the scrat $ cd .. $ hg clone ssh://user@dummy/repo client2 -q + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd client2 $ hg pull -B scratch/mybranch --traceback + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -87,6 +191,10 @@ From another client we can get the scrat new changesets 20759b6926ce (1 drafts) (run 'hg update' to get a working copy) $ hg log -G + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o changeset: 1:20759b6926ce | bookmark: scratch/mybranch | tag: tip @@ -105,17 +213,45 @@ Push to non-scratch bookmark $ cd client $ hg up 0 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit newcommit + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. created new head $ hg push -r . + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ newcommit public | | o scratchcommit draft scratch/mybranch @@ -126,14 +262,46 @@ Push to non-scratch bookmark Push to scratch branch $ cd ../client2 $ hg up -q scratch/mybranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ mkcommit 'new scratch commit' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . -B scratch/mybranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 2 commits: remote: 20759b6926ce scratchcommit remote: 1de1d7d92f89 new scratch commit $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ new scratch commit draft scratch/mybranch | o scratchcommit draft @@ -149,12 +317,32 @@ Push to scratch branch Push scratch bookmark with no new revs $ hg push -r . -B scratch/anotherbranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 2 commits: remote: 20759b6926ce scratchcommit remote: 1de1d7d92f89 new scratch commit $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ new scratch commit draft scratch/anotherbranch scratch/mybranch | o scratchcommit draft @@ -168,10 +356,38 @@ Push scratch bookmark with no new revs Pull scratch and non-scratch bookmark at the same time $ hg -R ../repo book newbook + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd ../client $ hg pull -B newbook -B scratch/mybranch --traceback + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -180,6 +396,10 @@ Pull scratch and non-scratch bookmark at new changesets 1de1d7d92f89 (1 drafts) (run 'hg update' to get a working copy) $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o new scratch commit draft scratch/mybranch | | @ newcommit public @@ -192,8 +412,24 @@ Pull scratch and non-scratch bookmark at Push scratch revision without bookmark with --bundle-store $ hg up -q tip + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ mkcommit scratchcommitnobook + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ scratchcommitnobook draft | o new scratch commit draft scratch/mybranch @@ -205,13 +441,33 @@ Push scratch revision without bookmark w o initialcommit public $ hg push -r . --bundle-store + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 3 commits: remote: 20759b6926ce scratchcommit remote: 1de1d7d92f89 new scratch commit remote: 2b5d271c7e0d scratchcommitnobook $ hg -R ../repo log -G -T '{desc} {phase}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o newcommit public | o initialcommit public @@ -224,15 +480,43 @@ Push scratch revision without bookmark w Test with pushrebase $ mkcommit scratchcommitwithpushrebase + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . -B scratch/mybranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 4 commits: remote: 20759b6926ce scratchcommit remote: 1de1d7d92f89 new scratch commit remote: 2b5d271c7e0d scratchcommitnobook remote: d8c4f54ab678 scratchcommitwithpushrebase $ hg -R ../repo log -G -T '{desc} {phase}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o newcommit public | o initialcommit public @@ -245,9 +529,33 @@ Test with pushrebase Change the order of pushrebase and infinitepush $ mkcommit scratchcommitwithpushrebase2 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . -B scratch/mybranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 5 commits: remote: 20759b6926ce scratchcommit remote: 1de1d7d92f89 new scratch commit @@ -255,6 +563,10 @@ Change the order of pushrebase and infin remote: d8c4f54ab678 scratchcommitwithpushrebase remote: 6c10d49fe927 scratchcommitwithpushrebase2 $ hg -R ../repo log -G -T '{desc} {phase}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o newcommit public | o initialcommit public @@ -269,6 +581,10 @@ Change the order of pushrebase and infin Non-fastforward scratch bookmark push $ hg log -GT "{rev}:{node} {desc}\n" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ 6:6c10d49fe92751666c40263f96721b918170d3da scratchcommitwithpushrebase2 | o 5:d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 scratchcommitwithpushrebase @@ -284,12 +600,28 @@ Non-fastforward scratch bookmark push o 0:67145f4663446a9580364f70034fea6e21293b6f initialcommit $ hg up 6c10d49fe927 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo 1 > amend $ hg add amend + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg ci --amend -m 'scratch amended commit' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. saved backup bundle to $TESTTMP/client/.hg/strip-backup/6c10d49fe927-c99ffec5-amend.hg $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ scratch amended commit draft scratch/mybranch | o scratchcommitwithpushrebase draft @@ -309,8 +641,24 @@ Non-fastforward scratch bookmark push scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da $ hg push -r . -B scratch/mybranch + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 5 commits: remote: 20759b6926ce scratchcommit remote: 1de1d7d92f89 new scratch commit @@ -321,6 +669,10 @@ Non-fastforward scratch bookmark push scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 scratch/mybranch 8872775dd97a750e1533dc1fbbca665644b32547 $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ scratch amended commit draft scratch/mybranch | o scratchcommitwithpushrebase draft @@ -343,22 +695,54 @@ Check that push path is not ignored. Add Checkout last non-scrath commit $ hg up 91894e11e8255 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 1 files updated, 0 files merged, 6 files removed, 0 files unresolved $ mkcommit peercommit + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. Use --force because this push creates new head $ hg push peer -r . -f + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/client2 + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 2 changes to 2 files (+1 heads) $ hg -R ../repo log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o newcommit public | o initialcommit public $ hg -R ../client2 log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o peercommit public | o newcommit public diff --git a/tests/test-infinitepush-ci.t b/tests/test-infinitepush-ci.t --- a/tests/test-infinitepush-ci.t +++ b/tests/test-infinitepush-ci.t @@ -19,14 +19,40 @@ Setup $ echo "pushtobundlestore = True" >> .hg/hgrc $ echo "[extensions]" >> .hg/hgrc $ echo "infinitepush=" >> .hg/hgrc + $ echo "[infinitepush]" >> .hg/hgrc + $ echo "deprecation-abort=no" >> .hg/hgrc $ echo initialcommit > initialcommit $ hg ci -Aqm "initialcommit" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact (chg !) + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be (chg !) + unused and barring learning of users of this functionality, we drop this (chg !) + extension in Mercurial 6.6. (chg !) $ hg phase --public . + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd .. $ hg clone repo client -q + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg clone repo client2 -q + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg clone ssh://user@dummy/repo client3 -q + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. $ cd client Pushing a new commit from the client to the server @@ -42,8 +68,16 @@ Pushing a new commit from the client to $ hg push pushing to $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes storing changesets on the bundlestore + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing 1 commit: 6cb0989601f1 added a @@ -74,6 +108,10 @@ Checking that the commit was not applied ------------------------------------------------------------------ $ hg glog + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. @ 0:67145f466344 initialcommit public @@ -81,6 +119,10 @@ Applying the changeset from the bundlest -------------------------------------------- $ hg unbundle .hg/scratchbranches/filebundlestore/3b/41/3b414252ff8acab801318445d88ff48faf4a28c3 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -89,6 +131,10 @@ Applying the changeset from the bundlest (run 'hg update' to get a working copy) $ hg glog + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o 1:6cb0989601f1 added a | public @ 0:67145f466344 initialcommit @@ -114,8 +160,16 @@ Pushing more changesets from the local r $ hg push pushing to $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes storing changesets on the bundlestore + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing 2 commits: eaba929e866c added b bf8a6e3011b3 added c @@ -124,6 +178,10 @@ Checking that changesets are not applied ------------------------------------------------------ $ hg glog -R ../repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o 1:6cb0989601f1 added a | public @ 0:67145f466344 initialcommit @@ -146,8 +204,16 @@ Pushing more changesets to the server XXX: we should have pushed only the parts which are not in bundlestore $ hg push pushing to $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes storing changesets on the bundlestore + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing 4 commits: eaba929e866c added b bf8a6e3011b3 added c @@ -166,6 +232,10 @@ Checking if `hg pull` pulls something or ----------------------------------------------------------------------- $ hg incoming + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. comparing with $TESTTMP/repo searching for changes no changes found @@ -173,6 +243,10 @@ Checking if `hg pull` pulls something or $ hg pull pulling from $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes no changes found @@ -184,6 +258,10 @@ Pulling the revision which is applied $ cd ../client2 $ hg pull -r 6cb0989601f1 pulling from $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes adding changesets adding manifests @@ -203,6 +281,10 @@ client side wrapping $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef pulling from $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef' [10] $ hg glog @@ -221,6 +303,10 @@ Pulling the revision which is applied $ cd ../client3 $ hg pull -r 6cb0989601f1 pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. searching for changes adding changesets adding manifests @@ -240,13 +326,25 @@ Trying to specify short hash XXX: we should support this $ hg pull -r b4e4bce660512 pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. abort: unknown revision 'b4e4bce660512' [255] XXX: we should show better message when the pull is happening from bundlestore $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -288,8 +386,16 @@ creating a draft commit $ hg push pushing to $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes storing changesets on the bundlestore + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing 5 commits: eaba929e866c added b bf8a6e3011b3 added c @@ -315,6 +421,10 @@ applying the bundle on the server to che eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f $ hg unbundle .hg/scratchbranches/filebundlestore/28/0a/280a46a259a268f0e740c81c5a7751bdbfaec85f + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -323,6 +433,10 @@ applying the bundle on the server to che (run 'hg update' to get a working copy) $ hg glog + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o 6:9b42578d4447 added f | draft o 5:b4e4bce66051 added e @@ -374,8 +488,16 @@ enabling obsmarkers and rebase extension $ hg push -f pushing to $TESTTMP/repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes storing changesets on the bundlestore + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing 1 commit: 99949238d9ac added f @@ -399,6 +521,14 @@ Unbundling on server to see obsmarkers b eaba929e866c59bc9a6aada5a9dd2f6990db83c0 280a46a259a268f0e740c81c5a7751bdbfaec85f $ hg glog + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact (chg !) + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be (chg !) + unused and barring learning of users of this functionality, we drop this (chg !) + extension in Mercurial 6.6. (chg !) o 6:9b42578d4447 added f | draft o 5:b4e4bce66051 added e @@ -415,6 +545,10 @@ Unbundling on server to see obsmarkers b public $ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -425,6 +559,10 @@ Unbundling on server to see obsmarkers b (run 'hg heads' to see heads, 'hg merge' to merge) $ hg glog + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o 7:99949238d9ac added f | draft | o 5:b4e4bce66051 added e diff --git a/tests/test-infinitepush.t b/tests/test-infinitepush.t --- a/tests/test-infinitepush.t +++ b/tests/test-infinitepush.t @@ -13,35 +13,107 @@ Setup $ cp $HGRCPATH $TESTTMP/defaulthgrc $ setupcommon $ hg init repo + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd repo $ setupserver $ echo initialcommit > initialcommit $ hg ci -Aqm "initialcommit" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg phase --public . + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd .. $ hg clone ssh://user@dummy/repo client -q + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. Create two heads. Push first head alone, then two heads together. Make sure that multihead push works. $ cd client $ echo multihead1 > multihead1 $ hg add multihead1 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg ci -m "multihead1" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg up null + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ echo multihead2 > multihead2 $ hg ci -Am "multihead2" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding multihead2 created new head $ hg push -r . --bundle-store + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 1 commit: remote: ee4802bf6864 multihead2 $ hg push -r '1:2' --bundle-store + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 2 commits: remote: bc22f9a30a82 multihead1 remote: ee4802bf6864 multihead2 @@ -51,35 +123,123 @@ multihead push works. Create two new scratch bookmarks $ hg up 0 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo scratchfirstpart > scratchfirstpart $ hg ci -Am "scratchfirstpart" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding scratchfirstpart created new head $ hg push -r . -B scratch/firstpart + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 1 commit: remote: 176993b87e39 scratchfirstpart $ hg up 0 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo scratchsecondpart > scratchsecondpart $ hg ci -Am "scratchsecondpart" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding scratchsecondpart created new head $ hg push -r . -B scratch/secondpart + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 1 commit: remote: 8db3891c220e scratchsecondpart Pull two bookmarks from the second client $ cd .. $ hg clone ssh://user@dummy/repo client2 -q + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd client2 $ hg pull -B scratch/firstpart -B scratch/secondpart + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -90,28 +250,88 @@ Pull two bookmarks from the second clien new changesets * (glob) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log -r scratch/secondpart -T '{node}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 8db3891c220e216f6da214e8254bd4371f55efca (no-eol) $ hg log -r scratch/firstpart -T '{node}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 176993b87e39bd88d66a2cccadabe33f0b346339 (no-eol) Make two commits to the scratch branch $ echo testpullbycommithash1 > testpullbycommithash1 $ hg ci -Am "testpullbycommithash1" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. adding testpullbycommithash1 created new head $ hg log -r '.' -T '{node}\n' > ../testpullbycommithash1 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ echo testpullbycommithash2 > testpullbycommithash2 $ hg ci -Aqm "testpullbycommithash2" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . -B scratch/mybranch -q + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. Create third client and pull by commit hash. Make sure testpullbycommithash2 has not fetched $ cd .. $ hg clone ssh://user@dummy/repo client3 -q + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd client3 $ hg pull -r `cat ../testpullbycommithash1` + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -119,6 +339,10 @@ Make sure testpullbycommithash2 has not new changesets 33910bfe6ffe (1 drafts) (run 'hg update' to get a working copy) $ hg log -G -T '{desc} {phase} {bookmarks}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o testpullbycommithash1 draft | @ initialcommit public @@ -128,10 +352,30 @@ Make sure phase on the client is public. $ cd ../repo $ echo publiccommit > publiccommit $ hg ci -Aqm "publiccommit" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg phase --public . + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ cd ../client3 $ hg pull + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes adding changesets adding manifests @@ -140,6 +384,10 @@ Make sure phase on the client is public. new changesets a79b6597f322 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg log -G -T '{desc} {phase} {bookmarks} {node|short}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. o publiccommit public a79b6597f322 | | o testpullbycommithash1 draft 33910bfe6ffe @@ -147,18 +395,66 @@ Make sure phase on the client is public. @ initialcommit public 67145f466344 $ hg up a79b6597f322 + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo scratchontopofpublic > scratchontopofpublic $ hg ci -Aqm "scratchontopofpublic" + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. $ hg push -r . -B scratch/scratchontopofpublic + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pushing to ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. remote: pushing 1 commit: remote: c70aee6da07d scratchontopofpublic $ cd ../client2 $ hg pull -B scratch/scratchontopofpublic + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. pulling from ssh://user@dummy/repo + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. searching for changes + remote: IMPORTANT: if you use this extension, please contact + remote: mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + remote: unused and barring learning of users of this functionality, we drop this + remote: extension in Mercurial 6.6. adding changesets adding manifests adding file changes @@ -169,4 +465,8 @@ Make sure phase on the client is public. new changesets a79b6597f322:c70aee6da07d (1 drafts) (run 'hg heads .' to see heads, 'hg merge' to merge) $ hg log -r scratch/scratchontopofpublic -T '{phase}' + IMPORTANT: if you use this extension, please contact + mercurial-devel@mercurial-scm.org IMMEDIATELY. This extension is believed to be + unused and barring learning of users of this functionality, we drop this + extension in Mercurial 6.6. draft (no-eol)