relink: format reclaimed byte count nicely

test-relink: remove unnecessary ui.username setting

test-https: match output from 31eac42d9123

merge with stable

merge with crew

convert/svn: fix _iterfiles() output in root dir case (issue2647) When converting directory additions/replacement with project directory set to root, _iterfiles() sometimes returned paths starting with a slash making following svn calls to fail. I could not reproduce the issue with hand-crafted repositories. Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>

eol: no need to accumulate files when checking all changesets Just check the files touched by the changesets.

eol: improve hook failure output Before, only the first failure was reported: abort: b.txt should not have CRLF line endings while now all of them are listed: abort: end-of-line check failed: d.txt in a7040e68714f should not have CRLF line endings b.txt in fbcf9b1025f5 should not have CRLF line endings As first suggested by Antoine Pitrou <solipsis@pitrou.net>

merge with stable

bookmarks: remove API limitation in setcurrent setcurrent refuses to set a new current bookmark if the current bookmark points to the current dirstate. This restriction is not needed. A current bookmark can point to a different bookmark.

bookmarks: separate bookmarks update code from localrepo's pull. We explicitly want to update bookmarks from a remote. This will avoid duplicate calls to listkeys if we clone (which calls pull) and keep bookmark related code together.

tests: add tests for bookmarks support in hg identify

identify: list bookmarks for remote repositories

hgignore: ignore dll files generated under cygwin

pager: don't page stderr if it's being redirected (issue2541)

color: port to using ctypes (issue2687) replacing usage of pywin32, which was removed for Mercurial 1.8

hgweb: drop use of super() for Exception base class In Python 2.4, Exception is an old-style class and doesn't work with super.

diff: make diff -c aware of revision sets

color: wrap lines in docstring

merge with stable

setup: fix mac build broken by e42d18538e1d Sometimes xcodebuild prints warnings to stderr, but runcmd() assumes anything printed to stderr implies failure. Since runcmd() was originally only intended to run hg, this was fine until it was pressed into service for running xcodebuild. Thus: split runcmd() into two parts: runcmd(), which does the minimal amount of work to run a subprocess, and runhg(), which calls runcmd().

color: don't mention internal function in docstring The render_text function actually never existed, the docstring probably meant the render_effects function instead.

keyword: offer additional datefilters when the extension is enabled Before the additional datefilters (utcdate, svnisodate, svnutcdate) were used when kwtemplater was initialized. Now they always be used once the extension is enabled.

keyword: docstrings for additional date filters

mq: do not let qrefresh write bad patch

graphlog: give meaningful error if more than one file is given

merge with stable

test-https: update to match output from 3f6a4579f803

tests: respect new hg clone listkey queries in http-proxy test

bookmarks: discard current bookmark if absent from the bookmarks (issue2692) After a rollback, the current bookmark might be absent from the bookmarks file. In that case we discard it instead of displaying a traceback during commit.

fix test-highlight after bookmark support change for hgweb

merge with stable

eol: do not abort when win32text is found, only warn The win32text extension does not break eol or vice-versa, so it is not a fatal error to have both of them enabled. It's just folly. So spewing warnings in this condition is preferrable to aborting. When both extensions are enabled, the user now sees: % hg st the eol extension is incompatible with the win32text extension win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension M hgext/eol.py

merge with stable

tests: fix failures introduced in 7359cb753a54

tests: fix permission issue trying to remove test directory

bookmarks: fix update of the current bookmark during rename We need to get rid of the previous bookmark after changing current bookmark.

setup: remove unnecessary code for win32com (pywin32)

test-highlight: fix test output (introduced by 2151703e7f84)

eol: rename hook into checkheadshook, add checkallhook (issue2665) "hook" is still an alias for "checkheadshook".

eol: make the hook check all new heads, not only tip (issue2666) Report and test by Antoine Pitrou <solipsis@pitrou.net>

eol: the hook no longer requires the extension to be loaded Reading rules in the hook means we no longer need ui to be filled and do not need reposetup() to be run anymore.

eol: extract parsing error handling in parseeol()

eol: separate .hgeol parsing from merge in ui This will help refactoring the hook.

eol: remove unused argument in readhgeol()

eol: explain why reading .hgeol from the working dir is special

templates: widen the graph canvas (issue2683)

rebase: don't use util.Abort for an internal error

help: limit documentation width to at most 80 characters Reading long lines is suboptimal no matter how wide the terminal is.

merge with stable

transplant: avoid the word "rebase" when we mean "transplant"

transplant: explain that changesets are copied, not moved

hg: add support for cloning bookmarks

httprepo: use caps instead of between for compat check We usually query the capabilities at some point anyway so this way the first roundtrip actually does useful work.

revset: add a revset command to get bisect state.

bisect: new command to extend the bisect range (issue2690) When bisect ends in a merge point, and one of the parent wasn't checked, this usually means the culprit is in a branch that wasn't scanned. For this case we provide a new command which extends the range of the bisect search to the common ancestor of the parents of the merge.

hgweb: pmezard thinks one default is enough

don't depend on features of Exception as much BaseException.message has been deprecated, so we try to not rely on it.

deal with empty Content-Length headers

hgweb: add separate page with bookmarks listing

hgweb: add display of bookmarks for changelog and changeset

merge with stable

setup.py: use StrictVersion instead of manual comparison

help: extract items doc generation function

templates: document missing keywords or filters Keywords keywords are not documented yet but are turned into function definitions to avoid lambda docstring weirdness.

templatefilters: move doc from templates.txt to docstrings

templatefilters: wrap all filters in dedicated functions This will highly simplify the docstring integration. I measured "hg log --style=changelog" duration on mercurial itself and could not detect any difference.

templatefilters: prefix helper functions

