web: Made elapsed time calculation dynamic (javascript). This allow safe caching of the pages by the browser and still display the right amount of elapsed time upon page refresh. If javascript is disabled, absolute time is displayed, leaving it readable. All the templates have been updated.

extdiff: add repository root as a variable Some external diff tools (notably Plan 9 diff(1)) require the absolute path to the file being diffed for proper function. A root variable was added to inform an external tool of the repository root (the tool is invoked with the cwd set to tmproot).

help: move hgignore man page into built-in help (issue2769)

graphlog: make use of graphmod's revset support

graphmod: use revsets internally Thanks for the idea and most of the implementation to Klaus Koch Backs revisions() and filerevs() with DAG walker which can iterate through arbitrary list of revisions instead of strict one by one iteration from start to stop. When a gap occurs in a revisions (i.e. in file log), the next topological parent within the revset is searched and the connection to it is printed in the ascii graph. File graph can draw sometimes more connections than previous version, because graph is produced according to the revset, not according to a file's filelog. In case the graph contains several branches where the left parent is null, the graphs for each are printed sequentially, not in parallel as it was a case earlier (see for example the graph for README in hg-dev).

svn subrepo: attempt work around obstructed checkouts (issue2752) It should be possible to do better than this with 'svn switch', but the logic required woud be significantly more complex. Until someone needs the performance improvements of using switch, we'll just use the same strategy for everything.

churn: strip key earlier to avoid false negative seach in aliases

bookmarks: further restrict IOError on write This won't risk losing the undo file when the error was something other than file not found

tags: loosen IOError filtering when reading localtags

run-tests: don't count test as succeeded if it failed regressed around ec4ae5727f07

changegroup: do not count closed new heads (issue2697) If a closed head gets pulled, we currently see (example): $ hg pull pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) A subsequent 'hg heads' doesn't show that head because it is closed. This patch improves the UI response texts for that same use case to: $ hg pull pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) That is, the part "(+1 heads)" is not shown in that case any longer.

merge with crew

shrink-revlog: defend against null first parents

test-contrib: add a test for shrink-revlog We only verify the extension runs and that verify passes at the end as constructing a test repository that would result in a shrink would be nontrivial.

test-simplemerge-cmd.t: move all tests into test-contrib.t

Move test-dumprevlog to test-contrib in anticipation of more contrib tests

shrink-revlog: use a bundler object (see d69c9510d648)

shrink-revlog: update util.opener to scmutil.opener after d13913355390

shrink-revlog: remove \ from docstring

bookmarks: be more restrictive in our Exception catching

strip: make it clear that --force discards changes (issue310)

