Mercurial > hg
comparison tests/test-infinitepush-bundlestore.t @ 37199:c5687ce3b411
infinitepush: drop the `--to` flag to push and use `-B` instead
The extension added a `--to` flag to specify the bookmark to which revs should
be pushed. This patch deletes that flag and instead uses the `-B` flag. After
this patch, bookmark passed as `-B` is parsed and if it matches the infinitepush
bookmark pattern, we consider that push as infinitepush.
This is still not the best of what we can do. Later patches in the series will
drop the use of `-B` flag and will instead handle things at bookmark bundle2
part. Plugging these logic to bookmark bundle2 part will also get rid of the
scratchbranchparttype bundle2 part.
Differential Revision: https://phab.mercurial-scm.org/D2108
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 09 Feb 2018 15:49:46 +0530 |
| parents | 78c2e9418278 |
| children | f083e7fd6313 |
comparison
equal
deleted
inserted
replaced
| 37198:78c2e9418278 | 37199:c5687ce3b411 |
|---|---|
| 24 remote: adding changesets | 24 remote: adding changesets |
| 25 remote: adding manifests | 25 remote: adding manifests |
| 26 remote: adding file changes | 26 remote: adding file changes |
| 27 remote: added 1 changesets with 1 changes to 1 files | 27 remote: added 1 changesets with 1 changes to 1 files |
| 28 $ mkcommit scratchcommit | 28 $ mkcommit scratchcommit |
| 29 $ hg push -r . --to scratch/mybranch | 29 $ hg push -r . -B scratch/mybranch |
| 30 pushing to ssh://user@dummy/repo | 30 pushing to ssh://user@dummy/repo |
| 31 searching for changes | 31 searching for changes |
| 32 remote: pushing 1 commit: | 32 remote: pushing 1 commit: |
| 33 remote: 20759b6926ce scratchcommit | 33 remote: 20759b6926ce scratchcommit |
| 34 $ hg log -G | 34 $ hg log -G |
| 117 | 117 |
| 118 Push to scratch branch | 118 Push to scratch branch |
| 119 $ cd ../client2 | 119 $ cd ../client2 |
| 120 $ hg up -q scratch/mybranch | 120 $ hg up -q scratch/mybranch |
| 121 $ mkcommit 'new scratch commit' | 121 $ mkcommit 'new scratch commit' |
| 122 $ hg push -r . --to scratch/mybranch | 122 $ hg push -r . -B scratch/mybranch |
| 123 pushing to ssh://user@dummy/repo | 123 pushing to ssh://user@dummy/repo |
| 124 searching for changes | 124 searching for changes |
| 125 remote: pushing 2 commits: | 125 remote: pushing 2 commits: |
| 126 remote: 20759b6926ce scratchcommit | 126 remote: 20759b6926ce scratchcommit |
| 127 remote: 1de1d7d92f89 new scratch commit | 127 remote: 1de1d7d92f89 new scratch commit |
| 138 | 138 |
| 139 $ scratchbookmarks | 139 $ scratchbookmarks |
| 140 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | 140 scratch/mybranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
| 141 | 141 |
| 142 Push scratch bookmark with no new revs | 142 Push scratch bookmark with no new revs |
| 143 $ hg push -r . --to scratch/anotherbranch | 143 $ hg push -r . -B scratch/anotherbranch |
| 144 pushing to ssh://user@dummy/repo | 144 pushing to ssh://user@dummy/repo |
| 145 searching for changes | 145 searching for changes |
| 146 remote: pushing 2 commits: | 146 remote: pushing 2 commits: |
| 147 remote: 20759b6926ce scratchcommit | 147 remote: 20759b6926ce scratchcommit |
| 148 remote: 1de1d7d92f89 new scratch commit | 148 remote: 1de1d7d92f89 new scratch commit |
| 214 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3 | 214 20759b6926ce827d5a8c73eb1fa9726d6f7defb2 66fa08ff107451320512817bed42b7f467a1bec3 |
| 215 2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3 | 215 2b5d271c7e0d25d811359a314d413ebcc75c9524 66fa08ff107451320512817bed42b7f467a1bec3 |
| 216 | 216 |
| 217 Test with pushrebase | 217 Test with pushrebase |
| 218 $ mkcommit scratchcommitwithpushrebase | 218 $ mkcommit scratchcommitwithpushrebase |
| 219 $ hg push -r . --to scratch/mybranch | 219 $ hg push -r . -B scratch/mybranch |
| 220 pushing to ssh://user@dummy/repo | 220 pushing to ssh://user@dummy/repo |
| 221 searching for changes | 221 searching for changes |
| 222 remote: pushing 4 commits: | 222 remote: pushing 4 commits: |
| 223 remote: 20759b6926ce scratchcommit | 223 remote: 20759b6926ce scratchcommit |
| 224 remote: 1de1d7d92f89 new scratch commit | 224 remote: 1de1d7d92f89 new scratch commit |
| 235 2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 | 235 2b5d271c7e0d25d811359a314d413ebcc75c9524 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 |
| 236 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 | 236 d8c4f54ab678fd67cb90bb3f272a2dc6513a59a7 e3cb2ac50f9e1e6a5ead3217fc21236c84af4397 |
| 237 | 237 |
| 238 Change the order of pushrebase and infinitepush | 238 Change the order of pushrebase and infinitepush |
| 239 $ mkcommit scratchcommitwithpushrebase2 | 239 $ mkcommit scratchcommitwithpushrebase2 |
| 240 $ hg push -r . --to scratch/mybranch | 240 $ hg push -r . -B scratch/mybranch |
| 241 pushing to ssh://user@dummy/repo | 241 pushing to ssh://user@dummy/repo |
| 242 searching for changes | 242 searching for changes |
| 243 remote: pushing 5 commits: | 243 remote: pushing 5 commits: |
| 244 remote: 20759b6926ce scratchcommit | 244 remote: 20759b6926ce scratchcommit |
| 245 remote: 1de1d7d92f89 new scratch commit | 245 remote: 1de1d7d92f89 new scratch commit |
| 298 | 298 |
| 299 | 299 |
| 300 $ scratchbookmarks | 300 $ scratchbookmarks |
| 301 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 | 301 scratch/anotherbranch 1de1d7d92f8965260391d0513fe8a8d5973d3042 |
| 302 scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da | 302 scratch/mybranch 6c10d49fe92751666c40263f96721b918170d3da |
| 303 $ hg push -r . --to scratch/mybranch | 303 $ hg push -r . -B scratch/mybranch |
| 304 pushing to ssh://user@dummy/repo | 304 pushing to ssh://user@dummy/repo |
| 305 searching for changes | 305 searching for changes |
| 306 remote: non-forward push | 306 remote: non-forward push |
| 307 remote: (use --non-forward-move to override) | 307 remote: (use --non-forward-move to override) |
| 308 abort: push failed on remote | 308 abort: push failed on remote |
| 309 [255] | 309 [255] |
| 310 | 310 |
| 311 $ hg push -r . --to scratch/mybranch --non-forward-move | 311 $ hg push -r . -B scratch/mybranch --non-forward-move |
| 312 pushing to ssh://user@dummy/repo | 312 pushing to ssh://user@dummy/repo |
| 313 searching for changes | 313 searching for changes |
| 314 remote: pushing 5 commits: | 314 remote: pushing 5 commits: |
| 315 remote: 20759b6926ce scratchcommit | 315 remote: 20759b6926ce scratchcommit |
| 316 remote: 1de1d7d92f89 new scratch commit | 316 remote: 1de1d7d92f89 new scratch commit |