tests: quote environment variable to extract wildcard on MinGW environment On MinGW environment, the command line below in test script can't extract wildcard "*" and remove target files correctly. $ rm $ENVVAR/foo/bar.* To extract wildcard, environment variable should be quoted by double quotation like below: $ rm "$ENVVAR"/foo/bar.* This patch also omits "-f" of "rm" to know whether files are removed or not by exit code of it.

tests: choose the path separator in PYTHONPATH suitable for platform Before this patch, test code introduced by e3a5922e18c3 into test-extension.t always uses ":" as the path separator in PYTHONPATH. But ";" should be used on Windows. This patch chooses the path separator in PYTHONPATH suitable for platform.

util: warn when adding paths ending with \ Paths ending with \ will fail the verification introduced in 684a977c2ae0 when checking out on Windows ... and if it didn't fail it would probably not do what the user expected.

check-code: more replacement characters for finding '.. note::' (even) more exact by using more characters: replace '.' with 'p' and ':' with 'q'

check-code: check comment for '.. note::' without two newlines Because string entries are replaced before matching, we must search for the transformed pattern. But it seems to be quite unique and does not return false matches. If it will, they can be listed as 3rd arg in pypats.

documentation: add an extra newline after note directive Like this no docutils version interprets any line in the following text as argument of note.

tests: modify minirst test input to new format Modifying the test input data shows the effects of the last patches. In text output nothing has changed. In html output the title has moved on its own line.

minirst: do not add a 2nd empty paragraph This does not add a separating block after a separated note directive. .. note:: text is formatted to Note: text

minirst: find admonitions before pruning comments and adding margins Lines with only a directive are not deleted anymore because they are detected before comments are deleted by prunecomments(). addmargins() will be adapted later.

minirst: do not fail on an empty admonition block

minirst: do not interpret a directive as a literal block When a directive was on its own line, it was interpreted as a literal block. Example of problematic input: .. note:: a note text

Makefile: do update on a temporary copy of a po file This avoids having a half completed file (with a new timestamp) when msgmerge has failed.

i18n-pt_BR: synchronized with d24ee6d7d167

date: allow %z in format (issue4040)

merge with stable

merge: move forgets to the beginning of the action list Forgets need to be in the beginning of the action list, same as removes. This lets us avoid clashes in the dirstate where a directory is forgotten and a file with the same name is added, or vice versa.

rebase: fix working copy location after a --collapse (issue4080) Rebasing with --collapse would leave the working copy on the parent of the collapsed commit, instead of on the collapsed commit. This fixes that. Also fixes a few tests that already covered this area but had bad data. This also fixes issue3716 where bookmarks are not kept across rebases with --collapse. I updated the test to cover that case as well.

Merge with stable.

rebase: fix rebase aborts when 'tip-1' is public (issue4082) When aborting a rebase where tip-1 is public, rebase would fail to undo the merge state. This caused unexpected dirstate parents and also caused unshelve to become unabortable (since it uses rebase under the hood). The problem was that rebase uses -2 as a marker rev, and when it checked for immutableness during the abort, -2 got resolved to the second to last entry in the phase cache. Adds a test for the fix. Add exception to phase code to prevent this in the future.

Merge with stable.

check-code: prepend warning prefix for repeated warnings only once When a warning occured several times in one file, "warning: " was prepended several times: examplefile.py:3: > def a(object): warning: this looks wrong examplefile.py:27: > def x(object): warning: warning: this looks wrong

check-code: fix an error message

test: do not add .pyc and .orig in test-commit-amend.t (issue4085) This makes the test fails with disabled byte-compilation (PYTHONDONTWRITEBYTECODE="1" environmental variable).

Added signature for changeset d825e4025e39

Added tag 2.8 for changeset d825e4025e39

merge with i18n

i18n-pt_BR: fix a few missing changes on 95304251c376

i18n-pt_BR: synchronized with 95304251c376

i18n-ja: synchronized with 1d7a36ff2615

patch: ensure valid git diffs if source/destination file is missing (issue4046) This is arguably a workaround, a better fix may be in the repo to ensure that it won't list a file 'modified' unless there is a file context for the previous version.

histedit: add description about exit code

rebase: add description about exit code when there are unresolved conflicts

shelve: remove unused variable assignment Fix test-check-pyflakes.t error after 1d7a36ff2615. This patch replaces "readshelvedfiles()" invocation by "shelvedfile().exists()" check and aborting, because it is required only to ensure that shelved changes corresponded to specified name exist after invocation. This patch also remove definition of "readshelvedfiles()" itself, because it is invoked only from the line removed by this patch.

rebase: fix selection of base used when rebasing merge (issue4041) Prior this changeset, rebasing a merge whose first parent was not in the rebase lead to wrong and highly conflicting merge. See the in-line comment for details. Test have been updated with the data provided by the reported.

