Patchwork [1,of,4,STABLE,V2] hg-ssh: copy doc string to man page

login
register
mail settings
Submitter Sean Farley
Date May 7, 2016, 6:40 a.m.
Message ID <de8ba4192ec5186ac866.1462603231@laptop.local>
Download mbox | patch
Permalink /patch/14961/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Sean Farley - May 7, 2016, 6:40 a.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1462601021 25200
#      Fri May 06 23:03:41 2016 -0700
# Branch stable
# Node ID de8ba4192ec5186ac866e87fe35e894c01224df4
# Parent  77de985d7c91c67650d9fba0e4b21dfdbd894eeb
# EXP-Topic docker-ppa
hg-ssh: copy doc string to man page

This corrects a warning from lintian that we're shipping an executable without
a man page. Since there is a doc string in the text, let's use that for the man
page.
Yuya Nishihara - May 8, 2016, 12:51 p.m.
On Fri, 06 May 2016 23:40:33 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1462141601 25200
> #      Sun May 01 15:26:41 2016 -0700
> # Branch stable
> # Node ID cb7650bb00cd6e1d41f27df3278eb9adc8b6be4d
> # Parent  47bd6b0f7bd6405cf76c575760ebc8a69613fff7
> # EXP-Topic docker-ppa
> debian: forgot to make debian/rules executable in 6b95a623ec90

Pushed the series to the committed repo, thanks.

> diff --git a/contrib/debian/rules b/contrib/debian/rules
> old mode 100644
> new mode 100755

Sorry, I noticed it before, but I didn't care since exec bit was fixed by
debuild.

Patch

diff --git a/doc/gendoc.py b/doc/gendoc.py
--- a/doc/gendoc.py
+++ b/doc/gendoc.py
@@ -134,10 +134,11 @@  def showdoc(ui):
 
 def showtopic(ui, topic):
     extrahelptable = [
         (["common"], '', loaddoc('common')),
         (["hg.1"], '', loaddoc('hg.1')),
+        (["hg-ssh.8"], '', loaddoc('hg-ssh.8')),
         (["hgignore.5"], '', loaddoc('hgignore.5')),
         (["hgrc.5"], '', loaddoc('hgrc.5')),
         (["hgignore.5.gendoc"], '', loaddoc('hgignore')),
         (["hgrc.5.gendoc"], '', loaddoc('config')),
     ]
diff --git a/mercurial/help/hg-ssh.8.txt b/mercurial/help/hg-ssh.8.txt
new file mode 100644
--- /dev/null
+++ b/mercurial/help/hg-ssh.8.txt
@@ -0,0 +1,71 @@ 
+========
+ hg-ssh
+========
+
+----------------------------------------
+restricted ssh login shell for Mercurial
+----------------------------------------
+
+:Author:         Thomas Arendsen Hein <thomas@intevation.de>
+:Organization:   Mercurial
+:Manual section: 8
+:Manual group:   Mercurial Manual
+
+.. contents::
+   :backlinks: top
+   :class: htmlonly
+   :depth: 1
+
+Synopsis
+""""""""
+**hg-ssh** repositories...
+
+Description
+"""""""""""
+**hg-ssh** is a wrapper for ssh access to a limited set of mercurial repos.
+
+To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8):
+command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ...
+(probably together with these other useful options:
+no-port-forwarding,no-X11-forwarding,no-agent-forwarding)
+
+This allows pull/push over ssh from/to the repositories given as arguments.
+
+If all your repositories are subdirectories of a common directory, you can
+allow shorter paths with:
+command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"
+
+You can use pattern matching of your normal shell, e.g.:
+command="cd repos && hg-ssh user/thomas/* projects/{mercurial,foo}"
+
+You can also add a --read-only flag to allow read-only access to a key, e.g.:
+command="hg-ssh --read-only repos/\*"
+
+Bugs
+""""
+Probably lots, please post them to the mailing list (see Resources_
+below) when you find them.
+
+See Also
+""""""""
+|hg(1)|_
+
+Author
+""""""
+Written by Matt Mackall <mpm@selenic.com>
+
+Resources
+"""""""""
+Main Web Site: https://mercurial-scm.org/
+
+Source code repository: http://selenic.com/hg
+
+Mailing list: http://selenic.com/mailman/listinfo/mercurial
+
+Copying
+"""""""
+Copyright (C) 2005-2016 Matt Mackall.
+Free use of this software is granted under the terms of the GNU General
+Public License version 2 or any later version.
+
+.. include:: common.txt
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -124,10 +124,11 @@  path variables are expanded (~ is the sa
   > EOF
 
   $ python wixxml.py help
   Not installed:
     help/common.txt
+    help/hg-ssh.8.txt
     help/hg.1.txt
     help/hgignore.5.txt
     help/hgrc.5.txt
   Not tracked: