This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10161

push: allow to specify multiple destinations
ClosedPublic

Authored by marmoute on Mar 11 2021, 11:52 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG066b8d8f75b8: push: allow to specify multiple destinations
Summary

I end up needing that on a regular basis and it turn out to be very simple to
implement. See documentation and test for details.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Mar 11 2021, 11:52 AM
danchr added a subscriber: danchr.Mar 11 2021, 12:12 PM
danchr added inline comments.
mercurial/commands.py
5666

DESTINATIONS should be plural; s/on /one/

Also, this seems a bit verbose. I'd suggest:

When passed multiple destinations, push will process them one after the other, but stop should an error occur.

baymax updated this revision to Diff 26252.Mar 11 2021, 12:45 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a comment.Mar 11 2021, 12:59 PM

Good idea, this is updated.

Alphare accepted this revision.Mar 16 2021, 5:52 AM
Alphare added a subscriber: Alphare.

I've been wanting this feature for a while, thanks!

baymax updated this revision to Diff 26485.Mar 17 2021, 11:01 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG066b8d8f75b8: push: allow to specify multiple destinations.Mar 17 2021, 1:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG066b8d8f75b8: push: allow to specify multiple destinations (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (31 lines)
Mtests/test-exchange-multi-source.t (203 lines)

Diff 26487

mercurial/commands.py

( (
b'', b'',
b'publish', b'publish',
False, False,
_(b'push the changeset as public (EXPERIMENTAL)'), _(b'push the changeset as public (EXPERIMENTAL)'),
), ),
] ]
+ remoteopts, + remoteopts,
_(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'), _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT, helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
helpbasic=True, helpbasic=True,
) )
def push(ui, repo, dest=None, **opts): def push(ui, repo, *dests, **opts):
"""push changes to the specified destination """push changes to the specified destination
Push changesets from the local repository to the specified Push changesets from the local repository to the specified
destination. destination.
This operation is symmetrical to pull: it is identical to a pull This operation is symmetrical to pull: it is identical to a pull
in the destination repository from the current one. in the destination repository from the current one.
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. Use the --all-bookmarks option for pushing all bookmark's name. Use the --all-bookmarks option for pushing all
current bookmarks. 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.
When passed multiple destinations, push will process them one after the
danchrUnsubmitted
Not Done

DESTINATIONS should be plural; s/on /one/

Also, this seems a bit verbose. I'd suggest:

When passed multiple destinations, push will process them one after the other, but stop should an error occur.

