Mercurial > public > mercurial-scm > hg
comparison mercurial/help.py @ 43117:8ff1ecfadcd1
cleanup: join string literals that are already on one line
Thanks to Kyle for noticing this and for providing the regular
expression to run on the codebase.
This patch has been reviewed by the test suite and they approved of
it.
# skip-blame: fallout from mass reformatting
Differential Revision: https://phab.mercurial-scm.org/D7028
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 08 Oct 2019 15:06:18 -0700 |
| parents | d783f945a701 |
| children | 9f70512ae2cf |
comparison
equal
deleted
inserted
replaced
| 43116:defabf63e969 | 43117:8ff1ecfadcd1 |
|---|---|
| 858 b'\n%s\n' | 858 b'\n%s\n' |
| 859 % optrst(_(b"global options"), commands.globalopts, ui.verbose) | 859 % optrst(_(b"global options"), commands.globalopts, ui.verbose) |
| 860 ) | 860 ) |
| 861 if name == b'shortlist': | 861 if name == b'shortlist': |
| 862 rst.append( | 862 rst.append( |
| 863 _(b"\n(use 'hg help' for the full list " b"of commands)\n") | 863 _(b"\n(use 'hg help' for the full list of commands)\n") |
| 864 ) | 864 ) |
| 865 else: | 865 else: |
| 866 if name == b'shortlist': | 866 if name == b'shortlist': |
| 867 rst.append( | 867 rst.append( |
| 868 _( | 868 _( |
| 870 b"or 'hg -v' for details)\n" | 870 b"or 'hg -v' for details)\n" |
| 871 ) | 871 ) |
| 872 ) | 872 ) |
| 873 elif name and not full: | 873 elif name and not full: |
| 874 rst.append( | 874 rst.append( |
| 875 _(b"\n(use 'hg help %s' to show the full help " b"text)\n") | 875 _(b"\n(use 'hg help %s' to show the full help text)\n") |
| 876 % name | 876 % name |
| 877 ) | 877 ) |
| 878 elif name and syns and name in syns.keys(): | 878 elif name and syns and name in syns.keys(): |
| 879 rst.append( | 879 rst.append( |
| 880 _( | 880 _( |
| 927 indicateomitted(rst, omitted) | 927 indicateomitted(rst, omitted) |
| 928 | 928 |
| 929 try: | 929 try: |
| 930 cmdutil.findcmd(name, commands.table) | 930 cmdutil.findcmd(name, commands.table) |
| 931 rst.append( | 931 rst.append( |
| 932 _(b"\nuse 'hg help -c %s' to see help for " b"the %s command\n") | 932 _(b"\nuse 'hg help -c %s' to see help for the %s command\n") |
| 933 % (name, name) | 933 % (name, name) |
| 934 ) | 934 ) |
| 935 except error.UnknownCommand: | 935 except error.UnknownCommand: |
| 936 pass | 936 pass |
| 937 return rst | 937 return rst |
| 983 ui, name, ui.configbool(b'ui', b'strict') | 983 ui, name, ui.configbool(b'ui', b'strict') |
| 984 ) | 984 ) |
| 985 doc = doc.splitlines()[0] | 985 doc = doc.splitlines()[0] |
| 986 | 986 |
| 987 rst = listexts( | 987 rst = listexts( |
| 988 _(b"'%s' is provided by the following " b"extension:") % cmd, | 988 _(b"'%s' is provided by the following extension:") % cmd, |
| 989 {ext: doc}, | 989 {ext: doc}, |
| 990 indent=4, | 990 indent=4, |
| 991 showdeprecated=True, | 991 showdeprecated=True, |
| 992 ) | 992 ) |
| 993 rst.append(b'\n') | 993 rst.append(b'\n') |