[PATCH 1 of 8] minirst: change hgrole to use single quotes
timeless
timeless at mozdev.org
Tue Jan 12 22:56:25 UTC 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1452578616 0
# Tue Jan 12 06:03:36 2016 +0000
# Node ID bbcdb50ea02fa18699b50ab559a05a7059d80702
# Parent edd2615ad226c14f6904fc1738c3dc36431db223
minirst: change hgrole to use single quotes
We decided to reserve double quotes for arguments to hg because cmd
does not like single quotes, so switch the outer quotes to single
diff --git a/mercurial/minirst.py b/mercurial/minirst.py
--- a/mercurial/minirst.py
+++ b/mercurial/minirst.py
@@ -368,7 +368,7 @@
return blocks
def hgrole(blocks):
- substs = [(':hg:`', '"hg '), ('`', '"')]
+ substs = [(':hg:`', "'hg "), ('`', "'")]
for b in blocks:
if b['type'] in ('paragraph', 'section'):
# Turn :hg:`command` into "hg command". This also works
diff --git a/tests/test-convert.t b/tests/test-convert.t
--- a/tests/test-convert.t
+++ b/tests/test-convert.t
@@ -57,7 +57,7 @@
<source ID> <destination ID>
If the file doesn't exist, it's automatically created. It's updated on
- each commit copied, so "hg convert" can be interrupted and can be run
+ each commit copied, so 'hg convert' can be interrupted and can be run
repeatedly to copy new commits.
The authormap is a simple text file that maps each source commit author to
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -431,7 +431,7 @@
to directories containing snapshots of files to compare.
The extdiff extension also allows you to configure new diff commands, so you
- do not need to type "hg extdiff -p kdiff3" always.
+ do not need to type 'hg extdiff -p kdiff3' always.
[extdiff]
# add new command that runs GNU diff(1) in 'context diff' mode
@@ -469,7 +469,7 @@
[diff-tools]
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
- You can use -I/-X and list of file or directory names like normal "hg diff"
+ You can use -I/-X and list of file or directory names like normal 'hg diff'
command. The extdiff extension makes snapshots of only needed files, so
running the external diff program will actually be pretty fast (at least
faster than having to compare the entire tree).
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -221,7 +221,7 @@
[extensions]
myfeature = ~/.hgext/myfeature.py
- See "hg help config" for more information on configuration files.
+ See 'hg help config' for more information on configuration files.
Extensions are not loaded by default for a variety of reasons: they can
increase startup overhead; they may be meant for advanced usage only; they
@@ -345,7 +345,7 @@
Schedule files to be version controlled and added to the repository.
The files will be added to the repository at the next commit. To undo an
- add before that, see "hg forget".
+ add before that, see 'hg forget'.
If no names are given, add all files to the repository (except files
matching ".hgignore").
@@ -371,14 +371,14 @@
Schedule files to be version controlled and added to the repository.
The files will be added to the repository at the next commit. To undo an
- add before that, see "hg forget".
+ add before that, see 'hg forget'.
If no names are given, add all files to the repository (except files
matching ".hgignore").
Examples:
- - New (unknown) files are added automatically by "hg add":
+ - New (unknown) files are added automatically by 'hg add':
$ ls
foo.c
@@ -498,7 +498,7 @@
Differences between files are shown using the unified diff format.
Note:
- "hg diff" may generate unexpected results for merges, as it will
+ 'hg diff' may generate unexpected results for merges, as it will
default to comparing against the working directory's first parent
changeset if no revisions are specified.
@@ -515,7 +515,7 @@
with undesirable results.
Use the -g/--git option to generate diffs in the git extended diff format.
- For more information, read "hg help diffs".
+ For more information, read 'hg help diffs'.
Returns 0 on success.
@@ -558,7 +558,7 @@
explicitly requested with -u/--unknown or -i/--ignored.
Note:
- "hg status" may appear to disagree with diff if permissions have
+ 'hg status' may appear to disagree with diff if permissions have
changed or a merge has occurred. The standard diff format does not
report permission changes and diff only reports changes relative to one
merge parent.
@@ -1378,7 +1378,7 @@
This paragraph is never omitted (for extension)
- This paragraph is omitted, if "hg help" is invoked without "-v" (for
+ This paragraph is omitted, if 'hg help' is invoked without "-v" (for
extension)
This paragraph is never omitted, too (for extension)
@@ -1399,7 +1399,7 @@
This paragraph is never omitted (for topic).
- This paragraph is omitted, if "hg help" is invoked without "-v" (for
+ This paragraph is omitted, if 'hg help' is invoked without "-v" (for
topic)
This paragraph is never omitted, too (for topic)
@@ -1416,7 +1416,7 @@
(DVCS) can be described as a directed acyclic graph (DAG), consisting
of nodes and edges, where nodes correspond to changesets and edges
imply a parent -> child relation. This graph can be visualized by
- graphical tools such as "hg log --graph". In Mercurial, the DAG is
+ graphical tools such as 'hg log --graph'. In Mercurial, the DAG is
limited by the requirement for children to have at most two parents.
@@ -1434,8 +1434,8 @@
local_path = /home/me/repo
These symbolic names can be used from the command line. To pull from
- "my_server": "hg pull my_server". To push to "local_path": "hg push
- local_path".
+ "my_server": 'hg pull my_server'. To push to "local_path": 'hg push
+ local_path'.
Options containing colons (":") denote sub-options that can influence
behavior for that specific path. Example:
@@ -1455,11 +1455,11 @@
"default"
The URL or directory to use when no source or remote is specified.
- "hg clone" will automatically define this path to the location the
+ 'hg clone' will automatically define this path to the location the
repository was cloned from.
"default-push"
- (deprecated) The URL or directory for the default "hg push" location.
+ (deprecated) The URL or directory for the default 'hg push' location.
"default:pushurl" should be used instead.
$ hg help glossary.mcguffin
@@ -1486,8 +1486,8 @@
the two file versions, so they can determine the changes made on both
branches.
- Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
- backout" and in several extensions.
+ Merge tools are used both for 'hg resolve', 'hg merge', 'hg update', 'hg
+ backout' and in several extensions.
Usually, the merge tool tries to automatically reconcile the files by
combining all non-overlapping changes that occurred separately in the two
@@ -2248,7 +2248,7 @@
</p>
<p>
The files will be added to the repository at the next commit. To
- undo an add before that, see "hg forget".
+ undo an add before that, see 'hg forget'.
</p>
<p>
If no names are given, add all files to the repository (except
@@ -2258,7 +2258,7 @@
Examples:
</p>
<ul>
- <li> New (unknown) files are added automatically by "hg add":
+ <li> New (unknown) files are added automatically by 'hg add':
<pre>
\$ ls (re)
foo.c
@@ -2425,8 +2425,8 @@
</p>
<p>
This command schedules the files to be removed at the next commit.
- To undo a remove before that, see "hg revert". To undo added
- files, see "hg forget".
+ To undo a remove before that, see 'hg revert'. To undo added
+ files, see 'hg forget'.
</p>
<p>
-A/--after can be used to remove only files that have already
@@ -2438,7 +2438,7 @@
The following table details the behavior of remove for different
file states (columns) and option combinations (rows). The file
states are Added [A], Clean [C], Modified [M] and Missing [!]
- (as reported by "hg status"). The actions are Warn, Remove
+ (as reported by 'hg status'). The actions are Warn, Remove
(from branch) and Delete (from disk):
</p>
<table>
@@ -2472,7 +2472,7 @@
<b>Note:</b>
</p>
<p>
- "hg remove" never deletes files in Added [A] state from the
+ 'hg remove' never deletes files in Added [A] state from the
working directory, not even if "--force" is specified.
</p>
<p>
diff --git a/tests/test-minirst.py.out b/tests/test-minirst.py.out
--- a/tests/test-minirst.py.out
+++ b/tests/test-minirst.py.out
@@ -594,18 +594,18 @@
== roles ==
60 column format:
----------------------------------------------------------------------
-Please see "hg add".
+Please see 'hg add'.
----------------------------------------------------------------------
30 column format:
----------------------------------------------------------------------
-Please see "hg add".
+Please see 'hg add'.
----------------------------------------------------------------------
html format:
----------------------------------------------------------------------
<p>
-Please see "hg add".
+Please see 'hg add'.
</p>
----------------------------------------------------------------------
@@ -621,7 +621,7 @@
Subsection
''''''''''
-Markup: "foo" and "hg help"
+Markup: "foo" and 'hg help'
---------------------------
----------------------------------------------------------------------
@@ -636,7 +636,7 @@
Subsection
''''''''''
-Markup: "foo" and "hg help"
+Markup: "foo" and 'hg help'
---------------------------
----------------------------------------------------------------------
@@ -645,7 +645,7 @@
<h1>Title</h1>
<h2>Section</h2>
<h3>Subsection</h3>
-<h2>Markup: "foo" and "hg help"</h2>
+<h2>Markup: "foo" and 'hg help'</h2>
----------------------------------------------------------------------
== admonitions ==
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -25,7 +25,7 @@
Known patches are represented as patch files in the .hg/patches directory.
Applied patches are both patch files and changesets.
- Common tasks (use "hg help command" for more details):
+ Common tasks (use 'hg help command' for more details):
create new patch qnew
import existing patch qimport
@@ -49,14 +49,14 @@
will override the [diff] section and always generate git or regular patches,
possibly losing data in the second case.
- It may be desirable for mq changesets to be kept in the secret phase (see "hg
- help phases"), which can be enabled with the following setting:
+ It may be desirable for mq changesets to be kept in the secret phase (see 'hg
+ help phases'), which can be enabled with the following setting:
[mq]
secret = True
You will by default be managing a patch queue named "patches". You can create
- other, independent patch queues with the "hg qqueue" command.
+ other, independent patch queues with the 'hg qqueue' command.
If the working directory contains uncommitted files, qpush, qpop and qgoto
abort immediately. If -f/--force is used, the changes are discarded. Setting:
diff --git a/tests/test-notify.t b/tests/test-notify.t
--- a/tests/test-notify.t
+++ b/tests/test-notify.t
@@ -22,7 +22,7 @@
This extension implements hooks to send email notifications when changesets
are sent from or received by the local repository.
- First, enable the extension as explained in "hg help extensions", and register
+ First, enable the extension as explained in 'hg help extensions', and register
the hook you want to run. "incoming" and "changegroup" hooks are run when
changesets are received, while "outgoing" hooks are for changesets sent to
another repository:
diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t
--- a/tests/test-qrecord.t
+++ b/tests/test-qrecord.t
@@ -30,10 +30,10 @@
interactively select changes to commit
- If a list of files is omitted, all changes reported by "hg status" will be
+ If a list of files is omitted, all changes reported by 'hg status' will be
candidates for recording.
- See "hg help dates" for a list of formats valid for -d/--date.
+ See 'hg help dates' for a list of formats valid for -d/--date.
You will be prompted for whether to record changes to each modified file,
and for files with multiple changes, for each change to use. For each
@@ -82,7 +82,7 @@
interactively record a new patch
- See "hg help qnew" & "hg help record" for more information and usage.
+ See 'hg help qnew' & 'hg help record' for more information and usage.
(some details hidden, use --verbose to show complete help)
@@ -114,7 +114,7 @@
interactively record a new patch
- See "hg help qnew" & "hg help record" for more information and usage.
+ See 'hg help qnew' & 'hg help record' for more information and usage.
(some details hidden, use --verbose to show complete help)
@@ -128,7 +128,7 @@
interactively record a new patch
- See "hg help qnew" & "hg help record" for more information and usage.
+ See 'hg help qnew' & 'hg help record' for more information and usage.
options ([+] can be repeated):
diff --git a/tests/test-record.t b/tests/test-record.t
--- a/tests/test-record.t
+++ b/tests/test-record.t
@@ -17,10 +17,10 @@
interactively select changes to commit
- If a list of files is omitted, all changes reported by "hg status" will be
+ If a list of files is omitted, all changes reported by 'hg status' will be
candidates for recording.
- See "hg help dates" for a list of formats valid for -d/--date.
+ See 'hg help dates' for a list of formats valid for -d/--date.
You will be prompted for whether to record changes to each modified file,
and for files with multiple changes, for each change to use. For each
More information about the Mercurial-devel
mailing list