danchr: `DESTINATIONS` should be plural; `s/on /one/` Also, this seems a bit verbose. I'd suggest: >…
other, but stop should an error occur.
.. 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,
``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
pushvars can provide for user-overridable hooks as well as set debug pushvars can provide for user-overridable hooks as well as set debug
# 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:
# if we try to push a deleted bookmark, translate it to null # if we try to push a deleted bookmark, translate it to null
# this lets simultaneous -r, -b options continue working # this lets simultaneous -r, -b options continue working
opts.setdefault(b'rev', []).append(b"null") opts.setdefault(b'rev', []).append(b"null")
if True:
if not dests:
dests = [None]
some_pushed = False
result = 0
for dest in dests:
path = ui.getpath(dest, default=(b'default-push', b'default')) path = ui.getpath(dest, default=(b'default-push', b'default'))
if not path: if not path:
raise error.ConfigError( raise error.ConfigError(
_(b'default repository not configured!'), _(b'default repository not configured!'),
hint=_(b"see 'hg help config.paths'"), hint=_(b"see 'hg help config.paths'"),
) )
dest = path.pushloc or path.loc dest = path.pushloc or path.loc
branches = (path.branch, opts.get(b'branch') or []) branches = (path.branch, opts.get(b'branch') or [])
) )
repo._subtoppath = dest repo._subtoppath = dest
try: try:
# push subrepos depth-first for coherent ordering # push subrepos depth-first for coherent ordering
c = repo[b'.'] c = repo[b'.']
subs = c.substate # only repos that are committed subs = c.substate # only repos that are committed
for s in sorted(subs): for s in sorted(subs):
result = c.sub(s).push(opts) sub_result = c.sub(s).push(opts)
if result == 0: if sub_result == 0:
return not result return 1
finally: finally:
del repo._subtoppath del repo._subtoppath
opargs = dict( opargs = dict(
opts.get(b'opargs', {}) opts.get(b'opargs', {})
) # copy opargs since we may mutate it ) # copy opargs since we may mutate it
opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', [])) opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
pushop = exchange.push( pushop = exchange.push(
repo, repo,
other, other,
opts.get(b'force'), opts.get(b'force'),
revs=revs, revs=revs,
newbranch=opts.get(b'new_branch'), newbranch=opts.get(b'new_branch'),
bookmarks=opts.get(b'bookmark', ()), bookmarks=opts.get(b'bookmark', ()),
publish=opts.get(b'publish'), publish=opts.get(b'publish'),
opargs=opargs, opargs=opargs,
) )
result = not pushop.cgresult if pushop.cgresult == 0:
result = 1
elif pushop.cgresult is not None:
some_pushed = True
if pushop.bkresult is not None: if pushop.bkresult is not None:
if pushop.bkresult == 2: if pushop.bkresult == 2:
result = 2 result = 2
elif not result and pushop.bkresult: elif not result and pushop.bkresult:
result = 2 result = 2
if result:
break
finally: finally:
other.close() other.close()
if result == 0 and not some_pushed:
result = 1
return result return result
@command( @command(
b'recover', b'recover',
[ [
(b'', b'verify', False, b"run `hg verify` after successful recover"), (b'', b'verify', False, b"run `hg verify` after successful recover"),
], ],

tests/test-exchange-multi-source.t

adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 4 changes to 4 files added 4 changesets with 4 changes to 4 files
new changesets 4a2df7238c3b:40faebb2ec45 new changesets 4a2df7238c3b:40faebb2ec45
Test simple bare operation Test simple bare operation
========================== ==========================
pull
----
$ hg clone main-repo test-repo-bare --rev 0 -U $ hg clone main-repo test-repo-bare --rev 0 -U
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 4a2df7238c3b new changesets 4a2df7238c3b
$ hg pull -R test-repo-bare ./branch-E ./branch-G ./branch-H $ hg pull -R test-repo-bare ./branch-E ./branch-G ./branch-H
| | | |
| o F 5 | o F 5
|/ |/
o B 1 o B 1
| |
o A 0 o A 0
push
----
$ cp -R ./branch-E ./branch-E-push
$ cp -R ./branch-G ./branch-G-push
$ cp -R ./branch-H ./branch-H-push
$ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
pushing to ./branch-E-push
searching for changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
pushing to ./branch-G-push
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files (+2 heads)
pushing to ./branch-H-push
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files (+2 heads)
$ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 7
|
| o E 4
| |
| o D 3
|/
o C 2
|
| o G 6
| |
| o F 5
|/
o B 1
|
o A 0
$ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 7
|
| o E 6
| |
| o D 5
|/
o C 4
|
| o G 3
| |
| o F 2
|/
o B 1
|
o A 0
$ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o G 7
|
o F 6
|
| o E 5
| |
| o D 4
| |
| | o H 3
| |/
| o C 2
|/
o B 1
|
o A 0
$ rm -rf ./*-push
Test operation with a target Test operation with a target
============================ ============================
pull
----
$ hg clone main-repo test-repo-rev --rev 0 -U $ hg clone main-repo test-repo-rev --rev 0 -U
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 4a2df7238c3b new changesets 4a2df7238c3b
pulling an explicite revision pulling an explicite revision
| | | |
| o F 5 | o F 5
|/ |/
o B 1 o B 1
| |
o A 0 o A 0
push
----
We only push a specific branch with --rev
$ cp -R ./branch-E ./branch-E-push
$ cp -R ./branch-G ./branch-G-push
$ cp -R ./branch-H ./branch-H-push
$ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
pushing to ./branch-E-push
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
pushing to ./branch-G-push
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
pushing to ./branch-H-push
searching for changes
no changes found
$ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 5
|
| o E 4
| |
| o D 3
|/
o C 2
|
o B 1
|
o A 0
$ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 5
|
o C 4
|
| o G 3
| |
| o F 2
|/
o B 1
|
o A 0
$ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 3
|
o C 2
|
o B 1
|
o A 0
$ rm -rf ./*-push
Same push, but the first one is a no-op
$ cp -R ./branch-E ./branch-E-push
$ cp -R ./branch-G ./branch-G-push
$ cp -R ./branch-H ./branch-H-push
$ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
pushing to ./branch-G-push
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
pushing to ./branch-H-push
searching for changes
no changes found
pushing to ./branch-E-push
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -R ./branch-E-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 5
|
| o E 4
| |
| o D 3
|/
o C 2
|
o B 1
|
o A 0
$ hg log -R ./branch-G-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 5
|
o C 4
|
| o G 3
| |
| o F 2
|/
o B 1
|
o A 0
$ hg log -R ./branch-H-push -T '{desc} {rev}\n' --rev 'sort(all(), "topo")' -G
o H 3
|
o C 2
|
o B 1
|
o A 0
$ rm -rf ./*-push
Test with --update Test with --update
================== ==================
update without conflicts update without conflicts
------------------------ ------------------------
$ hg clone main-repo test-repo-update --rev 0 $ hg clone main-repo test-repo-update --rev 0