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

revsets: provide contexts for filesets Before this change, revsets containing fileset patterns failed. This allows queries like: hg log -r "contains('set: added() and symlink()')"

fileset: don't attempt to check data predicates against removed files

revset: simplify help not about quoting

Added signature for changeset db33555eafea

Added tag 2.1-rc for changeset db33555eafea

bookmarks: correct correction of -i

commands: drop exclamation mark in abort message

update: note ways to avoid moving bookmark

push: prevent moving phases outside of the pushed subset

discovery: ensure that missingheads are always heads of everything we tried This only alter the third block executed when: * repo have secret changeset * onlyheads is not None In other case findcommonoutgoing already had this behavior

phase: extracts heads computation logics from analyzeremotephases

phase: fix warning text from invalid remote phase add missing end of line and substitution.

mq-safety: don't apply safety on non-outgoing changeset When mq changeset are secret, they don't appear in outgoing and won't be pushed. So it's not necessary to abort the push. The checkpush call is protected by lock to prevent race on phase.

phases: properly register excluded changeset when revision are specified There was no other drawback than a bad UI message for now.

bookmarks: make -i summary simpler and more accurate

revset: allow slashes in symbols suggested by Ryan Kelly

phases: do not mark debug message for translation

templatekw: fix phase keywords

phases: fix typo in warning message

rebase: drop uppercase in abort message

largefiles: add --normal option to hg add (issue3061)

largefiles: fix caching largefiles from an aliased repo (issue3212)

run-tests: expand user in --with-hg This makes it possible to run: $ ./run-tests.py --with-hg=~/hg-bin/hg

tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' This makes it easier to run tests on systems that have a usable sh in the search path but not in the standard location.

tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode This makes -d output much more readable when debugging the test framework or very strange test failures.

bookmarks: clarify help for -i/--inactive

revset: fix typo in message

merge default into stable for 2.1 code freeze

revset: add remote() predicate to lookup remote revisions

bookmarks: automatically advance bookmark on naked update (BC) (issue2894)

qimport: back out 2eec74d7ce95 This patch presumed mq csets must always be secret, which isn't yet established.

phases: only synchronize on common changeset when push fails If push failed we should not expect the pushed changeset to exist on remote. The common set before the push is used for phase related operation instead of common + missing. Note: * We still pull phase data even if push fails * We still try to push data even if push fails (same than bookmark)

discovery: diet discovery.prepush from non-discovery code The ``discovery.prepush`` function was doing multiple things not related to discovery. This changeset move some code into the ``localrepo.push`` method. The old ``discovery.prepush`` function jobs is now restricted to checking for multple head creation. It was then renamed ``discovery.checkheads``. This new ``discovery.checkheads`` function may receive several other changes in the future but we are a bit too much near the freeze for a wider refactoring.

qfinish: set all qfinished patch as draft, not only qbase Fix a silly bug.

largefiles: test and simplify empty directory removal in remove

tag: invalidate tag cache immediately after adding new tag (issue3210) New tags were written to .hgtags / .hglocaltags without updating or invalidating the localrepo cache. Before afd459933d5f a lock was acquired soon after the new tags had been written, and that invalidated the cache so the new tags for example could be seen in pretxncommit hooks. With afd459933d5f the lock had already been acquired at this point and the missing cache invalidation was exposed. The tag caches will now explicitly and immediately be invalidated when new tags are added.

mq: ensure mq changesets are set to secret when no phase data are found

mq: qimporting revision set them to secret

mq: have mq create secret changeset only

wireproto: refuse to lookup secret csets

qclone: ignore local qbase if secret

rebase: only advance phase on successful commit

phases: mechanism to allow extension to alter initial computation of phase This commit add a whennodata list where extension can register a callback to be called if no phase related data are found in the repository. The goal is to ensure the existing extension that move phase data in 2.1 can compute consistent phase boundary for existing repo.

qclone: add a few comment and blank line This help readability.

mq: turn changeset draft on qfinish (except if qparent is secret) As mq automatically sets changesets as secret, it should make them draft when he is done with it. We do not move them automatically to draft when we detect that something else have also set them as secret through their parents.

config: have a way to backup and restore value in config This is introduce to allow temporary overwriting of a config value while being able to reinstall the old value once done. The main advantage over using ``config`` and ``setconfig`` is that backup and restore will properly restore the lack of any config. Restoring the fact that there was no value is important to allow config user to keep using meaniful default value. A more naive approach will result in the following scenario:: Before: config(section, item, my_default) --> my_default temporal overwrite old = config(section, item) … setconfig(section, item, old) After config(section, item, my_default) --> None The first user of this feature should be mq to overwriting minimal phase of future commit.