checkheads: don't warn about unsynced changes that we ill obsolete We won't be able to pull them after this push.

checkheads: check successors for new heads in both missing and common A relevant obsolete marker may have been added -after- we previously exchanged the changeset. We have to search for remote heads that disappear by the sole fact of pushing obsolescence. This case will also happen when remote got the new version from a repository that does not propagate obsolescence markers.

checkheads: attend to phases when computing new heads with obsolete Checkheads was more permissive than expected. When the remote heads are public we don't need to search for successors. None will make a public head disappear.

test: add testing of checkheads behavior with obsolete Expected behavior is quite complex. Explicit testing with clear scenarios is welcome.

merge with stable

i18n-pt_BR: synchronized with f5e86b416e05

merge with i18n

i18n-de: Remove unused sprintf parameter

tests: unset variable HG if it is set When hg tries to call itself it can call a different hg executable when this variable is set. Some tests fail when the called hg version is different.

test-hybridencode: a few more cases

tests: enable more server tests on Windows

test-static-http.t: enable on Windows We cannot read $! to get the background job process identifier, with MinGW it can return internal identifiers not matching the native Windows ones. Instead we introduce a helper script polling on the pid file. We assume the pid file data will be written in order.

Merge spelling fixes

spelling: requested

en-us: serialization

en-us: recognized

en-us: penalize

en-us: initialization

en-us: Initialize

grammar: it-handles

grammar: rolled-back

grammar: just-the-heads

spelling: value

spelling: update

spelling: transferred

spelling: transaction

spelling: thoroughly

spelling: syntactic

spelling: synchronize

spelling: supersede

spelling: successfully

spelling: succeeded

spelling: Structured

spelling: split

spelling: specific

spelling: shouldn't

spelling: sentinel

spelling: responsibility

spelling: relies

spelling: release

spelling: recursion

spelling: propagated

spelling: primarily

spelling: prior

spelling: precede

spelling: override

spelling: operations

spelling: multiple

spelling: Macintosh

en-us: labeled

spelling: just

spelling: journaling

spelling: deactivates

spelling: implementing

spelling: indented * * * spelling: indented

spelling: further

spelling: following

spelling: nonexistent

spelling: existence

spelling: exercise

spelling: equivalent

spelling: efficiently

spelling: don't/do not

spelling: doesn't/does not

spelling: destination

spelling: directly

spelling: descendants

spelling: deactivate

spelling: dependent

spelling: Failing

spelling: Explicitly

spelling: Environment

spelling: Construct

spelling: Authoritative

amend: add obsolete support If the obsolete feature is enabled, `hg commit --amend` marks a changeset as obsolete instead of stripping it.

obsolete: add a high level function to create an obsolete marker This function is designed to be used by all code that creates new obsolete markers in the local repository. It is not used by debugobsolete because debugobsolete allows the use of an unknown hash as argument.

amend: use an explicit commit message for temporary amending commit Before this changeset, the extra commit created during amend had the same description as the final commit. This was a bit confusing when trying to understand what that extra commit was about. This changeset changes the description of such commit to: temporary amend commit for <ammend-commit-hash> The old behaviour was not a big deal, but would become more confusing once we use obsolescence marker instead of stripping the precursors. This also helps if the user restores a strip backup.

amend: wrap all commit operations in a single transaction This allows proper recovery of an interrupted amend process. No changes are made to the logic besides: - indent operations into a single try-except clause, - some comment and code wrapping to 80 chars, - strip logic should not be contained in the transaction and is extracted from the main code.

amend: lock the repository during the whole process Without this changes another writer can lock the repository in the middle the amend process. The resulting mess can be pretty ugly.

Merge with crew

obsolete: introduce caches for all meaningful sets This changeset introduces caches on the `obsstore` that keeps track of sets of revisions meaningful for obsolescence related logics. For now they are: - obsolete: changesets used as precursors (and not public), - extinct: obsolete changesets with osbolete descendants only, - unstable: non obsolete changesets with obsolete ancestors. The cache is accessed using the `getobscache(repo, '<set-name>')` function which builds the cache on demand. The `clearobscaches(repo)` function takes care of clearing the caches if any. Caches are cleared when one of these events happens: - a new marker is added, - a new changeset is added, - some changesets are made public, - some public changesets are demoted to draft or secret. Declaration of more sets is made easy because we will have to handle at least two other "troubles" (latecomer and conflicting). Caches are now used by revset and changectx. It is usually not much more expensive to compute the whole set than to check the property of a few elements. The performance boost is welcome in case we apply obsolescence logic on a lot of revisions. This makes the feature usable!