templatefilters: sort function definitions

templatefilters: match filter keys and function names

templatefilters: sort filters table

templates: generate keyword help dynamically

test-help: test a sample of 'templates' topic help

fix compiling of extensions for OS X and XCode 4.0

test-subrepo-paths: fix typo

eol: use dirstate methods to clear dirstate This fixes a race that was observed when status was called before and after clearing the dirstate.

tests: fix permission issue trying to remove test directory

transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command Sometimes it is necessary to know the original revision ID in order to correctly rewrite the patch or commit message when transplanting. This patch follows the pattern set by the existing 'HGUSER' environment variable, and adds a test that covers both HGUSER and HGREVISION.

test-subrepo-paths: test cummulative remapping

merge with stable

ui: yield unchanged values in walkconfig Ever since walkconfig was introduced back in 25e7ea0f2cff, the values yielded has been mutated by replacing "\n" with "\\n". This makes walkconfig less useful than it could and there is no other way to iterate over all config sections. The third-party reposettings extension used ui.walkconfig but did not take the replacement into account -- this change will actually fix a bug in the extension when a value contains a newline.

Added signature for changeset aa1f3be38ab1

Added tag 1.8.1 for changeset aa1f3be38ab1

i18n-pt_BR: synchronized with 66d65bccbf06

tests: use $TESTTMP more and use (glob) less This locks down the test output a little more.

hgweb_mod: respond right away if the client specified 100-continue support Clients that send 100-continue should make sure they really support continue intelligently. In a later patch we'll introduce a capability so new clients don't pay a performance penalty talking to old servers.

hgweb: add support for 100-continue as recommended by PEP 333.

subrepo: show the source that git pulls

commands.update() now works properly with a revision of 0 Without this change commands.update() treats an integer 0 as if no revision was passed and updates to the branch head. This fix allows an integer 0 to be detected as a revision number so the working directory is correctly changed to revision 0 rather than the branch head.

merge with stable

mergetools: add alternate registry keys for 32bit apps on 64bit O/S Not all applications needed the workarounds, so I did not add alternate keys for every Windows merge application.

filemerge: introduce a 'regkeyalt' merge tool variable This allows us to provide alternate search keys for 64bit operating systems that may have 32bit merge tools installed. Presumably it may find other uses.

merge with stable

wix: drop bin/ folder from MSI installers (issue 2673) Also fixes issue 2658.

zsh completion: remove computed default values from help texts The default encoding and encoding mode are computed at runtime and can vary from system to system. The two remaining default values in the completion help texts (number of directories to strip on import and default bundle name) are fixed in the source code.

merge: remove last traces of fastforward merging bbc97d419b16 introduced fast-forward branch merging. 66ed92ed115a partly removed it again. The fastforward variable would always be false if branchmerge was false, so the fastforward variable makes no difference and we can remove it completely.

merge with stable

subrepo: backout 67fbe566eff1, --force requires svn >= 1.5

merge with stable

merge with i18n

i18n-de: improve translation for "unmerged branches" This translation issue was pointed out by Georg Brandl.

httprepo: order URL query string fields for readability - cmd is always first, since the other fields are arguments to that command. - The other fields are in alphabetical order, rather than random order. example "hg serve" output BEFORE 127.0.0.1 - - [26/Feb/2011 14:20:07] "GET /?bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&cmd=changegroupsubset&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 14:00:50] "GET /?pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000&cmd=between HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 14:17:28] "GET /?nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521&cmd=branches HTTP/1.1" 200 - AFTER 127.0.0.1 - - [26/Feb/2011 14:21:28] "GET /?cmd=changegroupsubset&bases=fa5962be1d87fe9a57244a14033550e192e57521+1a38f137b190482eaf0986594cd6e6b486c76fec&heads=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 13:48:13] "GET /?cmd=between&pairs=0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 HTTP/1.1" 200 - 127.0.0.1 - - [26/Feb/2011 14:19:17] "GET /?cmd=branches&nodes=1a38f137b190482eaf0986594cd6e6b486c76fec+fa5962be1d87fe9a57244a14033550e192e57521 HTTP/1.1" 200 -

ancestor: improve description

subrepo: don't crash when git repo is missing

ancestor: rewrite to deal with crossed linkrevs (issue2682) This version is about 10% slower, possibly because it visits some revisions in a different topological order than what's in the revlog.

hgcia: accept "queued." xmlrpc return as success

merge: back out single-parent fast-forward merge This backs out changeset: 13158:9e7e24052745 user: Mads Kiilerich <mads@kiilerich.com> date: Tue Dec 07 03:29:21 2010 +0100 summary: merge: fast-forward merge with descendant Before named branches, the invariants were: a) "merges" always have two parents b) p1 is not linearly related to p2 Adding named branches made (b) problematic, so the above patch was introduced, which fixed (b) but broke (a). After discussion, we decided that the invariants should be: a) "merges" always have two parents b) p1 is not linearly related to p2 OR p1 and p2 are on different branches

merge: drop resolve state for mergers with identical contents (issue2680)

merge with stable

hgweb: fix filelog rss links generation

hgweb: use tip in gitweb/monoblue filelog rss links (issue2677)

merge with stable

cacert: improve error report when web.cacert file does not exist

tests: improve hghave error reporting for missing Py OpenSSL

Merge with stable

Improve unresolved merge conflicts warning (issue2681) Suggested by Antoine Pitrou <pitrou@free.fr>

tests: convert test-serve to new format

run-tests: handle mixed comment lines in blacklists

test-doctest: handle unix/windows path discrepancies

test-rename-merge1: make it easier to review, windows friendly - Reuse the coding style of the previous tests, both are very similar - Do not play with case changes, it does not work on Windows