# HG changeset patch # User timeless # Date 2016-01-12 06:03:36 # Node ID 58f8b29c37ff0724b8e6aa0fa61dd812283c117e # Parent 294037159c6443f46f18dc7200f36c568874a2da 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 @@ def inlineliterals(blocks): 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 @@ 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 @@ Extension module help vs command help: 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 @@ Extension module help vs command help: [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 @@ Test extension help: [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 @@ Test short command list with verbose opt 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 @@ Verbose help for add 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 @@ Test command without options 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 @@ Test command without options 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 @@ Test command without options 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 @@ Test omit indicating for help 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 @@ Test omit indicating for help 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 @@ Test section lookup (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 @@ Test section lookup 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 @@ Test section lookup "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 @@ Test dynamic list of merge tools only sh 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 @@ Dish up an empty repo; serve it cold.

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'.

If no names are given, add all files to the repository (except @@ -2258,7 +2258,7 @@ Dish up an empty repo; serve it cold. Examples: