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

revset: add tests for 'remote()' predicate

revset: fix documentation for 'remote()' predicate current documentation for 'remote()' predicate is wrong about specification of parameters. there are 3 patterns: # of param: id: remote: - 0 current branch "defult" remote - 1 specified "defult" remote - 2 specified specified

revset: fix 'remote()' failure when remote repo has more revs than local current 'remote()' implementation uses 'r' variable, even if it is not initialized when 'if n in repo' is not true. this causes unexpected exception.

help/config: fix help command markup

merge with i18n

i18n-ru: synchronized with bf502ccc46d7; fuzzies removed

i18n-ru: fix typos in `resolve` help * help entry is called 'merge-tools', not 'merge-tool'; * envvar is called HGMERGE, not HGEMERGT.

merge: defer symlink flag merging to filemerge (issue3200) Previously, we could change a normal file into a corrupt symlink when trying to merge a symlink flag. Now, we leave the flag alone and let filemerge deal with it (usually by a prompt). We also drop a redundant flag setting after filemerge (now dealt with by ms.resolve) that would cause similar corruption.

help: fix publish option spelling in phases topic

help: add missing phase config items to config topic

help/phases: remove trailing whitespace

sslutil: more helpful fingerprint mismatch message This will aid debugging for users of sites that renew certs.

help: add phases topic

i18n-pt_BR: synchronized with 0b05e0bfdc1c

copies: remove stray print

scmutil: unify some 'no changes found' messages This keeps the wording more consistent for secret csets

outgoing: display info about secret changets while no sharable changeset found

bundle: display info about secret changets while no sharable changeset found

test-rebase-collapse: Add test for rebase regression introduced in 12309c09d19a

test-commandserver: test that phase data is being refreshed

localrepo: delete _phaserev when invalidating caches

localrepo: fix phaseroots filecache definition it's in .hg/store

discovery: fix regression when checking heads for pre 1.4 client (issue3218) This code is not run by the test suite and silly name error were lurking here.

help: mark strings for translation

bookmarks: respect --debug during incoming/outgoing

largefiles: fix revert on missing largefile (issue3217)

largefiles: fix transplant for all cases (issue3192)

i18n-ru: synchronized with 9f2ed48f8cda

i18n-sv: translated phase

i18n-sv: translating strings for add, annotate, debuginstall

i18n-sv: synchronized with c2e6c5ef4555

merge with i18n

copies: eliminate criss-crosses when chaining Before the copies refactoring, we declared that if a and b were present in source and destination, we ignored copies between them. The refactored code could however report b was a copy of a and vice versa in a situation where we looked for differences between two identical changesets that copy a to b. y / x \ y'

i18n-pt_BR: synchronized with f7c8d6ee6056

merge with i18n

i18n-sv: synchronized with 7ed056f1e97d

mq: pass qbase node instead of mq statusentry in phasedefaults This was breaking my remotebranches extension in a completely mystifying way, because repo.lookup was failing to resolve the statusentry. I'm not sure how this works absent my remotebranches extension, but doing it this way looks more correct and doesn't break anything.

patch: a little bit more robust line counting on diff --stat (issue3183)

convert: subversion convert abort on revision not found (issue 3205)

bash_completion: added -o filename option to _hg_status (issue3101)

phase: alway return a value With the previous code, the phase command was returning None when displaying phase and 0 or 1 when moving them. This seemed an bit odd and displaying phase return 0 too now.

largefiles: fix addremove when no largefiles are specified

revset: include the correct first ancestor change for follow(file) Previously we always included '.', which may not touch a file. Instead, find the file revision present in '.' and add its linkrev. This matches the results of 'hg log --follow file'.

revset: remove unreferenced followfile function