heads: fix templating of headers again (issue2130) (tweaks and test by mpm)

minirst: use unicode string as intermediate form for replacement Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences.

subrepo: fix recording of + in .hgsubstate (issue2217)

mq: qimport cleanup on fail (issue2214) save state of successfully added patches and ensure cleanup on the way out.

test-acl: don't use $PWD solaris ....

test-alias: don't use the environment variable PWD solaris ...

revert: Make it clearer when not to use revert

progress: check stderr.isatty() before each print This prevents writing progress information to a non-tty stderr if one is swapped in after startup, which happens in `hg serve`.

http digest auth: reset redirect counter on new requests (issue2255) This fixes a regression introduced in a1e575b48563 when Mercurial reuses the auth handler for several requests and the redirect counter never is reset.

revset: deal with empty sets in range endpoints (spotted by Julian Cowley <julian@lava.net>)

subrepo: fix silent push failure for SVN (issue2241)

merge: pass constant cset ancestor to fctx.ancestor

context: allow passing the common cset ancestor to fctx.ancestor This is used by the next patch to speed up merge.applyupdates.

merge: document how to 'undo' a merge

resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.

revset: fix spelling typo

parser: fix URL to effbot

glog: fix crash on empty revision range

mercurial.spec: don't include convert-repo - use "hg convert" instead

revset: remove debugging leftover

contrib: update tcsh_completion with commands for 1.6 Added the following commands: debugbuilddag debugdag debugpushkey debugrevspec.

bookmarks: fix in/out return values

bookmarks: fix bogus cut and paste for outgoing

addchangegroup: pass in lock to release it before changegroup hook is called Currently, callers of addchangegroup first acquire the repository lock, usually to check that an unbundle request isn't racing. This means that changegroup hook actions that might write to a repo get stuck waiting for a lock. Here, we add a new optional lock parameter and update all the callers. Post-1.6 we may make it non-optional.

cmdutil: only output style header once in non-buffered mode (issue2130)

bookmarks: touch changelog on write to force hgweb reload

mq: explicit exit code when patch is already on top