doc: fix internal date sample (issue4072)

largefiles: use 'remote'/'local' in merge prompts like in other merge prompts Prompts like foo has been turned into a largefile use (l)argefile or keep as (n)ormal file? was not as clear as the usual prompts that use 'remote' or 'local' to explain what happened on which side ... especially not when used to the normal prompts. "as" could also indicate that it would be possible to take the content of the largefile and somehow put it into the normal file. It could make it more clear that it was a choice between one side or the other. For consistency we will now phrase it like: remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file?

largefiles: systematic testing of merges to/from largefiles 427ce5633c1c fixed one problem with update and added a test case for it. The test coverage was thus insufficient before that. To make sure we have good test coverage in this area we add systematic testing of all cases of merges that may or may not change normal files to largefiles or vice versa. The tests shows some annoying extra merge prompts in some cases, but these prompts are hard to avoid and they are now "safe" - they do not leave the system in a confused inconsistent state.

check-code: fix no-check-code skip message - obfuscation was too obscure

shelve: remove useless and incorrect code paths for file access This patch removes code paths in "shelvedfile.opener()", because: - explicit "vfs.mkdir()" invocation is useless "vfs.__call__()" for modes other than "read" creates parent directory of target file automatically by "util.ensuredirs()". - mode checking in "except IOError" code path is useless ENOENT occurs only for "read" mode, because target file is created forcibly for other modes. - there is no explicit "return" statement in the code path for "except IOError" if "mode[0] in 'wa'" this is incorrect, because None may be returnd unexpectedly, even though it seems the EEXIST case in the directory creation race for ".hg/shelved" and is very rare. this directory creation race is also treated in "util.ensuredirs()".

shelve: disallow commit while unshelve is in progress Before this patch, commit is allowed even while unshelve is in progress. In the other hand, "hg unshelve --abort" and "hg unshelve --continue" check whether parent revisions of the working directory have changed or not since last "hg unshelve", and abort without clearing state for unshelve in progress if they have. This causes that accidental commit makes clearing state for unshelve difficult in ordinary ways. This patch disallows commit while unshelve is in progress for consistency.

bdiff: avoid a memory error on malloc failure

shelve: use rebase instead of merge (issue4068) Previously, shelve used merge to unshelve things. This meant that if you shelved changes on one branch, then unshelved on another, all the changes from the first branch would be present in the second branch, and not just the shelved changes. The fix is to use rebase to pick the shelve commit off the original branch and place it on top of the new branch. This means only the shelved changes are brought across. This has the side effect of fixing several other issues in shelve: - you can now unshelve into a file that already has pending changes - unshelve a mv/cp now has the correct dirstate value (A instead of M) - you can now unshelve to an ancestor of the shelve - unshelve now no longer deletes untracked .orig files Updates tests and adds a new one to cover the issue. The test changes fall into a few categories: - I removed some excess output - The --continue/--abort state is a little different, so the parents and dirstate needed updating - Removed some untracked files at certain points that cluttered the output

doc: put text into header of 1st column in table to generate page correctly >From the table without header text of 1st column, docutils generates the table with fully empty header row.

doc: use double quotation mark to quote arguments in examples for Windows users On Windows, only double quotation mark can quote command line arguments. So, this patch uses double quotation mark to quote command line arguments in all examples of online help document.

doc: end line preceding command line example with double colon

hgweb: add missing semicolon

rebase: improve error message for more than one external parent

rebase: refactor and rename checkexternal - it is a getter more than a setter

largefiles: don't prompt for normal/largefile changes when doing plain updates We used to get like: $ hg up -r 2 foo has been turned into a normal file keep as (l)argefile or use (n)ormal file? l getting changed largefiles 0 largefiles updated, 0 removed 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ cat foo cat: foo: No such file or directory [1] - which both asked the wrong question and did the wrong thing. Instead, skip this conflict resolution when the local conflicting file has been scheduled for removal and there thus is no conflict.

largefiles: remove extra check for file to get - it _is_ by definition in p2

largefiles: don't process merge actions at all when overwriting

spelling: random spell checker fixes

largefiles: hide passwords in URLs in ui messages

largefiles: don't add extra \n when displaying remote messages in putlfile

largefiles: add missing \n in ui.warn messages

largefiles: fix 'unexpected response' warning newlines Warnings should always end with \n. The warning message might contain or end with \n, so better show it with repr encoding.

win32: add shelve extension to mercurial.ini

strip: fix spelling: "allows to" -> "allows you to"

cmdutil: fix makefileobj not to clobber default modemap dict Problem occurs if "hg cat -o" is invoked more than once in the same process. The output of "hg cat" will be appended because of modemap[fn] = 'ab'.

shelve: make unshelve work even if it don't run in repository root revertfiles are relative to the repository root. not paths relative to the cwd.