Sat, 16 Nov 2013 13:57:35 -0800 test-filecache.py: add markers to the output for each event
Siddharth Agarwal <sid0@fb.com> [Sat, 16 Nov 2013 13:57:35 -0800] rev 20041
test-filecache.py: add markers to the output for each event Previously it was possible that a different, incorrect set of events might print out 'creating' the same number of times.
Sat, 16 Nov 2013 14:10:28 -0800 test-filecache.py: make setbeforeget test clearer
Siddharth Agarwal <sid0@fb.com> [Sat, 16 Nov 2013 14:10:28 -0800] rev 20040
test-filecache.py: make setbeforeget test clearer '0' and 'None' as outputs tripped me up. Make the distinction between values set externally and values computed by calling the decorated function clearer.
Sun, 17 Nov 2013 13:38:35 -0500 test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 13:38:35 -0500] rev 20039
test-module-imports.t: new test to use the import cycle detector
Sun, 17 Nov 2013 13:33:20 -0500 import-checker: try a little harder to show fewer cycles
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 13:33:20 -0500] rev 20038
import-checker: try a little harder to show fewer cycles This makes sure that all cycles begin with the lexicographically first module, so that we're less likely to show overlapping cycles in the final analysis.
Sun, 17 Nov 2013 16:58:18 -0500 import-checker: ignore nested imports
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 16:58:18 -0500] rev 20037
import-checker: ignore nested imports
Sun, 17 Nov 2013 13:04:18 -0500 contrib: add an import checker
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 13:04:18 -0500] rev 20036
contrib: add an import checker This checks for cycles in the module graph and verifies that imports of stdlib modules are not on the same line as relative imports of mercurial modules.
Wed, 06 Nov 2013 22:09:15 -0500 makememctx: move from patch to context to break import cycle
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 22:09:15 -0500] rev 20035
makememctx: move from patch to context to break import cycle
Wed, 06 Nov 2013 16:48:06 -0500 cleanup: move stdlib imports to their own import statement
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 16:48:06 -0500] rev 20034
cleanup: move stdlib imports to their own import statement There are a few warnings still produced by my import checker, but those are false positives produced by modules that share a name with stdlib modules.
Wed, 06 Nov 2013 18:19:04 -0500 pathutil: tease out a new library to break an import cycle from canonpath use
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 18:19:04 -0500] rev 20033
pathutil: tease out a new library to break an import cycle from canonpath use
Wed, 06 Nov 2013 14:38:34 -0500 subsettable: move from repoview to branchmap, the only place it's used
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 14:38:34 -0500] rev 20032
subsettable: move from repoview to branchmap, the only place it's used This is a step towards breaking an import cycle between revset and repoview. Import cycles happened to work in Python 2 with implicit relative imports, but breaks on Python 3 when we start using explicit relative imports via 2to3 rewrite rules.
Sat, 16 Nov 2013 20:12:02 -0500 obsolete: add __eq__ and __hash__ to marker to make set() deduplication work
Augie Fackler <raf@durin42.com> [Sat, 16 Nov 2013 20:12:02 -0500] rev 20031
obsolete: add __eq__ and __hash__ to marker to make set() deduplication work
Sat, 16 Nov 2013 20:31:58 -0500 obsolete: do not accept duplicated marker during exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 16 Nov 2013 20:31:58 -0500] rev 20030
obsolete: do not accept duplicated marker during exchange Before this patch, duplicated obsolescence markers could slip into an obstore if the bookmark was unknown locally and duplicated in the incoming obsolescence stream. Existing duplicate markers will not be automatically removed but they'll stop propagating. Having a few duplicated markers is harmless and people have been warned evolution is <blink>experimental</blink> anyway.
Sun, 17 Nov 2013 13:42:24 -0500 Merge with stable.
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 13:42:24 -0500] rev 20029
Merge with stable.
Sat, 16 Nov 2013 20:34:58 -0500 obsolete: stop doing membership test on list stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 16 Nov 2013 20:34:58 -0500] rev 20028
obsolete: stop doing membership test on list According to the Surgeon General, computer should not use list for membership testing because of the risk of being slow.
Fri, 08 Nov 2013 12:45:52 +0900 bookmarks: rewrite pushing bookmarks in "localrepository.push()" by "compare()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 08 Nov 2013 12:45:52 +0900] rev 20027
bookmarks: rewrite pushing bookmarks in "localrepository.push()" by "compare()" This patch adds "updateremote()", which uses "compare()" to compare bookmarks between the local and the remote repositories, to replace pushing local bookmarks in "localrepository.push()".
Fri, 08 Nov 2013 12:45:52 +0900 bookmarks: rewrite pushing local bookmarks in "commands.push()" by "compare()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 08 Nov 2013 12:45:52 +0900] rev 20026
bookmarks: rewrite pushing local bookmarks in "commands.push()" by "compare()" This patch adds "pushtoremote()", which uses "compare()" to compare bookmarks between the local and the remote repositories, to replace pushing local bookmarks in "commands.push()".
Fri, 08 Nov 2013 12:45:52 +0900 bookmarks: rewrite "updatefromremote()" by "compare()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 08 Nov 2013 12:45:52 +0900] rev 20025
bookmarks: rewrite "updatefromremote()" by "compare()" To update entries in bmstore "localmarks", this patch uses "bin(changesetid)" instead of "repo[changesetid].node()" used in original "updatefromremote()" implementation, because the former is cheaper than the latter.
Fri, 08 Nov 2013 12:45:52 +0900 bookmarks: add function to centralize the logic to compare bookmarks
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 08 Nov 2013 12:45:52 +0900] rev 20024
bookmarks: add function to centralize the logic to compare bookmarks This patch adds "compare()" function to centralize the logic to compare bookmarks between two repositories.
Sun, 10 Nov 2013 18:23:29 +0400 hgweb: use semantically suitable filelog.revs in filelog
Alexander Plavin <alexander@plav.in> [Sun, 10 Nov 2013 18:23:29 +0400] rev 20023
hgweb: use semantically suitable filelog.revs in filelog The functions are equivalent in behaviour, so no behavior change.
Sun, 10 Nov 2013 18:07:56 +0400 hgweb: always compute all entries and latestentry in filelog
Alexander Plavin <alexander@plav.in> [Sun, 10 Nov 2013 18:07:56 +0400] rev 20022
hgweb: always compute all entries and latestentry in filelog This is the same thing which was done for changelog earlier, and it doesn't affect performance at all. This change will make it possible to get the first entry of the next page easily without computing the list twice.
Sun, 10 Nov 2013 18:05:53 +0400 hgweb: remove unused argument of entries function in filelog
Alexander Plavin <alexander@plav.in> [Sun, 10 Nov 2013 18:05:53 +0400] rev 20021
hgweb: remove unused argument of entries function in filelog This doesn't change the behavior as the argument wasn't used anyway.
Sat, 16 Nov 2013 23:14:20 +0900 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 16 Nov 2013 23:14:20 +0900] rev 20020
transplant: use peer of source repository as "remote" for "repo.pull()" Before this patch, transplant with "--merge" option fails with traceback unexpectedly, if it causes pull from the source repository on the local host. "discovery.findcommonincoming()" invokes "capable()" method on the object given from "localrepository.pull()", but it is "localrepository" object in this case and doesn't have such method. This patch uses peer object of source repository as "remote" argument for "localrepository.pull()" invocation like other invocations of it in transplant.py.
Fri, 15 Nov 2013 22:57:11 -0500 run-tests: remove files that we potentially create outside of $TMPDIR
Sean Farley <sean.michael.farley@gmail.com> [Fri, 15 Nov 2013 22:57:11 -0500] rev 20019
run-tests: remove files that we potentially create outside of $TMPDIR
Fri, 15 Nov 2013 22:56:08 -0500 run-tests: remove code that creates a dummy 'diffstat'
Sean Farley <sean.michael.farley@gmail.com> [Fri, 15 Nov 2013 22:56:08 -0500] rev 20018
run-tests: remove code that creates a dummy 'diffstat' This was introduced in fb1d7a42663c for an old test that is no longer the same.
Fri, 15 Nov 2013 18:08:50 -0500 template: change extras to use showlist rather than manual templ call.
Matthew Turk <matthewturk@gmail.com> [Fri, 15 Nov 2013 18:08:50 -0500] rev 20017
template: change extras to use showlist rather than manual templ call. This enables start_extras and end_extras in template maps.
Fri, 15 Nov 2013 18:09:02 -0500 help: adding example 'extras' printing to 'hg help templates'
Matthew Turk <matthewturk@gmail.com> [Fri, 15 Nov 2013 18:09:02 -0500] rev 20016
help: adding example 'extras' printing to 'hg help templates'
Fri, 15 Nov 2013 16:53:54 -0500 help: document about {extras} template keyword
Matthew Turk <matthewturk@gmail.com> [Fri, 15 Nov 2013 16:53:54 -0500] rev 20015
help: document about {extras} template keyword This adds text about the "extras" template keyword, similar to that proposed by Yuya Nishihara previously.
Sat, 09 Nov 2013 14:50:12 +0100 check-code: document last ignore regexp
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 14:50:12 +0100] rev 20014
check-code: document last ignore regexp For easier remembering to delete when it is not needed anymore.
Sat, 09 Nov 2013 14:49:05 +0100 check-code: drop unneeded ignore patterns
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 14:49:05 +0100] rev 20013
check-code: drop unneeded ignore patterns The exceptions seem to have disappeared.
Sat, 16 Nov 2013 12:44:28 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 16 Nov 2013 12:44:28 -0500] rev 20012
merge with stable
Sat, 16 Nov 2013 12:34:05 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Sat, 16 Nov 2013 12:34:05 -0500] rev 20011
merge with i18n
Fri, 15 Nov 2013 13:20:49 -0800 contrib: add editmerge script for editor conflict prompts
Durham Goode <durham@fb.com> [Fri, 15 Nov 2013 13:20:49 -0800] rev 20010
contrib: add editmerge script for editor conflict prompts Adds a script that opens the editor to the conflict as part of the merge process. This way you can fix the merge during the rebase instead of having to pause the rebase, resolve --mark, rebase --continue. Only works on unix.
Thu, 14 Nov 2013 21:37:18 -0600 strip: fix last unprotected mq reference (issue4097) stable
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 21:37:18 -0600] rev 20009
strip: fix last unprotected mq reference (issue4097)
Thu, 14 Nov 2013 18:07:43 -0600 tests: skip tests that require not having root (issue4089)
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 18:07:43 -0600] rev 20008
tests: skip tests that require not having root (issue4089) This adds a new root hghave to test against. Almost all of these are a subset of unix-permissions, but that is also used for checking exec bit handling.
Thu, 14 Nov 2013 17:17:44 -0600 make: restrict recursion in make clean
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 17:17:44 -0600] rev 20007
make: restrict recursion in make clean
Tue, 12 Nov 2013 00:07:23 +0900 scmutil: skip checks in "casecollisionauditor" if filename is already checked
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 12 Nov 2013 00:07:23 +0900] rev 20006
scmutil: skip checks in "casecollisionauditor" if filename is already checked Before this patch, almost all of check code in "casecollisionauditor.__call__()" is executed, even if specified filename is already checked, because "f in self._newfiles" is examined lastly. In addition to it, adding "fl" to "self._loweredfiles" and "f" to "self._newfiles" are also redundant in such case. This patch checks "f in self._newfiles" first, and returns immediately to avoid execution of check code for efficiency.
Sat, 09 Nov 2013 10:21:20 +0100 check-code: prepend warning prefix only once, but for each warning stable
Simon Heimberg <simohe@besonet.ch> [Sat, 09 Nov 2013 10:21:20 +0100] rev 20005
check-code: prepend warning prefix only once, but for each warning The code adding the prefix is now run once per pattern. It was run once per file (after the change 3e1e4a8aec1e). Demonstrate that it is working now by extending the test. Raise two different warnings, one of them twice.
Wed, 13 Nov 2013 16:46:46 -0200 hgweb, i18n: do not translate search mode description stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 13 Nov 2013 16:46:46 -0200] rev 20004
hgweb, i18n: do not translate search mode description The search mode description can't be translated by itself, since it's displayed as part of a template phrase (the "Assuming ..." / "Use ... instead" bits). Just drop the translation markers for now, since the templates themselves currently do not support translations.
Sun, 10 Nov 2013 16:48:24 +0900 tests: end output lines including path with "(glob)" to pass on Windows stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Nov 2013 16:48:24 +0900] rev 20003
tests: end output lines including path with "(glob)" to pass on Windows
Sun, 10 Nov 2013 16:48:24 +0900 tests: quote environment variable to extract wildcard on MinGW environment stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Nov 2013 16:48:24 +0900] rev 20002
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.
Sun, 10 Nov 2013 16:48:24 +0900 tests: choose the path separator in PYTHONPATH suitable for platform stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Nov 2013 16:48:24 +0900] rev 20001
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.
Fri, 08 Nov 2013 12:35:50 +0100 util: warn when adding paths ending with \ stable
Mads Kiilerich <madski@unity3d.com> [Fri, 08 Nov 2013 12:35:50 +0100] rev 20000
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.
Tue, 05 Nov 2013 09:00:31 +0100 check-code: more replacement characters stable
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 09:00:31 +0100] rev 19999
check-code: more replacement characters for finding '.. note::' (even) more exact by using more characters: replace '.' with 'p' and ':' with 'q'
Tue, 05 Nov 2013 09:00:31 +0100 check-code: check comment for '.. note::' without two newlines stable
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 09:00:31 +0100] rev 19998
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.
Tue, 05 Nov 2013 08:59:55 +0100 documentation: add an extra newline after note directive stable
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 08:59:55 +0100] rev 19997
documentation: add an extra newline after note directive Like this no docutils version interprets any line in the following text as argument of note.
Mon, 04 Nov 2013 10:23:06 +0100 tests: modify minirst test input to new format stable
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19996
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.
Mon, 04 Nov 2013 10:23:06 +0100 minirst: do not add a 2nd empty paragraph stable
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19995
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
Mon, 04 Nov 2013 10:23:06 +0100 minirst: find admonitions before pruning comments and adding margins stable
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19994
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.
Mon, 04 Nov 2013 10:23:06 +0100 minirst: do not fail on an empty admonition block stable
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19993
minirst: do not fail on an empty admonition block
Mon, 04 Nov 2013 10:23:06 +0100 minirst: do not interpret a directive as a literal block stable
Simon Heimberg <simohe@besonet.ch> [Mon, 04 Nov 2013 10:23:06 +0100] rev 19992
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
Tue, 05 Nov 2013 09:43:36 +0100 Makefile: do update on a temporary copy of a po file
Simon Heimberg <simohe@besonet.ch> [Tue, 05 Nov 2013 09:43:36 +0100] rev 19991
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.
Mon, 04 Nov 2013 10:52:41 -0200 i18n-pt_BR: synchronized with d24ee6d7d167 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 04 Nov 2013 10:52:41 -0200] rev 19990
i18n-pt_BR: synchronized with d24ee6d7d167
Thu, 07 Nov 2013 15:24:23 -0600 date: allow %z in format (issue4040)
Matt Mackall <mpm@selenic.com> [Thu, 07 Nov 2013 15:24:23 -0600] rev 19989
date: allow %z in format (issue4040)
Wed, 06 Nov 2013 16:36:07 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 06 Nov 2013 16:36:07 -0600] rev 19988
merge with stable
Wed, 06 Nov 2013 10:20:18 -0800 merge: move forgets to the beginning of the action list stable
Siddharth Agarwal <sid0@fb.com> [Wed, 06 Nov 2013 10:20:18 -0800] rev 19987
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.
Fri, 01 Nov 2013 17:08:06 -0700 rebase: fix working copy location after a --collapse (issue4080) stable
Durham Goode <durham@fb.com> [Fri, 01 Nov 2013 17:08:06 -0700] rev 19986
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.
Wed, 06 Nov 2013 12:53:39 -0500 Merge with stable.
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 12:53:39 -0500] rev 19985
Merge with stable.
Mon, 04 Nov 2013 19:59:00 -0800 rebase: fix rebase aborts when 'tip-1' is public (issue4082) stable
Durham Goode <durham@fb.com> [Mon, 04 Nov 2013 19:59:00 -0800] rev 19984
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.
Tue, 05 Nov 2013 13:25:45 -0500 Merge with stable.
Augie Fackler <raf@durin42.com> [Tue, 05 Nov 2013 13:25:45 -0500] rev 19983
Merge with stable.
Sat, 02 Nov 2013 11:25:04 +0100 check-code: prepend warning prefix for repeated warnings only once
Simon Heimberg <simohe@besonet.ch> [Sat, 02 Nov 2013 11:25:04 +0100] rev 19982
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
Sat, 02 Nov 2013 11:25:33 +0100 check-code: fix an error message
Simon Heimberg <simohe@besonet.ch> [Sat, 02 Nov 2013 11:25:33 +0100] rev 19981
check-code: fix an error message
Tue, 05 Nov 2013 10:55:45 +0100 test: do not add .pyc and .orig in test-commit-amend.t (issue4085) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Nov 2013 10:55:45 +0100] rev 19980
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).
Fri, 01 Nov 2013 17:04:18 -0500 Added signature for changeset d825e4025e39 stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:18 -0500] rev 19979
Added signature for changeset d825e4025e39
Fri, 01 Nov 2013 17:04:14 -0500 Added tag 2.8 for changeset d825e4025e39 stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:14 -0500] rev 19978
Added tag 2.8 for changeset d825e4025e39
Fri, 01 Nov 2013 17:04:03 -0500 merge with i18n stable 2.8
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:03 -0500] rev 19977
merge with i18n
Fri, 01 Nov 2013 11:04:48 -0200 i18n-pt_BR: fix a few missing changes on 95304251c376 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Nov 2013 11:04:48 -0200] rev 19976
i18n-pt_BR: fix a few missing changes on 95304251c376
Thu, 31 Oct 2013 00:25:20 -0200 i18n-pt_BR: synchronized with 95304251c376 stable
Wagner Bruna <wbruna@yahoo.com> [Thu, 31 Oct 2013 00:25:20 -0200] rev 19975
i18n-pt_BR: synchronized with 95304251c376
Thu, 31 Oct 2013 03:05:46 +0900 i18n-ja: synchronized with 1d7a36ff2615 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 31 Oct 2013 03:05:46 +0900] rev 19974
i18n-ja: synchronized with 1d7a36ff2615
Sun, 13 Oct 2013 08:38:30 -0400 patch: ensure valid git diffs if source/destination file is missing (issue4046) stable
Johan Bjork <jbjoerk@gmail.com> [Sun, 13 Oct 2013 08:38:30 -0400] rev 19973
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.
Sun, 27 Oct 2013 00:24:25 +0900 histedit: add description about exit code stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 27 Oct 2013 00:24:25 +0900] rev 19972
histedit: add description about exit code
Sun, 27 Oct 2013 00:24:25 +0900 rebase: add description about exit code when there are unresolved conflicts stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 27 Oct 2013 00:24:25 +0900] rev 19971
rebase: add description about exit code when there are unresolved conflicts
Sat, 02 Nov 2013 04:49:42 +0900 shelve: remove unused variable assignment stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 Nov 2013 04:49:42 +0900] rev 19970
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.
Wed, 30 Oct 2013 19:45:14 +0100 rebase: fix selection of base used when rebasing merge (issue4041) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 30 Oct 2013 19:45:14 +0100] rev 19969
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.
Tue, 29 Oct 2013 21:54:49 +0200 doc: fix internal date sample (issue4072) stable
Pavlos Touboulidis <pav@pav.gr> [Tue, 29 Oct 2013 21:54:49 +0200] rev 19968
doc: fix internal date sample (issue4072)
Mon, 28 Oct 2013 22:34:07 +0100 largefiles: use 'remote'/'local' in merge prompts like in other merge prompts stable
Mads Kiilerich <madski@unity3d.com> [Mon, 28 Oct 2013 22:34:07 +0100] rev 19967
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?
Mon, 28 Oct 2013 22:34:05 +0100 largefiles: systematic testing of merges to/from largefiles stable
Mads Kiilerich <madski@unity3d.com> [Mon, 28 Oct 2013 22:34:05 +0100] rev 19966
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.
Wed, 23 Oct 2013 23:42:13 +0800 check-code: fix no-check-code skip message - obfuscation was too obscure stable
Mads Kiilerich <madski@unity3d.com> [Wed, 23 Oct 2013 23:42:13 +0800] rev 19965
check-code: fix no-check-code skip message - obfuscation was too obscure
Tue, 29 Oct 2013 01:03:43 +0900 shelve: remove useless and incorrect code paths for file access stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 29 Oct 2013 01:03:43 +0900] rev 19964
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()".
Tue, 29 Oct 2013 01:03:43 +0900 shelve: disallow commit while unshelve is in progress stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 29 Oct 2013 01:03:43 +0900] rev 19963
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.
Wed, 30 Oct 2013 16:03:42 -0500 bdiff: avoid a memory error on malloc failure stable
Matt Mackall <mpm@selenic.com> [Wed, 30 Oct 2013 16:03:42 -0500] rev 19962
bdiff: avoid a memory error on malloc failure
Wed, 23 Oct 2013 13:12:48 -0700 shelve: use rebase instead of merge (issue4068) stable
Durham Goode <durham@fb.com> [Wed, 23 Oct 2013 13:12:48 -0700] rev 19961
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
Fri, 25 Oct 2013 01:14:18 +0900 doc: put text into header of 1st column in table to generate page correctly stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 25 Oct 2013 01:14:18 +0900] rev 19960
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.
Fri, 25 Oct 2013 01:14:18 +0900 doc: use double quotation mark to quote arguments in examples for Windows users stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 25 Oct 2013 01:14:18 +0900] rev 19959
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.
Fri, 25 Oct 2013 01:14:18 +0900 doc: end line preceding command line example with double colon stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 25 Oct 2013 01:14:18 +0900] rev 19958
doc: end line preceding command line example with double colon
Thu, 24 Oct 2013 21:37:13 +0900 hgweb: add missing semicolon stable
Takumi IINO <trot.thunder@gmail.com> [Thu, 24 Oct 2013 21:37:13 +0900] rev 19957
hgweb: add missing semicolon
Wed, 23 Oct 2013 23:42:13 +0800 rebase: improve error message for more than one external parent stable
Mads Kiilerich <madski@unity3d.com> [Wed, 23 Oct 2013 23:42:13 +0800] rev 19956
rebase: improve error message for more than one external parent
Thu, 24 Oct 2013 12:05:22 +0800 rebase: refactor and rename checkexternal - it is a getter more than a setter stable
Mads Kiilerich <madski@unity3d.com> [Thu, 24 Oct 2013 12:05:22 +0800] rev 19955
rebase: refactor and rename checkexternal - it is a getter more than a setter
Fri, 25 Oct 2013 02:33:59 +0800 largefiles: don't prompt for normal/largefile changes when doing plain updates stable
Mads Kiilerich <madski@unity3d.com> [Fri, 25 Oct 2013 02:33:59 +0800] rev 19954
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.
Fri, 25 Oct 2013 02:25:10 +0800 largefiles: remove extra check for file to get - it _is_ by definition in p2 stable
Mads Kiilerich <madski@unity3d.com> [Fri, 25 Oct 2013 02:25:10 +0800] rev 19953
largefiles: remove extra check for file to get - it _is_ by definition in p2
Fri, 25 Oct 2013 01:24:10 +0800 largefiles: don't process merge actions at all when overwriting stable
Mads Kiilerich <madski@unity3d.com> [Fri, 25 Oct 2013 01:24:10 +0800] rev 19952
largefiles: don't process merge actions at all when overwriting
Thu, 24 Oct 2013 01:49:56 +0800 spelling: random spell checker fixes stable
Mads Kiilerich <madski@unity3d.com> [Thu, 24 Oct 2013 01:49:56 +0800] rev 19951
spelling: random spell checker fixes
Thu, 17 Oct 2013 16:13:15 +0800 largefiles: hide passwords in URLs in ui messages stable
Mads Kiilerich <madski@unity3d.com> [Thu, 17 Oct 2013 16:13:15 +0800] rev 19950
largefiles: hide passwords in URLs in ui messages
Thu, 24 Oct 2013 01:49:56 +0800 largefiles: don't add extra \n when displaying remote messages in putlfile stable
Mads Kiilerich <madski@unity3d.com> [Thu, 24 Oct 2013 01:49:56 +0800] rev 19949
largefiles: don't add extra \n when displaying remote messages in putlfile
Mon, 21 Oct 2013 11:22:54 +0800 largefiles: add missing \n in ui.warn messages stable
Mads Kiilerich <madski@unity3d.com> [Mon, 21 Oct 2013 11:22:54 +0800] rev 19948
largefiles: add missing \n in ui.warn messages
Thu, 24 Oct 2013 01:49:56 +0800 largefiles: fix 'unexpected response' warning newlines stable
Mads Kiilerich <madski@unity3d.com> [Thu, 24 Oct 2013 01:49:56 +0800] rev 19947
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.
Mon, 21 Oct 2013 23:40:56 +0200 win32: add shelve extension to mercurial.ini stable
Pascal Quantin <pascal.quantin@gmail.com> [Mon, 21 Oct 2013 23:40:56 +0200] rev 19946
win32: add shelve extension to mercurial.ini
(0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip