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.

commands: do not split a translated string Splitting the string after translation relies on the implicit assumption that translators will always translate the English words using single foreign words. Also, when translating we want as much context as possible so I've moved the string formatting into the translatable string.

Remove parents from default help in favor of summary

summary: quieter with -q

commands: fix missing empty synopses

Introduce summary command

Merge with redone c655432c2c24 (issue1860)

Dummy-merge with c655432c2c24 (issue1860)

Redo c655432c2c24 (issue1860)

Merge with crew-stable

Merge with crew-stable

Merge with mpm

README: revert accidental commit

test-gendoc: adjust output to account for Swedish translation

merge with mpm

merge with crew-stable

merge with mpm

Merge with crew-stable

mq: fix traceback for qpush inexistant-patch with no patch applied

rebase: change rebase help to talk about changesets and branch names

mq: changed help for qpop -f to reflect actual behaviour

convert/svn: better error when hg cannot call itself (issue1838)

patch: handle symlink updates/replacements (issue1785)

patch: handle symlinks without symlinkhunk Symlink creations and deletions were handled with a special symlinkhunk object, working like a binary hunk. However, this model does not support symlink updates or replacements, so we teach regular hunks how to handle symlinks.

bisect: use util.system and fix good/bad when using -c The existing scheme using util.find_exe and subprocess.call meant we couldn't use simple shell commands in tests. Fix that. Also, it mistakenly used status from the system() call rather than good from the bisect call in reporting results.

bisect: limit considered set to descendants of first good rev

tests: add -k to test scripts matching keywords argument is a space-separated list of keywords that are searched for in the name and body of each test. This makes it easy to run only tests related to tags, hgweb, revert, etc. (eg -k "tag hgweb revert").

use short identifiers in atom feed