changeset 1968:37dd4928d042

merge with crew.

--- a/mercurial/commands.py	Fri Mar 17 09:48:43 2006 -0800
+++ b/mercurial/commands.py	Fri Mar 17 09:49:28 2006 -0800
@@ -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]
@@ -2415,11 +2425,11 @@
         [util.pathto(cwd, x) for x in n]
         for n in repo.changes(files=files, match=matchfn)]
 
-    changetypes = [(_('modified'), 'M', modified),
-                   (_('added'), 'A', added),
-                   (_('removed'), 'R', removed),
-                   (_('deleted'), '!', deleted),
-                   (_('unknown'), '?', unknown)]
+    changetypes = [('modified', 'M', modified),
+                   ('added', 'A', added),
+                   ('removed', 'R', removed),
+                   ('deleted', '!', deleted),
+                   ('unknown', '?', unknown)]
 
     end = opts['print0'] and '\0' or '\n'
 
@@ -2428,7 +2438,7 @@
         if opts['no_status']:
             format = "%%s%s" % end
         else:
-            format = "%s %%s%s" % (char, end);
+            format = "%s %%s%s" % (char, end)
 
         for f in changes:
             ui.write(format % f)
@@ -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,