Mercurial > hg
changeset 1965:62aa1b90414f
add remotecmd/ssh option support to incoming/outgoing
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 16 Mar 2006 06:58:15 +0100 |
| parents | 778281d46bb2 |
| children | f8b0e73e320f |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 18 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Mar 15 11:28:00 2006 -0800 +++ b/mercurial/commands.py Thu Mar 16 06:58:15 2006 +0100 @@ -1765,6 +1765,11 @@ twice if the incoming is followed by a pull. """ source = ui.expandpath(source) + if opts['ssh']: + ui.setconfig("ui", "ssh", opts['ssh']) + if opts['remotecmd']: + ui.setconfig("ui", "remotecmd", opts['remotecmd']) + other = hg.repository(ui, source) incoming = repo.findincoming(other, force=opts["force"]) if not incoming: @@ -1977,6 +1982,11 @@ See pull for valid source format details. """ dest = ui.expandpath(dest) + if opts['ssh']: + ui.setconfig("ui", "ssh", opts['ssh']) + if opts['remotecmd']: + ui.setconfig("ui", "remotecmd", opts['remotecmd']) + other = hg.repository(ui, dest) o = repo.findoutgoing(other, force=opts['force']) o = repo.changelog.nodesbetween(o)[0] @@ -2764,7 +2774,10 @@ ('n', 'newest-first', None, _('show newest record first')), ('', 'bundle', '', _('file to store the bundles into')), ('p', 'patch', None, _('show patch')), - ('', 'template', '', _('display with template'))], + ('', 'template', '', _('display with template')), + ('e', 'ssh', '', _('specify ssh command to use')), + ('', 'remotecmd', '', + _('specify hg command to run on the remote side'))], _('hg incoming [-p] [-n] [-M] [--bundle FILENAME] [SOURCE]')), "^init": (init, [], _('hg init [DEST]')), "locate": @@ -2799,7 +2812,10 @@ ('p', 'patch', None, _('show patch')), ('', 'style', '', _('display using template map file')), ('n', 'newest-first', None, _('show newest record first')), - ('', 'template', '', _('display with template'))], + ('', 'template', '', _('display with template')), + ('e', 'ssh', '', _('specify ssh command to use')), + ('', 'remotecmd', '', + _('specify hg command to run on the remote side'))], _('hg outgoing [-M] [-p] [-n] [DEST]')), "^parents": (parents,