subrepo: tell Subversion when we are non-interactive (issue2759) $ hg clone repo repo-clone -v updating to branch default resolving manifests getting .hgsub getting .hgsubstate abort: svn: OPTIONS of 'https://subversion.srv/project': Server certificate verification failed: issuer is not trusted (https://subversion.srv)

merge with stable

tests: check for (*/sec) instead of (*B/sec) to match (X bytes/sec) I just had: transferred 606 bytes in 2.9 seconds (211 bytes/sec)

test-repair-strip: turn into new style test

extdiff: fix broken symlinks handling (issue1909)

tags: catch more corruption during cache parsing (issue2779)

run-tests: do chdir for tests under a lock for thread safety

run-tests: add iolock to vlog

patch: remove redundant variable in iterhunks()

merge with stable

merge default heads

commit: improve --date help text

merge with stable

test-transplant: fix missing file addition

tests: add script to disable a selected wire protocol capability This can be used to test that the client and server both fall back to the previous wire protocol when the capability is not supported. It is currently used by test-push-http.t and I plan to use it for the HTTP long argument support tests.

mq: prevent traceback when qfinish patches not in series. When mq status entry referencing a patches that is not in series `hg qfinish -a` used to issue a traceback. This states is inconsistent but might happen regularly when people misuse hg up -mq. This changeset prevent hg from crashing. The faulty entry is finished anyway and a warning is issued.

check-code: separate warnings to avoid repetitive str.startswith

atomictempfile: rewrite docstring to clarify rename() vs. close().

atomictempfile: avoid infinite recursion in __del__(). The problem is that a programmer using atomictempfile directly can make an innocent everyday mistake -- not enough args to the constructor -- which escalates badly. You would expect a simple TypeError crash in that case, but you actually get an infinite recursion that is surprisingly difficult to kill: it happens between __del__() and __getattr__(), and Python does not handle infinite recursion from __del__() well. The fix is to not implement __getattr__(), but instead assign instance attributes for the methods we wish to delegate to the builtin file type: write() and fileno(). I've audited mercurial.* and hgext.* and found no users of atomictempfile using methods other than write() and rename(). I audited third-party extensions and found one (snap) passing an atomictempfile to util.fstat(), so I also threw in fileno(). The last time I submitted a similar patch, Matt proposed that we make atomictempfile a subclass of file instead of wrapping it. Rejected on grounds of unnecessary complexity: for one thing, it would make the Windows implementation of posixfile quite a bit more complex. It would have to become a subclass of file rather than a simple function -- but since it's written in C, this is non-obvious and non-trivial. Furthermore, there's nothing wrong with wrapping objects and delegating methods: it's a well-established pattern that works just fine in many cases. Subclassing is not the answer to all of life's problems.

run-tests: display diff before prompting with --interactive

check-code: warn about naked except clauses

eliminate various naked except clauses

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.

opener: use %r in format string for abort

wireproto: allow unbundle with hashed heads parameter (issue2126) Current wire protocol of unbundle sends the list of all heads in the remote repository to avoid race condition. This causes "URL too long" error on HTTP server when the repository has many heads. This change allows clients to send SHA1 hash of sorted head hashes instead. Also, this introduces "unbundlehash" capability to inform them that the server accepts hashed heads parameter.

merge with stable

encoding: avoid localstr when a string can be encoded losslessly (issue2763) localstr's hash method exists to prevent bogus matching on lossy local encodings. For instance, we don't want 'caf?' to match 'café' in an ASCII locale. But when café can be losslessly encoded in the local charset, we can simply use a normal string and avoid the hashing trick. This avoids using localstr's hash method, which would prevent a match between

merge with stable

revset: optimize stringset when subset == entire repo if range(len(repo)) is passed to stringset and x is a valid rev (checked before) then x is guaranteed to be in subset, we can check for that by comparing the lengths of the sets

help/revset: fix grammar

qrecord: provide help when mq is not enabled

record: improve help test coverage

paper: preserve whitespace on description instead of adding breaks This preserves the indentation of text in the changeset description. This is useful for example for descriptions containing command line use case examples like: $ hg -q heads 13934:648a834cca14 13912:71ea5b2b9517 Without this patch, such space-char indented text was just left aligned.

compact style: show bookmarks in the same manner as tags

revsets: preserve ordering with the or operator This is valuable because now revsets like 'bookmarks() or tip' will always show tip after bookmarks unless tip was itself a bookmark. This is a somewhat contrived example, but this behavior is useful for "where am I" type aliases that use log and revsets.

hgweb: set minimum number of revision to display to 1 when revcount is 0 When revcount goes to 0 nothing is displayed in hgweb. This patch sets revcount to max(revcount, 1).

zeroconf: clean up naked exceptions

localrepo: don't add deleted files to list of modified/added files (issue2761) If a file is deleted (rm, not 'hg rm') from the working dir an attempt to run 'hg diff -r X', with the file being present in X will cause an abort. We didn't check if the file has been deleted from the working dir and later on tried to open it to compare with the one from X, causing the abort. This fix adds that check. Consequently, no output will be returned.

path_auditor: eliminate local function 'check' in __call__

subrepo: trailing whitespace cleanup