merge with stable

i18n-de: update po and remove fuzzies

i18n-de: Rework and fixes continued

Added signature for changeset 2aa5b51f310f

Added tag 2.1 for changeset 2aa5b51f310f

phases: don't complain if cset is already public on pushkey (issue3230)

i18n-pt_BR: synchronized with 140b6282ac79

merge with i18n

mq: prevent rewriting operation on public changeset The following operation are denied if the mq changeset is public * qrefresh * qpop * qfold note: qimport was already denied.

i18n-pt_BR: miscellaneous spelling and wording fixes

i18n-ja: synchronized with 0f99e709ce08

i18n-ru: synchronized with c0b2986b37b8; public phase name changed

i18n-pt_BR: synchronized with c0b2986b37b8

qpush: avoid trying to manage existing history (issue2218)

bundlerepo: try to find containing repo on creation (issue1812)

phases: add resync example to help topic

mq: fix secret description in help

pull: return 1 when no changes found (BC) Currently we have the following return codes if nothing is found: commit incoming outgoing pull push intended 1 1 1 1 1 documented 1 1 1 0 1 actual 1 1 1 0 1 This makes pull agree with the rest of the table and makes it easy to detect "nothing was pulled" in scripts.

push: don't treat bookmark as a found change Treating bookmarks as a found change results in confusing documentation or output and is less useful for scripting.

glossary: add phase terms

merge with i18n

i18n-sv: snchronized with ed9f40bc346f

i18n-ru: phases help translated

i18n-ru: minor corrections on unclear strings

i18n-ru: synchronized with 2605fc990725

i18n-ru: verifying uncertain translations.

phases: allow phase name in phases.new-commit settings Before this commit only phase index where accepted

qfinish: do not set secret changeset to draft if mq.secret=false If mq.secret=false, mq should not touch phase

mq: take mq.secret configuration into account when picking the default phase

qimport: when mq.secret=True set qimported revision as secret

qrefresh: keep changeset phase during refresh

phases: write default phase data as soon as possible. Marks phase data as dirty when computing default phase. Actual writing is done when the lock is released. So, read only operation don't write phase data because they don't lock the repo.

phase: accept old style revision specification

push: return 1 if no changes found (issue3228) Currently we have the following return codes if nothing is found: commit incoming outgoing pull push intended 1 1 1 1 1 documented 1 1 1 0 1 actual 1 1 1 0 0 This fixes the lower-right entry.

push: more precise failure check on subrepo push This will let us distinguish between nothing to push and push failed

push: return 0 when updating bookmarks

push: fix coding errors in unused branch This branch will get re-enabled in a subsequent fix

bookmarks: move current bookmark on update -u and bare pull -u (issue3222) Currently, this won't update when a #branch spec is in the URL

phases: fix verify with secret csets Verify uses repo.cancopy() to detect whether a repo is a plain old local repo, so it was giving a confusing error message when secret changesets were present.

mq: add secret setting

merge with i18n

i18n-pt_BR: synchronized with f2c49d9dee57

tests: don't rely on 'false' exit code in test-run-tests.t On Solaris: $ sh -c 'false ; echo $?' 255

tests: don't use alias alias doesn't work in Solaris sh.

tests: don't include plain 'diff -U0' content in test-diff-unified.t The only purpose of 'diff -U0' was to show that 'hg diff -U0' did almost the same. Unfortunately 'diff -U0' on Solaris gives incorrect line numbers. Masking it with globs wouldn't it make sense, so removing it is the best solution.

help: add examples to phases topic

update: note updated bookmark This brings update in line with pull: we notify the user when an action indirectly updates a bookmark.

resolve: mention merge-tools topic in help