| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (11 lines) | |||
| M | tests/test-bookmarks-pushpull.t (30 lines) | |||
| M | tests/test-completion.t (2 lines) |
| ( | ( | ||||
| b'r', | b'r', | ||||
| b'rev', | b'rev', | ||||
| [], | [], | ||||
| _(b'a changeset intended to be included in the destination'), | _(b'a changeset intended to be included in the destination'), | ||||
| _(b'REV'), | _(b'REV'), | ||||
| ), | ), | ||||
| (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')), | (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')), | ||||
| (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")), | |||||
| ( | ( | ||||
| b'b', | b'b', | ||||
| b'branch', | b'branch', | ||||
| [], | [], | ||||
| _(b'a specific branch you would like to push'), | _(b'a specific branch you would like to push'), | ||||
| _(b'BRANCH'), | _(b'BRANCH'), | ||||
| ), | ), | ||||
| (b'', b'new-branch', False, _(b'allow pushing a new branch')), | (b'', b'new-branch', False, _(b'allow pushing a new branch')), | ||||
| almost always cause confusion for collaborators. | almost always cause confusion for collaborators. | ||||
| If -r/--rev is used, the specified revision and all its ancestors | If -r/--rev is used, the specified revision and all its ancestors | ||||
| will be pushed to the remote repository. | will be pushed to the remote repository. | ||||
| If -B/--bookmark is used, the specified bookmarked revision, its | If -B/--bookmark is used, the specified bookmarked revision, its | ||||
| ancestors, and the bookmark will be pushed to the remote | ancestors, and the bookmark will be pushed to the remote | ||||
| repository. Specifying ``.`` is equivalent to specifying the active | repository. Specifying ``.`` is equivalent to specifying the active | ||||
| bookmark's name. | bookmark's name. Use the --all-bookmarks option for pushing all | ||||
| current bookmarks. | |||||
| Please see :hg:`help urls` for important details about ``ssh://`` | Please see :hg:`help urls` for important details about ``ssh://`` | ||||
| URLs. If DESTINATION is omitted, a default path will be used. | URLs. If DESTINATION is omitted, a default path will be used. | ||||
| .. container:: verbose | .. container:: verbose | ||||
| The --pushvars option sends strings to the server that become | The --pushvars option sends strings to the server that become | ||||
| environment variables prepended with ``HG_USERVAR_``. For example, | environment variables prepended with ``HG_USERVAR_``. For example, | ||||
| [push] | [push] | ||||
| pushvars.server = true | pushvars.server = true | ||||
| Returns 0 if push was successful, 1 if nothing to push. | Returns 0 if push was successful, 1 if nothing to push. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if opts.get(b'all_bookmarks'): | |||||
| cmdutil.check_incompatible_arguments( | |||||
| opts, b'all_bookmarks', [b'bookmark', b'rev'], | |||||
| ) | |||||
| opts[b'bookmark'] = list(repo._bookmarks) | |||||
| if opts.get(b'bookmark'): | if opts.get(b'bookmark'): | ||||
| ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push') | ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push') | ||||
| for b in opts[b'bookmark']: | for b in opts[b'bookmark']: | ||||
| # translate -B options to -r so changesets get pushed | # translate -B options to -r so changesets get pushed | ||||
| b = repo._bookmarks.expandname(b) | b = repo._bookmarks.expandname(b) | ||||
| if b in repo._bookmarks: | if b in repo._bookmarks: | ||||
| opts.setdefault(b'rev', []).append(b) | opts.setdefault(b'rev', []).append(b) | ||||
| else: | else: | ||||
| Pushing the bookmark "foo" now fails as it contains a secret changeset | Pushing the bookmark "foo" now fails as it contains a secret changeset | ||||
| $ hg push -r foo | $ hg push -r foo | ||||
| pushing to $TESTTMP/issue6159remote | pushing to $TESTTMP/issue6159remote | ||||
| searching for changes | searching for changes | ||||
| no changes found (ignored 1 secret changesets) | no changes found (ignored 1 secret changesets) | ||||
| abort: cannot push bookmark foo as it points to a secret changeset | abort: cannot push bookmark foo as it points to a secret changeset | ||||
| [255] | [255] | ||||
| Test pushing all bookmarks | |||||
| $ hg init $TESTTMP/ab1 | |||||
| $ cd $TESTTMP/ab1 | |||||
| $ "$PYTHON" $TESTDIR/seq.py 1 5 | while read i; do | |||||
| > echo $i > test && hg ci -Am test | |||||
| > done | |||||
| adding test | |||||
| $ hg clone -U . ../ab2 | |||||
| $ hg book -r 1 A; hg book -r 2 B; hg book -r 3 C | |||||
| $ hg push ../ab2 | |||||
| pushing to ../ab2 | |||||
| searching for changes | |||||
| no changes found | |||||
| [1] | |||||
| $ hg push --all-bookmarks -r 1 ../ab2 | |||||
| abort: cannot specify both --all-bookmarks and --rev | |||||
| [255] | |||||
| $ hg push --all-bookmarks -B A ../ab2 | |||||
| abort: cannot specify both --all-bookmarks and --bookmark | |||||
| [255] | |||||
| $ hg push --all-bookmarks ../ab2 | |||||
| pushing to ../ab2 | |||||
| searching for changes | |||||
| no changes found | |||||
| exporting bookmark A | |||||
| exporting bookmark B | |||||
| exporting bookmark C | |||||
| [1] | |||||
| log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude | log: follow, follow-first, date, copies, keyword, rev, line-range, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, graph, style, template, include, exclude | ||||
| manifest: rev, all, template | manifest: rev, all, template | ||||
| merge: force, rev, preview, abort, tool | merge: force, rev, preview, abort, tool | ||||
| outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos | outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos | ||||
| parents: rev, style, template | parents: rev, style, template | ||||
| paths: template | paths: template | ||||
| phase: public, draft, secret, force, rev | phase: public, draft, secret, force, rev | ||||
| pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure | pull: update, force, confirm, rev, bookmark, branch, ssh, remotecmd, insecure | ||||
| push: force, rev, bookmark, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure | push: force, rev, bookmark, all-bookmarks, branch, new-branch, pushvars, publish, ssh, remotecmd, insecure | ||||
| recover: verify | recover: verify | ||||
| remove: after, force, subrepos, include, exclude, dry-run | remove: after, force, subrepos, include, exclude, dry-run | ||||
| rename: after, at-rev, force, include, exclude, dry-run | rename: after, at-rev, force, include, exclude, dry-run | ||||
| resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template | resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template | ||||
| revert: all, date, rev, no-backup, interactive, include, exclude, dry-run | revert: all, date, rev, no-backup, interactive, include, exclude, dry-run | ||||
| rollback: dry-run, force | rollback: dry-run, force | ||||
| root: template | root: template | ||||
| serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos | serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos | ||||