Merge with stable

test-http-branchmap: enable on Windows Tests using "hg serve --daemon" are currently disabled on Windows for lack of proper kill utility. The one shipped with MinGW operates on internal process identifiers and not on the ones recorded by hg serve. Fortunately we can replace most of them by calls to killdaemons.py. This patch is a proof of concept on how to run these tests on Windows. The plan is: - Check test-http-branchmap.t does not fail/hang on the buildbot - Convert all kill utility calls to killdaemons.py calls. - Add a rule in check-code.py to forbid kill calls, or ignore the remaining ones (test-hup.t, etc.). - Possibly drop the 'serve' rule from hghave. The: listening at http://*:$HGPORT1/ line does not appear on Windows because the detached process can no longer write on its parent streams. Grepping hg serve stdout directly causes the parent process to never return and hangs the test. This is a bug, but I have no simple solution and prefer to pay this small price and enable hg serve tests on Windows.

killdaemons: take file argument explicitely It makes it easier to use as a generic replacement for kill utility, mostly for Windows tests.

killdaemons: add windows implementation

run-tests: do not duplicate killdaemons() code

bash_completion: add rebase rev completion

tests: correct quoting of double quotes in here documents used to write hooks Some shells, e.g. ksh89, will emit \" in a here document as ", while others will emit \". To be sure of getting \", we specify \\". This gets test-commit-amend.t and test-largefiles.t working on AIX.

amend: preserve phase of amended revision (issue3602) New commit from the amend process were created without any phase contraint. If the amended changeset had a different phase from it's parent, the phases data were lost. The changeset ensure the new commit are created in the same phase than the original changeset.

color: enabled color support for export command (issue1507) The export command didn't output the diffs in color, even when color support was enabled. This patch fixes that by making the export command use the default ui.write method, instead of directly manipulating the ui.fout file object. Also added a test case to verify color output to test-export.t.

test-hybridencode: extensions are replicated on hashed paths unfortunately, this is done unbounded, so the length of the hashed path is not really limited

Merge with crew-stable

test-hybridencode: dropping dir eight in hashed path due to dot or space at end

hgweb: respond 403 forbidden for ssl required error It's preferable to report "ssl required" as an error, so that the client can detect error and exit with 255. Currently hg exits with 1, which is "nothing to push."

test-push-http: include exit status of hg push

help: fix literal block syntax

test-hybridencode: adding one truncated char to dir 1..7 won't drop dir 8

test-hybridencode: testing dir levels and dir prefix lenghts of hashed paths

histedit: fix unused variable warnings spotted by pyflakes

test-convert-mtn.t: generate files in binary mode

test-convert-mtn.t: use #if to set mtndir to the correct value Monotone store directory name is not the same on Windows and Unix.

test-convert-darcs.t: fix elementtree test On OSX, the test succeeds because darcs aborts when trying to convert the dummy repository, and the test only grep for the output. On Windows, the darcs call succeeds for some reason but darcs fails to emit any output, which is not a valid XML output, which causes a traceback including the ElementTree string matched by the check, and makes a false positive. Check with a real repository instead. The darcs upgrade test is moved at the end so we can use our handmade darcs repository for the test.

test-convert-svn-branches.t: fix self call failure on Windows The error message is preceded by a cmd.exe error.

record: checks for valid username before starting recording process (issue3456)

test-hybridencode: test full range of ASCII codes from 126 to 255

test-hybridencode: remove x00 character case precludes implementation in C

Merge with crew-stable

Merge

subrepo: encode unicode path names (issue3610) Subversion 1.7 changes its XML output to include an explicit encoding tag: <?xml version="1.0" encoding="UTF-8"?> This triggers xml.dom.minidom to always return unicode strings, causing other parts of the code to explode. We unconditionally encode path names before handing them back, which works with both str (actually a no-op) and unicode values.

test-hybridencode: add more testcases for hashed paths

Merge with crew-stable

Merge

Merge with stable

Merge

merge with crew-stable

test: remove invalid hidden rev in graphlog test The hidden set of revision can not have descendant outside this set. The extension is patched to raise and exception when this happen.

Merge with stable

test-hybridencode: more testcases

remove template-vars.txt - it is outdated and neither usable nor necessary

largefiles: minor code cleanup Fix: * unnecessary use of map and lambda * comment instead of readable code * comparing None with 0 * and...or anti-pattern for 'ternary if' with very clever handling of i=None