Mercurial > hg
changeset 7983:7b813bdbd5d0
Change double spaces to single spaces in help texts.
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sat, 04 Apr 2009 21:09:43 +0200 |
| parents | cab4a521a3fd |
| children | 5c61c75c2384 |
| files | hgext/color.py hgext/convert/__init__.py hgext/extdiff.py hgext/fetch.py hgext/mq.py hgext/patchbomb.py hgext/record.py hgext/win32mbcs.py mercurial/commands.py tests/test-convert.out tests/test-mq.out tests/test-record.out |
| diffstat | 12 files changed, 52 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/color.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/color.py Sat Apr 04 21:09:43 2009 +0200 @@ -24,8 +24,8 @@ additions, removals, diff headers, and trailing whitespace. Other effects in addition to color, like bold and underlined text, are also -available. Effects are rendered with the ECMA-48 SGR control function (aka -ANSI escape codes). This module also provides the render_text function, +available. Effects are rendered with the ECMA-48 SGR control function (aka +ANSI escape codes). This module also provides the render_text function, which can be used to add effects to any text. To enable this extension, add this to your .hgrc file:
--- a/hgext/convert/__init__.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/convert/__init__.py Sat Apr 04 21:09:43 2009 +0200 @@ -37,16 +37,16 @@ understood by the source). If no destination directory name is specified, it defaults to the - basename of the source with '-hg' appended. If the destination + basename of the source with '-hg' appended. If the destination repository doesn't exist, it will be created. If <REVMAP> isn't given, it will be put in a default location - (<dest>/.hg/shamap by default). The <REVMAP> is a simple text + (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that maps each source commit ID to the destination ID for that revision, like so: <source ID> <destination ID> - If the file doesn't exist, it's automatically created. It's updated + If the file doesn't exist, it's automatically created. It's updated on each commit copied, so convert-repo can be interrupted and can be run repeatedly to copy new commits. @@ -57,7 +57,7 @@ srcauthor=whatever string you want The filemap is a file that allows filtering and remapping of files - and directories. Comment lines start with '#'. Each line can + and directories. Comment lines start with '#'. Each line can contain one of the following directives: include path/to/file @@ -70,18 +70,18 @@ directory, to be included in the destination repository, and the exclusion of all other files and dirs not explicitely included. The 'exclude' directive causes files or directories to be omitted. - The 'rename' directive renames a file or directory. To rename from a + The 'rename' directive renames a file or directory. To rename from a subdirectory into the root of the repository, use '.' as the path to rename to. The splicemap is a file that allows insertion of synthetic - history, letting you specify the parents of a revision. This is + history, letting you specify the parents of a revision. This is useful if you want to e.g. give a Subversion merge two parents, or - graft two disconnected series of history together. Each entry + graft two disconnected series of history together. Each entry contains a key, followed by a space, followed by one or two - comma-separated values. The key is the revision ID in the + comma-separated values. The key is the revision ID in the source revision control system whose parents should be modified - (same format as a key in .hg/shamap). The values are the revision + (same format as a key in .hg/shamap). The values are the revision IDs (in either the source or destination revision control system) that should be used as the new parents for that node.
--- a/hgext/extdiff.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/extdiff.py Sat Apr 04 21:09:43 2009 +0200 @@ -7,7 +7,7 @@ ''' The `extdiff' Mercurial extension allows you to use external programs -to compare revisions, or revision with working dir. The external diff +to compare revisions, or revision with working dir. The external diff programs are called with a configurable set of options and two non-option arguments: paths to directories containing snapshots of files to compare. @@ -40,7 +40,7 @@ vimdiff = gvim -f '+next' '+execute "DirDiff" argv(0) argv(1)' You can use -I/-X and list of file or directory names like normal -"hg diff" command. The `extdiff' extension makes snapshots of only +"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). ''' @@ -191,12 +191,12 @@ '''use external program to diff repository (or selected files) Show differences between revisions for the specified files, using - an external program. The default program used is diff, with + an external program. The default program used is diff, with default options "-Npru". - To select a different program, use the -p option. The program - will be passed the names of two directories to compare. To pass - additional options to the program, use the -o option. These will + To select a different program, use the -p option. The program + will be passed the names of two directories to compare. To pass + additional options to the program, use the -o option. These will be passed before the names of the directories to compare. When two revision arguments are given, then changes are
--- a/hgext/fetch.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/fetch.py Sat Apr 04 21:09:43 2009 +0200 @@ -17,12 +17,12 @@ or URL and adds them to the local repository. If the pulled changes add a new branch head, the head is automatically - merged, and the result of the merge is committed. Otherwise, the + merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes. When a merge occurs, the newly pulled changes are assumed to be - "authoritative". The head of the new changes is used as the first - parent, with local changes as the second. To switch the merge + "authoritative". The head of the new changes is used as the first + parent, with local changes as the second. To switch the merge order, use --switch-parent. See 'hg help dates' for a list of formats valid for -d/--date.
--- a/hgext/mq.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/mq.py Sat Apr 04 21:09:43 2009 +0200 @@ -8,11 +8,11 @@ '''patch management and development This extension lets you work with a stack of patches in a Mercurial -repository. It manages two stacks of patches - all known patches, and +repository. It manages two stacks of patches - all known patches, and applied patches (subset of known patches). Known patches are represented as patch files in the .hg/patches -directory. Applied patches are both patch files and changesets. +directory. Applied patches are both patch files and changesets. Common tasks (use "hg help command" for more details): @@ -1716,14 +1716,14 @@ def clone(ui, source, dest=None, **opts): '''clone main and patch repository at same time - If source is local, destination will have no patches applied. If + If source is local, destination will have no patches applied. If source is remote, this command can not check if patches are applied in source, so cannot guarantee that patches are not - applied in destination. If you clone remote repository, be sure + applied in destination. If you clone remote repository, be sure before that it has no patches applied. Source patch repository is looked for in <src>/.hg/patches by - default. Use -p <url> to change. + default. Use -p <url> to change. The patch directory must be a nested mercurial repository, as would be created by qinit -c.
--- a/hgext/patchbomb.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/patchbomb.py Sat Apr 04 21:09:43 2009 +0200 @@ -37,16 +37,16 @@ as a patchbomb. To avoid sending patches prematurely, it is a good idea to first run -the "email" command with the "-n" option (test only). You will be +the "email" command with the "-n" option (test only). You will be prompted for an email recipient address, a subject an an introductory -message describing the patches of your patchbomb. Then when all is +message describing the patches of your patchbomb. Then when all is done, patchbomb messages are displayed. If PAGER environment variable is set, your pager will be fired up once for each patchbomb message, so you can verify everything is alright. -The "-m" (mbox) option is also very useful. Instead of previewing +The "-m" (mbox) option is also very useful. Instead of previewing each patchbomb message in a pager or sending the messages directly, -it will create a UNIX mailbox file with the patch emails. This +it will create a UNIX mailbox file with the patch emails. This mailbox file can be previewed with any mail user agent which supports UNIX mbox files, e.g. with mutt: @@ -173,13 +173,13 @@ '''send changesets by email By default, diffs are sent in the format generated by hg export, - one per message. The series starts with a "[PATCH 0 of N]" + one per message. The series starts with a "[PATCH 0 of N]" introduction, which describes the series as a whole. Each patch email has a Subject line of "[PATCH M of N] ...", using the first line of the changeset description as the subject text. - The message contains two or three body parts. First, the rest of - the changeset description. Next, (optionally) if the diffstat + The message contains two or three body parts. First, the rest of + the changeset description. Next, (optionally) if the diffstat program is installed, the result of running diffstat on the patch. Finally, the patch itself, as generated by "hg export".
--- a/hgext/record.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/record.py Sat Apr 04 21:09:43 2009 +0200 @@ -353,7 +353,7 @@ 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 query, the following responses are + change to use. For each query, the following responses are possible: y - record this change
--- a/hgext/win32mbcs.py Sat Apr 04 18:31:01 2009 +0200 +++ b/hgext/win32mbcs.py Sat Apr 04 21:09:43 2009 +0200 @@ -13,7 +13,7 @@ Some MBCS encodings are not good for some path operations (i.e. splitting path, case conversion, etc.) with its encoded bytes. We call such a encoding (i.e. shift_jis and big5) as "problematic -encoding". This extension can be used to fix the issue with those +encoding". This extension can be used to fix the issue with those encodings by wrapping some functions to convert to unicode string before path operation.
--- a/mercurial/commands.py Sat Apr 04 18:31:01 2009 +0200 +++ b/mercurial/commands.py Sat Apr 04 21:09:43 2009 +0200 @@ -591,10 +591,10 @@ $ cp -al REPO REPOCLONE - This is the fastest way to clone, but it is not always safe. The + This is the fastest way to clone, but it is not always safe. The operation is not atomic (making sure REPO is not modified during the operation is up to you) and you have to make sure your editor - breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, + breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, this is not compatible with certain extensions that place their metadata under the .hg directory, such as mq. @@ -609,8 +609,8 @@ def commit(ui, repo, *pats, **opts): """commit the specified files or all outstanding changes - Commit changes to the given files into the repository. Unlike a - centralized RCS, this operation is a local operation. See hg push + Commit changes to the given files into the repository. Unlike a + centralized RCS, this operation is a local operation. See hg push for means to actively distribute your changes. If a list of files is omitted, all changes reported by "hg status" @@ -2915,7 +2915,7 @@ the revision to remove the working copy (like 'hg clone -U'). When the working dir contains no uncommitted changes, it will be - replaced by the state of the requested revision from the repo. When + replaced by the state of the requested revision from the repo. When the requested revision is on a different branch, the working dir will additionally be switched to that branch. @@ -2927,7 +2927,7 @@ the parent revision and requested revision are on the same branch, and one of them is an ancestor of the other, then the new working directory will contain the requested revision merged with the - uncommitted changes. Otherwise, the update will fail with a + uncommitted changes. Otherwise, the update will fail with a suggestion to use 'merge' or 'update -C' instead. If you want to update just one file to an older revision, use revert.
--- a/tests/test-convert.out Sat Apr 04 18:31:01 2009 +0200 +++ b/tests/test-convert.out Sat Apr 04 21:09:43 2009 +0200 @@ -22,16 +22,16 @@ understood by the source). If no destination directory name is specified, it defaults to the - basename of the source with '-hg' appended. If the destination + basename of the source with '-hg' appended. If the destination repository doesn't exist, it will be created. If <REVMAP> isn't given, it will be put in a default location - (<dest>/.hg/shamap by default). The <REVMAP> is a simple text + (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file that maps each source commit ID to the destination ID for that revision, like so: <source ID> <destination ID> - If the file doesn't exist, it's automatically created. It's updated + If the file doesn't exist, it's automatically created. It's updated on each commit copied, so convert-repo can be interrupted and can be run repeatedly to copy new commits. @@ -42,7 +42,7 @@ srcauthor=whatever string you want The filemap is a file that allows filtering and remapping of files - and directories. Comment lines start with '#'. Each line can + and directories. Comment lines start with '#'. Each line can contain one of the following directives: include path/to/file @@ -55,18 +55,18 @@ directory, to be included in the destination repository, and the exclusion of all other files and dirs not explicitely included. The 'exclude' directive causes files or directories to be omitted. - The 'rename' directive renames a file or directory. To rename from a + The 'rename' directive renames a file or directory. To rename from a subdirectory into the root of the repository, use '.' as the path to rename to. The splicemap is a file that allows insertion of synthetic - history, letting you specify the parents of a revision. This is + history, letting you specify the parents of a revision. This is useful if you want to e.g. give a Subversion merge two parents, or - graft two disconnected series of history together. Each entry + graft two disconnected series of history together. Each entry contains a key, followed by a space, followed by one or two - comma-separated values. The key is the revision ID in the + comma-separated values. The key is the revision ID in the source revision control system whose parents should be modified - (same format as a key in .hg/shamap). The values are the revision + (same format as a key in .hg/shamap). The values are the revision IDs (in either the source or destination revision control system) that should be used as the new parents for that node.
--- a/tests/test-mq.out Sat Apr 04 18:31:01 2009 +0200 +++ b/tests/test-mq.out Sat Apr 04 21:09:43 2009 +0200 @@ -2,11 +2,11 @@ mq extension - patch management and development This extension lets you work with a stack of patches in a Mercurial -repository. It manages two stacks of patches - all known patches, and +repository. It manages two stacks of patches - all known patches, and applied patches (subset of known patches). Known patches are represented as patch files in the .hg/patches -directory. Applied patches are both patch files and changesets. +directory. Applied patches are both patch files and changesets. Common tasks (use "hg help command" for more details):
--- a/tests/test-record.out Sat Apr 04 18:31:01 2009 +0200 +++ b/tests/test-record.out Sat Apr 04 21:09:43 2009 +0200 @@ -10,7 +10,7 @@ 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 query, the following responses are + change to use. For each query, the following responses are possible: y - record this change