eol: test win32text compatible encode/decode filters

eol: be explicit about how to enable hook (issue2661)

eol: stop after first matched rule in hook (issue2660) When matching a file against the rules in .hgeol, the eol extension's hook should stop after the first matching rule is encountered. Otherwise, if this rule is contradicted by other more general rule (for example a catch-all at the end of .hgeol), some files are simply impossible to push. Trivial example: **.bat = CRLF ** = LF If all matching rules were applied, a .bat file would be rejected either because it has LFs (first rule) or because it has CRLFs (second rule).

merge with i18n

i18n-pt_BR: synchronized with 3178aca36b0f

help: document branch template keyword The branch keyword was added in d79fdff55627

merge with i18n

i18n-sv: started translation of mq and patchbomb

i18n-sv: synchronized with 95b0d4c1c9e1

convert.svn: branch name which equals trunk means `default' branch (issue2653) Converting from subversion specifying config.svn.trunk results in storing trunk under branch named as config.svn.trunk, where `default' brunch is expected. Submission contains patch and test.

ui: always report untrusted hgrc files when debug enabled It was suggested in IRC that people disabling the reporting of unstructed hgrc files can masquerade as problems. This makes sure untrusted hgrc files are always reported if --debug is used.

tests: test renaming a file added on two branches (issue2089) The issue was fixed by d100702326d5 .

merge with i18n

i18n-ja: synchronized with 16725043a6fc

i18n-de: translate some bookmark strings

i18n-de: synchronized with 703717eb112c

i18n-da: translate some small strings

i18n-pt_BR: synchronized with 9f2c407caf34

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