run-tests: fix some missing i/o locks

run-tests: add a lock for console I/O

run-tests: switch timeout handling from alarm to helper thread This should be slightly more portable than signals and be compatible with threaded dispatch.

run-tests: add locking on results struct

run-tests: fix --interactive (after 994ad067ac6e) - Do not prompt if there is no .err file - Fix source and target paths

color: code simplification

test-status-color: fix terminfo code compatibility problem On a linux host in xterm mode, 'none' is translated to: \x1b[m\x1b(B While it is the following on osx: \x1b(B\x1b[m Take advantage of the new color.color.X option to force it to a common value.

hg-ssh: fix duplicate word in docstring

run-tests: move test loop into a helper function

run-tests: use a results dict

run-tests: move blacklist and retest filtering to runone

run-tests: keep a list of passed tests

run-tests: move keyword checking into runone

run-tests: add ignores list

run-tests: move existence/name format check into runone

run-tests: move interactive handling into runone

color: add support for terminfo-based attributes and color Using terminfo instead of hard-coding ECMA-48 control sequences provides a greater assurance that the terminal codes are correct for the current terminal type; not everything supports the ANSI escape codes. It also allows us to use a wider range of colors when a terminal emulator supports it (such as 16- or 256-color xterm), and a few more non-color attributes, such as the ever-popular blink.

move system_rcpath and user_rcpath to scmutil

move os_rcpath from util to scmutil

move rcpath from util to scmutil

merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: synchronized with 1416b9118540

i18n: merge with stable

i18n-da: synchronize with 1184bb274cb3

i18n-de: improve grammar

win32: Wine doesn't know about hardlinks

move walkrepos from util to scmutil

move checkfilename from util to scmutil checkfilename is specific to Mercurial, since it contains the knowledege that Mercurial can't track files with \n or \r in the name.

scmutil: fix erroneous Abort call This fixes d13913355390 (affected Windows only).

move path_auditor from util to scmutil

move canonpath from util to scmutil

move opener from util to scmutil

merge with stable

convert: make filemap prune useless branch closing revs (issue2774) A branch closing revision only applies if one of its parents belongs to the branch being closed. Otherwise the filemap can prune it too.

dispatch: improve repository not found message This should help clarify what the problem is in various problematic cases like ssh.

hgweb: support disabling page cache By default, hgweb_mod supports caching via the ETag header. This can cause some confusion with browsers which cache aggressively. This change preserves existing behavior while giving the administrator a knob to disable the ETag header.

merge with stable

hgweb: support alternate logo url Clicking on the logo image/text in the hgweb interface brings the user to the Mercurial project page. The majority of users expect that this would bring them to the top level index. I have added a new template variable named `logourl' which allows an administrator to change this behavior. To stay compatible with existing behavior, `logourl' will default to http://mercurial.selenic.com/. This change is very useful in large installations where jumping to the index is common.

identify: further clarification of help Following on to 1416b9118540, correct a minor grammar issue, re-wrap to 72 columns, and further clarify wording.

add: introduce a warning message for non-portable filenames (issue2756) (BC) On POSIX platforms, the 'add', 'addremove', 'copy' and 'rename' commands now warn if a file has a name that can't be checked out on Windows. Example: $ hg add con.xml warning: filename contains 'con', which is reserved on Windows: 'con.xml' $ hg status A con.xml The file is added despite the warning. The warning is ON by default. It can be suppressed by setting the config option 'portablefilenames' in section 'ui' to 'ignore' or 'false': $ hg --config ui.portablefilenames=ignore add con.xml $ hg sta A con.xml If ui.portablefilenames is set to 'abort', then the command is aborted: $ hg --config ui.portablefilenames=abort add con.xml abort: filename contains 'con', which is reserved on Windows: 'con.xml' On Windows, the ui.portablefilenames config setting is irrelevant and the command is always aborted if a problematic filename is found.

paper: use monospace font for description

update: fix check for no rev when a date is given The previous check caught a corner case in which rev was pointing to 0.

merge with stable

hgweb: detect change based on changelog size too Before, there was a race between an access and a modification made within the same second.

rollback: lower-case warning issued when branch cannot be reset Also improved the word order.

tests: remove redundant mkdir There are still many tests that check that a bare 'hg init' initializes the current directory.

help config: explain that config files do not exist by default Inspired by critique given on StackOverflow where a user writes: I can have a good guess at what "%USERPROFILE%" might signify but none of the files listed in the "hg help config" output exist after running the installer. Previous experience would suggest that missing files mean something somewhere has gone seriously wrong. http://stackoverflow.com/questions/2329023/2351139#2351139

merge with stable

identify: restructure code to make it more readable

identify/help: say what the command does first, mention bookmarks

templatefilters: improve person() for john.doe@example.com BEFORE: person('john.doe@example.com') -> 'john' AFTER: person('john.doe@example.com') -> 'john doe'

help: do not show full help text for command on option errors Example $ hg clone --jump foo bar hg clone: option --jump not recognized hg clone [OPTION]... SOURCE [DEST] make a copy of an existing repository options: -U --noupdate the clone will include an empty working copy (only a repository) -u --updaterev REV revision, tag or branch to check out -r --rev REV [+] include the specified changeset -b --branch BRANCH [+] clone only the specified branch --pull use pull protocol to copy metadata --uncompressed use uncompressed transfer (fast over LAN) -e --ssh CMD specify ssh command to use --remotecmd CMD specify hg command to run on the remote side --insecure do not verify server certificate (ignoring web.cacerts config) [+] marked option can be specified multiple times use "hg help clone" to show the full help text Motivation for this change If the user already has specified the command, he probably already knows the command to some extent. Apparently, he has a problem with the options, so we show him just the synopsis with the short help and the details about the options, with a hint on the last line how to get the full help text. Why is Mercurial better with this change? Experts who just forgot about the details of an option don't get that much text thrown at them, while the newbies still get a hint on the last line how to get the full help text.

store: add some doctests

paper: don't add breaks on the remaining instances of desc fixes ebe1ddbbefd7

checkwinfilename: use %r in format string

tests: new test cases for the unbundlehash capability

copy: do not copy file if name is disallowed anyway

util: new function checkfilename checkfilename checks for restrictions on filenames imposed by Mercurial itself, irrespective of on what platform it is run.