inotify: server: use dirstate instead of repo

inotify: server: use wprefix everywhere, introduce prefixlen self.wprefix = self.repo.root + '/' = self.repo.wjoin('') + '/' Since we'll eventually get rid of self.repo, keep only the first form. use self.prefixlen to compute only once the root prefix size.

inotify: server._updatestatus: simplify control flow

url: add support for custom handlers in extensions

patchbomb: add --flag to put flags in subject prefixes --flag foo uses: [PATCH foo] or [PATCH M of N foo] depending on the number of patches. Multiple flags are supported: --flag foo --flag bar gives [PATCH foo bar]

Merge with stable

Merge with i18n-stable

Merge with i18n

merge with i18n-stable

i18n-pt_BR: miscellaneous fixes

i18n-pt_BR: synchronized with 2de7d96593db

config: improve code readability

mq: re-phrase the qrefresh help about the user and date options

mq: add the date with qrefresh, even if missing (issue1768) When setting the date with qrefresh (-d|-D), and the patch does have neither a 'Date:' nor a '# Date' header, add the date field as such: - if the patch has a 'From:' header, add a 'Date:' header - otherwise, upgrade to Mercurial extended patch format and add '# Date'

mq: upgrade the patch to HG format when adding the author name with qrefresh When setting the author field with qrefresh (-u|-U), and the patch does have neither a 'From:' nor a '# User' header, add the author name as such: - if the patch has a 'Date:' header, add a 'From:' header - otherwise, upgrade to Mercurial extended patch format and add # From

mq: add function to check if a header exists in a patch

mq: fix coding style in qrefresh

Merge with crew-stable.

hook: fix full path imports on Windows (issue1779) Bottom portion fixes full path imports on source installs on Windows. The top portion further fixes full path imports on binary installs. Initial patch by Roman V. Kiseliov

patch: marked string for translation

diffstat: scale adds/removes proportionally to graph width The previous method of scaling had a tendency to include graph lines that went past the output width when the file with the most changes had a very large number of changes.

test-clone-failure: reenable perm to allow deletion

patch: create file even if source is not /dev/null as long as the first hunk is -0,0 and the source and destination have the same name. Matt found a patch like this, and /usr/bin/patch accepts it.

Merge with crew

Fix failing darcs test

Merge with mpm

Merge backout of 26fa0e31011d

Backed out changeset 26fa0e31011d. On OS X, it broke test-issue322, test-issue660, test-permissions, test-symlink-addremove, and test-walk.

mercurial.ini: provide more useful info * Add warning about not editing the site-wide file on Vista * More detail about where to create user Mercurial.ini * Provide examples for ssh tools * List extensions, all disabled * add [patch] section, for fixing patch behavior when using win32text * example [extdiff] section, all disabled * example [diff] section, all disabled

churn: correct output when run in subdirectories

i18n: move unrelated line out of try-except block

i18n: updated outdated comment

merge backout of 5724cd7b3688

Backed out changeset 5724cd7b3688 (depends on other changes, no tests)

merge with crew-stable

dispatch: also pass level argument to __import__ for ignored modules I wanted to check if mercurial.demandimport could speed up the loading of PyObjC, and ran into this: the level argument for __import__, available in Python 2.5 and later, is silently dropped when doing an 'import *'. I have no idea what these arguments mean, but this minor change made it work. (Oh, and because of that 'from ... import *', PyObjC still took about 2s...)

lsprof: make profile not die when imported modules changes (issue1774)

notify: do not mime encode multipart templates Mulitpart templates should take care of this themselves. See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html Also catch potential parsing errors gracefully.

kill trailing whitespace

color: simplify & improve colorization of qseries Use 'repo.mq.series' to obtain patch names, instead of deriving them from the qseries output. This is both simpler and more robust, and fixes colorization of patches without a message with -s/--summary.

gendoc: documentation section describing available extensions

localrepo: document the locking scheme a little better - localrepo: document lock(), wlock() methods - lock: add class docstring

keyword: use util.datestr for utcdate filter, expose through variable

keyword: reference templating help, add utcdate filter example

keyword: remove "help keyword" from test Testing help output does not make sense as we have no way to check for errors in content which would be the only reasonable test here.

keyword: update copyright

hgwebdir: add links to the main repository page in notfound.tmpl

Merge with crew-stable

help: improve "hg help revisions" Add info about branch names, and other clarifications.

rebase: link to RebaseExtension This new page has the usual user-oriented information about the extension.

patchbomb: use a list instead of indented paragraphs

help: un-indent list in "hg help diffs"

help: add "templates" as an alias for "templating" help topic

gendoc: make anchors for help topic names

gendoc: rename underlined/bold to section/subsection

help: use field lists for lists of extensions

help: format templating help topic with a field list

minirst: parse field lists

minirst: simplify bullet list indentation computation

minirst: indent literal blocks with two spaces The vast majority* of them are formatted like this in the source, so this basically reverts the output to how it looked before we got the minirst parser. *: the help on templating use four spaces for some examples and will now shown with an indentation of just two spaces.