Mercurial > hg-stable
changeset 7810:b136c6c5c1c7
merge with crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 02 Mar 2009 23:11:15 +0100 |
| parents | dcdda2f59513 (diff) 6d99ff7b79b5 (current diff) |
| children | 864ad81b4e24 |
| files | |
| diffstat | 7 files changed, 88 insertions(+), 71 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/win32/mercurial.iss Fri Feb 27 08:13:42 2009 -0600 +++ b/contrib/win32/mercurial.iss Mon Mar 02 23:11:15 2009 +0100 @@ -42,6 +42,7 @@ Source: dist\w9xpopen.exe; DestDir: {app} Source: dist\add_path.exe; DestDir: {app} Source: doc\*.html; DestDir: {app}\Docs +Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt Source: COPYING; DestDir: {app}; DestName: Copying.txt
--- a/hgext/patchbomb.py Fri Feb 27 08:13:42 2009 -0600 +++ b/hgext/patchbomb.py Mon Mar 02 23:11:15 2009 +0100 @@ -48,7 +48,7 @@ each patchbomb message in a pager or sending the messages directly, 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, i.e. with mutt: +UNIX mbox files, e.g. with mutt: % mutt -R -f mbox @@ -444,7 +444,7 @@ emailopts = [ ('a', 'attach', None, _('send patches as attachments')), ('i', 'inline', None, _('send patches as inline attachments')), - ('', 'bcc', [], _('email addresses of blind copy recipients')), + ('', 'bcc', [], _('email addresses of blind carbon copy recipients')), ('c', 'cc', [], _('email addresses of copy recipients')), ('d', 'diffstat', None, _('add diffstat output to messages')), ('', 'date', '', _('use the given date as the sending date')),
--- a/mercurial/changelog.py Fri Feb 27 08:13:42 2009 -0600 +++ b/mercurial/changelog.py Mon Mar 02 23:11:15 2009 +0100 @@ -24,7 +24,7 @@ return text.replace('\0', '\\0') class appender: - '''the changelog index must be update last on disk, so we use this class + '''the changelog index must be updated last on disk, so we use this class to delay writes to it''' def __init__(self, fp, buf): self.data = buf
--- a/mercurial/cmdutil.py Fri Feb 27 08:13:42 2009 -0600 +++ b/mercurial/cmdutil.py Mon Mar 02 23:11:15 2009 +0100 @@ -940,10 +940,10 @@ raise util.Abort(_("revision matching date not found")) def walkchangerevs(ui, repo, pats, change, opts): - '''Iterate over files and the revs they changed in. + '''Iterate over files and the revs in which they changed. Callers most commonly need to iterate backwards over the history - it is interested in. Doing so has awful (quadratic-looking) + in which they are interested. Doing so has awful (quadratic-looking) performance, so we use iterators in a "windowed" way. We walk a window of revisions in the desired order. Within the
--- a/mercurial/commands.py Fri Feb 27 08:13:42 2009 -0600 +++ b/mercurial/commands.py Mon Mar 02 23:11:15 2009 +0100 @@ -23,7 +23,7 @@ The files will be added to the repository at the next commit. To undo an add before that, see hg revert. - If no names are given, add all files in the repository. + If no names are given, add all files to the repository. """ rejected = None @@ -184,7 +184,7 @@ The --merge option remembers the parent of the working directory before starting the backout, then merges the new head with that changeset afterwards. This saves you from doing the merge by - hand. The result of this merge is not committed, as for a normal + hand. The result of this merge is not committed, as with a normal merge. See \'hg help dates\' for a list of formats valid for -d/--date. @@ -277,7 +277,7 @@ If you supply a command it will be used for automatic bisection. Its exit status will be used as flag to mark revision as bad or good. In case exit status is 0 the revision is marked as good, 125 - skipped, 127 (command not - found) - bisection will be aborted and any other status bigger than 0 will + found) - bisection will be aborted; any other status bigger than 0 will mark revision as bad. """ def print_result(nodes, good): @@ -456,7 +456,7 @@ """create a changegroup file Generate a compressed changegroup file collecting changesets not - found in the other repository. + known to be in another repository. If no destination repository is specified the destination is assumed to have all the nodes specified by one or more --base @@ -614,7 +614,7 @@ file names or -I/-X filters. If no commit message is specified, the configured editor is started to - enter a message. + prompt you for a message. See 'hg help dates' for a list of formats valid for -d/--date. """ @@ -653,13 +653,13 @@ Mark dest as having copies of source files. If dest is a directory, copies are put in that directory. If dest is a file, - there can only be one source. + the source must be a single file. By default, this command copies the contents of files as they stand in the working directory. If invoked with --after, the operation is recorded, but no copying is performed. - This command takes effect in the next commit. To undo a copy + This command takes effect with the next commit. To undo a copy before that, see hg revert. """ wlock = repo.wlock(False) @@ -1023,7 +1023,7 @@ probably with undesirable results. Use the --git option to generate diffs in the git extended diff - format. Read the diffs help topic for more information. + format. For more information, read hg help diffs. """ revs = opts.get('rev') @@ -1857,8 +1857,8 @@ files and full commit message is shown. NOTE: log -p may generate unexpected diff output for merge - changesets, as it will compare the merge changeset against its - first parent only. Also, the files: list will only reflect files + changesets, as it will only compare the merge changeset against + its first parent. Also, the files: list will only reflect files that are different from BOTH parents. """ @@ -2312,10 +2312,10 @@ a file, there can only be one source. By default, this command copies the contents of files as they - stand in the working directory. If invoked with --after, the + exist in the working directory. If invoked with --after, the operation is recorded, but no copying is performed. - This command takes effect in the next commit. To undo a rename + This command takes effect at the next commit. To undo a rename before that, see hg revert. """ wlock = repo.wlock(False)
--- a/mercurial/help.py Fri Feb 27 08:13:42 2009 -0600 +++ b/mercurial/help.py Mon Mar 02 23:11:15 2009 +0100 @@ -41,9 +41,9 @@ The log command also accepts date ranges: - "<{date}" - on or before a given date - ">{date}" - on or after a given date - "{date} to {date}" - a date range, inclusive + "<{datetime}" - at or before a given date/time + ">{datetime}" - on or after a given date/time + "{datetime} to {datetime}" - a date range, inclusive "-{days}" - within a given number of days of today ''')), @@ -57,16 +57,16 @@ Alternate pattern notations must be specified explicitly. - To use a plain path name without any pattern matching, start a - name with "path:". These path names must match completely, from - the root of the current repository. + To use a plain path name without any pattern matching, start it + with "path:". These path names must completely match starting at + the current repository root. - To use an extended glob, start a name with "glob:". Globs are - rooted at the current directory; a glob such as "*.c" will match - files ending in ".c" in the current directory only. + To use an extended glob, start a name with "glob:". Globs are + rooted at the current directory; a glob such as "*.c" will only + match files in the current directory ending with ".c". The supported glob syntax extensions are "**" to match any string - across path separators, and "{a,b}" to mean "a or b". + across path separators and "{a,b}" to mean "a or b". To use a Perl/Python regular expression, start a name with "re:". Regexp pattern matching is anchored at the root of the repository. @@ -81,11 +81,11 @@ glob:*.c any name ending in ".c" in the current directory *.c any name ending in ".c" in the current directory - **.c any name ending in ".c" in the current directory, or - any subdirectory + **.c any name ending in ".c" in any subdirectory of the + current directory including itself. foo/*.c any name ending in ".c" in the directory foo - foo/**.c any name ending in ".c" in the directory foo, or any - subdirectory + foo/**.c any name ending in ".c" in any subdirectory of foo + including itself. Regexp examples: @@ -97,11 +97,13 @@ _(r''' HG:: Path to the 'hg' executable, automatically passed when running hooks, - extensions or external tools. If unset or empty, an executable named - 'hg' (with com/exe/bat/cmd extension on Windows) is searched. + extensions or external tools. If unset or empty, this is the hg + exutable's name if it's frozen, or an executable named 'hg' + (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on + Windows) is searched. HGEDITOR:: - This is the name of the editor to use when committing. See EDITOR. + This is the name of the editor to run when committing. See EDITOR. (deprecated, use .hgrc) @@ -113,8 +115,8 @@ HGENCODINGMODE:: This sets Mercurial's behavior for handling unknown characters - while transcoding user inputs. The default is "strict", which - causes Mercurial to abort if it can't translate a character. Other + while transcoding user input. The default is "strict", which + causes Mercurial to abort if it can't map a character. Other settings include "replace", which replaces unknown characters, and "ignore", which drops them. This setting can be overridden with the --encodingmode command-line option. @@ -127,26 +129,32 @@ (deprecated, use .hgrc) HGRCPATH:: - A list of files or directories to search for hgrc files. Item - separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, - platform default search path is used. If empty, only .hg/hgrc of - current repository is read. + A list of files or directories to search for hgrc files. Item + separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, + platform default search path is used. If empty, only the .hg/hgrc + from the current repository is read. - For each element in path, if a directory, all entries in directory - ending with ".rc" are added to path. Else, element itself is - added to path. + For each element in HGRCPATH: + * if it's a directory, all directories ending with .rc are added + * otherwise, the directory itself will be added HGUSER:: - This is the string used for the author of a commit. + This is the string used as the author of a commit. If not set, + available values will be considered in this order: + + * HGUSER (deprecated) + * hgrc files from the HGRCPATH + * EMAIL + * interactive prompt + * LOGNAME (with '@hostname' appended) (deprecated, use .hgrc) EMAIL:: - If HGUSER is not set, this will be used as the author for a commit. + May be used as the author of a commit; see HGUSER. LOGNAME:: - If neither HGUSER nor EMAIL is set, LOGNAME will be used (with - '@hostname' appended) as the author value for a commit. + May be used as the author of a commit; see HGUSER. VISUAL:: This is the name of the editor to use when committing. See EDITOR. @@ -161,17 +169,19 @@ PYTHONPATH:: This is used by Python to find imported modules and may need to be set - appropriately if Mercurial is not installed system-wide. + appropriately if this Mercurial is not installed system-wide. ''')), (['revs', 'revisions'], _('Specifying Single Revisions'), _(r''' - Mercurial accepts several notations for identifying individual + Mercurial supports several ways to specify individual revisions. A plain integer is treated as a revision number. Negative - integers are treated as offsets from the tip, with -1 denoting the - tip. + integers are treated as toplogical offsets from the tip, with + -1 denoting the tip. As such, negative numbers are only useful + if you've memorized your local tree numbers and want to save + typing a single digit. This editor suggests copy and paste. A 40-digit hexadecimal string is treated as a unique revision identifier. @@ -179,7 +189,7 @@ A hexadecimal string less than 40 characters long is treated as a unique revision identifier, and referred to as a short-form identifier. A short-form identifier is only valid if it is the - prefix of one full-length identifier. + prefix of exactly one full-length identifier. Any other string is treated as a tag name, which is a symbolic name associated with a revision identifier. Tag names may not @@ -200,8 +210,8 @@ (['mrevs', 'multirevs'], _('Specifying Multiple Revisions'), _(r''' When Mercurial accepts more than one revision, they may be - specified individually, or provided as a continuous range, - separated by the ":" character. + specified individually, or provided as a topologically continuous + range, separated by the ":" character. The syntax of range notation is [BEGIN]:[END], where BEGIN and END are revision identifiers. Both BEGIN and END are optional. If @@ -213,7 +223,7 @@ order. A range acts as a closed interval. This means that a range of 3:5 - gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. + gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6. ''')), (['diffs'], _('Diff Formats'), @@ -225,14 +235,14 @@ While this standard format is often enough, it does not encode the following information: - - executable status + - executable status and other permission bits - copy or rename information - changes in binary files - creation or deletion of empty files Mercurial also supports the extended diff format from the git VCS which addresses these limitations. The git diff format is not - produced by default because there are very few tools which + produced by default because a few widespread tools still do not understand this format. This means that when generating diffs from a Mercurial repository @@ -255,7 +265,7 @@ via the --template option, or select an existing template-style (--style). You can customize output for any "log-like" command: log, outgoing, - incoming, tip, parents, heads and glog are all template-enabled. + incoming, tip, parents, heads and glog. Three styles are packaged with Mercurial: default (the style used when no explicit preference is passed), compact and changelog. Usage: @@ -290,7 +300,7 @@ The "date" keyword does not produce human-readable output. If you want to use a date in your output, you can use a filter to process it. Filters are functions which return a string based on the input variable. - You can also use a chain of filters to get the wanted output: + You can also use a chain of filters to get the desired output: $ hg tip --template "{date|isodate}\n" 2008-08-21 18:22 +0000 @@ -299,15 +309,20 @@ - addbreaks: Any text. Add an XHTML "<br />" tag before the end of every line except the last. - - age: Date. Returns a human-readable age for the given date. + - age: Date. Returns a human-readable date/time difference between + the given date/time and the current date/time. - basename: Any text. Treats the text as a path, and returns the - basename. For example, "foo/bar/baz" becomes "baz". - - date: Date. Returns a date in a Unix date command format, including + last component of the path after splitting by the path + separator (ignoring trailing seprators). For example, + "foo/bar/baz" becomes "baz" and "foo/bar//" becomes "bar". + - date: Date. Returns a date in a Unix date format, including the timezone: "Mon Sep 04 15:13:13 2006 0700". - domain: Any text. Finds the first string that looks like an email address, and extracts just the domain component. + Example: 'User <user@example.com>' becomes 'example.com'. - email: Any text. Extracts the first string that looks like an email - address. + address. Example: 'User <user@example.com>' becomes + 'user@example.com'. - escape: Any text. Replaces the special XML/XHTML characters "&", "<" and ">" with XML entities. - fill68: Any text. Wraps the text to fit in 68 columns. @@ -323,7 +338,7 @@ in email headers. - short: Changeset hash. Returns the short form of a changeset hash, i.e. a 12-byte hexadecimal string. - - shortdate: Date. Returns a date like "2006-09-04". + - shortdate: Date. Returns a date like "2006-09-18". - strip: Any text. Strips all leading and trailing whitespace. - tabindent: Any text. Returns the text, with every line except the first starting with a tab character. @@ -346,7 +361,7 @@ 'hg incoming --bundle'). An optional identifier after # indicates a particular branch, tag, - or changeset to deal with in the remote repository. + or changeset to use from the remote repository. Some features, such as pushing to http:// and https:// URLs are only possible if the feature is explicitly enabled on the @@ -377,13 +392,14 @@ You can then use the alias for any command that uses a url (for example 'hg pull alias1' would pull from the 'alias1' path). - Two path aliases are more important because they are used as defaults + Two path aliases are special because they are used as defaults when you do not provide the url to a command: default: When you create a repository with hg clone, the clone command saves - the location of the source repository as the 'default' path. This is - then used when you omit a path from the push and pull commands. + the location of the source repository as the new repository's + 'default' path. This is then used when you omit path from push- + and pull-like commands (including in and out). default-push: The push command will look for a path named 'default-push', and
--- a/tests/test-help.out Fri Feb 27 08:13:42 2009 -0600 +++ b/tests/test-help.out Mon Mar 02 23:11:15 2009 +0100 @@ -169,7 +169,7 @@ The files will be added to the repository at the next commit. To undo an add before that, see hg revert. - If no names are given, add all files in the repository. + If no names are given, add all files to the repository. options: @@ -188,7 +188,7 @@ The files will be added to the repository at the next commit. To undo an add before that, see hg revert. - If no names are given, add all files in the repository. + If no names are given, add all files to the repository. options: @@ -220,7 +220,7 @@ probably with undesirable results. Use the --git option to generate diffs in the git extended diff - format. Read the diffs help topic for more information. + format. For more information, read hg help diffs. options: