Fri, 22 Jun 2012 10:14:21 -0300 merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 22 Jun 2012 10:14:21 -0300] rev 17039
merge with i18n
Thu, 21 Jun 2012 18:23:18 +0200 i18n-de: Move policies from header of de.po to http://mercurial.selenic.com/wiki/GermanTranslation stable
Martin Schröder <martinschroeder@vcp-sh.de> [Thu, 21 Jun 2012 18:23:18 +0200] rev 17038
i18n-de: Move policies from header of de.po to http://mercurial.selenic.com/wiki/GermanTranslation
Fri, 22 Jun 2012 12:00:41 -0700 scmutil: speed up new-style range extension
Bryan O'Sullivan <bryano@fb.com> [Fri, 22 Jun 2012 12:00:41 -0700] rev 17037
scmutil: speed up new-style range extension This improves perfrevset performance by 10% for 2222::33333 on a kernel repo.
Tue, 26 Jun 2012 14:32:20 +0200 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Jun 2012 14:32:20 +0200] rev 17036
merge with crew-stable
Tue, 26 Jun 2012 14:27:33 +0200 subrepo/svn: make rev number retrieval compatible with svn 1.5 (issue2968) stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Jun 2012 14:27:33 +0200] rev 17035
subrepo/svn: make rev number retrieval compatible with svn 1.5 (issue2968) ae2664ee0223 introduced "svn info TARGET@REV" to determine if a certain path exists in the specified revision, but in svn 1.5 the error message "Not a valid URL" yields exit code 0 so the error is not caught. Use "svn list TARGET@REV" instead which works with svn 1.5 and is even faster in some situations.
Tue, 26 Jun 2012 12:17:40 +0200 convert/bzr: make tests work with bzr 2.0 again stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Jun 2012 12:17:40 +0200] rev 17034
convert/bzr: make tests work with bzr 2.0 again bzr ci --commit-time was introduced in 2.1 bzr add without -q prints "adding" in 2.1, "added" in 2.0
Tue, 26 Jun 2012 03:35:22 +0200 tests: cleanup of svn url handling
Mads Kiilerich <mads@kiilerich.com> [Tue, 26 Jun 2012 03:35:22 +0200] rev 17033
tests: cleanup of svn url handling The subversion tests used different tricks to create properly encoded URLs, partly due to partial support for different ways of running the tests on windows. Now we only need/support one way of running the tests on windows. Windows URLs should look like 'file:///c:/foo%20bar' and on Unix platforms like 'file:///tmp/baz'. 'pwd' in the test framework will on Windows emit paths like 'c:/foo bar'. Explicit handling of backslashes in paths is thus no longer needed and is removed. Paths on windows do however need an extra '/' compared to other platforms. This change makes test-subrepo-svn.t pass on windows with msys. Other tests might need more work.
Sat, 23 Jun 2012 19:54:08 +0300 test-subrepo-svn.t: partially adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com> [Sat, 23 Jun 2012 19:54:08 +0300] rev 17032
test-subrepo-svn.t: partially adapt for Windows hg forget 'notafile*' is changed to use a name that is valid on Windows so we still get the same error ... but the error message is disabled because it varies with the Windows version.
Sun, 24 Jun 2012 17:06:47 +0200 convert: ignore svn:executable for subversion targets without exec bit support
Mads Kiilerich <mads@kiilerich.com> [Sun, 24 Jun 2012 17:06:47 +0200] rev 17031
convert: ignore svn:executable for subversion targets without exec bit support Calling propset/propdel with subversion 1.6 on FAT gave abort: svn exited with status 256 and made test-convert-hg-svn.t and test-convert-svn-sink.t fail. 1.7 worked. This is a rework of fdee5d614fcc but ignores the executable bit when it isn't supported instead of using an approximation.
Fri, 22 Jun 2012 02:39:52 +0200 tests: add missing 'backup bundle' path glob in test-rebase-collapse.t
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Jun 2012 02:39:52 +0200] rev 17030
tests: add missing 'backup bundle' path glob in test-rebase-collapse.t Introduced by c8eda7bbdcab.
Fri, 22 Jun 2012 00:52:14 +0200 tests: add missing 'backup bundle' path glob in test-rebase-scenario-global.t
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Jun 2012 00:52:14 +0200] rev 17029
tests: add missing 'backup bundle' path glob in test-rebase-scenario-global.t Introduced by 50f434510da6.
Thu, 21 Jun 2012 17:37:02 -0500 merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2012 17:37:02 -0500] rev 17028
merge with crew
Thu, 21 Jun 2012 15:10:01 +0200 merge with stable
Martin Geisler <mg@aragost.com> [Thu, 21 Jun 2012 15:10:01 +0200] rev 17027
merge with stable
Mon, 18 Jun 2012 11:16:24 +0200 rebase: improve error message on improper phases stable
Dan Villiom Podlaski Christiansen <dan@cabo.dk> [Mon, 18 Jun 2012 11:16:24 +0200] rev 17026
rebase: improve error message on improper phases The previous error message had two issues: The first issue was that it wasn't, in fact, an error but a warning, even though it described a fatal error condition preventing the successful completion of the command. The second was that it didn't mention the immutable changesets, leaving the user guessing at the true cause of the error. The main downside to this change is that we now get an 'abort: can't abort...' message which technically contradicts itself. In this case, I blame that on the two uses we have for the word; if it weren't for backwards compatibility, we could make util.Abort print out 'error: <whatever>'.
Tue, 12 Jun 2012 09:31:04 -0400 subrepo: support Git being named "git.cmd" on Windows (issue3173) stable
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 12 Jun 2012 09:31:04 -0400] rev 17025
subrepo: support Git being named "git.cmd" on Windows (issue3173) Popen does not consider "foo.cmd" equivalent to "foo" on Windows. Unfortunately, the default MSYS Git installation installs only "git.cmd" into the path by default. This patch probes for both possible names on Windows.
Tue, 12 Jun 2012 09:28:55 -0400 subrepo: warn user if Git is not version 1.6.0 or higher stable
Benjamin Pollack <benjamin@bitquabit.com> [Tue, 12 Jun 2012 09:28:55 -0400] rev 17024
subrepo: warn user if Git is not version 1.6.0 or higher
Tue, 19 Jun 2012 19:45:00 +0200 test-http and test-https: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com> [Tue, 19 Jun 2012 19:45:00 +0200] rev 17023
test-http and test-https: partially adapt for Windows
Wed, 20 Jun 2012 02:09:49 +0300 test-subrepo-git.t: adapt for Windows
Eduard-Cristian Stefan <alexandrul.ct@gmail.com> [Wed, 20 Jun 2012 02:09:49 +0300] rev 17022
test-subrepo-git.t: adapt for Windows hg forget 'notafile*' is changed to use a name that is valid on Windows so we still get the same error ... but the error message is disabled because it varies with the Windows version.
Wed, 20 Jun 2012 18:02:01 +0200 test-bookmarks-pushpull: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Jun 2012 18:02:01 +0200] rev 17021
test-bookmarks-pushpull: partially adapt for Windows The kill call at the end is redundant, as we already have 199: $ hg serve -p $HGPORT -d --pid-file=../hg.pid -E errors.log 200: $ cat ../hg.pid >> $DAEMON_PIDS So there is nothing left that would not already be killed by the $DAEMON_PIDS mechanism.
Tue, 19 Jun 2012 19:28:55 +0200 test-static-http: partially adapt for Windows
Adrian Buehlmann <adrian@cadifra.com> [Tue, 19 Jun 2012 19:28:55 +0200] rev 17020
test-static-http: partially adapt for Windows
Tue, 19 Jun 2012 17:05:04 +0200 test-bad-pull: partially adjust for Windows
Adrian Buehlmann <adrian@cadifra.com> [Tue, 19 Jun 2012 17:05:04 +0200] rev 17019
test-bad-pull: partially adjust for Windows On a English Windows 7, the testcase fails with $ hg clone http://localhost:$HGPORT/ copy abort: error: No connection could be made because the target machine actively refused it Since the error message on non-English Windows installs are most likely different, we have to glob the entire error message away for Windows.
Thu, 21 Jun 2012 03:05:02 +0200 tests: consistently use printenv.py the same MSYS/Windows-compatible way
Mads Kiilerich <mads@kiilerich.com> [Thu, 21 Jun 2012 03:05:02 +0200] rev 17018
tests: consistently use printenv.py the same MSYS/Windows-compatible way This will remove some reasons some tests are disabled on Windows.
Thu, 21 Jun 2012 03:05:02 +0200 tests: prepare get-with-headers.py for MSYS
Mads Kiilerich <mads@kiilerich.com> [Thu, 21 Jun 2012 03:05:02 +0200] rev 17017
tests: prepare get-with-headers.py for MSYS get-with-headers.py took the http GET parameter as a command line parameter that had to start with '/'. MSYS on windows will mangle such paths. Instead of applying a workaround everywhere (such as an extra '/') we let get-with-headers.py add the mandatory '/'. That is consistent with the url path handling in the Mercurial url class. A few tests sent 'GET ?cmd=...' which is invalid. They will now send 'GET /?cmd=...'. This will not enable any tests for being run on windows - only remove one reason they were disabled.
Wed, 20 Jun 2012 23:41:21 +0200 tests: hghave outer-repo should be true even if a bad repo is found
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Jun 2012 23:41:21 +0200] rev 17016
tests: hghave outer-repo should be true even if a bad repo is found Only the abort message 'no repository found' is a reliable indication that there is no outer repo.
Wed, 20 Jun 2012 23:41:21 +0200 tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Jun 2012 23:41:21 +0200] rev 17015
tests: add missing no-outer-repo requirements Outer repos (if any) will now never be touched by the tests. But it is better to run without any repos around the tmp directory.
Wed, 20 Jun 2012 23:41:21 +0200 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Jun 2012 23:41:21 +0200] rev 17014
tests: convert some 'hghave no-outer-repo' to #if In some places we instead use 'hg init' to create a well-known outer repo without any special extensions or other config settings.
Fri, 18 May 2012 12:45:47 -0700 strip: incrementally update the branchheads cache after a strip
Joshua Redstone <joshua.redstone@fb.com> [Fri, 18 May 2012 12:45:47 -0700] rev 17013
strip: incrementally update the branchheads cache after a strip This function augments strip to incrementally update the branchheads cache rather than recompute it from scratch. This speeds up the performance of strip and rebase on repos with long history. The performance optimization only happens if the revisions stripped are all on the same branch and the parents of the stripped revisions are also on that same branch. This adds a few test cases, particularly one that reproduces the extra heads that mpm observed.
Fri, 01 Jun 2012 08:56:17 -0700 localrepo: convert _updatebranchcache from nodespace to revspace
Joshua Redstone <joshua.redstone@fb.com> [Fri, 01 Jun 2012 08:56:17 -0700] rev 17012
localrepo: convert _updatebranchcache from nodespace to revspace _updatebranchcache used to use revlog.reachable. After the switch to revlog.ancestors, we can now clean it up a bit and switch the algorithm from nodes to revs.
Fri, 08 Jun 2012 14:23:31 -0700 discovery: convert legacy part of checkheads to revs from nodes
Joshua Redstone <joshua.redstone@fb.com> [Fri, 08 Jun 2012 14:23:31 -0700] rev 17011
discovery: convert legacy part of checkheads to revs from nodes After a recent switch from revlog.reachable to revlog.ancestors, clean up this old call site, switching it from nodes to revs.
Fri, 08 Jun 2012 14:21:32 -0700 transplant: convert applied() algorithm from nodes to revs
Joshua Redstone <joshua.redstone@fb.com> [Fri, 08 Jun 2012 14:21:32 -0700] rev 17010
transplant: convert applied() algorithm from nodes to revs After a recent switch from revlog.reachable to revlog.ancestors, clean up the code a bit to use revs rather than nodes.
Fri, 08 Jun 2012 08:39:44 -0700 revlog: remove reachable and switch call sites to ancestors
Joshua Redstone <joshua.redstone@fb.com> [Fri, 08 Jun 2012 08:39:44 -0700] rev 17009
revlog: remove reachable and switch call sites to ancestors This change does a trivial conversion of callsites to ancestors. Followon diffs will switch the callsites over to revs.
Fri, 08 Jun 2012 07:59:37 -0700 revlog: add incancestors, a version of ancestors that includes revs listed
Joshua Redstone <joshua.redstone@fb.com> [Fri, 08 Jun 2012 07:59:37 -0700] rev 17008
revlog: add incancestors, a version of ancestors that includes revs listed ancestors() returns the ancestors of revs provided. This func is like that except it also includes the revs themselves in the total set of revs generated.
(0) -10000 -3000 -1000 -300 -100 -50 -32 +32 +50 +100 +300 +1000 +3000 +10000 +30000 tip