dispatch: better error message for --config option

mq: fix literal blocks in docstrings

convert/mtn: handle change in mtn 0.45 certs output

merge with crew

bundle: add test for Issue1704 Original version by Greg Ward.

bundle: don't send too many changesets (Issue1704) The fast path in changegroupsubset can send too many csets. This happens because it uses the parents of all bases as common nodes and then goes forward from this again. If a base has a parent that has another child, which is -not- a base, then this other child will nevertheless end up in the changegroup. The fix is to not use findmissing(), but use nodesbetween() instead, as do the slow path and incoming/outgoing. The change to test-notify.out is correct, because it actually hits this bug, as can be seen by glog'ing the two repos: @ 22c88 |\ | o 0a184 | | o | 0647d |/ o cb9a9 and o 0647d | @ cb9a9 It used to pull 0647d again, which is unnecessary.

convert: reenable SVN support after license issue solved

patchbomb: normalize date format in generated mboxes mbox format should use time.asctime(). Unfortunately, this function writes 2-characters day of week on Windows while unix one writes a single character. Normalize to Windows version since the other one can hardly be written with strftime().

hghave: be more tolerant to rst2html output On Windows, rst2html.bat calls rst2html.py, printing something like: "rst2html.py (Docutils" (notice the extra ".py")

test-convert-hg-svn: fix test output

rebase: make sure the newancestor is used during the whole update (issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.

buildrpm: enhance changelog of the RPM file Now the changelog is different depending if the parent is tagged: - for tags, keep the previous content, i.e. changelog of the tags. - for nightly build, changelog of the changesets since the latest tag As RPM is expecting strictly descending dates, I have used a python script to reorder the mercurial changelog.

buildrpm: build full RPM package including sources

buildrpm: cleanup script

buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.

buildrpm: warn if there is outstanding uncommitted changes

buildrpm: build from working dir parent and use hg version for RPM versioning Previous, RPMs was always built from tip, and the release number did not match the 'hg version' put in place for 1.4. This will enable also to this script to be able to build official tag and not only nightly build.

doc: fix language in CSS comments (by timeless)

setup: fix f51d1822d6fd refactoring, propagate env to runcmd

clone: simplify help text

Merge with main

i18n-zh: updated Chinese translation

i18n-da: synchronized with 6cb1808e5ae7

test-extension: Solaris grep don't know [[:digit:]]

merge with hg-stable

fix test-patchbomb on solaris

fix test-diffstat on solaris

doc: uppercase first letter in HTML man pages

Merge with crew

merge with crew

merge with stable

doc: styles for man page, which suit with the mercurial website designed loosely based on: http://mercurial.selenic.com/css/styles.css with some modifications by intention: * visited links are colored differently * no fixed size * works without typeface.js we keep most styles, which is from docutils, untouched. tested with: * MSIE 6.0 on Windows * Firefox 3.5 on Linux

rst2man: more robust uppercasing of section titles This handles section titles with child elements such as emphasis or inline literals.

doc: use titlecase in man page section titles

rst2man: automatically write sections in uppercase Man pages have uppercased section titles but other formats do not. Letting rst2man handle the tranformation allows better reuse of text between man pages and other formats.

relink: do not translate format string with no text

Use utf-8 encoding in test-branchmap's clone call After 75520c24feda it is printed in local encoding, i.e. "C" if not set otherwise.

Branch name printed since a3d73b3e1f8a now in local encoding.

Make test-branchmap executable and adjust output after a3d73b3e1f8a

ui: refer to "hg help config" when no username is set

help: add "hg help config" topic This is a condensed version of the first two sections of hgrc.5.txt. After a slight upgrade of minirst, we can move the whole of hgrc.5.txt into the config help topic and just let the man page include it.

hgrc.5: do not mention "name: value" syntax This was supported in versions prior to 1.3 where we used the standard Python ConfigParser. The new config parser never supported it.

submerge: properly deal with overwrites also pull .hgsubstate check out of inner loop

subrepo: add more debugging output, lose _ markers

subrepo: do a linear update when appropriate

subrepo: notice dirty subrepo states when merging

subrepo: add some debug output to submerge

Merge with i18n

i18n-sv: add missing newlines to translations

i18n-sv: simple translation fixes Fixed the fuzzy translations. Also took care of a few really simple strings, and translated the 'summary' command.

i18n-de: Update msgids, remove .txt linespecs + few small translations

i18n-pt_BR: synchronized with d942e06d7b14

Merge with main

i18n-da: synchronized with e06c940d554d plus some new translations

i18n-pt_BR: synchronized with e06c940d554d

i18n-zh_TW: synchronized with e06c940d554d

i18n-zh_CN: synchronized with e06c940d554d

i18n-sv: synchronized with e06c940d554d

i18n-ja: synchronized with e06c940d554d

i18n-it: synchronized with e06c940d554d

i18n-fr: synchronized with e06c940d554d

i18n-el: synchronized with e06c940d554d

Merge with main

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.

clone: add option -u/--updaterev

hgweb/sshserver: extract capabilities for easier modification

kill trailing whitespace

color: wrap qrecord The qrecord command is registered in uisetup phase, so we do our wrapping in extsetup phase.

record: use uisetup instead of extsetup to register qrecord New commands should be registered in uisetup so that other extensions have a change of wrapping them in extsetup.

merge: supply base node to merge tools in the environment Merge tools will be able to exploit this to correctly merge backouts. This won't work fully, though, until issue 1327 is solved, since the node information is not necessarily correct.

test-bisect: normalize shell error message Different shells on vary in their error messages. Here we're satisfied if the shell mentions './foobar' at all.

run-tests: add "debug" mode: don't capture child output, just show it. In debug mode, we: - don't try to diff expected vs actual output - disallow --interactive - disable timeouts (warn if user tried to supply one) - don't try to parse hghave output, since we don't have the output - don't try to save output to .err file

run-tests: make --tmpdir option more useful. - instead of creating HGTMP inside tmpdir, now HGTMP is tmpdir (thus, fail if tmpdir already exists) - passing --tmpdir automatically turns on --keep-tmpdir