mq: fix qpush --move for selected guarded patches In the case of guarded patch, the patch could not be found because the full_series list contains also the guard value appended to each patch name. As we already checked that the patch is pushable above in the code, we just have to use the series list (which doesn't contains guard value) to get the patch index.

help: glossary.txt formatting fixes

help: fix glossary.txt named branches description

zeroconf: Use BadDomainName exception instead of string exceptions String exceptions no longer work in python 2.6. Use exception classes instead.

bookmarks: Use error message consistently The 'updating bookmark %s failed!' message is better than 'failed to update bookmark %s'. To have more consistent error messages we use just 'updating bookmarks %s failed'.

Merge with default, fix up stray topological head from i18n

i18n: disable check-code on polib.py

bookmarks: Add -B option to incoming/outgoing to compare bookmarks We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option is passed we compare bookmarks instead of changesets. This can be used to see which bookmarks do not exists on the remote site.

Merge with i18n

discovery: use stable sort order in --new-branch warning A Python set seems to do this already when you iterate over it, but this should be considered an implementation detail and not something we can rely on. This also gets rid of an unnecessary string conversion -- the set already contains strings.

Merge with i18n

Merge i18n default into stable

i18n-pt_BR: synchronized with b4467a7d5c75

Merge with mpm

i18n-da: copy msgids that does not need translating

acl: delete trailing whitespace in docstring

i18n-da: synchronize with 42408cd43f55

Merge default into stable for the 1.6 code freeze

revset: improve help on strings

tests: extend revset test

merge: sort arguments to stabilize the ancestor search

merge: improve merge with ancestor message

ui: ignore EIO in write_err Hgs signal handler will catch the signal for example if the terminal hg is running in is closed. That will make it try to warn that it was 'killed', but that might fail with EIO and cause hg to exit with an unhandled exception. Normally nobody cares, but system error handlers such as Fedoras abrt will notice and report https://bugzilla.redhat.com/show_bug.cgi?id=596594 .

http push: break infinite recursion on failure with Python 2.6.5 (issue2179) Python 2.6.5 will keep resetting the retry count on redirects, for example when the server returns 401 on failing auth (like google code currently does). We stop the endless recursion by not resetting the count. http://bugs.python.org/issue3819 introduced the regression with Python 2.6.5. http://bugs.python.org/issue8797 discusses a fix which might make it to 2.6.6 and 2.7.0.

pager: respect HGPLAIN Pager shouldn't be enabled for scripting use.

patchbomb: reduce number of opts.get calls Rename outgoing() function to getoutgoing() analogous to getbundle() etc. to avoid name conflict.

parser: improve infix error checking (spotted by timeless)

transplant: when reading journal, treat only lines starting with "# " special like patch.extract() does

revrange: fix up empty query again

revset: add some tests

Explain trust near hgrc in config help

test-import: test git patch import with strip Tests revision 0429d0d49f92

revset: fix up contains/getstring when no args passed

revrange: attempt to parse old-style queries as a first pass

revset: allow extended characters in symbols

i18n: fix translation of empty paragraphs

extensions: recommend against using wrapfunction for repo methods Instead, all extensions should use the "dynamic subclass" trick: subclass repo.__class__ and then replace repo.__class__ with your new subclass. This avoids conflicts that happen when one extension uses wrapfunction and another uses subclassing to extend the same method of localrepository.

i18n-zh_TW: split messages into paragraphs

i18n-zh_CN: split messages into paragraphs

i18n-sv: split messages into paragraphs

i18n-pt_BR: split messages into paragraphs

i18n-ja: split messages into paragraphs

i18n-it: split messages into paragraphs

i18n-fr: split messages into paragraphs

i18n-el: split messages into paragraphs

i18n-de: split messages into paragraphs

i18n-da: split messages into paragraphs

Merge with hg-i18n

i18n: translate each paragraph separately Makes translation work easier by reducing message sizes and avoiding invalidating whole messages on small changes or additions to the original text.

i18n: script for splitting large messages on .po/.pot files With fixes and heavy refactoring by Martin Geisler.

i18n: patch polib.unescape Patch submitted to upstream as rev b9174a342092 in http://bitbucket.org/mg/polib/

i18n: import polib 0.5.2 (rev b0ab301cfdcc)

i18n-da: remove spurious \n

revset: nicer exception for empty queries

commands: advertise "hg help revsets" in help for log

revset: all your error messages are belong to _

help: new revsets topic Based on a patch by timeless which in turn is based on http://selenic.com/pipermail/mercurial-devel/2010-June/021638.html

Merge with main

Ignore mercurial.egg-info build output

bookmarks: add support for push --bookmark to export bookmarks

bookmarks: add support for pull --bookmark to import remote bookmarks

patch: inline small, single-use 'write' function

patch: inline small, single-use 'close' function

mq: __str__ falls back to __repr__

bookmarks: update known bookmarks on the target on push

bookmarks: pull known bookmarks from server that are newer

bookmarks: add pushkey server-side support

pushkey: add debugpushkey command for testing

pushkey: add http support pushkey requires the same permissions as push listitems requires the same permissions as pull

pushkey: add ssh support

pushkey: add localrepo support

pushkey: add pushkey core

sshrepo: sort arguments All current commands have zero or one args. Future multi-arg commands will want args to appear in a deterministic order.

mq: make 'qdelete <patchidx>' work again. This just backs out 1abd9442727c (a minor code cleanup that accidentally broke qdelete) and adds a test.

bdiff.c: Added support for py3k. This patch adds support for py3k in bdiff.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

diffhelpers.c: Added support for py3k. This patch adds support for py3k in diffhelpers.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

base85.c: Added support for py3k. This patch adds support for py3k in base85.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

parsers.c: Added support for py3k. This patch adds support for py3k in parsers.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3.

mpatch.c: Added preliminary support for py3k. This is done by including the util.h header file, that defines appropriate macros according to the current python version.

osutil.c: Support for py3k added. This patch adds support for py3k in osutil.c. This is accomplished by including a header file responsible for abstracting the API differences between python 2 and python 3. listdir_stat_type is also changed in the following way: A previous call to PyObject_HEAD_INIT is substituted to a call to PyVarObject_HEAD_INIT, which makes the object buildable in both python 2.x and 3.x without weird warnings. After testing on windows, some modifications were also made in the posixfile function, as it calls PyFile_FromFile and PyFile_SetBufSize, which are gone in py3k. In py3k the PyFile_* API is, actually a wrapper over the io module, and code has been adapted accordingly to fit py3k.

util.h: Utility macros for handling different Python APIs. If we are in py3k, a IS_PY3K symbol is defined. Apart from that, byte strings use the API defined in Python 2.6+ (_?PyBytes_.*). For Python < 2.6, the bytes API is defined accordingly for mercurial usage (shameless copy from bytesobject.h from Python's code). Some macros were backported from 2.6, as inspired by rPath's pycompat.h.

relink: ensure deterministic directory walk in collect

help: add "glossary" topic Joint work with Vishakh Harikumar, Pradeepkumar Gayam, David Champion, Mark Booth, timeless, Matt Mackall, Heinrik Stuart, Greg Ward, and Martin Geisler.

relink/progress: Adding progress for collecting stage

relink/progress: Adding progress for pruning stage

merge: when current branch has 1 or > 2 heads, actually abort. Currently merge just prints abort-like messages to stderr and then exits with a misleading status 0 (cleverly disguised as "False"). With this change it raises Abort, just like every other fatal error.

tags: remove inactive debugging code. It was left in just in case things went wrong with the tag cache in Mercurial 1.4, so we could easily crank up the verbosity with a one-line change. There have been no problems in 1.4 or 1.5, so it should be safe to drop this now.

tags: remove the old non-caching implementation of findglobaltags(). It was left behind just in case the tag cache blew up in Mercurial 1.4, so we could easily revert to the non-caching code. There have been no problems with the tag cache in 1.4 or 1.5, so it should be safe to get rid of this code now.

keyword: postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.

revset: fix call to ctx.extra() in closed()

p4: fix long line and bad spacing around %

Fix shell quoting on p4 conversion

tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.