merge changes from mpm

cmdutil: update finddate() walkchangerevs() now returns contexts, does not take a cache func.

walkchangerevs: drop ui arg

walkchangerevs: reset cache between windows

log: tidy up some filter tests

walkchangerevs: move 'add' to callback Now walkchangerevs is a simple iterator over contexts

hgweb: added test case for extension loading phases (issue1824) this checks the order of module loading phases of hgweb. `4) reposetup' lines are duplicated because hgweb calls hg.repository() twice, one by __init__, another by refresh.

extensions: changed to call extsetup() from extensions.loadall() previously uisetup() was invoked by extensions.loadall(), but extsetup() was by _dispatch(). there's no need to split them because we have nothing to do between uisetup() and extsetup(). this fixes issue1824 indirectly.

hgrc.5.txt: mention hgrc categories with higher precedence first Reordering the FILES section accordingly. The previous ordering of categories might have been nice from the viewpoint of a site admin doing an initial install, but presenting a higher-precedence-first ordering is more relevant and natural for the average end user, since he will most likely resort to editing rc files in the order of their precedence, overriding whatever "sane" defaults are coming from more general files. Note that this patch does not change the texts, it just moves them. So, whatever bugs, grammar errors, or typos may have been in the texts before this patch: they are still there. On purpose. Because this patch here does not want to reword texts while moving them.

hook: only redirect stdout if it and stderr are valid files When using hgwebdir with WSGI via the IIS ISAPI-WSGI extension, both stdout and stderr filenos are set to -2, which makes the os.dup call in hook.py fail.

verify: filter the candidate list for broken linkrevs

Merge with crew

walkchangerevs: internalize ctx caching

walkchangerevs: yield contexts

walkchangerevs: kill window step of iterator

walkchangerevs: pull out matchfn * * * imported patch mercurial/commands.py

diffstat: made test case work with POSIX sh and printf * arithmetic expression ((...)), without $, is bashism. * printf '\xXX' seems non-standard. '\0' is okay. http://www.opengroup.org/onlinepubs/009695399/utilities/printf.html tested with bash 4.0 and dash 0.5.5.1

bundlerepo: fix small bug in exception raising

minor documentation improvements

patchbomb: accept default if it is empty string This fixes Cc: prompt.

patchbomb: fix double-spaces in prompts

commands: adding --no-status to resolve to match status

commands: use rev from remote repo when updating as part of a pull

commands: highlighting that rev is based on the remote repository

bookmarks: use API to determine if repo is local

diffstat: with --git, mark binary files with Bin Normally, diffs without any text insertions or deletions are reported as having 0 lines changed by stock diffstat. Compatibility is preserved with stock diffstat in this case, but when using --git, binary files are marked with Bin as a means of clarification. git diff --stat does something similar, though it also includes the old and new file sizes.

color: colorize diff --stat

diff: add --stat for diffstat output diff/qdiff --stat invokes patch.diffstat() on the diff output. When in interactive mode, the output's maximum width is determined by the terminal's width.

diffstat: print 0 instead of nothing for 0 adds or removes This is in line with how the stock diffstat behaves when processing a single diff with no line modifications (like a binary diff).

update tcsh_completion for the new forget and summary commands

cmdutil: minor refactoring of changeset_printer._show - use ctx.branch() instead of directly accessing the extra field "branch" - move definitions of locals ('extra' and 'branch') down to where they are used

commands: search for translated version of "DEPRECATED" The option description is already translated at this point, so we must search for a translation of "DEPRECATED".

mercurial.spec: update requirements for the build

convert: document parent order in splicemap help (issue1764)

Add style.css file to Inno Setup script

util: use sys.argv[0] if $HG is unset and 'hg' is not in PATH This is necessary when the executable name is not 'hg'. For example, if your system-wide mercurial is name 'hgs', sys.argv[0] is more accurate than 'hg'.

graphlog: hide internal state of ascii() from users

doc/hgrc.5.txt: deprecate [defaults] Quoting Matt: "Defaults are a bad idea. They are deprecated. Don't use them. Don't recommend them. Forget they existed. Use aliases." in http://selenic.com/pipermail/mercurial-devel/2009-October/016095.html

Merge with crew

rst2man: highlight inline literals in bold The old code would switch to Courier, but that doesn't really help much in a manpage.

rst2man: avoid italic for references The links to other manpages used both italic and bold text nested within each other. The \fP (select previous font) macro was used incorrectly to "reset" the nested fonts resulting in: <roman> text <italic> <bold> hg <italic> (1) <bold> more text with no switch back to roman. This stops the bleeding and removes the ugly italic (underline) from the manpage links.

doc: add a style sheet to the generated HTML pages

summary: remove reference to -p

doc, help: stream-line use of inline-literals

minirst: convert ``foo`` into "foo" upon display This lets us markup many more occurances of inline literals since they no longer look strange in the terminal output.

gendoc: fix synopsis The synopsis is used as an inline literal when generating the manpage. There should not be any whitespace on the inside of the quotation marks in inline literals. Commands with an empty synopsis (such as tags) produces ``tags `` as synopsis, which triggers a warning.

test-debugcomplete: update output to match a7ef354da662

summary: add --remote

summary: restore briefer commit status

summary: add empty repository and no revision checked out hints

Merge with crew

merge with crew

setup: refactor the version string to a subset of tag+tagdist-hash+date Here is an array summarizing the mercurial version string: [A] [B] [C] [D] [1] clone tag clean => tag [2] clone hash clean => latesttag+latesttagdistance-hash [3] clone tag dirty => tag+date [4] clone hash dirty => latesttag+latesttagdistance-hash+date [5] archive tag clean => tag [6] archive hash clean => latesttag+latesttagdistance-hash Column [A]: Mercurial built from an hg *archive* or hg *clone* working directory Column [B]: revision built has a *tag* or else default to the SHA1 *hash* Column [C]: working tree *clean* or *dirty* Column [D]: Mercurial version string Over the previous version: - row [5] did return just the node hash, now it returns the tag - prepend the latest tag and the distance to it to rows [2][4][6] - append also the date to row [3]; previously, it was just the tag - the version string is with an empty string to avoid possible TypeError exceptions during string manipulations - factorize the function to run hg commands; remove the error message as it is no more specific to the function. This scheme enables to have first part of the version strings that can be compared, whether it has been built from a tagged or untagged revision. The second part of the version adds a hash for untagged revisions and today's date if the working tree has local modifications. As the version string does not contain spaces or special characters, it should not break script parsing the 'hg version' command and should be usable for use in file names. The new code also ensure that the version string has exactly the same version string, whether it has been built from an archive or from a clone.

archive: add branch and tag informations to the .hg_archival.txt file Up to this changeset, only the repo (first node) and current node hash were included. This adds also the named branch and tags. So the additional lines to .hg_archival.txt are branch: the named branch tag: the global tags of this revision, one per line in case of multiple tags latesttag: if the revision is untagged, the latest tag (most recent in ancestors), again one per line if this ancestor has multiple tags. latestagdistance: the longest distance (changesets) to this latest ancestor.

ui: only use "user@host" as username in noninteractive mode We regularly see people on IRC ask how they can correct commits they accidentally made without having configured a username. This change will make Mercurial abort when a commit is made without a username. If Mercurial is run without a TTY (from a cronjob or similar), a username is constructed as usual. Schematically the changes are as follows: With ui.askusername=False: old new interactive user@host abort noninteractive user@host user@host With ui.askusername=True: old new interactive prompt prompt noninteractive user@host user@host

fix patchbomb prompt when sending series of patches

hg.clone: report branch name on update

make path expanding more consistent This expands ~user and $FOO constructs in ui.ignore files, [defaults], [paths], extension paths, and HGRCPATH files.

tests: fix inadvertent use of existing test repository

commands: clarify output for the commit summary It is not clear what is meant with '2 modified, 3 unknown'. We clarify this by writing '2 modified files, 3 unknown files' instead.