Mercurial > hg
changeset 6490:b13dae8ed779
Merge from crew-stable.
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 07 Apr 2008 09:26:40 +0200 |
| parents | 938319418d8c (current diff) 204a2ca249b6 (diff) |
| children | 43d14cbd69b7 |
| files | doc/hg.1.txt doc/hgignore.5.txt |
| diffstat | 5 files changed, 32 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/Makefile Sat Apr 05 21:29:02 2008 +0200 +++ b/doc/Makefile Mon Apr 07 09:26:40 2008 +0200 @@ -18,7 +18,9 @@ python gendoc.py > $@ %: %.xml - xmlto man $*.xml + xmlto man $*.xml ; \ + sed -e 's/^\.hg/\\\&.hg/' $* > $*~ ; \ + mv $*~ $* %.xml: %.txt asciidoc -d manpage -b docbook $*.txt
--- a/doc/gendoc.py Sat Apr 05 21:29:02 2008 +0200 +++ b/doc/gendoc.py Mon Apr 07 09:26:40 2008 +0200 @@ -59,36 +59,36 @@ underlined(_("COMMANDS")) h = {} for c, attr in table.items(): - f = c.split("|")[0] - f = f.lstrip("^") - h[f] = c + f = c.split("|")[0] + f = f.lstrip("^") + h[f] = c cmds = h.keys() cmds.sort() for f in cmds: - if f.startswith("debug"): continue - d = get_cmd(h[f]) - # synopsis - ui.write("%s::\n" % d['synopsis'].replace("hg ","", 1)) - # description - ui.write("%s\n\n" % d['desc'][1]) - # options - opt_output = list(d['opts']) - if opt_output: - opts_len = max([len(line[0]) for line in opt_output]) - ui.write(_(" options:\n")) - for optstr, desc in opt_output: - if desc: - s = "%-*s %s" % (opts_len, optstr, desc) - else: - s = optstr - s = textwrap.fill(s, initial_indent=4 * " ", - subsequent_indent=(6 + opts_len) * " ") - ui.write("%s\n" % s) - ui.write("\n") - # aliases - if d['aliases']: - ui.write(_(" aliases: %s\n\n") % " ".join(d['aliases'])) + if f.startswith("debug"): continue + d = get_cmd(h[f]) + # synopsis + ui.write("%s::\n" % d['synopsis'].replace("hg ","", 1)) + # description + ui.write("%s\n\n" % d['desc'][1]) + # options + opt_output = list(d['opts']) + if opt_output: + opts_len = max([len(line[0]) for line in opt_output]) + ui.write(_(" options:\n")) + for optstr, desc in opt_output: + if desc: + s = "%-*s %s" % (opts_len, optstr, desc) + else: + s = optstr + s = textwrap.fill(s, initial_indent=4 * " ", + subsequent_indent=(6 + opts_len) * " ") + ui.write("%s\n" % s) + ui.write("\n") + # aliases + if d['aliases']: + ui.write(_(" aliases: %s\n\n") % " ".join(d['aliases'])) # print topics for t in helptable:
--- a/doc/hg.1.txt Sat Apr 05 21:29:02 2008 +0200 +++ b/doc/hg.1.txt Mon Apr 07 09:26:40 2008 +0200 @@ -91,11 +91,11 @@ FILES ----- - repo/.hgignore:: + .hgignore:: This file contains regular expressions (one per line) that describe file names that should be ignored by hg. For details, see hgignore(5). - repo/.hgtags:: + .hgtags:: This file contains changeset hash values and text tag names (one of each separated by spaces) that correspond to tagged versions of the repository contents.