mq/qqueue: enable renaming of active queue

mq/qqueue: split _setactive Prepare _setactive to be called without checking for applied patches.

merge with stable

templates: add filenolink to raw style (issue2332)

revlog: optimize deltachain

manifest: correct readdelta() according to parentdeltas

contrib: simple extension to practically convert a repo from tip delta to parentdelta

localrepo: add parentdelta to requires only if enabled in config file

revlog: append delta against p1

revlog: teach revlog to construct a revision from parentdeltas

revlog: deltachain() returns chain of revs need to construct a revision

revlog: parentdelta flags for revlog index

glossary: fixed typo

Merge with stable

tests: unify test-clone-r

tests: unify test-debugcomplete

tests: unify tests-debugindexdot

tests: unify test-debugbuilddag

tests: unify test-diffdir

tests: unify test-children

tests: unify test-revlog-packentry

tests: unify test-revlog-group-emptyiter

tests: unify test-install

tests: unify test-subrepo-svn

tests: unify test-subrepo-relative-path

tests: unify test-subrepo-paths

tests: unify test-subrepo-deep-nested-change

tests: unify test-subrepo

glossary: add entry for "Branch, inactive"

tests: unify test-patchbomb

Merge with mpm

tests: unify test-mq-symlinks

tests: use regular expressions instead of helpers

tests: unify test-mq-strip

tests: drop big sed from test-keyword.t

tests: unify test-keyword

test-walk: enable absolute path tests

tests: unify test-grep

cmdutil: code simplification

tests: unify test-log

log: do not --follow file that is deleted and recreated later (issue732) == What == issue732 is only one example of a buggy behaviour, but there are in fact many intricated cases. For example: ( "o" contains an alive version of the tracked file, "x" does not) tip - o - o - x - o - o - x ... \ o - o - o - o - x ... \ / o - o This repository contains at least two instances of the tracked file, but when calling "hg log -f file" only the latest one (the one alive in tip) matters to us. == How == We must extract from the filelog the history of the file instance we're interested in and discard changes related to other instances of that file. We see that we're only interested in ancestors(node), and that all other nodes in the filelog should not be considered.

tests: unify test-mq-safety

tests: unify test-mq-caches

tests: unify test-mq-guards

tests: unify test-mq-eol

tests: unify test-mq

Merge with stable

encoding: improve handling of buggy getpreferredencoding() on Mac OS X Prior to version 2.7, calling locale.getpreferredencoding() would always return 'mac-roman' on Mac OS X. Previously, this was handled by a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older have a bug where isspace() would incorrectly report True for 0x85 and 0xa0 after such a call. In order to fix this, we replace the previous _encodingfixup mapping to an _encodingfixers mapping. Rather than mapping encodings to their replacement, it maps them to a function returning the replacement. This allows us to provide an simplified implementation of getpreferredencoding() which extracts the expected encoding and restores the locale. This fix is based on a patch originally submitted by Martijn Pieters as well as feedback from Brodie Rao.

templatefilters: unnest uescape()

templatefilters: use \uxxxx style escape for JSON string It's embeddable in plain javascript, and also conforms to JSON standard.

test-notify: make it pass on Mac OS X (again) Changeset 25e74cd3f023 (from 2008) introduced a hack to handle the very long values of $TMPDIR typically seen on Mac OS X. This hack expected continuation lines to begin with a tab. However, as a result of a change in Python 2.7, changeset 594b98846ce1 made it so continuation lines began with a tab. Since then, `test-notify' has been broken on Mac OS X. Merely replacing the tab in the regular expression with a space will not work: not only do tab continuations still occur in the message, but other lines -- in the body of the message -- also start with a space. Luckily, all broken up lines appear to end with either a colon or an n, so we can match those, and reinsert them in the replacement.

tests: combine test-dirstate-future.t into test-dirstate.t

tests: unify test-dirstatedirs

Merge with stable

dagparser: transplant part of 4e804302d30c

check-code: catch "echo -n" in tests

test-init: replace 'echo -n' with 'printf' The '-n' argument to echo is a non-standard extension that isn't supported on Mac OS X 10.6.

revset: fix outgoing argument handling

debugbuilddag: escape backslash properly in help string

url.py: removed 'file' inheritance in the httpsendfile class Since py3k doesn't have a "file" builtin and, consequently, doesn't support inheriting from it, this patch refactors the httpsendfile class to wrap the objects returned by the builtin "open" function while adding the necessary methods (__len__ for constructing the Content-Length header and read, write, close and seek for the file-like interface).

fix undefined variables, spotted by pylint

py3kcompat: added fake ord implementation for py3k In py3k, a bytes object __getitem__ will return an int instead of a one-character bytes object. This has negative consequences when we want to ord(), like in the following example: >>> b'foo'[0] 102 >>> ord(b'foo'[0]) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: ord() expected string of length 1, but int found This patch overrides the default ord() implementation to just return an int that's what is passed as an argument for ord(). Making the above call succeed: >>> ord(b'foo'[0]) 102

commit: explicitly document the existence of "last-message.txt"

Merge with stable

tests: unify test-changelog-exec

tests: unify test-cat

tests: unify test-bundle-vs-outgoing

tests: unify test-bundle-type

tests: unify test-bundle-r

tests: unify test-bundle

tests: unify test-branch-option

tests: unify test-branches

tests: unify test-dumprevlog

tests: unify test-dirstate-future

tests: unify test-fncache

tests: unify test-bookmarks-strip

tests: unify test-bookmarks-rebase

tests: unify test-bookmarks-current

tests: unify test-bookmarks

tests: unify test-bisect2

tests: unify test-bad-pull

tests: unify test-bad-extension

tests: unify test-backwards-remove

tests: unify test-backout

tests: unify test-audit-path

tests: unify test-archive-symlinks

tests: unify test-archive

tests: unify test-annotate

tests: unify test-addremove-similar

tests: unify test-addremove

tests: unify test-acl

tests: unify test-abort-checkin

tests: unify test-1102

tests: unify test-586

mercurial.spec: gettext is a build requirement for getting proper localization

http basic auth: reset redirect counter on new requests (issue2255) On Python 2.6.6 (and patched 2.6.5 on certain Linux distros), the change that caused issue2255 was also applied to non-digest authentication; this change extends the 2ec346160783 fix accordingly.