i18n-da: synchronize with 14a699ed774b

i18n: merge with main

i18n-ja: synchronized with 7458b7e0d8d5

i18n-ja: synchronized with ba50f1600131

context: be even more careful about result order in ancestors() (issue2642) The earlier patch could be confused by more complicated topologies.

convert/svn: abort operation when python bindings are not available Subversion python bindings check was not present in svn_sink source class which made it fail while using svn as destination repository. Added a more maintainble svn bindings check for svn_source and svn_sink classes.

convert/svn: handle MissingTool exception from converter_sink class The converter_sink class had no way of handling MissingTool exception. This change makes it to abort when there is a MissingTool exception.

bookmarks: restrict moving a bookmark to its descendants (issue1502) A bookmark can only move to a descendant on commit, pull or unbundle. Bookmarks cannot jump between heads anymore. This fixese issue 1502. We explicitly use new.node(), to emphasise that we are updating the current bookmark to the new node.

id: add bookmarks to id Since bookmarks are no longer merged with repo.tags() as of d012d95499f7, they don't show up in `hg id` as they used to. This adds them back into the summary that `hg id` prints, and adds a -B/--bookmarks flag alongside the -t/--tags and -b/--branch options. Note this introduces a slight backwards-incompatibility: the summary printed by `hg id` now separates bookmarks from tags with a space, as seen below, instead of running it into the tags list. Default summary output: $ hg id db815d6d32e6 tip/tag1 bm1/bm2 Output with --bookmarks: $ hg id --bookmarks bm1 bm2 See also afc84a879ac8 which adds bookmarks back into `hg summary`.

workingctx: overload bookmarks() to return parents' bookmarks This implements workingctx.bookmarks() parallel to workingctx.tags(), overloading the implementation from changectx.

eol: handle LockUnavailable error (issue2569) If the repository is not locked when clearing the dirstate, then running test-eol.t in a loop fails sooner or later with: ERROR: /home/mg/src/mercurial-crew/tests/test-eol.t output changed --- /home/mg/src/mercurial-crew/tests/test-eol.t +++ /home/mg/src/mercurial-crew/tests/test-eol.t.err @@ -343,6 +343,7 @@ % hg status (eol activated) M win.txt % hg commit + nothing changed % hg status $ testmixed CRLF However, if we cannot lock the repository, then we can also not make a commit and so we can simply ignore a LockUnavailable error.

tests: check if the bookmarks extension is ignored

backout: clarify which changesets are new in help text Plus another wording tweak ("default behavior -> "behavior without --merge"). Suggested by Kevin Bullock.

commands: update year to 2011 in version string

eol: clarify where the .hgeol file is located

commands: mark strings for translation

tests: remove bookmark extension configuration

context: generate file ancestors in reverse revision order (issue2642) The related() function in copies assumes that revisions are generated in reverse revision order, so it was getting confused in some situations.

export: only close files which export itself has opened

subrepo: only attempt pulling from git's origin git fetch does not accept repository URLs as arguments, and the intended logic of this code was not actually doing anything.

subrepo: disallow all unknown git ref types

sshrepo: catch passwords in ssh urls see also e4b02eb825b1

hgk: display bookmark in commit diff window

hgk: display bookmarks as gray labels in the commitline

hgk: read bookmarks

subrepo: expand relative sources for git subrepos

changegroup: fix typo introduced in 9f2c407caf34

changegroup: don't accept odd chunk headers

changegroup: verify all stream reads Mercurial often failed with struct.error or mpatch.mpatchError if incomplete data was received from a server. Now we validate all changegroup reads and aborts with abort: stream ended unexpectedly (got %d bytes, expected %d) if less than requested was read.

changegroup: don't accept streams without proper termination Streams should be terminated with a zero size changegroup, and read should never be permitted to return less than requested.