i18n-da: synchronized

i18n-pt_BR: translate 'changeset' like 'revision' On Mercurial, 'changeset' and 'revision' may be used interchangeably, but the first is more or less untranslatable to a single word.

i18n: merge de and pt_BR translations

i18n-de: fixed inline emphasis The test-gendoc test said: gendoc-de.txt:1385: (WARNING/2) Inline emphasis start-string without end-string

i18n-pt_BR: fixed bullet list The test-gendoc test said: gendoc-pt_BR.txt:1475: (WARNING/2) Bullet list ends without a blank line; unexpected unindent.

i18n-pt_BR: synchronized with fc493cb90bb1

i18n-pt_BR: synchronized with 5287de171d74

i18n-de: Removed all fuzzies and translated small alphaend-extensions

i18n-pt_BR: synchronized with 02c43e8e0835

Fix up import test

subrepo: more robust split for .hgsubstate parsing

filectx: shortcut unrelated files in ancestor() (issue1327)

merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.

Related to Issue919: ui.progress, apparently unused before now, is busted.

Sometimes pushing to an HTTP repo fails with a useless message. abort: 'https://.../.../' does not appear to be an hg repository! Ought to produce a better diagnostics on the client. With patched 1.3.1, observed to produce an Apache HTML error message (from cgitb) including the vital text: File ".../hgwebdir.cgi", line 70, in ? wsgicgi.launch(application) File "mercurial/hgweb/wsgicgi.py", line 68, in launch File "mercurial/hgweb/hgwebdir_mod.py", line 91, in __call__ File "mercurial/hgweb/hgwebdir_mod.py", line 148, in run_wsgi File "mercurial/hgweb/hgweb_mod.py", line 100, in run_wsgi File "mercurial/hgweb/protocol.py", line 156, in unbundle File "mercurial/localrepo.py", line 2031, in addchangegroup File "mercurial/revlog.py", line 1204, in addgroup LookupError: 00manifest.i@......: unknown parent Might also be helpful if server's hgweb_mod.run_wsgi caught unexpected errors and returned a well-formed error response including the stack trace. The client patch would still be useful in this case, because it would let you diagnose issues with HTTP proxy servers and so on.

hg help resolve grossly mischaracterizes the --all switch

hgrc.5: mark more inline literals

hgrc.5: do not turn random URLs into links URLs and email addresses are automatically turned into links. We don't want that when talking about example links and addresses.

hgrc.5: use enumerated list for email charsets

hgrc.5: order of email charsets is not a top level literal block - it belongs under email charsets, not email in general - enumerate order

sshrepo: move mkstemp() out of the try block, we don't use the exception simpler fix for 3b6f18851d87

minirst: update module docstring

commands: use enumerated lists in help texts

minirst: support enumerated lists

minirst: prepare for general types of bullet lists The old code worked for '-' bullets only, but we can easily support variable width bullets.

minirst: combine list parsing in one function Bullet, option, field, and definition lists were parsed very similar code. They are now parsed by a single function (splitparagraphs). Some logic from the old parsing functions has been moved down to formatblock. This simplifies the parsing while putting the logic where it's really needed.

test-minirst: don't test on invalid reST input Input such as Only the left-most line (this line!) is significant for the indentation is not valid reStructuredText: the first line starts a block quote, but then the second line is not allowed to be unindented.

minirst: remove unnecessary "elif:" statements

commands: call ui.username carefully in debuginstall After c63c336ee2f7, 'hg debuginstall' would abort halfway through if no username was set. We now catch and display the exception instead.

mq: do not call ui.username unless it is necessary After changeset c63c336ee2f7, ui.username will abort by default if no username is set. It is therefore wrong to call ui.username when a username was provided on the command line.

util: sort paths in walkrepos() (fixes test failures in test-hgwebdir)

hgweb: treat rev as raw-rev if user agent is hg

patchbomb: fix 'echo -en' bashism in test-patchbomb The echo command doesn't accept options in some shells. printf is required by the SUSv2 (Single UNIX Specification v2).

Issue919: add a standard extension to recreate hardlinks between repositories. Having to run a standalone Python script from the contrib dir is a nuisance. Also makes various improvements to locking, file discovery, etc. Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories

tests: glog with style and file parameter (issue1896)

graphlog: don't pass filectxs to the templater (issue1896)

keepalive: handle broken pipes gracefully during large POSTs

diff: add --inverse option Most of the time, one can reverse a diff by swapping the revisions passed with -r but it happens that if you use the global -R, and diff against the tip of the current repo, you can't swap the revisions. One use-case for that is reviewing changes from a bundle before unbundling. One could also pipe the output of `hg diff` to a command line filter that reverses the diff, but that would remove the benefit from color diffs. Therefore, having an option in `hg diff` to reverse a diff is a good thing. The option flag selection was tricky. GNU patch uses -R/--reverse but -R is already used as a global option and --reverse would make --rev ambiguous.

hgweb: keep original order from hgwebdir config files (issue1535)

hgweb: use a tuple-list instead of dictionary for append-only store

templater: readable dates older than 24 months revert to ISO8601 (issue1006)

templater: put 'ago' inside the age template filter

coal/paper: show link to latest file revision (issue1344)

tests: fix hghave test for rst2html to not spew error output

help: describe new cross-branch behavior in update help text, plus cleanups

update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.

update: add comments and test cases for updating across branches Add comment to merge.py:update() showing various cases of 'hg update': to a descendant, crossing named branches, and crossing branches within a named branch; with no option, -c or -C; with or without uncommitted changes; and with or without a specific revision. Add tests for all of these cases.

patchbomb: fix handling of email addresses with Unicode domains (IDNA) dom.encode('idna') requires dom to be a Unicode string.