subrepo: use '/' for joining non-local paths

fetch: drop force arg for commit (issue1752) This appears to be unneeded and forces fetch commits to examine clean files.

Fix issue1679: path reconstruction in hgwebdir was mangling things badly

do not translate commit messages It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.

hgignore.5: expanded description - explain that .hgignore must be created manually - hint that it is typically put under revision control

Merge with stable

merge with -stable

Update win32 build instructions for rst2html

Merge with crew-stable

Merge with crew-stable

graphlog: fix incoming with local repo (issue1731)

Mention GnuWin32 gettext in win32 build instructions

Fix test-demandimport and test-trusted under Windows The Windows-only wrapper around stdout is causing both of these tests to fail. test-demandimport fails because it tries to print repr(sys.stdout). Use stderr instead since that is not wrapped. test-trusted fails because the wrapper doesn't handle softspace and an unexpected extra space gets printed.

Merge with crew-stable

doc: update README with links to Docutils

hg: better wrapping of string literal

Merge with crew

Merge with crew-stable

convert/svn: fix backtrace in tags discovery (issue1742)

Merge with hg

changelog: move delayopener outside of class to eliminate reference cycle

changelog: swap opener to switch delay modes

changelog: factor out _delayname

changelog: _delaycount -> _divert

doc: link man pages to one another

doc: fixup font markup in man pages This exposed a bug in rst2man where it neglects to escape a literal backslash. A patch has been applied upstream, but not yet packaged in, say, Debian unstable. A forward-compatible work-around has therefore been put in place.

help: fix bad indentation in template filters list The indentation showed up in the hg.1.html file.

doc: add newline after literal blocks in man pages The rst2man writer leaves no space between a literal block and the following paragraph. This patch corrects this. It has also been applied upstream. This does not conflict with this change since any number of newlines can be added without effecting the rendered man page.

doc: use reStructuredText for man and HTML pages The Makefile now requires the rst2html and rst2man programs. Both can be found in Debian testing or downloaded from the Docutils homepage: http://docutils.sf.net/ http://docutils.sf.net/sandbox/manpage-writer/ The new HTML and man pages no longer contain huge amounts of un-wrapping literal blocks, thanks to how snippets of reStructuredText can easily be included inside other reStructuredText documents. The HTML pages now have anchors for all sections, including the help topics in hgrc.1 which were missing from the old HTML pages.

commands: use minirst parser when displaying help

minimal reStructuredText parser

util: wrap at termwidth-2 by default

Merge with stable

Add ui.progress API

tags: support 'instant' tag retrieval (issue548) - modify _readtagcache() and _writetagcache() to read/write tag->node mapping for global tags - if (and only if) tip unchanged, use that cached mapping to avoid reading any revisions of .hgtags - change so tag names are UTF-8 in memory in tags.py, and converted to local encoding as late as possible (in localrepository._findtags())

tags: implement persistent tag caching (issue548). - rename findglobaltags() to findglobaltags1() (so the "no cache" implementation is still there if we need it) - add findglobaltags2() and make findglobaltags() an alias for it (disabling tag caching is a one-line patch) - factor out tagcache class with methods readcache() and writecache(); the expensive part of tag finding (iterate over heads and find .hgtags filenode) is now in tagcache.readcache()

localrepo: add destroyed() method for strip/rollback to use (issue548).

Factor tags module out of localrepo (issue548). Currently only handles reading tags, and will soon grow support for tag caching. Could eventually deal with updating tags too.

localrepo: factor updatetags() out of readtags() (issue548).

localrepo: improve readability of _findtags(), readtags() (issue548). - rename many local variables - add some comments - refactor call to line.split() (catch ValueError rather than checking length of return value: one less local variable)

localrepo: rename in-memory tag cache instance attributes (issue548). - self.tagscache to self._tags - self._tagstypecache to self._tagtypes - this is for consistency, readability, privacy, and to subtly hint that "caching" is something else

localrepo: factor _findtags() out of tags() (issue548). This makes in-memory caching the sole responsibility of localrepo, eliminating some localrepo code that was duplicated in mq and bookmarks.

test-tags: enhance the test to probe tag caching better (issue548). - give detailed dumps of .hgtags and localtags content - repeat some query operations to expose cache bugs - ensure that rollback/strip undo tagging operations

test-tags: clarify test output; simplify test script a bit (issue548). - use simpler way ('hg id') to get current changeset id - add 'echo' statements to guide the eye when reading output - add some more output to clarify the state of .hgtags - drop '-d' option from every commit/tag, since run-tests.py does this (although with a different timestamp, so changeset ids differ)

merge with crew-stable

Merge with crew-stable

Merge with crew-stable

Merge with crew-stable