test-histedit: $TESTTMP quoting fixes for Windows Without this, C:\path\to\test is converted into C:pathtotest. Since $TESTTMP appears in output, seems to work in some places without quotes, and is also used within a larger quote block (see test-rebase-collapse.t, ~line 160), I'm not sure what a check-code rule would look like (or even if it is feasible).

lsprof: support PyPy (issue4573) PyPy's _lsprof module doesn't export a "profiler_entry" symbol. This patch treats the symbol as optional and falls back to verifying the attribute is present on the first entry in the collected data as part of validation. There is a chance not every entry will contain the requested sort attribute. But, this patch does unbust lsprof on PyPy for the hg commands I've tested, so I assume it is sufficient. It's certainly better than the ImportError we encountered before. As part of the import refactor, I snuck in the addition of absolute_import.

base85: clean up function definition style Cleanup performed with clang-format.

rebase: use bookmarks.recordchange instead of bookmarks.write Before this patch we were using the old api bookmarks.write instead of bookmarks.recordchange at the end of rebase operations. We move clearstatus within the transaction to make it easier for extensions that wrap transactions operations.

rebase: indentation change to make the next patch more legible We put the code to be indented in the next patch in a "if True:" block to make it easier to review.

test-run-tests: conditionalize the $TESTDIR check for Windows separator The variable uniformly uses '\' separators, so the straight equality check with '/' separating the last component fails. It also doesn't like having the quote appear in the middle of the string when testing.

test-context: conditionalize the workingfilectx date printing for Windows Starting with 13272104bb07, the output changed on Windows: --- e:/Projects/hg/tests/test-context.py.out +++ e:/Projects/hg/tests/test-context.py.err @@ -1,4 +1,4 @@ -workingfilectx.date = (1000, 0) +workingfilectx.date = (1000L, 0) ASCII : Gr?ezi! Latin-1 : Grⁿezi! UTF-8 : Gr├╝ezi! Since int and long are both 32 bit on Windows, this seems harmless in practice other than the previous test failure.

test-mq-qrefresh: drop single quoting of HGEDITOR value for Windows This was failing with: sh: $TESTTMP/checkvisibility.sh: No such file or directory

test-import: don't use printf to append an extension to $HGRCPATH The extension was failing to load on Windows because $TESTTMP contains a path component 'test', prefixed by a path separator '\'. That combination ends up converted to "...<tab>est...".

test-ssh: stop quoting dummyssh invocation for Windows The other invocations aren't quoted, and Windows doesn't like the single quotes: diff --git a/tests/test-ssh.t b/tests/test-ssh.t --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -520,20 +520,8 @@ remote hook failure is attributed to rem $ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >> remote/.hg/hgrc $ hg -q --config ui.ssh="python '$TESTDIR/dummyssh'" clone ssh://user@dummy/remote hookout + abort: no suitable response from remote hg! + [255] $ cd hookout + $TESTTMP.sh: line 264: cd: hookout: No such file or directory $ touch hookfailure - $ hg -q commit -A -m 'remote hook failure' ....

strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write Before this patch, strip was using repo._bookmarks.write. This patch replaces this code with the recommended way of saving bookmarks changes: repo._bookmarks.recordchange.

histedit: make use of bookmarks.recordchange instead of bookmarks.write Before this patch we were using the old api bookmarks.write, this patches replaces its usage by bookmarks.recordchange, the new api to record bookmark changes.

largefiles: fall back to the original for change/delete conflicts The largefiles merge code (currently) does not handle change/delete conflicts. So fall back to regular filemerge in that case. Making this code handle change/delete conflicts is left as an exercise for the future.

mergestate.add: store absentfilectxes as nullhex This is the most natural way to represent these files. We also need to make sure we don't try to store these files in the merge store.

mergestate._resolve: handle change/delete conflicts We will represent a deleted file as 'nullhex' in the in-memory and on-disk merge states. We need to be able to create absentfilectxes in that case, and delete the file from disk rather than try to write it out.