Fri, 07 Jun 2013 15:58:14 -0500 run-tests: remove spurious disable of --time with --debug stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Jun 2013 15:58:14 -0500] rev 1269
run-tests: remove spurious disable of --time with --debug [ original upstream message ]
Fri, 07 Jun 2013 15:56:16 -0500 run-tests: always gather runtimes stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Jun 2013 15:56:16 -0500] rev 1268
run-tests: always gather runtimes [ original upstream message ]
Wed, 05 Jun 2013 22:05:29 +0200 run-tests: when interrupted report time in failure message stable
Simon Heimberg <simohe@besonet.ch> [Wed, 05 Jun 2013 22:05:29 +0200] rev 1267
run-tests: when interrupted report time in failure message When --time is specified, the interruption message of an interrupted test is extended with the time the test has run INTERRUPTED: /path/to/tests/test-example.t (after 513 seconds) [ original upstream message ]
Wed, 05 Jun 2013 22:05:02 +0200 run-tests: report interrupted tests stable
Simon Heimberg <simohe@besonet.ch> [Wed, 05 Jun 2013 22:05:02 +0200] rev 1266
run-tests: report interrupted tests When the test run is aborted, a message is printed for each interrupted test. This is helpful when a test is hanging. example failure message: INTERRUPTED: /path/to/tests/test-example.t The message can appear before or after the line with the number of tests [ original upstream message ]
Wed, 05 Jun 2013 22:42:43 +0200 run-tests: open hgrc file only for writing stable
Simon Heimberg <simohe@besonet.ch> [Wed, 05 Jun 2013 22:42:43 +0200] rev 1265
run-tests: open hgrc file only for writing The file is not read here. Opening with "w+" is unnecessary. [ original upstream message ]
Thu, 06 Jun 2013 22:36:18 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 06 Jun 2013 22:36:18 +0100] rev 1264
Merge with stable
Thu, 06 Jun 2013 14:40:26 -0500 run-tests: make --noskips work stable
Matt Mackall <mpm@selenic.com> [Thu, 06 Jun 2013 14:40:26 -0500] rev 1263
run-tests: make --noskips work [ original upstream message ]
Mon, 03 Jun 2013 09:59:32 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Jun 2013 09:59:32 +0100] rev 1262
Merge with stable
Sun, 02 Jun 2013 18:09:06 -0500 run-tests: add --loop support stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 18:09:06 -0500] rev 1261
run-tests: add --loop support This makes it easy to run tests repeatedly at high loads to look for test failures. [ original upstream message ]
Sun, 02 Jun 2013 17:58:51 -0500 run-tests: --interactive and --jobs no longer conflict stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:58:51 -0500] rev 1260
run-tests: --interactive and --jobs no longer conflict [ original upstream message ]
Sun, 02 Jun 2013 17:58:49 -0500 run-tests: sort certain slow tests earlier by keyword stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:58:49 -0500] rev 1259
run-tests: sort certain slow tests earlier by keyword There are a few tests that evade the size heuristic [ original upstream message ]
Sun, 02 Jun 2013 17:57:37 -0500 run-tests: drop unused resultslock stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:57:37 -0500] rev 1258
run-tests: drop unused resultslock [ original upstream message ]
Sun, 02 Jun 2013 17:57:36 -0500 run-tests: drop options.child and users stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:57:36 -0500] rev 1257
run-tests: drop options.child and users [ original upstream message ]
Sun, 02 Jun 2013 17:56:53 -0500 run-tests: remove runchildren, now unused stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:56:53 -0500] rev 1256
run-tests: remove runchildren, now unused [ original upstream message ]
Sun, 02 Jun 2013 17:56:51 -0500 run-tests: schedule largest tests first stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:56:51 -0500] rev 1255
run-tests: schedule largest tests first [ original upstream message ]
Sun, 02 Jun 2013 16:58:22 -0500 run-tests: introduce thread scheduler stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:58:22 -0500] rev 1254
run-tests: introduce thread scheduler [ original upstream message ]
Sun, 02 Jun 2013 16:55:19 -0500 run-tests: use count to calculate port to use stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:55:19 -0500] rev 1253
run-tests: use count to calculate port to use This will keep threads from using the same server ports [ original upstream message ]
Sun, 02 Jun 2013 16:38:15 -0500 run-tests: introduce threadtmp directory stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:38:15 -0500] rev 1252
run-tests: introduce threadtmp directory [ original upstream message ]
Sun, 02 Jun 2013 16:29:35 -0500 run-tests: add abort flag stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:29:35 -0500] rev 1251
run-tests: add abort flag This will be used to help threads clean up gracefully [ original upstream message ]
Sun, 02 Jun 2013 16:29:22 -0500 run-tests: move more variables to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:29:22 -0500] rev 1250
run-tests: move more variables to env [ original upstream message ]
Sun, 02 Jun 2013 16:29:20 -0500 run-tests: simplify env deletion stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:29:20 -0500] rev 1249
run-tests: simplify env deletion [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move most of remaining environment tweaks stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1248
run-tests: move most of remaining environment tweaks [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move environment creation to a separate function stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1247
run-tests: move environment creation to a separate function [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move HGRCPATH to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1246
run-tests: move HGRCPATH to env [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move DAEMON_PIDS to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1245
run-tests: move DAEMON_PIDS to env [ original upstream message ]
Sun, 02 Jun 2013 16:22:34 -0500 run-tests: move HGPORT setting to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:34 -0500] rev 1244
run-tests: move HGPORT setting to env [ original upstream message ]
Sun, 02 Jun 2013 15:33:41 -0500 run-tests: write tmp paths into env copy stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 15:33:41 -0500] rev 1243
run-tests: write tmp paths into env copy [ original upstream message ]
Sun, 02 Jun 2013 14:04:55 -0500 run-tests: use env dict to kill daemons stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 14:04:55 -0500] rev 1242
run-tests: use env dict to kill daemons [ original upstream message ]
Sun, 02 Jun 2013 13:45:08 -0500 run-tests: add env dict to isolate test environment stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 13:45:08 -0500] rev 1241
run-tests: add env dict to isolate test environment [ original upstream message ]
Mon, 27 May 2013 15:24:19 -0500 run-tests: remove some unnecessary globals stable
Matt Mackall <mpm@selenic.com> [Mon, 27 May 2013 15:24:19 -0500] rev 1240
run-tests: remove some unnecessary globals [ original upstream message ]
Fri, 24 May 2013 14:30:43 -0500 run-tests: add a log function stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 14:30:43 -0500] rev 1239
run-tests: add a log function [ original upstream message ]
Fri, 24 May 2013 14:30:43 -0500 run-tests: make vlog a proper function stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 14:30:43 -0500] rev 1238
run-tests: make vlog a proper function [ original upstream message ]
Fri, 24 May 2013 14:30:43 -0500 run-tests: unify marks and result codes stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 14:30:43 -0500] rev 1237
run-tests: unify marks and result codes [ original upstream message ]
Fri, 24 May 2013 14:30:35 -0500 run-tests: change return code of runone stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 14:30:35 -0500] rev 1236
run-tests: change return code of runone [ original upstream message ]
Fri, 24 May 2013 13:53:56 -0500 run-tests: regroup some initialization checks stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:53:56 -0500] rev 1235
run-tests: regroup some initialization checks [ original upstream message ]
Fri, 24 May 2013 13:52:05 -0500 run-tests: fix a path existence check stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:52:05 -0500] rev 1234
run-tests: fix a path existence check [ original upstream message ]
Fri, 24 May 2013 13:51:20 -0500 run-tests: regroup some variable initialization stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:51:20 -0500] rev 1233
run-tests: regroup some variable initialization [ original upstream message ]
Fri, 24 May 2013 13:48:25 -0500 run-tests: regroup nested functions stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:48:25 -0500] rev 1232
run-tests: regroup nested functions [ original upstream message ]
Fri, 24 May 2013 13:47:17 -0500 run-tests: regroup temp dir creation stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:47:17 -0500] rev 1231
run-tests: regroup temp dir creation [ original upstream message ]
Fri, 24 May 2013 13:41:20 -0500 run-tests: pull hgrc creation out as function stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:41:20 -0500] rev 1230
run-tests: pull hgrc creation out as function [ original upstream message ]
Fri, 24 May 2013 13:34:22 -0500 tests: simplify handling of unknown test types stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:34:22 -0500] rev 1229
tests: simplify handling of unknown test types [ original upstream message ]
Fri, 24 May 2013 13:31:44 -0500 run-tests: filter out non-tests from default list stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:31:44 -0500] rev 1228
run-tests: filter out non-tests from default list [ original upstream message ]
Fri, 24 May 2013 13:23:19 -0500 run-tests: make a table of test types stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:23:19 -0500] rev 1227
run-tests: make a table of test types [ original upstream message ]
Fri, 24 May 2013 13:02:00 -0500 run-tests: don't need to test shebang any more stable
Matt Mackall <mpm@selenic.com> [Fri, 24 May 2013 13:02:00 -0500] rev 1226
run-tests: don't need to test shebang any more [ original upstream message ]
Sun, 05 May 2013 01:25:36 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 05 May 2013 01:25:36 +0100] rev 1225
Merge with stable
Fri, 03 May 2013 15:18:21 -0700 run-tests: when running in parallel, delete tmpdirs immediately stable
Siddharth Agarwal <sid0@fb.com> [Fri, 03 May 2013 15:18:21 -0700] rev 1224
run-tests: when running in parallel, delete tmpdirs immediately This is especially important if extensions that use inotify are enabled, because it's very easy to hit the inotify max_user_instances limit without this. [ original upstream message ]
Sat, 20 Apr 2013 13:48:54 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 20 Apr 2013 13:48:54 +0100] rev 1223
Merge with stable
Wed, 10 Oct 2012 21:55:49 +0200 repo: repo isolation, do not pass on repo.ui for creating new repos stable
Simon Heimberg <simohe@besonet.ch> [Wed, 10 Oct 2012 21:55:49 +0200] rev 1222
repo: repo isolation, do not pass on repo.ui for creating new repos A repo should not get the configuration from an other repo, so create it with the global configuration in repo.baseui. This is done too when recreating a repo. The repo configuration is reread anyway. And now deleted repo configuration does not persist. [ orginal upstream message ]
Wed, 17 Apr 2013 03:41:34 +0200 run-tests: introduce --random for running tests in random error stable
Mads Kiilerich <madski@unity3d.com> [Wed, 17 Apr 2013 03:41:34 +0200] rev 1221
run-tests: introduce --random for running tests in random error This is convenient when investigating failures one by one to avoid running the same fixed tests first every time. [ original upstream message ]
Sat, 23 Mar 2013 14:43:30 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 23 Mar 2013 14:43:30 +0000] rev 1220
Merge with stable
Thu, 21 Mar 2013 08:56:21 +0100 run-tests: only sort files when not given as argument stable
Simon Heimberg <simohe@besonet.ch> [Thu, 21 Mar 2013 08:56:21 +0100] rev 1219
run-tests: only sort files when not given as argument os.listdir returns the files in any order. This has to be sorted. But when given as argument, the user should be allowed to set any order. This restores the behaviour before 9848a94e2a. [ original upstream message ]
Tue, 12 Mar 2013 10:37:48 -0700 tests: fix test-profile to not depend on HGPROF environment variable stable
Durham Goode <durham@fb.com> [Tue, 12 Mar 2013 10:37:48 -0700] rev 1218
tests: fix test-profile to not depend on HGPROF environment variable The test-profile test would fail if the user had HGPROF set to another profiler in their environment. This fix makes the test independent of that environment variable. Reverts the previous attempt to fix this, which was not cross platoform. [ original upstream message ]
Thu, 14 Feb 2013 11:33:19 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2013 11:33:19 +0000] rev 1217
Merge with stable
Mon, 15 Oct 2012 23:28:45 +0200 tests: inform on Windows about unnecessary glob lines stable
Simon Heimberg <simohe@besonet.ch> [Mon, 15 Oct 2012 23:28:45 +0200] rev 1216
tests: inform on Windows about unnecessary glob lines When glob lines directly match on windows, "/" (and not "\") was output in the path on the line. No glob matching is necessary in this case. The test output will look like this (when 5 tests have passed and no 4 has an unnecessary glob): ... Info, unnecessary glob: info about some/thing (glob) .. [ original upstream message ]
Wed, 13 Feb 2013 21:58:52 +0100 tests: quickly check if the glob line already matches the output stable
Simon Heimberg <simohe@besonet.ch> [Wed, 13 Feb 2013 21:58:52 +0100] rev 1215
tests: quickly check if the glob line already matches the output This happens when a path with "/" as only glob char is matched on a non windows platform. (Currently one third of all glob matches.) The slowdown on windows and the speedup on other os are neglectable. [ original upstream message ]
Fri, 08 Feb 2013 22:54:17 +0100 export: show 'Date' header in a format that also is readable for humans stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Feb 2013 22:54:17 +0100] rev 1214
export: show 'Date' header in a format that also is readable for humans 'export' is the official export format and used by patchbomb, but it would only show date as a timestamp that most humans might find it hard to relate to. It would be very convenient when reviewing a patch to be able to see what timestamp the patch will end up with. Mercurial has always used util.parsedate for parsing these headers. It can handle 'all' date formats, so we could just as well use a readable one. 'export' will now use the format used by 'log' - which is the format described as 'Unix date format' in the templating help. We assume that all parsers of '# HG changeset patch'es can handle that. [ original upstream message ]
Sun, 10 Feb 2013 01:51:28 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2013 01:51:28 +0000] rev 1213
Merge with stable
Wed, 30 Jan 2013 01:24:04 +0100 test: display used python hash seed stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 30 Jan 2013 01:24:04 +0100] rev 1212
test: display used python hash seed We keep using a random seed for each run, but we "compute" it ourself to be able to reproduce a failed test run. [ original upstream message ]
Fri, 08 Feb 2013 12:11:51 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Feb 2013 12:11:51 +0000] rev 1211
Merge with stable
Wed, 24 Oct 2012 23:09:31 +0200 run-tests: do not fail on empty tsttest file stable
Simon Heimberg <simohe@besonet.ch> [Wed, 24 Oct 2012 23:09:31 +0200] rev 1210
run-tests: do not fail on empty tsttest file Initialize n for not failing on empty tsttest files. [ original upstream message ]
Tue, 29 Jan 2013 22:19:10 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2013 22:19:10 +0000] rev 1209
Merge with stable
Tue, 29 Jan 2013 20:03:51 +0100 run-tests.py: inherit PYTHONHASHSEED from environment if set stable
Mads Kiilerich <madski@unity3d.com> [Tue, 29 Jan 2013 20:03:51 +0100] rev 1208
run-tests.py: inherit PYTHONHASHSEED from environment if set This makes it possible to fix the seed by using for instance PYTHONHASHSEED=7 ./run-tests.py ... This can be very convenient when trying to debug problems that are influenced by hash values. Try different seed values until you find one that triggers the bad behaviour and then keep that while debugging. The value 0 will restore default Python behavior and disable randomization. [ original upstream message ]
Wed, 23 Jan 2013 22:30:58 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2013 22:30:58 +0000] rev 1207
Merge with stable
Mon, 21 Jan 2013 19:40:15 +0100 documentation: update to new filter names stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 21 Jan 2013 19:40:15 +0100] rev 1206
documentation: update to new filter names Changeset f3b21beb9802 change filter names but forgot some documentation updates. [ original upstream description ]
Sat, 19 Jan 2013 09:40:50 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Jan 2013 09:40:50 +0000] rev 1205
Merge with stable
Fri, 18 Jan 2013 01:23:51 +0100 run-tests.py: don't let hg run interactively in debug mode stable
Mads Kiilerich <madski@unity3d.com> [Fri, 18 Jan 2013 01:23:51 +0100] rev 1204
run-tests.py: don't let hg run interactively in debug mode In normal test mode stdin is closed and hg is thus not interactive. In --debug mode stdin is inherited from the running console and to the tests, and hg could thus wait in prompts when running on Windows. See http://selenic.com/pipermail/mercurial-devel/2013-January/047548.html . Instead set ui.interactive=False to make Mercurial non-interactive. Other commands might still work differently in the --debug environment. This should solve the problem with hg waiting for input but still make it possible to add --debugger to hg in a test and run run-tests.py with --debug. [ original upstream message ]
Fri, 18 Jan 2013 01:16:16 +0100 run-tests.py: backout "don't use console for stdin when running in debug mode" stable
Mads Kiilerich <madski@unity3d.com> [Fri, 18 Jan 2013 01:16:16 +0100] rev 1203
run-tests.py: backout "don't use console for stdin when running in debug mode" f5842787a958 caused that some kind of interactive debugging no longer was possible - such as running hg with --debugger in a test run with run-tests.py --debug . [ original upstream message ]
Wed, 16 Jan 2013 20:56:02 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jan 2013 20:56:02 +0000] rev 1202
Merge with stable
Wed, 16 Jan 2013 14:26:19 +0100 get-with-headers: add a --headeronly switch stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Wed, 16 Jan 2013 14:26:19 +0100] rev 1201
get-with-headers: add a --headeronly switch In some case we do not care about the actual rendering. [ original upstream message ]
Wed, 16 Jan 2013 02:01:11 +0100 tests: make test-hgweb.t output stable stable
Mads Kiilerich <madski@unity3d.com> [Wed, 16 Jan 2013 02:01:11 +0100] rev 1200
tests: make test-hgweb.t output stable Instability introduced in combination of a4d7fd7ad1f7 and e389a25e7e60. [ original upstream message ]
Tue, 15 Jan 2013 20:54:57 +0100 serve: don't send any content headers with 304 responses stable
Mads Kiilerich <madski@unity3d.com> [Tue, 15 Jan 2013 20:54:57 +0100] rev 1199
serve: don't send any content headers with 304 responses Fixes HTTP protocol violation introduced in cf5c76017e11. 'hg serve' would show a stacktrace when loading pages that not had been modified. There was test coverage for this, but the wrong response headers wasn't shown and thus not detected. [ original upstream message ]
Wed, 16 Jan 2013 00:09:26 +0100 destroyed: drop complex branchcache rebuilt logic stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 16 Jan 2013 00:09:26 +0100] rev 1198
destroyed: drop complex branchcache rebuilt logic The strip code used a trick to lower the cost of branchcache update after a strip. However is less necessary since we have branchcache collaboration. Invalid branchcache are likely to be cheaply rebuilt again a near subset of the repo. Moreover, this trick would need update to be relevant in the now filtered repository world. It currently update the unfiltered branchcache that few people cares about. Make it smarter on that aspect would need complexes update of the calling logic So this mechanism is: - Arguably needed, - Currently irrelevant, - Hard to update and I'm dropping it. We now update the branchcache in all case by courtesy of the read only reader. This changeset have a few expected impact on the testsuite are different cache are updated. [ original upstream message ]
Wed, 16 Jan 2013 00:08:08 +0100 branchmap: update cache of 'unserved' filter on new changesets stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 16 Jan 2013 00:08:08 +0100] rev 1197
branchmap: update cache of 'unserved' filter on new changesets The `commitctx` and `addchangegroup` methods of repo upgrade branchcache after completion. This behavior aims to keep the branchcache in sync for read only process as hgweb. See ee317dbfb9d0 for details. Since changelog filtering is used, those calls only update the cache for unfiltered repo. One of no interest for typical read only process like hgweb. Note: By chance in basic case, `repo.unfiltered() == repo.filtered('unserved')` This changesets have the "unserved" cache updated instead. I think this is the only cache that matter for hgweb. We could imagine updating all possible branchcaches instead but: - I'm not sure it would have any benefit impact. It may even increase the odd of all cache being invalidated. - This is more complicated change. So I'm going for updating a single cache only which is already better that updating a cache nobody cares about. This changeset have a few expected impact on the testsuite are different cache are updated. [ original upstream message ]
Tue, 15 Jan 2013 23:30:10 +0100 tests: run with PYTHONHASHSEED=random stable
Mads Kiilerich <madski@unity3d.com> [Tue, 15 Jan 2013 23:30:10 +0100] rev 1196
tests: run with PYTHONHASHSEED=random Python set and dict iteration order is in principle undefined but usually 'quite stable'. Setting PYTHONHASHSEED=random will make the iteration order more random in Python 2.6.8 and 2.7.3 and where it has been backported. This can thus help spot dependencies on undefined behaviour and prevent future problems. [ original upstream message ]
Tue, 15 Jan 2013 13:33:28 -0800 run-tests: exit cleanly if parallel run is interrupted stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 15 Jan 2013 13:33:28 -0800] rev 1195
run-tests: exit cleanly if parallel run is interrupted If interrupted while running with "--jobs N", run-tests asynchronously spewed a bunch of output and backtraces from both the master and slave processes, leaving the terminal full of goop. This patch makes it behave more sensibly. [ original upstream message ]
Sun, 13 Jan 2013 01:39:16 -0600 filtering: rename filters to their antonyms stable
Kevin Bullock <kbullock@ringworld.org> [Sun, 13 Jan 2013 01:39:16 -0600] rev 1194
filtering: rename filters to their antonyms Now that changelog filtering is in place, it's become evident that naming the filters according to the set of revs _not_ included in the filtered changelog is confusing. This is especially evident in the collaborative branch cache scheme. This changes the names of the filters to reflect the revs that _are_ included: hidden -> visible unserved -> served mutable -> immutable impactable -> base repoview.filteredrevs is renamed to filterrevs, so that callers read a bit more sensibly, e.g.: filterrevs('visible') # filter revs according to what's visible [ original upstream message ]
Fri, 11 Jan 2013 18:33:15 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2013 18:33:15 +0000] rev 1193
Merge with default
Thu, 10 Jan 2013 16:25:06 +0000 test: improve grammar and spelling in branchcache note
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Jan 2013 16:25:06 +0000] rev 1192
test: improve grammar and spelling in branchcache note See: 769eb1b179b5
Thu, 10 Jan 2013 16:02:08 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Jan 2013 16:02:08 +0000] rev 1191
Merge with stable
Wed, 09 Jan 2013 13:16:54 -0800 hghave: introduce a test (unused) for cvs >= 1.12 stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 09 Jan 2013 13:16:54 -0800] rev 1190
hghave: introduce a test (unused) for cvs >= 1.12 [ original upstream message ]
Tue, 08 Jan 2013 20:37:37 +0100 clfilter: enforce hidden changeset globally stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 08 Jan 2013 20:37:37 +0100] rev 1189
clfilter: enforce hidden changeset globally The dispatch code now enables filtering of "hidden" changesets globally. The filter is installed before command and extension invocation. The `--hidden` switch is now global and disables this filtering for any command. Code in log dedicated to changeset exclusion is removed as this global filtering has the same effect. [ original upstream message ]
Tue, 08 Jan 2013 12:41:51 +0100 branchcache: add note about cache invalidation to test-keyword.t stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 08 Jan 2013 12:41:51 +0100] rev 1188
branchcache: add note about cache invalidation to test-keyword.t [Should've been included in aff706b3a21c.] --Kevin Bullock <kbullock@ringworld.org> [ original upstream message ]
Wed, 02 Jan 2013 01:57:46 +0100 clfilter: add mutable filtering stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 02 Jan 2013 01:57:46 +0100] rev 1187
clfilter: add mutable filtering It filters all mutable changesets, leaving only public changeset unfiltered. This filtering set is expected to be much more stable that the previous one as public changeset are unlikely to disapear. The only official use of this filter is for branchcache. [ original upstream message ]
Mon, 07 Jan 2013 02:14:41 +0100 run-tests.py: fix handling of symlink to the right python stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Jan 2013 02:14:41 +0100] rev 1186
run-tests.py: fix handling of symlink to the right python Before: a symlink for python in BINDIR was sometimes created, but it was never updated when a different Python was used and it was never removed. An invalid python could thus be left around and used when testing with --local. Now: the symlink is removed when wrong and created when necessary. The mechanism for finding the right name (python or python.exe) also had to be simplified and made more explicit. [ original upstream message ]
Mon, 07 Jan 2013 23:30:00 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2013 23:30:00 +0000] rev 1185
Merge with stable
Mon, 07 Jan 2013 17:23:25 +0100 branchmap: allow to use cache of subset stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 07 Jan 2013 17:23:25 +0100] rev 1184
branchmap: allow to use cache of subset Filtered repository are *subset* of unfiltered repository. This means that a filtered branchmap could be use to compute the unfiltered version. And filtered version happen to be subset of each other: - "all() - unserved()" is a subset of "all() - hidden()" - "all() - hidden()" is a subset of "all()" This means that branchmap with "unfiltered" filter can be used as a base for "hidden" branchmap that itself could be used as a base for unfiltered branchmap. unserved < hidden < None This changeset implements this mechanism. If the on disk branchcache is not valid we use the branchcache of the nearest subset as base instead of computing it from scratch. Such fallback can be cascaded multiple time is necessary. Note that both "hidden" and "unserved" set are a bit volatile. We will add more stable filtering in next changesets. This changeset enables collaboration between no filtering and "unserved" filtering. Fixing performance regression introduced by 47f00b0de337 [ original upstream message ]
Mon, 07 Jan 2013 02:00:43 +0100 run-tests.py: don't use console for stdin when running in debug mode stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Jan 2013 02:00:43 +0100] rev 1183
run-tests.py: don't use console for stdin when running in debug mode Tests would wait for input instead of using non-interactive mode. [ original upstream message ]
Mon, 07 Jan 2013 02:00:43 +0100 tests: make hghave and run-tests exit on unknown feature requirements stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Jan 2013 02:00:43 +0100] rev 1182
tests: make hghave and run-tests exit on unknown feature requirements [ original upstream message ]
Fri, 04 Jan 2013 20:12:31 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2013 20:12:31 +0000] rev 1181
Merge with stable
Fri, 21 Dec 2012 17:19:52 +0100 localrepo: filter unknown nodes from the phasecache on destroyed stable
Idan Kamara <idankk86@gmail.com> [Fri, 21 Dec 2012 17:19:52 +0100] rev 1180
localrepo: filter unknown nodes from the phasecache on destroyed When commit is followed by strip (qrefresh), phasecache contains nodes that were removed from the changelog. Since phasecache is filecached with .hg/store/phaseroots which doesn't change as a result of stripping, we have to filter it manually. If we don't write it immediately, the next time it is read from disk the nodes will be filtered again. That's what happened before, but there's no reason not to write it immediately. The change in test-keyword.t is caused by the above. [ original upstream message ]
Sat, 29 Dec 2012 02:35:54 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 29 Dec 2012 02:35:54 +0000] rev 1179
Merge with stable
Fri, 28 Dec 2012 00:02:40 +0100 strip: do not update branchcache during strip (issue3745) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 28 Dec 2012 00:02:40 +0100] rev 1178
strip: do not update branchcache during strip (issue3745) At this moment, the cache is invalid, and will be thrown away. Later the strip function will call the `localrepo.destroyed` method that will update the branchmap cache. [ original upstream message ]
Mon, 24 Dec 2012 02:49:59 +0100 branchmap: move validity logic in the object itself stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 24 Dec 2012 02:49:59 +0100] rev 1177
branchmap: move validity logic in the object itself In several place, We check if a branchcache is still valid regarding the current state of the repository. This changeset puts this logic in a method of the object that can be reused when necessary. A branch map is considered valid whenever it is up to date or a strict subset of the repository state. The change will help making branchcache aware of filtered revision. The change in keyword is expected. the branch cache is actually invalid after the amend. The previous check did not detected it. [ original upstream message ]
Fri, 21 Dec 2012 15:21:55 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Dec 2012 15:21:55 +0000] rev 1176
Merge with stable
Wed, 12 Dec 2012 15:17:18 -0800 run-tests: fix whitespace nonsense stable
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Dec 2012 15:17:18 -0800] rev 1175
run-tests: fix whitespace nonsense [ original upstream message ]
Wed, 12 Dec 2012 14:52:58 -0800 run-tests: on windows, put correct python at front of PATH stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 12 Dec 2012 14:52:58 -0800] rev 1174
run-tests: on windows, put correct python at front of PATH The older approach of trying to copy the python executable into the test directory was doomed to fail. There remains one weakness with this approach: if you've run "make local", tests may pick up the wrong extension DLLs from inside the source tree. I don't know why this happens. A reasonable workaround for now is to test either using --local or with a working directory that does not contain built DLLs. [ original upstream message ]
Sun, 09 Dec 2012 23:33:16 +0100 tests: kill daemons early, making breaking at "Accept" prompt safe stable
Mads Kiilerich <madski@unity3d.com> [Sun, 09 Dec 2012 23:33:16 +0100] rev 1173
tests: kill daemons early, making breaking at "Accept" prompt safe [ original upstream message ]
Tue, 11 Dec 2012 15:38:42 -0800 run-tests: fix exename on Windows stable
Siddharth Agarwal <sid0@fb.com> [Tue, 11 Dec 2012 15:38:42 -0800] rev 1172
run-tests: fix exename on Windows [ original upstream message ]
Tue, 11 Dec 2012 15:13:23 -0800 run-tests: support running tests in parallel on windows stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 11 Dec 2012 15:13:23 -0800] rev 1171
run-tests: support running tests in parallel on windows Previously, we used os.spawnvp, which doesn't exist on Windows, and isn't needed anyway (the command line begins with an absolute path). We also need a slightly more convoluted way to wait for processes without specifying an order on Windows, as it lacks os.wait. [ original upstream message ]
Mon, 10 Dec 2012 12:14:55 -0800 run-tests: use correct python safely under --jobs stable
Bryan O'Sullivan <bryano@fb.com> [Mon, 10 Dec 2012 12:14:55 -0800] rev 1170
run-tests: use correct python safely under --jobs [ original upstream message ]
Mon, 10 Dec 2012 12:09:02 -0800 run-tests: check for the correct python when starting stable
Bryan O'Sullivan <bryano@fb.com> [Mon, 10 Dec 2012 12:09:02 -0800] rev 1169
run-tests: check for the correct python when starting [ original upstream message ]
Mon, 10 Dec 2012 12:07:42 -0800 run-tests: use correct python when run with --local stable
Bryan O'Sullivan <bryano@fb.com> [Mon, 10 Dec 2012 12:07:42 -0800] rev 1168
run-tests: use correct python when run with --local [ original upstream message ]
Wed, 28 Nov 2012 23:59:39 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 28 Nov 2012 23:59:39 +0000] rev 1167
Merge with stable
Tue, 27 Nov 2012 13:09:05 -0800 run-tests: fix an unnoticed check-code violation stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 27 Nov 2012 13:09:05 -0800] rev 1166
run-tests: fix an unnoticed check-code violation [ original upstream message ]
Tue, 27 Nov 2012 11:18:33 -0800 run-tests: add a --compiler option stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 27 Nov 2012 11:18:33 -0800] rev 1165
run-tests: add a --compiler option Without this option, it is not possible to run the test suite on Windows using mingw's gcc as the compiler. [ original upstream message ]
Tue, 27 Nov 2012 11:18:31 -0800 run-tests: make build command line less intimidating stable
Bryan O'Sullivan <bryano@fb.com> [Tue, 27 Nov 2012 11:18:31 -0800] rev 1164
run-tests: make build command line less intimidating Use a dict for parameters to the format string, instead of a ridiculous number of positional parameters. [ original upstream message ]
Wed, 14 Nov 2012 18:08:39 -0600 run-tests: backout 4a4173519b63 stable
Matt Mackall <mpm@selenic.com> [Wed, 14 Nov 2012 18:08:39 -0600] rev 1163
run-tests: backout 4a4173519b63 This deleted work in progress to eliminate child processes for -j. [ original upstream message ]
Wed, 14 Nov 2012 13:25:00 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Nov 2012 13:25:00 +0000] rev 1162
Merge with stable
Thu, 08 Nov 2012 14:10:04 -0800 run-tests.py: remove runqueue's results parameter since it is now a global stable
Siddharth Agarwal <sid0@fb.com> [Thu, 08 Nov 2012 14:10:04 -0800] rev 1161
run-tests.py: remove runqueue's results parameter since it is now a global [ original upstream message ]
Sat, 10 Nov 2012 11:37:41 -0800 run-tests: open child-parent pipes in binary mode stable
Siddharth Agarwal <sid0@fb.com> [Sat, 10 Nov 2012 11:37:41 -0800] rev 1160
run-tests: open child-parent pipes in binary mode Python's pickle is a binary format. [ original upstream message ]
Fri, 09 Nov 2012 14:49:30 -0800 run-tests: add --time option to log times for each test stable
Siddharth Agarwal <sid0@fb.com> [Fri, 09 Nov 2012 14:49:30 -0800] rev 1159
run-tests: add --time option to log times for each test --time also prints out the wall-clock time each test takes in descending order. [ original upstream message ]
Fri, 09 Nov 2012 15:09:35 -0800 run-tests: remove resultslock since it serves no useful purpose stable
Siddharth Agarwal <sid0@fb.com> [Fri, 09 Nov 2012 15:09:35 -0800] rev 1158
run-tests: remove resultslock since it serves no useful purpose Each child process has its own copy of the results dict, so all access to the results dict is serial. [ original upstream message ]
Fri, 09 Nov 2012 14:42:36 -0800 run-tests: use pickle to send results from children to parent stable
Siddharth Agarwal <sid0@fb.com> [Fri, 09 Nov 2012 14:42:36 -0800] rev 1157
run-tests: use pickle to send results from children to parent JSON would probably be preferable, but it isn't available for Python 2.4 or 2.5. [ original upstream message ]
Thu, 08 Nov 2012 18:35:43 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 08 Nov 2012 18:35:43 +0000] rev 1156
Merge with stable
Wed, 24 Oct 2012 23:09:31 +0200 run-tests: skip unnecessary operations on the args in the child proces stable
Simon Heimberg <simohe@besonet.ch> [Wed, 24 Oct 2012 23:09:31 +0200] rev 1155
run-tests: skip unnecessary operations on the args in the child proces The arguments are already sorted and never empty. [ original upstream message ]
Sun, 21 Oct 2012 16:10:25 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Oct 2012 16:10:25 +0100] rev 1154
Merge with stable
Sun, 21 Oct 2012 16:10:04 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Oct 2012 16:10:04 +0100] rev 1153
Merge with default
Thu, 18 Oct 2012 00:44:32 +0200 run-tests: remove dead code for supporting old test scripts stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 18 Oct 2012 00:44:32 +0200] rev 1152
run-tests: remove dead code for supporting old test scripts [ original upstream message ]
Thu, 18 Oct 2012 00:33:29 +0200 run-tests: handle windows crlf in .py tests again stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 18 Oct 2012 00:33:29 +0200] rev 1151
run-tests: handle windows crlf in .py tests again Before af7c6bc48d8d all crlf occurrences in test output on Windows were simply changed to lf. In af7c6bc48d8d it was replaced by more clever handling in the .t test runner ... but the .py runner was forgotten and many .py tests were failing on Windows. The crlf/lf replacement is now reintroduced in the py test runner. [ original upstream message ]
Sun, 14 Oct 2012 18:30:42 +0200 run-tests: make it possible to combine (esc) with (glob) and (re) stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 14 Oct 2012 18:30:42 +0200] rev 1150
run-tests: make it possible to combine (esc) with (glob) and (re) This makes it possible to combine the annotations ... if done in the right order. [ original upstream message ]
Mon, 15 Oct 2012 02:33:12 +0200 run-tests: alternative way of handling \r on Windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 15 Oct 2012 02:33:12 +0200] rev 1149
run-tests: alternative way of handling \r on Windows After f71d60da58fb all \r was stripped from output on Windows, and the places where a \r explicitly was expected it was accepted that it was missing. Ugly hack. Instead we now accept that an extra \r might appear at the end of lines on Windows. That is more to the point and less ugly. [ original upstream message ]
Thu, 18 Oct 2012 22:12:15 +0200 amend: add noise in extra to avoid creating obsolescence cycle (issue3664) stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Thu, 18 Oct 2012 22:12:15 +0200] rev 1148
amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Obsolescence cycle are bad and should be avoided as much as possible. The current amend implemented touch changeset meta data as few as possible. This make is easy for amend to result in the same node than a precursors. We add some deterministic noise in extra to avoid this. In practice, the hex of the amended changeset is stored in 'amend_source' extra key. [ original upstream message ]
Thu, 18 Oct 2012 16:28:04 +0200 Move commands.inferrepo for code maintenance
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Oct 2012 16:28:04 +0200] rev 1147
Move commands.inferrepo for code maintenance
Wed, 17 Oct 2012 17:19:48 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2012 17:19:48 +0200] rev 1146
Merge with stable
Tue, 16 Oct 2012 11:43:15 -0700 commands: don't infer repo for commands like update (issue2748) stable
Siddharth Agarwal <sid0@fb.com> [Tue, 16 Oct 2012 11:43:15 -0700] rev 1145
commands: don't infer repo for commands like update (issue2748) Maintain a whitelist of commands to infer the repo for instead. The whitelist contains those commands that take file(s) in the working dir as arguments. [ original upstream message ]
Fri, 12 Oct 2012 23:47:40 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 12 Oct 2012 23:47:40 +0200] rev 1144
Merge with stable
Thu, 11 Oct 2012 16:05:14 -0700 tests: correctly report a test killed by a signal stable
Bryan O'Sullivan <bryano@fb.com> [Thu, 11 Oct 2012 16:05:14 -0700] rev 1143
tests: correctly report a test killed by a signal [ original upstream message ]
Fri, 12 Oct 2012 23:46:19 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 12 Oct 2012 23:46:19 +0200] rev 1142
Merge with default
Fri, 10 Aug 2012 20:37:20 +0100 Avoid traceback caused by bogus date input (issue3344)
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Aug 2012 20:37:20 +0100] rev 1141
Avoid traceback caused by bogus date input (issue3344) Wrap datefilters which split date texts with util.parsedate. We do not abort, as the bogus date must have been given by the user.
Thu, 11 Oct 2012 19:46:25 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Oct 2012 19:46:25 +0200] rev 1140
Merge with stable
Wed, 26 Sep 2012 00:56:27 +0200 run-tests: allow test output lines to be terminated with \r in addition to \n stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 26 Sep 2012 00:56:27 +0200] rev 1139
run-tests: allow test output lines to be terminated with \r in addition to \n str.splitlines could not be used in 546c76e5a3e6, but _now_ we would like to have lines with other line endings than \n. Some fine occurences of (esc) markup of \r is replaced with multiple lines ending with '\r (no-eol) (esc)'. That is no win but also no significant loss. This change makes it possible to drop filtercr.py - _that_ is a win. [ original upstream message ]
Wed, 10 Oct 2012 01:37:53 +0200 run-tests: use more explicit criteria for detecting no-eol stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 10 Oct 2012 01:37:53 +0200] rev 1138
run-tests: use more explicit criteria for detecting no-eol Preparing for the situation where there could be unsalted lines not terminated with \n. [ original upstream message ]
Wed, 10 Oct 2012 11:31:01 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 10 Oct 2012 11:31:01 +0200] rev 1137
Merge with stable
Thu, 04 Oct 2012 16:52:20 +0200 subrepo, hghave: use "svn --version --quiet" to determine version number stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Oct 2012 16:52:20 +0200] rev 1136
subrepo, hghave: use "svn --version --quiet" to determine version number svn --version --quiet is implemented since svn 0.14.1 (August 2002) and prints just the version number, not the long output (21 lines) of "svn --version". Additionally I expect this output format to be more stable, at least it is not changed with different translations. [ original upstream message ]
Wed, 10 Oct 2012 01:30:45 +0200 run-tests: drop unused enumerate stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 10 Oct 2012 01:30:45 +0200] rev 1135
run-tests: drop unused enumerate [ original upstream message ]
Wed, 19 Sep 2012 00:59:23 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 19 Sep 2012 00:59:23 +0100] rev 1134
Merge with stable
Sun, 09 Sep 2012 12:31:14 +0200 test-http-branchmap: enable on Windows stable
Patrick Mezard <patrick@mezard.eu> [Sun, 09 Sep 2012 12:31:14 +0200] rev 1133
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. [ orginal upstream message ]
Thu, 13 Sep 2012 23:02:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Sep 2012 23:02:29 +0100] rev 1132
Merge with stable
Sat, 28 Jul 2012 23:28:17 +0200 tests: unset variable HG if it is set stable
Simon Heimberg <simohe@besonet.ch> [Sat, 28 Jul 2012 23:28:17 +0200] rev 1131
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. [ original upstream message ]
Wed, 12 Sep 2012 18:44:43 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 12 Sep 2012 18:44:43 +0100] rev 1130
Merge with stable
Fri, 17 Aug 2012 13:58:18 -0700 spelling: destination stable
timeless@mozdev.org [Fri, 17 Aug 2012 13:58:18 -0700] rev 1129
spelling: destination [ original upstream message ]
Mon, 20 Aug 2012 22:36:51 +0200 killdaemons: take file argument explicitely stable
Patrick Mezard <patrick@mezard.eu> [Mon, 20 Aug 2012 22:36:51 +0200] rev 1128
killdaemons: take file argument explicitely It makes it easier to use as a generic replacement for kill utility, mostly for Windows tests. [ original upstream message ]
Sun, 19 Aug 2012 18:06:15 +0200 killdaemons: add windows implementation stable
Patrick Mezard <patrick@mezard.eu> [Sun, 19 Aug 2012 18:06:15 +0200] rev 1127
killdaemons: add windows implementation [ original upstream message ]
Sun, 19 Aug 2012 16:41:09 +0200 run-tests: do not duplicate killdaemons() code stable
Patrick Mezard <patrick@mezard.eu> [Sun, 19 Aug 2012 16:41:09 +0200] rev 1126
run-tests: do not duplicate killdaemons() code [ original upstream message ]
Wed, 14 Apr 2010 17:58:10 +0900 pylint, pyflakes: remove unused or duplicate imports stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 14 Apr 2010 17:58:10 +0900] rev 1125
pylint, pyflakes: remove unused or duplicate imports [ original upstream message, already done for run-tests.py ]
Sun, 05 Jul 2009 11:01:30 +0200 compat: use open() instead of file() everywhere stable
Alejandro Santos <alejolp@alejolp.com> [Sun, 05 Jul 2009 11:01:30 +0200] rev 1124
compat: use open() instead of file() everywhere [ original upstream message only for killdaemons here ]
Fri, 07 Nov 2008 16:28:53 -0600 tests: add killdaemons helper script stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Nov 2008 16:28:53 -0600] rev 1123
tests: add killdaemons helper script [ orgininal upstream message ]
Thu, 30 Aug 2012 16:18:03 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 30 Aug 2012 16:18:03 +0100] rev 1122
Merge with stable
Wed, 15 Aug 2012 22:38:42 +0200 fix trivial spelling errors stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 15 Aug 2012 22:38:42 +0200] rev 1121
fix trivial spelling errors [ original upstream message ]
Thu, 09 Aug 2012 12:52:34 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Aug 2012 12:52:34 +0100] rev 1120
Merge with stable
Wed, 08 Aug 2012 18:10:16 +0200 check-code: fix check for trailing whitespace on sh command lines stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 08 Aug 2012 18:10:16 +0200] rev 1119
check-code: fix check for trailing whitespace on sh command lines The $ has been without necessary escaping since introduced in c7d23b4ca4ba. [ original upstream message ]
Wed, 04 Jul 2012 12:06:34 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 04 Jul 2012 12:06:34 +0100] rev 1118
Merge with stable
Tue, 03 Jul 2012 18:02:07 +0200 test-keyword: adapt for Windows stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 03 Jul 2012 18:02:07 +0200] rev 1117
test-keyword: adapt for Windows [ original upstream message ]
Wed, 04 Jul 2012 02:04:58 +0200 tests: don't use dates before epoch in test-keyword.t stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 04 Jul 2012 02:04:58 +0200] rev 1116
tests: don't use dates before epoch in test-keyword.t Timezone offsets of less than a minute is not shown but can cause displayed dates to be before epoch start - and dates before epoch start is not shown correctly on Windows (see also 4d5b12a5517b). These 'negative' dates could be considered undefined behaviour so we don't care and swap the tests values for timestamp and timezone. [ original upstream message ]
Wed, 04 Jul 2012 12:04:06 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 04 Jul 2012 12:04:06 +0100] rev 1115
Merge with default
Thu, 28 Jun 2012 23:19:35 +0100 Use ui.formatter for kwfiles output
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jun 2012 23:19:35 +0100] rev 1114
Use ui.formatter for kwfiles output
Fri, 22 Jun 2012 13:40:23 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Jun 2012 13:40:23 +0100] rev 1113
Merge with stable
Fri, 18 May 2012 12:45:47 -0700 strip: incrementally update the branchheads cache after a strip stable
Joshua Redstone <joshua.redstone@fb.com> [Fri, 18 May 2012 12:45:47 -0700] rev 1112
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. [ original upstream message ]
Thu, 21 Jun 2012 14:04:15 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Jun 2012 14:04:15 +0100] rev 1111
Merge with stable
Mon, 07 Nov 2011 13:46:41 -0600 run-tests: replace inline python handling with more native scheme stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:41 -0600] rev 1110
run-tests: replace inline python handling with more native scheme Normally changes in tests are reported like this in diffs: $ cat foo - a + b Using -i mode lets us update tests when the new results are correct and/or populate tests with their output. But with the standard doctest framework, inline Python sections in tests changes instead result in a big failure report that's unhelpful. So here, we replace the doctest calls with a simple compile/eval loop. [ original upstream message - missed change to heredoctest ]
Tue, 01 Nov 2011 12:25:54 -0700 tests: fix readline escape characters in heredoctest.py/test-url.py stable
Brodie Rao <brodie@bitheap.org> [Tue, 01 Nov 2011 12:25:54 -0700] rev 1109
tests: fix readline escape characters in heredoctest.py/test-url.py This fix mirrors the changes made to test-doctest.py in b856071435f7 and 967adcf5910d. Without this change, tests running heredoctest.py can fail on certain versions of OS X when TERM is set to xterm-256color: $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF > >>> open('b', 'w').write('this' * 1000) > EOF + \x1b[?1034h (no-eol) (esc) A similar problem occurs with test-url.py: $ ./run-tests.py test-url.py --- .../tests/test-url.py.out +++ .../tests/test-url.py.err @@ -0,0 +1 @@ + ERROR: .../test-url.py output changed ! Failed test-url.py: output changed # Ran 1 tests, 0 skipped, 1 failed. [ original upstream message ]
Thu, 13 Oct 2011 17:54:35 +0200 tests: remove temp doctest file when finished running it stable
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:35 +0200] rev 1108
tests: remove temp doctest file when finished running it [ original upstream message ]
Wed, 12 Oct 2011 22:01:13 +0200 tests: add helper script for processing doctests read from stdin stable
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:13 +0200] rev 1107
tests: add helper script for processing doctests read from stdin Writes stdin to a temp file and doctests it. In the future we might want to spare the temp file and directly call into doctest. Also, with some tweaking it seems possible to adjust the line numbers reported in an error report so they match the ones in the original file. [ original upstream message ]
Thu, 21 Jun 2012 03:05:02 +0200 tests: prepare get-with-headers.py for MSYS stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 21 Jun 2012 03:05:02 +0200] rev 1106
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. [ original upstream message ]
Wed, 20 Jun 2012 23:41:21 +0200 tests: hghave outer-repo should be true even if a bad repo is found stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Jun 2012 23:41:21 +0200] rev 1105
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. [ original upstream message ]
Wed, 20 Jun 2012 23:41:21 +0200 tests: add missing no-outer-repo requirements stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Jun 2012 23:41:21 +0200] rev 1104
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. [ original upstream message ]
Tue, 19 Jun 2012 16:00:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 19 Jun 2012 16:00:31 +0100] rev 1103
Merge with stable
Fri, 15 Jun 2012 00:02:27 +0200 tests: introduce hghave hardlinks stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 15 Jun 2012 00:02:27 +0200] rev 1102
tests: introduce hghave hardlinks Some tests can't be run on FAT filesystems because it doesn't support hardlinks. [ original upstream message ]
Fri, 15 Jun 2012 00:02:27 +0200 tests/hghave: test that the inotify unix socket actually can be created stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 15 Jun 2012 00:02:27 +0200] rev 1101
tests/hghave: test that the inotify unix socket actually can be created Inotify do not work on FAT filesystems. [ original upstream message ]
Fri, 15 Jun 2012 00:02:27 +0200 tests/hghave: test that a fifo actually can be created on the filesystem stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 15 Jun 2012 00:02:27 +0200] rev 1100
tests/hghave: test that a fifo actually can be created on the filesystem Some tests were failing on FAT filesystems. [ original upstream message ]
Fri, 15 Jun 2012 00:02:27 +0200 tests/hghave: consistently use dir='.', prefix=tempprefix for tempfiles stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 15 Jun 2012 00:02:27 +0200] rev 1099
tests/hghave: consistently use dir='.', prefix=tempprefix for tempfiles Some feature tests were done in the wrong directory and could thus give the wrong result. [ original upstream message ]
Thu, 14 Jun 2012 12:54:54 +0200 tests/hghave: extract hghave.py stable
Adrian Buehlmann <adrian@cadifra.com> [Thu, 14 Jun 2012 12:54:54 +0200] rev 1098
tests/hghave: extract hghave.py hghave is degraded to a bare script, moving the functions to hghave.py so they can be shared later on. [ original upstream message ]
Mon, 11 Jun 2012 13:56:02 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 11 Jun 2012 13:56:02 +0100] rev 1097
Merge with stable
Mon, 11 Jun 2012 01:40:51 +0200 tests: add missing trailing 'cd ..' stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 11 Jun 2012 01:40:51 +0200] rev 1096
tests: add missing trailing 'cd ..' Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around. [ original upstream message ]
Sun, 10 Jun 2012 18:50:42 +0200 tests: convert some 'hghave symlink' to #if stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 10 Jun 2012 18:50:42 +0200] rev 1095
tests: convert some 'hghave symlink' to #if This will enable some tests for windows. [ original upstream message ]
Sun, 10 Jun 2012 18:50:42 +0200 tests: use the right directory for running hghave from run-tests.py stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 10 Jun 2012 18:50:42 +0200] rev 1094
tests: use the right directory for running hghave from run-tests.py [ original upstream message ]
Sun, 10 Jun 2012 18:50:42 +0200 tests: make .t tests stop immediately if a cd fails stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 10 Jun 2012 18:50:42 +0200] rev 1093
tests: make .t tests stop immediately if a cd fails This prevents tests from escaping from TESTTMP as a consequence of a failing directory creation. [ original upstream message ]
Sun, 10 Jun 2012 16:32:22 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Jun 2012 16:32:22 +0100] rev 1092
Merge with stable
Fri, 08 Jun 2012 15:11:05 +0200 tests/hghave: implement #if true / #if false stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 08 Jun 2012 15:11:05 +0200] rev 1091
tests/hghave: implement #if true / #if false For unconditionally testing / skipping a section. Useful for testing the test infrastructure in test-run-tests.t and for debugging/developing tests. [ original upstream message ]
Sun, 10 Jun 2012 03:05:59 +0200 tests/run-tests: avoid C:/ in arguments stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 10 Jun 2012 03:05:59 +0200] rev 1090
tests/run-tests: avoid C:/ in arguments MSYS replaces C:/... in arguments with C;... as it interprets the C:/ as a colon separated POSIX path list. The colon is replaced with ; (path separator on Windows) according to http://www.mingw.org/wiki/Posix_path_conversion So we must not replace \ with / for neither $TESTTMP nor $TESTDIR, but we have to keep replacing \ with / for the Popen4 call of function hghave. If we don't do the latter, test-run-tests.t will fail with $ python run-tests.py --local test-run-tests.t --- C:\Users\adi\hgrepos\hg-main\tests\test-run-tests.t +++ C:\Users\adi\hgrepos\hg-main\tests\test-run-tests.t.err @@ -70,6 +70,7 @@ tested #else $ echo skipped + skipped #endif #if false An additional tweak in test-ssh.t is needed that globs away an encoded path, as it can't be translated back to $TESTTMP, because the backslashes in the output have been already encoded as %5C. This patch makes test-ssh.t pass in MSYS on Windows. [ original upstream message ]
Sun, 27 May 2012 18:25:04 +0200 hghave: wrap command in 'sh -c "..."' for has_pyflakes() stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 27 May 2012 18:25:04 +0200] rev 1089
hghave: wrap command in 'sh -c "..."' for has_pyflakes() Without this, the has_pyflakes() check always fails in MSYS on Windows. [ original upstream message ]
Fri, 08 Jun 2012 15:11:05 +0200 tests/run-tests: use $TMP on Windows (issue3490) stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 08 Jun 2012 15:11:05 +0200] rev 1088
tests/run-tests: use $TMP on Windows (issue3490) This is just a short-term workaround for that issue. More work needs to be done on scmutil.canonpath & friends. $TMP on Windows is specified to be defined, and it has correct casing, so we can use that as the default dir for tempfile.mkdtemp on Windows. [ original upstream message ]
Tue, 05 Jun 2012 00:20:53 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Jun 2012 00:20:53 +0100] rev 1087
Merge with stable
Fri, 01 Jun 2012 02:25:12 +0200 tests: introduce c-style conditional sections in .t tests stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jun 2012 02:25:12 +0200] rev 1086
tests: introduce c-style conditional sections in .t tests This makes it possible to have conditional sections like: #if windows $ echo foo foo #else $ echo bar bar #endif The directives and skipped sections are treated like comments, so don't interleave them with commands and their output. The parameters to #if are evaluated while preparing the test by passing them over to hghave. Requirements can thus be negated with 'no-' prefix, and multiple requirements must all be true to return true. [ original upstream message ]
Wed, 30 May 2012 14:28:57 +0200 run-tests: don't add python lines to expected dict stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 30 May 2012 14:28:57 +0200] rev 1085
run-tests: don't add python lines to expected dict For test input lines of *.t files starting with ' >>> ', the code block for ' >>> ' 609: if l.startswith(' >>> '): # python inlines 610: after.setdefault(pos, []).append(l) was (unsurprisingly) executed, but because there was an "if" instead of an "elif" on the condition "l.startswith(' ... ')", program execution proceeded to line 636 635: elif l.startswith(' '): # results 636: # queue up a list of expected results 637: expected.setdefault(pos, []).append(l[2:]) due to the fact that if l starts with ' >>> ' it also starts with ' '. The net effect was that python command lines in *.t files were (surprisingly) also added to the "expected" dict. This caused no externally observable bad behavior, as the "expected" dict was not consulted for these lines. [ original upstream message ]
Sun, 03 Jun 2012 19:35:23 +0200 run-test: replace backslashes in TESTDIR stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 03 Jun 2012 19:35:23 +0200] rev 1084
run-test: replace backslashes in TESTDIR This may cause troubles in MSYS on Windows. [ original upstream message ]
Sat, 02 Jun 2012 10:09:59 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 02 Jun 2012 10:09:59 +0200] rev 1083
Merge with default
Thu, 31 May 2012 12:47:50 +0200 Update copyleft
Christian Ebert <blacktrash@gmx.net> [Thu, 31 May 2012 12:47:50 +0200] rev 1082
Update copyleft
Thu, 31 May 2012 12:47:50 +0200 Wlock cmdutil.copy wrapper
Christian Ebert <blacktrash@gmx.net> [Thu, 31 May 2012 12:47:50 +0200] rev 1081
Wlock cmdutil.copy wrapper Expanding/shrinking happens outside the wrapped copy function; therefore write lock the repo.
Thu, 31 May 2012 12:47:50 +0200 Support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net> [Thu, 31 May 2012 12:47:50 +0200] rev 1080
Support commit --amend (issue3471) Include a test as well.
Thu, 31 May 2012 12:47:49 +0200 Rename kwt.record attribute to kwt.postcommit
Christian Ebert <blacktrash@gmx.net> [Thu, 31 May 2012 12:47:49 +0200] rev 1079
Rename kwt.record attribute to kwt.postcommit A more general descriptive name, as the attribute will be used for commit --amend as well.
Fri, 18 May 2012 01:21:54 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 18 May 2012 01:21:54 +0100] rev 1078
Merge with stable
Tue, 15 May 2012 14:37:49 -0500 hgext: mark all first-party extensions as such stable
Augie Fackler <raf@durin42.com> [Tue, 15 May 2012 14:37:49 -0500] rev 1077
hgext: mark all first-party extensions as such [ original upstream message ]
Fri, 18 May 2012 01:21:22 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 18 May 2012 01:21:22 +0100] rev 1076
Merge with default
Sun, 13 May 2012 14:26:26 +0100 Intentionally ignore check-code warning about unwrapped ui message
Christian Ebert <blacktrash@gmx.net> [Sun, 13 May 2012 14:26:26 +0100] rev 1075
Intentionally ignore check-code warning about unwrapped ui message
Sun, 13 May 2012 14:39:47 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 13 May 2012 14:39:47 +0100] rev 1074
Merge with stable
Sat, 12 May 2012 16:00:57 +0200 cleanup: "not x in y" -> "x not in y" stable
Brodie Rao <brodie@sf.io> [Sat, 12 May 2012 16:00:57 +0200] rev 1073
cleanup: "not x in y" -> "x not in y" [ original upstream message ]
Sat, 12 May 2012 16:02:45 +0200 cleanup: replace naked excepts with more specific ones stable
Brodie Rao <brodie@sf.io> [Sat, 12 May 2012 16:02:45 +0200] rev 1072
cleanup: replace naked excepts with more specific ones [ original upstream message ]
Sat, 12 May 2012 16:00:53 +0200 cleanup: replace hasattr() usage with getattr() in hghave stable
Brodie Rao <brodie@sf.io> [Sat, 12 May 2012 16:00:53 +0200] rev 1071
cleanup: replace hasattr() usage with getattr() in hghave [ original upstream message ]
Sat, 12 May 2012 15:56:23 +0200 cleanup: "x != None" -> "x is not None" stable
Brodie Rao <brodie@sf.io> [Sat, 12 May 2012 15:56:23 +0200] rev 1070
cleanup: "x != None" -> "x is not None" [ original upstream message ]
Sat, 12 May 2012 15:54:54 +0200 cleanup: eradicate long lines stable
Brodie Rao <brodie@sf.io> [Sat, 12 May 2012 15:54:54 +0200] rev 1069
cleanup: eradicate long lines [ original upstream message ]
Tue, 08 May 2012 15:46:51 -0500 tests: set a standard terminal type stable
Matt Mackall <mpm@selenic.com> [Tue, 08 May 2012 15:46:51 -0500] rev 1068
tests: set a standard terminal type This makes test-ui-color.py happy when run in a dumb terminal. Spotted by Jesse Glick <jesse.glick@oracle.com> [ original upstream message ]
Thu, 10 May 2012 18:21:15 +0200 repair: no need to call filterunknown() in strip() stable
Patrick Mezard <patrick@mezard.eu> [Thu, 10 May 2012 18:21:15 +0200] rev 1067
repair: no need to call filterunknown() in strip() Calling strip() will eventually trigger localrepo.destroyed() which will invalidate _parseroots. It will call filterunknown() upon reload. Changes to test-keyword.t are related to commit --debug running after either qpop or rollback. [ original upstream message ]
Sun, 29 Apr 2012 16:58:42 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Apr 2012 16:58:42 +0100] rev 1066
Merge with stable
Sat, 28 Apr 2012 01:22:47 +0200 tests: don't require 'hg' without extension on windows stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 28 Apr 2012 01:22:47 +0200] rev 1065
tests: don't require 'hg' without extension on windows Hackable uses hg.exe instead. [ original upstream message ]
Fri, 06 Apr 2012 22:53:24 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Apr 2012 22:53:24 +0200] rev 1064
Merge with stable
Wed, 04 Apr 2012 15:59:56 +0200 hghave: remove symlink test made useless by ac0da5caebec stable
Patrick Mezard <patrick@mezard.eu> [Wed, 04 Apr 2012 15:59:56 +0200] rev 1063
hghave: remove symlink test made useless by ac0da5caebec [ original upstream message ]
Wed, 04 Apr 2012 09:31:47 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 04 Apr 2012 09:31:47 +0200] rev 1062
Merge with stable
Tue, 03 Apr 2012 19:06:35 +0200 tests: make tests work if directory contains special characters stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Apr 2012 19:06:35 +0200] rev 1061
tests: make tests work if directory contains special characters With this quoting tests will work e.g. in "/tmp/foo bar/mercurial/". [ original upstream message ]
Tue, 03 Apr 2012 16:34:50 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 03 Apr 2012 16:34:50 +0100] rev 1060
Merge with stable
Mon, 02 Apr 2012 17:02:03 -0500 tests: shorten post-test sleeps stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Apr 2012 17:02:03 -0500] rev 1059
tests: shorten post-test sleeps This helps expose races [ original upstream message ]
Mon, 02 Apr 2012 17:28:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 02 Apr 2012 17:28:55 +0100] rev 1058
Merge with stable
Fri, 30 Mar 2012 22:08:46 +0100 record: allow splitting of hunks by manually editing patches stable
A. S. Budden <abudden@gmail.com> [Fri, 30 Mar 2012 22:08:46 +0100] rev 1057
record: allow splitting of hunks by manually editing patches It is possible that unrelated changes in a file are on sequential lines. The current record extension does not allow these to be committed independently. An example use case for this is in software development for deeply embedded real-time systems. In these environments, it is not always possible to use a debugger (due to time-constraints) and hence inline UART-based printing is often used. When fixing a bug in a module, it is often convenient to add a large number of 'printf's (linked to the UART via a custom fputc) to the module in order to work out what is going wrong. printf is a very slow function (and also variadic so somewhat frowned upon by the MISRA standard) and hence it is highly undesirable to commit these lines to the repository. If only a partial fix is implemented, however, it is desirable to commit the fix without deleting all of the printf lines. This is also simplifies removal of the printf lines as once the final fix is committed, 'hg revert' does the rest. It is likely that the printf lines will be very near the actual fix, so being able to split the hunk is very useful in this case. There were two alternatives I considered for the user interface. One was to manually edit the patch, the other to allow a hunk to be split into individual lines for consideration. The latter option would require a significant refactor of the record module and is less flexible. While the former is potentially more complicated to use, this is a feature that is likely to only be used in certain exceptional cases (such as the use case proposed above) and hence I felt that the complexity would not be a considerable issue. I've also written a follow-up patch that refactors the 'prompt' code to base everything on the choices variable. This tidies up and clarifies the code a bit (removes constructs like 'if ret == 7' and removes the 'e' option from the file scope options as it's not relevant there. It's not really a necessity, so I've excluded it from this submission for now, but I can send it separately if there's a desire and it's on bitbucket (see below) in the meantime. Possible future improvements include: * Tidying up the 'prompt' code to base everything on the choices variable. This would allow entries to be removed from the prompt as currently 'e' is offered even for entire file patches, which is currently unsupported. * Allowing the entire file (or even multi-file) patch to be edited manually: this would require quite a large refactor without much benefit, so I decided to exclude it from the initial submission. * Allow the option to retry if a patch fails to apply (this is what Git does). This would require quite a bit of refactoring given the current 'hg record' implementation, so it's debatable whether it's worth it. Output is similar to existing record user interface except that an additional option ('e') exists to allow manual editing of the patch. This opens the user's configured editor with the patch. A comment is added to the bottom of the patch explaining what to do (based on Git's one). A large proportion of the changeset is test-case changes to update the options reported by record (Ynesfdaq? instead of Ynsfdaq?). Functional changes are in record.py and there are some new test cases in test-record.t. [ original upstream message ]
Sat, 31 Mar 2012 10:44:31 -0500 tests: make hghave handle exec bit on Linux with vfat stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 10:44:31 -0500] rev 1056
tests: make hghave handle exec bit on Linux with vfat [ original upstream message ]
Sat, 31 Mar 2012 10:44:31 -0500 tests: teach hghave to actually test for symlink support stable
Matt Mackall <mpm@selenic.com> [Sat, 31 Mar 2012 10:44:31 -0500] rev 1055
tests: teach hghave to actually test for symlink support [ original upstream message ]
Sat, 31 Mar 2012 17:14:32 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 31 Mar 2012 17:14:32 +0100] rev 1054
Merge with stable
Sat, 11 Sep 2010 10:57:35 +0200 tests: fix incompatibility with python-2.4 in test-hgweb stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 11 Sep 2010 10:57:35 +0200] rev 1053
tests: fix incompatibility with python-2.4 in test-hgweb Thanks to lcantey for catching it. [ original upstream message ]
Wed, 08 Sep 2010 15:11:35 +0200 tests: extend get-with-headers to support cache testing stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:11:35 +0200] rev 1052
tests: extend get-with-headers to support cache testing [ original upstream message ]
Wed, 14 Apr 2010 17:58:10 +0900 pylint, pyflakes: remove unused or duplicate imports stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 14 Apr 2010 17:58:10 +0900] rev 1051
pylint, pyflakes: remove unused or duplicate imports [ original upstream message ]
Sat, 11 Feb 2012 14:18:19 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Feb 2012 14:18:19 +0000] rev 1050
Merge with stable
Tue, 07 Feb 2012 18:47:16 +0100 mq: restore _branchtags() fast path (issue3223) stable
Patrick Mezard <patrick@mezard.eu> [Tue, 07 Feb 2012 18:47:16 +0100] rev 1049
mq: restore _branchtags() fast path (issue3223) Since a5917346c72e, mq saves the nodeid of the first applied patch to cache/branchheads, which breaks the optimized cache handling introduced in fbf8320f25c8. The problem is the revision being committed is appended to mqrepo.applied after the commit succeeds, which means mqrepo._branchtags() performs a regular update and write the first applied patch to the branch cache. One solution is to set a context variable _committingpatch on the mqrepo while it is committing a patch and to take it in account when deciding to fast-path mqrepo._branchtags(). Not really elegant but it works. The changes to test-mq-caches.t reverse changes introduced by a5917346c72e. The cache should not have been updated with mq records. The changes to test-keyword.t are indirectly caused by a5917346c72e. Reported and analyzed by Yuya Nishihara <yuya@tcha.org> Notes: - qpush still makes a slow path _branchtags() call when checking heads. Maybe this can be optimized. - be careful when merging this patch in default as secretcommit() was renamed newcommit() right after the end of the code freeze. [ original upstream message ]
Wed, 08 Feb 2012 16:56:00 +0000 tests: tighten checks for octal escapes in shell printf. stable
Jim Hague <jim.hague@acm.org> [Wed, 08 Feb 2012 16:56:00 +0000] rev 1048
tests: tighten checks for octal escapes in shell printf. printf on AIX default shell ksh (89) says \1 is an invalid escape. It insists on at least 2 digits. This causes failures in test-keyword.t and test-status.t. check-code.py already looks out for \NNN and recommends using Python for outputting octal values. Extend the check to \NN and \N and fix up resulting failures. [ original upstream message ]
Mon, 23 Jan 2012 16:21:12 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 23 Jan 2012 16:21:12 +0100] rev 1047
Merge with stable
Sat, 14 Jan 2012 01:56:27 +0100 run-tests: expand user in --with-hg stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 14 Jan 2012 01:56:27 +0100] rev 1046
run-tests: expand user in --with-hg This makes it possible to run: $ ./run-tests.py --with-hg=~/hg-bin/hg [ original upstream message ]
Fri, 20 Jan 2012 01:24:16 +0100 tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 20 Jan 2012 01:24:16 +0100] rev 1045
tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' This makes it easier to run tests on systems that have a usable sh in the search path but not in the standard location. [ original upstream message ]
Sat, 14 Jan 2012 01:55:50 +0100 tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 14 Jan 2012 01:55:50 +0100] rev 1044
tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode This makes -d output much more readable when debugging the test framework or very strange test failures. [ original upstream message ]
Thu, 19 Jan 2012 02:01:05 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jan 2012 02:01:05 +0100] rev 1043
Merge with default
Sun, 15 Jan 2012 13:37:33 +0100 Update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jan 2012 13:37:33 +0100] rev 1042
Update filectx.cmp monkeypatch to handle '\1\n' at start of file Analogous to 012b285cf643 in mercurial main.
Wed, 18 Jan 2012 16:46:15 +0100 phases: use nodemap to check for missing nodes stable
Sune Foldager <cryo@cyanite.org> [Wed, 18 Jan 2012 16:46:15 +0100] rev 1041
phases: use nodemap to check for missing nodes [ original upstream message ]
Thu, 19 Jan 2012 01:50:48 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jan 2012 01:50:48 +0100] rev 1040
Merge with stable
Wed, 11 Jan 2012 15:38:31 +0100 tests: add htmlcov option stable
Markus Zapke-Gr?ndemann <info@keimlink.de> [Wed, 11 Jan 2012 15:38:31 +0100] rev 1039
tests: add htmlcov option [ original upstream message ]
Thu, 12 Jan 2012 14:39:02 -0600 run-tests: use a list comprehension instead of map stable
Matt Mackall <mpm@selenic.com> [Thu, 12 Jan 2012 14:39:02 -0600] rev 1038
run-tests: use a list comprehension instead of map [ original upstream message ]
Wed, 11 Jan 2012 15:37:25 +0100 tests: fix omit path list stable
Markus Zapke-Gr?ndemann <info@keimlink.de> [Wed, 11 Jan 2012 15:37:25 +0100] rev 1037
tests: fix omit path list All directories need a trailing asterisk. Otherwise the files are not excluded from coverage. [ original upstream message ]
Fri, 09 Dec 2011 00:10:00 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Dec 2011 00:10:00 +0100] rev 1036
Merge with stable
Thu, 08 Dec 2011 14:32:44 -0600 branch: warn on branching stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Dec 2011 14:32:44 -0600] rev 1035
branch: warn on branching [ orginal upstream message ]
Thu, 24 Nov 2011 06:43:43 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Nov 2011 06:43:43 +0000] rev 1034
Merge with stable
Mon, 21 Nov 2011 01:49:20 +0100 tests: use an alias to make msys 'pwd' return paths with forward slashes stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 1033
tests: use an alias to make msys 'pwd' return paths with forward slashes [ original upstream message ]
Mon, 21 Nov 2011 01:49:20 +0100 tests: skip cvs tests with msys on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 1032
tests: skip cvs tests with msys on windows They will fail with weird 'ssh' errors. [ original upstream message ]
Mon, 21 Nov 2011 01:49:20 +0100 tests: introduce 'hghave msys' to skip tests that would fail because of msys stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 1031
tests: introduce 'hghave msys' to skip tests that would fail because of msys [ original upstream message ]
Thu, 24 Nov 2011 06:42:48 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Nov 2011 06:42:48 +0000] rev 1030
Merge with default
Wed, 23 Nov 2011 01:20:32 +0000 test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Nov 2011 01:20:32 +0000] rev 1029
test-keyword: use inline doctest syntax
Mon, 21 Nov 2011 11:52:11 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 21 Nov 2011 11:52:11 +0000] rev 1028
Merge with stable
Mon, 21 Nov 2011 00:39:32 +0100 tests: skip color test on platforms without tic stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 00:39:32 +0100] rev 1027
tests: skip color test on platforms without tic [ original upstream message ]
Mon, 21 Nov 2011 11:51:46 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 21 Nov 2011 11:51:46 +0000] rev 1026
Merge with default Make tests/hgave executable on stable branch too.
Fri, 18 Nov 2011 11:06:59 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 18 Nov 2011 11:06:59 +0000] rev 1025
Merge with stable
Wed, 16 Nov 2011 18:04:19 -0600 merge: give a special message for internal:merge failure (issue3105) stable
Matt Mackall <mpm@selenic.com> [Wed, 16 Nov 2011 18:04:19 -0600] rev 1024
merge: give a special message for internal:merge failure (issue3105) [ original upstream message ]
Wed, 16 Nov 2011 12:55:59 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Nov 2011 12:55:59 +0000] rev 1023
Merge with stable
Wed, 16 Nov 2011 03:45:14 +0100 tests: use the specified shell for running old fashioned sh tests stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 03:45:14 +0100] rev 1022
tests: use the specified shell for running old fashioned sh tests [ original upstream message ]
Fri, 11 Nov 2011 09:39:33 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Nov 2011 09:39:33 +0000] rev 1021
Merge with stable
Fri, 11 Nov 2011 09:38:45 +0000 Make hghave executable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Nov 2011 09:38:45 +0000] rev 1020
Make hghave executable
Mon, 07 Nov 2011 03:25:10 +0100 run-tests: make $TESTTMP matching case-insensitive on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1019
run-tests: make $TESTTMP matching case-insensitive on windows [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 run-tests: don't quote command names - that do apparently not work with msys stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1018
run-tests: don't quote command names - that do apparently not work with msys [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 tests: ignore \r on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1017
tests: ignore \r on windows [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 run-tests: convert windows paths to unix stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1016
run-tests: convert windows paths to unix [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 tests: make (glob) on windows accept \ instead of / stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1015
tests: make (glob) on windows accept \ instead of / Globbing is usually used for filenames, so on windows it is reasonable and very convenient that glob patterns accepts '\' or '/' when the pattern specifies '/'. [ original upstream message ]
Mon, 07 Nov 2011 03:24:53 +0100 tests: use 'hghave serve' to guard tests that requires serve daemon management stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:24:53 +0100] rev 1014
tests: use 'hghave serve' to guard tests that requires serve daemon management [ original upstream message ]
Mon, 07 Nov 2011 03:14:55 +0100 tests: use 'hghave system-sh' to guard tests that requires sh in system() stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 1013
tests: use 'hghave system-sh' to guard tests that requires sh in system() [ original upstream message ]
Mon, 07 Nov 2011 03:14:55 +0100 tests: use 'hghave no-windows' to avoid testing reserved file names on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 1012
tests: use 'hghave no-windows' to avoid testing reserved file names on windows [ original upstream message ]
Mon, 07 Nov 2011 03:14:55 +0100 tests: use 'hghave unix-permissions' for tests that really use chmod stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 1011
tests: use 'hghave unix-permissions' for tests that really use chmod chmod of helper scripts is not included. tests that exercise the x bit in the file system uses 'hghave execbit'. [ original upstream message ]
Mon, 07 Nov 2011 03:14:54 +0100 tests: use 'hghave symlink' for tests using symlinks stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:54 +0100] rev 1010
tests: use 'hghave symlink' for tests using symlinks [ original upstream message ]
Mon, 07 Nov 2011 02:44:04 +0100 tests: make '(esc)' matching in run-tests.py work as intended stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 02:44:04 +0100] rev 1009
tests: make '(esc)' matching in run-tests.py work as intended The code for match on (esc) lines didn't work, and it would thus always end up emitting another suggestion ... which however would match the old one. [ original upstream message ]
Wed, 09 Nov 2011 13:45:20 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Nov 2011 13:45:20 +0000] rev 1008
Merge with default
Wed, 09 Nov 2011 13:44:57 +0000 Add hghave test as of 5635a4017061
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Nov 2011 13:44:57 +0000] rev 1007
Add hghave test as of 5635a4017061
Tue, 08 Nov 2011 18:13:53 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Nov 2011 18:13:53 +0000] rev 1006
Merge with stable
Mon, 07 Nov 2011 13:46:41 -0600 run-tests: replace inline python handling with more native scheme stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:41 -0600] rev 1005
run-tests: replace inline python handling with more native scheme Normally changes in tests are reported like this in diffs: $ cat foo - a + b Using -i mode lets us update tests when the new results are correct and/or populate tests with their output. But with the standard doctest framework, inline Python sections in tests changes instead result in a big failure report that's unhelpful. So here, we replace the doctest calls with a simple compile/eval loop. [ original upstream message ]
Mon, 07 Nov 2011 13:52:03 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Nov 2011 13:52:03 +0000] rev 1004
Merge with stable
Thu, 03 Nov 2011 15:18:10 -0500 run-tests: minor cleanups stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 15:18:10 -0500] rev 1003
run-tests: minor cleanups [ original upstream message ]
Thu, 03 Nov 2011 15:08:45 -0500 run-tests: pull out line matching function stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 15:08:45 -0500] rev 1002
run-tests: pull out line matching function [ original upstream message ]
Thu, 03 Nov 2011 14:51:04 -0500 run-tests: pull out unified matching funcs stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:51:04 -0500] rev 1001
run-tests: pull out unified matching funcs [ original upstream message ]
Thu, 03 Nov 2011 14:48:56 -0500 tests: add some comments to the unified test code stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:48:56 -0500] rev 1000
tests: add some comments to the unified test code [ original upstream message ]
Thu, 03 Nov 2011 14:30:00 -0500 tests: rewrite inline Python support stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:30:00 -0500] rev 999
tests: rewrite inline Python support Tests with inline Python could turn '>>>' into their underlying python invocation if the test got updated with -i. [ original upstream message ]
Mon, 07 Nov 2011 13:48:11 +0000 Backout b78cce2b1430 until a proper solution is found stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Nov 2011 13:48:11 +0000] rev 998
Backout b78cce2b1430 until a proper solution is found
Mon, 24 Oct 2011 17:02:10 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 24 Oct 2011 17:02:10 +0100] rev 997
Merge with stable
Sat, 22 Oct 2011 23:21:38 +0200 run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Oct 2011 23:21:38 +0200] rev 996
run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t If no_proxy (or NO_PROXY) includes localhost, the test for detecting an unreachable proxy fails, because the proxy setting is ignored. [ original upstream message ]
Mon, 24 Oct 2011 13:54:59 +0200 keyword: use util.realpath instead of os.path.realpath stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Oct 2011 13:54:59 +0200] rev 995
keyword: use util.realpath instead of os.path.realpath This makes test-keyword.t pass on Python 2.4.1 (e.g. Debian sarge) [ original upstream message ]
Sat, 22 Oct 2011 15:45:19 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 Oct 2011 15:45:19 +0100] rev 994
Merge with default
Fri, 21 Oct 2011 12:07:27 +0100 Correct grammar in iskwfile docstring
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Oct 2011 12:07:27 +0100] rev 993
Correct grammar in iskwfile docstring
Sat, 22 Oct 2011 15:43:48 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 Oct 2011 15:43:48 +0100] rev 992
Merge with stable
Fri, 30 Sep 2011 21:58:54 -0400 rollback: avoid unsafe rollback when not at tip (issue2998) stable
Greg Ward <greg@gerg.ca> [Fri, 30 Sep 2011 21:58:54 -0400] rev 991
rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force. [ original upstream message ]
Sun, 16 Oct 2011 15:32:04 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 16 Oct 2011 15:32:04 +0100] rev 990
Merge with stable
Thu, 13 Oct 2011 17:54:37 +0200 run-tests: end doctest block when seeing a non-command stable
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:37 +0200] rev 989
run-tests: end doctest block when seeing a non-command [ original upstream message ]
Thu, 13 Oct 2011 17:48:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Oct 2011 17:48:29 +0100] rev 988
Merge with stable
Wed, 12 Oct 2011 22:01:14 +0200 tests: add support for inline doctests in test files stable
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:14 +0200] rev 987
tests: add support for inline doctests in test files This adds doctest like syntax to .t files, that can be interleaved with regular shell code: $ echo -n a > file >>> print open('file').read() a >>> open('file', 'a').write('b') $ cat file ab The syntax is exactly the same as regular doctests, so multiline statements look like this: >>> for i in range(3): ... print i 0 1 2 Each block has its own context, i.e.: >>> x = 0 >>> print x 0 $ echo 'foo' foo >>> print x will result in a NameError. Errors are displayed in standard doctest format: >>> print 'foo' bar --- /home/idan/dev/hg/default/tests/test-test.t +++ /home/idan/dev/hg/default/tests/test-test.t.err @@ -2,3 +2,16 @@ > >>> print 'foo' > bar > EOF + ********************************************************************** + File "/tmp/tmps8X_0ohg-tst", line 1, in tmps8X_0ohg-tst + Failed example: + print 'foo' + Expected: + bar + Got: + foo + ********************************************************************** + 1 items had failures: + 1 of 1 in tmps8X_0ohg-tst + ***Test Failed*** 1 failures. + [1] As for the implementation, it's quite simple: when the test runner sees a line starting with '>>>' it converts it, and all subsequent lines until the next line that begins with '$' to a 'python -m heredoctest <<EOF' call with the proper heredoc to follow. So if we have this test file: >>> for c in 'abcd': ... print c a b c d $ echo foo foo It gets converted to: $ python -m heredoctest <<EOF > >>> for c in 'abcd': > ... print c > a > b > c > d > EOF $ echo foo foo And then processed like every other test file by converting it to a sh script. [ original upstream message ]
Sat, 08 Oct 2011 00:24:35 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 08 Oct 2011 00:24:35 +0100] rev 986
Merge with stable
Sun, 02 Oct 2011 14:34:28 -0400 import: wrap a transaction around the whole command stable
Greg Ward <greg@gerg.ca> [Sun, 02 Oct 2011 14:34:28 -0400] rev 985
import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now. [ original upstream message ]
Wed, 14 Sep 2011 16:19:33 +0100 (0.9.2compat) merge with default 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Sep 2011 16:19:33 +0100] rev 984
(0.9.2compat) merge with default Adapt preserving filemode. Fix a typo. Clean up last merge.
Wed, 14 Sep 2011 15:34:32 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Sep 2011 15:34:32 +0100] rev 983
Merge with default
Sat, 10 Sep 2011 13:23:41 +0100 Make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net> [Sat, 10 Sep 2011 13:23:41 +0100] rev 982
Make status test after record and kwexpand/kwshrink reliable This guarantees test failure when the dirstate code is omitted at the end of the kwtemplater.overwrite method. kwexpand/kwshrink: Without a 1 second wait the test succeeds sometimes, even when the dirstate of the overwritten file is not forced to normal. record: status after recording an added file allows to check whether normallookup is needed after overwriting.
Wed, 14 Sep 2011 15:30:21 +0100 Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Sep 2011 15:30:21 +0100] rev 981
Preserve file mode when overwriting
Tue, 09 Aug 2011 12:56:43 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Aug 2011 12:56:43 +0200] rev 980
Merge with default
Tue, 09 Aug 2011 12:54:11 +0200 Avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Aug 2011 12:54:11 +0200] rev 979
Avoid x = a and b or c
Mon, 08 Aug 2011 09:38:40 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Aug 2011 09:38:40 +0100] rev 978
Merge with stable
Mon, 25 Jul 2011 16:37:18 -0500 tests: use getattr instead of hasattr stable
Augie Fackler <durin42@gmail.com> [Mon, 25 Jul 2011 16:37:18 -0500] rev 977
tests: use getattr instead of hasattr [ original upstream message ]
Thu, 14 Jul 2011 08:39:48 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Jul 2011 08:39:48 +0100] rev 976
Merge with stable
Wed, 13 Jul 2011 19:23:08 +0200 run-tests: fix summary when accepting changes interactively stable
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:08 +0200] rev 975
run-tests: fix summary when accepting changes interactively Accepted changes were not counted as success. [ original upstream message ]
Thu, 07 Jul 2011 12:54:12 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Jul 2011 12:54:12 +0100] rev 974
Merge with default
Sun, 03 Jul 2011 12:58:03 +0200 Reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net> [Sun, 03 Jul 2011 12:58:03 +0200] rev 973
Reuse already present working contexts for match Shortens overlong line as side-effect.
Fri, 01 Jul 2011 14:52:14 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Jul 2011 14:52:14 +0200] rev 972
Merge with stable
Thu, 30 Jun 2011 16:36:38 +0200 run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate() stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:36:38 +0200] rev 971
run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate() [ original upstream message ]
Thu, 30 Jun 2011 16:25:05 +0200 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:25:05 +0200] rev 970
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() [ original upstream message ]
Mon, 20 Jun 2011 12:02:52 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 20 Jun 2011 12:02:52 +0200] rev 969
Merge with stable
Sat, 18 Jun 2011 16:52:51 -0500 scmutil: switch match users to supplying contexts stable
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 968
scmutil: switch match users to supplying contexts The most appropriate context is not always clearly defined. The obvious cases: For working directory commands, we use None For commands (eg annotate) with single revs, we use that revision The less obvious cases: For commands (eg status, diff) with a pair of revs, we use the second revision For commands that take a range (like log), we use None [ original upstream message ]
Tue, 14 Jun 2011 20:35:21 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Jun 2011 20:35:21 +0200] rev 967
Merge with stable
Sun, 12 Jun 2011 17:26:20 +0300 run-tests: verbose log ignored test stable
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 17:26:20 +0300] rev 966
run-tests: verbose log ignored test [ original upstream message ]
Sat, 11 Jun 2011 15:03:58 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jun 2011 15:03:58 +0200] rev 965
Merge with stable
Sat, 11 Jun 2011 14:17:25 +0200 patch: generalize the use of patchmeta in applydiff() stable
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:17:25 +0200] rev 964
patch: generalize the use of patchmeta in applydiff() - Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta instances in applydiff() makes things simpler. - Rename selectfile() into makepatchmeta(). It is responsible for creating patchmeta for regular patches. - Pass patchmeta objects to patchfile() directly patchmeta instances were associated with git patches, for regular patches we had to pass additional variables to tell the patch intent to patchfile(). Instead, we generate patchmeta for regular patches and pass them. This will also help with patch filtering by matcher objects. [ original upstream message ]
Thu, 02 Jun 2011 00:12:10 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jun 2011 00:12:10 +0100] rev 963
Merge with stable
Tue, 31 May 2011 20:39:04 -0500 run-tests: allow whitelisting tests that should always run stable
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 20:39:04 -0500] rev 962
run-tests: allow whitelisting tests that should always run It's desirable to run some tests all the time, for example test-check-pyflakes.t and test-check-code-hg.py. This allows passing --whitelist as a path to a file (flag can be specified more than once) which contains a list of files to whitelist. Whitelisted tests are run even if they're blacklisted or wouldn't match a --keyword test run. For example, to do a quick test of usehttp2, one can now do $ cat > test-whitelist <<EOF > test-check-pyflakes.t > test-check-code-hg.py > EOF $ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true' > -k http -j 8 --whitelist test-whitelist) and have all http-specific tests run as well as the two code linters. [ original upstream message ]
Sat, 28 May 2011 15:16:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 May 2011 15:16:55 +0100] rev 961
Merge with stable
Sat, 28 May 2011 11:44:27 +0200 run-tests: fix --blacklist (broken by 95715c2f90bf) stable
Patrick Mezard <pmezard@gmail.com> [Sat, 28 May 2011 11:44:27 +0200] rev 960
run-tests: fix --blacklist (broken by 95715c2f90bf) [ original upstream message ]
Sat, 28 May 2011 03:19:16 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 May 2011 03:19:16 +0100] rev 959
Merge with stable
Fri, 27 May 2011 21:50:10 +0200 patch: use temporary files to handle intermediate copies stable
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:10 +0200] rev 958
patch: use temporary files to handle intermediate copies git patches may require copies to be handled out-of-order. For instance, take the following sequence: * modify a * copy a into b Here, we have to generate b from a before its modification. To do so, applydiff() was scanning for copy metadata and performing the copies before processing the other changes in-order. While smart and efficient, this approach complicates things by handling file copies and file creations at different places and times. While a new file must not exist before being patched a copied file already exists before applying the first hunk. Instead of copying the files at their final destination before patching, we store them in a temporary file location and retrieve them when patching. The filestore always stores file content in real files but nothing prevents adding a cache layer. The filestore class was kept separate from fsbackend for at least two reasons: - This class is likely to be reused as a temporary result store for a future repository patching call (entries just have to be extended to contain copy sources). - Delegating this role to backends might be more efficient in a repository backend case: the source files are already available in the repository itself and do not need to be copied again. It also means that third-parties backend would have to implement two other methods. If we ever decide to merge the filestore feature into backend, a minimalistic approach would be to compose with filestore directly. Keep in mind this copy overhead only applies for copy/rename sources, and may even be reduced to copy sources which have to handled ahead of time. [ original upstream message ]
Fri, 27 May 2011 21:50:09 +0200 patch: refactor file creation/removal detection stable
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:09 +0200] rev 957
patch: refactor file creation/removal detection The patcher has to know if a file is being created or removed to check if the target already exists, or to actually unlink the file when a hunk emptying it is applied. This was done by embedding the creation/removal information in the first (and only) hunk attached to the file. There are two problems with this approach: - creation/removal is really a property of the file being patched and not its hunk. - for regular patches, file creation cannot be deduced at parsing time: there are case where the *stripped* file paths must be compared. Modifying hunks after their creation is clumsy and prevent further refactorings related to copies handling. Instead, we delegate this job to selectfile() which has all the relevant information, and remove the hunk createfile() and rmfile() methods. [ original upstream message ]
Fri, 27 May 2011 17:46:48 +0300 run-tests: fix --blacklist with jobs > 1 stable
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:46:48 +0300] rev 956
run-tests: fix --blacklist with jobs > 1 filter blacklisted tests before partitioning them to the children. maintains the 'Skipped...' output but not the 's'. [ original upstream message ]
Fri, 27 May 2011 17:46:47 +0300 run-tests: slightly simplify blacklist check stable
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:46:47 +0300] rev 955
run-tests: slightly simplify blacklist check [ original upstream message ]
Thu, 19 May 2011 00:51:06 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 19 May 2011 00:51:06 +0200] rev 954
Merge with stable
Wed, 18 May 2011 23:48:13 +0200 patch: set desired mode when patching, not in updatedir() stable
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:13 +0200] rev 953
patch: set desired mode when patching, not in updatedir() This patch and the following aim at merging _updatedir() actions into _applydiff(). [ original upstream message ]
Wed, 18 May 2011 23:30:45 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 May 2011 23:30:45 +0200] rev 952
Merge with stable
Wed, 18 May 2011 15:45:57 +0200 run-tests: print a newline after all warnings stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 May 2011 15:45:57 +0200] rev 951
run-tests: print a newline after all warnings [ original upstream message ]
Wed, 18 May 2011 00:44:15 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 May 2011 00:44:15 +0200] rev 950
Merge with stable
Tue, 17 May 2011 23:46:15 +0200 patch: extract fs access from patchfile into fsbackend stable
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:46:15 +0200] rev 949
patch: extract fs access from patchfile into fsbackend Most filesystem calls are already isolated in patchfile but this is not enough: renames are performed before patchfile is available and some chmod calls are even done outside of the applydiff call. Once all these calls are extracted into a backend class, we can provide cleaner APIs to write to a working directory context directly into the repository. [ original upstream message ]
Tue, 17 May 2011 13:45:25 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 17 May 2011 13:45:25 +0200] rev 948
Merge with stable
Mon, 16 May 2011 21:56:26 +0200 run-tests: replace chdir() with Popen cwd option stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:56:26 +0200] rev 947
run-tests: replace chdir() with Popen cwd option [ original upstream message ]
Mon, 16 May 2011 21:54:43 +0200 run-tests: make --debug run in the temporary test directory stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:54:43 +0200] rev 946
run-tests: make --debug run in the temporary test directory [ original upstream message ]
Mon, 16 May 2011 21:52:28 +0200 run-tests: use the common test path on Windows and Java stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:52:28 +0200] rev 945
run-tests: use the common test path on Windows and Java The alternate one did not run in the test directory and controlling the jobs execution with threads instead of process made it harder to fix. [ original upstream message ]
Mon, 16 May 2011 21:41:46 +0200 run-tests: ignore timeout when Popen.terminate is unavailable stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:41:46 +0200] rev 944
run-tests: ignore timeout when Popen.terminate is unavailable Popen.terminate was introduced in python 2.6 [ original upstream message ]
Mon, 16 May 2011 21:26:50 +0200 run-tests: fix hg.bat python reference stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:26:50 +0200] rev 943
run-tests: fix hg.bat python reference hg.bat expects to live in pythonxx/scripts and the python interpreter to be in pythonxx. run-tests.py file layout is a little different and python location must be fixed. [ original upstream message ]
Mon, 16 May 2011 21:24:14 +0200 run-tests: fix python executable detection and copy on Windows stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:24:14 +0200] rev 942
run-tests: fix python executable detection and copy on Windows [ original upstream message ]
Sat, 14 May 2011 13:26:49 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 May 2011 13:26:49 +0200] rev 941
Merge with stable
Fri, 13 May 2011 14:58:24 -0500 scmutil: drop aliases in cmdutil for match functions stable
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:58:24 -0500] rev 940
scmutil: drop aliases in cmdutil for match functions [ original upstream message ]
Thu, 12 May 2011 19:45:46 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 12 May 2011 19:45:46 +0200] rev 939
Merge with stable
Thu, 12 May 2011 14:31:07 +0200 keyword: use cmdutil.command decorator stable
Martin Geisler <mg@aragost.com> [Thu, 12 May 2011 14:31:07 +0200] rev 938
keyword: use cmdutil.command decorator [ original upstream message ]
Tue, 10 May 2011 01:44:09 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 10 May 2011 01:44:09 +0200] rev 937
Merge with stable
Mon, 09 May 2011 17:20:15 +0200 run-tests: remove check on --shell argument stable
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 17:20:15 +0200] rev 936
run-tests: remove check on --shell argument No shell is needed when executing Python tests and finding a good shell might be difficult/impossible on some platforms (e.g., Windows). [ original upstream message ]
Sat, 07 May 2011 21:01:15 +0300 run-tests: take the basepath when constructing the test temp dir stable
Idan Kamara <idankk86@gmail.com> [Sat, 07 May 2011 21:01:15 +0300] rev 935
run-tests: take the basepath when constructing the test temp dir so it's possible to run tests that are outside the test/ dir [ original upstream message ]
Sat, 07 May 2011 20:56:43 +0300 run-tests: compare absolute paths in _checkhglib stable
Idan Kamara <idankk86@gmail.com> [Sat, 07 May 2011 20:56:43 +0300] rev 934
run-tests: compare absolute paths in _checkhglib [ original upstream message ]
Fri, 06 May 2011 20:13:10 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 06 May 2011 20:13:10 +0200] rev 933
Merge with stable
Thu, 05 May 2011 20:04:49 +0200 run-tests: add --shell command line flag stable
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 20:04:49 +0200] rev 932
run-tests: add --shell command line flag This makes it easy to test with, say, both /bin/bash and /bin/dash instead of changing the system-wide /bin/sh. [ original upstream message ]
Thu, 05 May 2011 20:03:43 +0200 run-tests: use type of default to convert environment variable stable
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 20:03:43 +0200] rev 931
run-tests: use type of default to convert environment variable Before, defaults could only be integers, they can now also be strings, floats and what have you. [ original upstream message ]
Wed, 04 May 2011 10:39:10 -0500 run-tests.py: correctly handle list options with parallel tasks stable
Augie Fackler <durin42@gmail.com> [Wed, 04 May 2011 10:39:10 -0500] rev 930
run-tests.py: correctly handle list options with parallel tasks [ original upstream message ]
Mon, 02 May 2011 10:11:18 +0200 prevent transient leaks of file handle by using new helper functions stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 02 May 2011 10:11:18 +0200] rev 929
prevent transient leaks of file handle by using new helper functions These leaks may occur in environments that don't employ a reference counting GC, i.e. PyPy. This implies: - changing opener(...).read() calls to opener.read(...) - changing opener(...).write() calls to opener.write(...) - changing open(...).read(...) to util.readfile(...) - changing open(...).write(...) to util.writefile(...) [ original upstream description ]
Mon, 02 May 2011 19:20:29 +0200 localrepo: reuse parent manifest in commitctx if no files have changed stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 02 May 2011 19:20:29 +0200] rev 928
localrepo: reuse parent manifest in commitctx if no files have changed This speeds up the in-memory version of debugbuilddag that I'm working on considerably for the case where we want to build just a 00changelog.i (for discovery tests, for instance). There are a couple of test changes because node ids in tests have changed. The changes to the patch names in test-mq-qdelete.t were required because they could collide with nodeid abbreviations and newly actually do (patch "c" collides with id "cafe..." for patch "b"). [ original upstream description ]
Sun, 01 May 2011 18:18:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 01 May 2011 18:18:31 +0100] rev 927
Merge with stable
Sun, 01 May 2011 08:00:25 -0500 run-tests: add flag to provide extra hgrc options for test runs stable
Augie Fackler <durin42@gmail.com> [Sun, 01 May 2011 08:00:25 -0500] rev 926
run-tests: add flag to provide extra hgrc options for test runs [ original upstream message ]
Sat, 30 Apr 2011 17:38:06 +0200 tests: move test bundles in a bundles/ subdirectory stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 925
tests: move test bundles in a bundles/ subdirectory [ original upstream message ]
Sun, 01 May 2011 10:37:57 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 01 May 2011 10:37:57 +0100] rev 924
Merge with stable
Sat, 30 Apr 2011 15:20:27 +0300 run-tests: print a new line before writing the diff stable
Idan Kamara <idankk86@gmail.com> [Sat, 30 Apr 2011 15:20:27 +0300] rev 923
run-tests: print a new line before writing the diff [ original upstream message ]
Sat, 30 Apr 2011 11:41:20 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 30 Apr 2011 11:41:20 +0100] rev 922
Merge with stable
Fri, 29 Apr 2011 20:29:22 +0300 run-tests: don't count test as succeeded if it failed stable
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 20:29:22 +0300] rev 921
run-tests: don't count test as succeeded if it failed regressed around ec4ae5727f07 [ original upstream message ]
Sat, 30 Apr 2011 01:25:43 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 30 Apr 2011 01:25:43 +0100] rev 920
Merge with stable
Mon, 25 Apr 2011 17:01:34 -0500 run-tests: do chdir for tests under a lock for thread safety stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Apr 2011 17:01:34 -0500] rev 919
run-tests: do chdir for tests under a lock for thread safety [ original upstream message ]
Mon, 25 Apr 2011 16:17:08 -0500 run-tests: add iolock to vlog stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Apr 2011 16:17:08 -0500] rev 918
run-tests: add iolock to vlog [ original upstream message ]
Mon, 25 Apr 2011 23:09:47 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Apr 2011 23:09:47 +0100] rev 917
Merge with stable
Mon, 25 Apr 2011 18:42:31 +0200 run-tests: display diff before prompting with --interactive stable
Patrick Mezard <pmezard@gmail.com> [Mon, 25 Apr 2011 18:42:31 +0200] rev 916
run-tests: display diff before prompting with --interactive [ original upstream message ]
Sun, 24 Apr 2011 17:52:46 -0500 run-tests: fix some missing i/o locks stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 17:52:46 -0500] rev 915
run-tests: fix some missing i/o locks [ original upstream message ]
Sun, 24 Apr 2011 16:46:37 -0500 run-tests: add a lock for console I/O stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:46:37 -0500] rev 914
run-tests: add a lock for console I/O [ original upstream message ]
Sun, 24 Apr 2011 16:42:15 -0500 run-tests: switch timeout handling from alarm to helper thread stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:42:15 -0500] rev 913
run-tests: switch timeout handling from alarm to helper thread This should be slightly more portable than signals and be compatible with threaded dispatch. [ original upstream message ]
Sun, 24 Apr 2011 16:42:11 -0500 run-tests: add locking on results struct stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:42:11 -0500] rev 912
run-tests: add locking on results struct [ original upstream message ]
Mon, 25 Apr 2011 01:42:21 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Apr 2011 01:42:21 +0100] rev 911
Merge with stable
Sun, 24 Apr 2011 23:33:48 +0200 run-tests: fix --interactive (after 994ad067ac6e) stable
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Apr 2011 23:33:48 +0200] rev 910
run-tests: fix --interactive (after 994ad067ac6e) - Do not prompt if there is no .err file - Fix source and target paths [ original upstream message ]
Fri, 22 Apr 2011 14:04:34 -0500 run-tests: move test loop into a helper function stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 14:04:34 -0500] rev 909
run-tests: move test loop into a helper function [ original upstream message ]
Fri, 22 Apr 2011 12:24:22 -0500 run-tests: use a results dict stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 12:24:22 -0500] rev 908
run-tests: use a results dict [ original upstream message ]
Fri, 22 Apr 2011 11:36:40 -0500 run-tests: move blacklist and retest filtering to runone stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:36:40 -0500] rev 907
run-tests: move blacklist and retest filtering to runone [ original upstream message ]
Fri, 22 Apr 2011 11:32:05 -0500 run-tests: keep a list of passed tests stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:32:05 -0500] rev 906
run-tests: keep a list of passed tests [ original upstream message ]
Fri, 22 Apr 2011 11:24:27 -0500 run-tests: move keyword checking into runone stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:24:27 -0500] rev 905
run-tests: move keyword checking into runone [ original upstream message ]
Fri, 22 Apr 2011 11:22:02 -0500 run-tests: add ignores list stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:22:02 -0500] rev 904
run-tests: add ignores list [ original upstream message ]
Thu, 21 Apr 2011 18:38:30 -0500 run-tests: move existence/name format check into runone stable
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 18:38:30 -0500] rev 903
run-tests: move existence/name format check into runone [ original upstream message ]
Thu, 21 Apr 2011 18:19:45 -0500 run-tests: move interactive handling into runone stable
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 18:19:45 -0500] rev 902
run-tests: move interactive handling into runone [ original upstream message ]
Wed, 20 Apr 2011 21:41:41 +0200 move canonpath from util to scmutil stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 21:41:41 +0200] rev 901
move canonpath from util to scmutil [ original upstream message ]
Sun, 10 Apr 2011 20:51:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Apr 2011 20:51:39 +0200] rev 900
Merge with stable
Sat, 09 Apr 2011 15:52:19 -0500 tests: better output on timeouts stable
Matt Mackall <mpm@selenic.com> [Sat, 09 Apr 2011 15:52:19 -0500] rev 899
tests: better output on timeouts Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out". [ original upstream message ]
Tue, 05 Apr 2011 16:35:41 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Apr 2011 16:35:41 +0200] rev 898
Merge with stable
Tue, 05 Apr 2011 11:07:25 +0200 keyword: convert a verbatim block to a field list stable
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 11:07:25 +0200] rev 897
keyword: convert a verbatim block to a field list [ orginal upstream message ]
Sun, 27 Mar 2011 13:15:35 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 27 Mar 2011 13:15:35 +0200] rev 896
Merge with stable
Fri, 25 Mar 2011 22:15:37 +0200 tests: set HOME to the test temp dir (issue2707) stable
Idan Kamara <idankk86@gmail.com> [Fri, 25 Mar 2011 22:15:37 +0200] rev 895
tests: set HOME to the test temp dir (issue2707) [ original upstream message ]
Mon, 14 Mar 2011 23:11:14 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 23:11:14 +0100] rev 894
Merge with default
Mon, 14 Mar 2011 12:26:50 +0100 Offer additional datefilters when the extension is enabled
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:26:50 +0100] rev 893
Offer additional datefilters when the extension is enabled Before the additional datefilters (utcdate, svnisodate, svnutcdate) were used when kwtemplater was initialized. Now they always be used once the extension is enabled.
Mon, 14 Mar 2011 12:19:59 +0100 Docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:19:59 +0100] rev 892
Docstrings for additional date filters
Sat, 12 Mar 2011 13:19:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Mar 2011 13:19:55 +0100] rev 891
Merge with stable
Sat, 12 Mar 2011 12:46:31 +0100 templates: document missing keywords or filters stable
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 890
templates: document missing keywords or filters Keywords keywords are not documented yet but are turned into function definitions to avoid lambda docstring weirdness. [ original upstream message ]
Thu, 10 Mar 2011 22:02:02 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Mar 2011 22:02:02 +0100] rev 889
Merge with stable
Thu, 10 Mar 2011 13:43:47 +0100 tests: use $TESTTMP more and use (glob) less stable
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 13:43:47 +0100] rev 888
tests: use $TESTTMP more and use (glob) less This locks down the test output a little more. [ original upstream message ]
Thu, 10 Mar 2011 22:01:08 +0100 stable: merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Mar 2011 22:01:08 +0100] rev 887
stable: merge with default
Mon, 07 Mar 2011 14:43:27 +0100 README: minimal test command line
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Mar 2011 14:43:27 +0100] rev 886
README: minimal test command line
Mon, 07 Mar 2011 14:41:14 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Mar 2011 14:41:14 +0100] rev 885
Merge with stable
Thu, 10 Feb 2011 09:03:06 +0100 rollback: clarifies the message about the reverted state (issue2628) stable
Gilles Moris <gilles.moris@free.fr> [Thu, 10 Feb 2011 09:03:06 +0100] rev 884
rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1) [ original upstream message ]
Mon, 07 Mar 2011 14:34:27 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Mar 2011 14:34:27 +0100] rev 883
Merge with stable
Sun, 06 Mar 2011 14:19:57 +0100 run-tests: handle mixed comment lines in blacklists stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 882
run-tests: handle mixed comment lines in blacklists [ original upstream message ]
Tue, 15 Feb 2011 10:40:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Feb 2011 10:40:29 +0100] rev 881
Merge with stable
Fri, 24 Dec 2010 15:23:01 +0100 explicitly close files stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 24 Dec 2010 15:23:01 +0100] rev 880
explicitly close files Add missing calls to close() to many places where files are opened. Relying on reference counting to catch them soon-ish is not portable and fails in environments with a proper GC, such as PyPy. [ original upstream description ]
Fri, 11 Feb 2011 04:55:00 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Feb 2011 04:55:00 +0100] rev 879
Merge with stable
Wed, 02 Feb 2011 23:21:13 +0100 run-tests: only call WIFEXITED on systems it exists stable
Simon Heimberg <simohe@besonet.ch> [Wed, 02 Feb 2011 23:21:13 +0100] rev 878
run-tests: only call WIFEXITED on systems it exists not on Windows or in jython [ original upstream message ]
Tue, 01 Feb 2011 20:47:05 +0100 run-tests: loadable as module stable
Simon Heimberg <simohe@besonet.ch> [Tue, 01 Feb 2011 20:47:05 +0100] rev 877
run-tests: loadable as module [ original upstream message ]
Wed, 26 Jan 2011 17:49:11 +0000 stable: merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Jan 2011 17:49:11 +0000] rev 876
stable: merge with default
Sun, 23 Jan 2011 03:15:44 +0100 Move repo.__class__ assignment out of monkeypatch context
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Jan 2011 03:15:44 +0100] rev 875
Move repo.__class__ assignment out of monkeypatch context A cosmetic change to improve readability.
Sun, 23 Jan 2011 03:15:39 +0100 Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Jan 2011 03:15:39 +0100] rev 874
Inform user about current keywordset in kwdemo The kwdemo --default output now looks roughly like this: configuration using default cvs keywordset [extensions] keyword = [keyword] demo.txt = [keywordset] * section added with this change svn = False [keywordmaps] ...
Sun, 16 Jan 2011 15:45:26 +0100 Update documentation for kwshrink
Christian Ebert <blacktrash@gmx.net> [Sun, 16 Jan 2011 15:45:26 +0100] rev 873
Update documentation for kwshrink * remove obsolete reference to potential problems with merge and import * emphasize that running kwshrink before configuration changes which affect active/expanded keywords is mandatory
Sat, 11 Dec 2010 12:49:10 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Dec 2010 12:49:10 +0100] rev 872
Merge with default
Sun, 05 Dec 2010 13:07:28 +0100 Make kwfiles show deleted files configured for expansion
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Dec 2010 13:07:28 +0100] rev 871
Make kwfiles show deleted files configured for expansion
Sun, 05 Dec 2010 13:07:24 +0100 Colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Dec 2010 13:07:24 +0100] rev 870
Colorize hg kwfiles output
Thu, 02 Dec 2010 09:44:01 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Dec 2010 09:44:01 +0100] rev 869
Merge with default
Thu, 02 Dec 2010 09:42:21 +0100 Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Dec 2010 09:42:21 +0100] rev 868
Copy: when copied source is a symlink, follow it 1) hg cp symlink copy -> copy is a symlink. 2) cp symlink copy; hg cp -A symlink copy -> copy is a regular file. In the second case we have to follow the symlink to its target to find out whether we have to unexpand keywords in the copy. Add test covering the case where the copied link's target is ignored by keyword but has content which would match the regex for expanded keywords to check whether we indeed leave the destination alone.
Thu, 02 Dec 2010 09:41:56 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Dec 2010 09:41:56 +0100] rev 867
Merge with stable
Mon, 22 Nov 2010 18:15:58 +0100 code style: prefer 'is' and 'is not' tests with singletons stable
Martin Geisler <mg@aragost.com> [Mon, 22 Nov 2010 18:15:58 +0100] rev 866
code style: prefer 'is' and 'is not' tests with singletons [ original upstream description ]
Mon, 22 Nov 2010 20:45:42 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 20:45:42 +0100] rev 865
Merge with default
Mon, 22 Nov 2010 20:44:36 +0100 s/config/configuration/ in help
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 20:44:36 +0100] rev 864
s/config/configuration/ in help
Tue, 16 Nov 2010 16:59:06 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Nov 2010 16:59:06 +0100] rev 863
Merge with stable
Tue, 16 Nov 2010 10:33:19 +0900 run-tests: fix --debug for .t tests stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 16 Nov 2010 10:33:19 +0900] rev 862
run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers. [ original upstream message ]
Tue, 09 Nov 2010 10:31:54 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Nov 2010 10:31:54 +0000] rev 861
Merge with stable
Mon, 08 Nov 2010 10:56:47 +0100 run-test: fixed wrong parenthesis stable
Erik Zielke <ez@aragost.com> [Mon, 08 Nov 2010 10:56:47 +0100] rev 860
run-test: fixed wrong parenthesis Fixed wrong placement of end parenthesis, from b911cb80c671 [ original upstream message ]
Mon, 08 Nov 2010 11:11:23 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Nov 2010 11:11:23 +0000] rev 859
Merge with stable
Mon, 08 Nov 2010 01:35:41 +0100 tests: use (esc) markup for string-escape stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:41 +0100] rev 858
tests: use (esc) markup for string-escape This makes test output less ambiguous. Failing test output will be escaped and marked up if necessary. A Python string-escape compatible encoding is used, but not everything is encoded - especially not \n and \t and '. [ original upstream message ]
Mon, 08 Nov 2010 01:35:40 +0100 tests: (no-eol) markup for command output without trailing LF stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:40 +0100] rev 857
tests: (no-eol) markup for command output without trailing LF Output chunks without a trailing LF will now work but get (no-eol) appended. This change mostly moves code around so we can handle that an output line starts with data from previous command, followed by salt and the next command. [ original upstream message ]
Sat, 06 Nov 2010 00:31:44 +0100 tests: handle .t files without trailing LF stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 06 Nov 2010 00:31:44 +0100] rev 856
tests: handle .t files without trailing LF 9a2de8dae27b made this simple test-test.t succeed silently: $ printf ' $ true' > test-test.t but did not give a usable .err in this case: $ printf ' $ false' > test-test.t The missing LF will now be fixed in the test output and it will thus give a test failure and a solution in the .err file. [ original upstream message ]
Fri, 05 Nov 2010 10:01:23 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Nov 2010 10:01:23 +0000] rev 855
Merge with default
Fri, 05 Nov 2010 10:00:11 +0000 Turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Nov 2010 10:00:11 +0000] rev 854
Turn regexes and escaped keywords into a propertycache
Tue, 02 Nov 2010 14:04:21 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Nov 2010 14:04:21 +0100] rev 853
Merge with stable
Mon, 01 Nov 2010 10:24:07 +0100 run-tests: use regex when searching for $HGPORT in test output stable
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 10:24:07 +0100] rev 852
run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ... [ original upstream message ]
Wed, 27 Oct 2010 11:15:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 27 Oct 2010 11:15:31 +0100] rev 851
Merge with stable
Wed, 20 Oct 2010 17:38:21 -0500 pull: silence spurious 'requesting all changes' message stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 20 Oct 2010 17:38:21 -0500] rev 850
pull: silence spurious 'requesting all changes' message When issuing `hg pull -r REV` in a repo with no common ancestor with the remote repo, the message 'requesting all changes' is printed, even though only the changese that are ancestors of REV are actually requested. This can be confusing for users (see http://www.selenic.com/pipermail/mercurial/2010-October/035508.html). This silences the message if (and only if) the '-r' option was passed. [ original upstream message ]
Mon, 25 Oct 2010 19:21:06 +0100 Function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 849
Function to look up changectx for expansion Similarly rename variable in kwtemplater.overwrite().
Mon, 25 Oct 2010 19:21:06 +0100 Compile regexes on demand
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 848
Compile regexes on demand
Mon, 25 Oct 2010 20:00:18 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 20:00:18 +0100] rev 847
Merge with default
Mon, 25 Oct 2010 19:21:06 +0100 Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 846
Fix regressions introduced in 9d01f9cab5e2 - dirstate of overwritten files must be forced to normal with kwexpand/kwshrink, not commit. - recorded files must be weeded before overwriting. - add test cases.
Wed, 20 Oct 2010 22:46:09 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Oct 2010 22:46:09 +0100] rev 845
Merge with stable
Sat, 02 Oct 2010 22:57:25 +0900 tests: accept \-escaped test output stable
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:57:25 +0900] rev 844
tests: accept \-escaped test output It changes tsttest to accept expected outputs in python-style \-escapes. It aims to avoid trouble with outputs for non-ascii, color and progress tests. [ original upstream message ]
Fri, 15 Oct 2010 00:36:45 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Oct 2010 00:36:45 +0200] rev 843
Merge with default
Thu, 14 Oct 2010 22:53:17 +0200 Only use expensive fctx.cmp when needed
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Oct 2010 22:53:17 +0200] rev 842
Only use expensive fctx.cmp when needed Restrict expensive cmp to cases when: - comparing against working directory and - encode filters active or - path is configured for keyword expansion
Wed, 13 Oct 2010 09:21:19 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:21:19 +0100] rev 841
Merge with stable
Tue, 27 Jul 2010 23:07:30 +0900 filectx: use ctx.size comparisons to speed up ctx.cmp stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:07:30 +0900] rev 840
filectx: use ctx.size comparisons to speed up ctx.cmp Comparing sizes is cheaper than comparing file contents, as it does not involve reading the file on disk or from the filelog. It is however not always possible: some extensions, or encode filters, change data when extracting it to the working directory. [ original upstream description ]
Wed, 13 Oct 2010 09:18:46 +0100 Merge with stable stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:18:46 +0100] rev 839
Merge with stable
Tue, 12 Oct 2010 16:29:32 +0100 Code cleanup
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Oct 2010 16:29:32 +0100] rev 838
Code cleanup - move preselection of expansion candidates for rollback and record into helper function - same overwrite order in rollback and record: 1. modified, 2. added - self.wlock() inside kwrepo class instead of repo.wlock()
Sun, 10 Oct 2010 01:07:16 +0100 enforce subn method via boolean switch
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:07:16 +0100] rev 837
enforce subn method via boolean switch There are only 2 patterns to choose, and so far only 1 case where kwtemplater.re_kw.subn is applied on data read from the working directory: when recording added files. With this change the code reflects more closely the boolean character of the switch and underlines the special case.
Sun, 10 Oct 2010 01:07:16 +0100 Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:07:16 +0100] rev 836
Fix weeding of expansion candidates when recording Rearrange tests to check this, i.e. that there are changes in other files, not only the recorded one.
Sun, 10 Oct 2010 01:10:13 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:10:13 +0100] rev 835
Merge with stable
Sat, 09 Oct 2010 16:27:10 -0500 run-tests.py: remove support for .bat files stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:27:10 -0500] rev 834
run-tests.py: remove support for .bat files [ original upstream message ]
Sat, 09 Oct 2010 16:25:28 -0500 run-tests.py: do not install hg when the tests do no exist stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:25:28 -0500] rev 833
run-tests.py: do not install hg when the tests do no exist [ original upstream message ]
Sat, 09 Oct 2010 15:47:19 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 15:47:19 +0100] rev 832
Merge with stable
Sat, 09 Oct 2010 07:13:51 -0500 test-keyword: ignore subject in notify hook mails stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:51 -0500] rev 831
test-keyword: ignore subject in notify hook mails Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP replacement fail. [ original upstream description ]
Sat, 09 Oct 2010 07:13:49 -0500 test-keyword: fix test glob to ACL/SELinux flag stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:49 -0500] rev 830
test-keyword: fix test glob to ACL/SELinux flag [ original upstream description ]
Fri, 08 Oct 2010 22:36:11 -0500 tests: reintroduce ":$HGPORT" in test output stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:11 -0500] rev 829
tests: reintroduce ":$HGPORT" in test output This reduces the number of patterns that must be adjusted when writing tests. [ original upstream description ]
Fri, 08 Oct 2010 22:36:10 -0500 tests: remove redundant globs stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 828
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed. [ original upstream description ]
Thu, 30 Sep 2010 09:49:40 +0200 tests: removed test names in tests stable
Erik Zielke <ez@aragost.com> [Thu, 30 Sep 2010 09:49:40 +0200] rev 827
tests: removed test names in tests The name of the test files is replaced with a glob * expression, thereby the tests does not depend on the filename of the file they are in. [ original upstream description ]
Fri, 08 Oct 2010 22:36:10 -0500 tests: replace test tmp directory with $TESTTMP in test output stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 826
tests: replace test tmp directory with $TESTTMP in test output This reduces the number of patterns that must be adjusted when writing tests. [ original upstream description ]
Sat, 09 Oct 2010 12:26:56 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 12:26:56 +0100] rev 825
Merge with stable
Fri, 08 Oct 2010 17:00:38 -0500 run-tests: handle .tst not ending with an LF stable
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Oct 2010 17:00:38 -0500] rev 824
run-tests: handle .tst not ending with an LF [ original upstream description ]
Mon, 27 Sep 2010 22:49:30 +0200 tests: show skip reason instead of "irrelevant" with unified tests, too stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 27 Sep 2010 22:49:30 +0200] rev 823
tests: show skip reason instead of "irrelevant" with unified tests, too parsehghaveoutput expects just the test output, not the merged test/output, so for skipped unified tests e.g.: Skipped test-convert-darcs.t: missing feature: irrelevant was shown instead of: Skipped test-convert-darcs.t: missing feature: darcs client [ original upstream description ]
Sun, 26 Sep 2010 22:22:59 +0200 run-tests: move build/ directory to HGTMP stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Sep 2010 22:22:59 +0200] rev 822
run-tests: move build/ directory to HGTMP Before, running a test would give you a build/ directory in the root of your Mercurial source tree. The directory had a full copy of the the source, so a grep in '**/*.py' would find files inside build/. [ original upstream description ]
Fri, 08 Oct 2010 20:12:40 -0500 keyword: fix test glob stable
Matt Mackall <mpm@selenic.com> [Fri, 08 Oct 2010 20:12:40 -0500] rev 821
keyword: fix test glob [ original upstream description ]
Sat, 09 Oct 2010 11:52:32 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:52:32 +0100] rev 820
Merge with default
Sat, 09 Oct 2010 11:35:31 +0100 Switch kwtemplater.record in kw_dorecord()
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:31 +0100] rev 819
Switch kwtemplater.record in kw_dorecord() Obsoletes the need for a global recordcommands variable.
Sat, 09 Oct 2010 11:35:24 +0100 Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:24 +0100] rev 818
Specific regular expressions depending on read mode More safeguarding against accidental (un)expansion: Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always stored unexpanded. Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only are interested in expanded keywords in this situation. Note: we cannot use ..): [^$\n\r]+? \$ because e.g. the {branch} template might be empty. hg record is a special case as we read from the working directory and need one regex each for modified and added files. Therefore test recording an added file. This way we finally also forbid sequences like $Id: $ being treated as keywords.
Sat, 09 Oct 2010 11:34:55 +0100 test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:55 +0100] rev 817
test: remove remaining sed calls
Sat, 09 Oct 2010 11:34:39 +0100 disable expansion in kwfilelog.read() if file renamed in node
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:39 +0100] rev 816
disable expansion in kwfilelog.read() if file renamed in node Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog. Reorder imports alphabetically.
Sat, 09 Oct 2010 11:33:38 +0100 Make iskwfile() a weeding method in lieu of a boolean
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:38 +0100] rev 815
Make iskwfile() a weeding method in lieu of a boolean Update iskwfile docstring.
Sat, 09 Oct 2010 11:33:12 +0100 Support copy and rename
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:12 +0100] rev 814
Support copy and rename copy/rename destinations being unversioned and possibly ignored by the extension should not contain expanded keywords. Files copied/renamed from an ignored source are not touched. Add tests covering both of the above cases, plus the corner case of cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).
Sat, 09 Oct 2010 11:33:04 +0100 Refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:04 +0100] rev 813
Refactor kwtemplater.overwrite() Make kwexpand, kwshrink restricted commands - i.e. read from filelog without expansion for substition in kwtemplater.overwrite, and set/unset restricted mode for overwrite() in in kwcommitctx and the dorecord wrapper. Preselect candidates when working on changed files (rollback, record) outside kwtemplater class, and remove 6th argument from overwrite(). Avoid duplicate substitution/search in overwrite(): Only go into restricted read mode when reading from filelog. rollback and record read from the working directory, where restricted mode would already shrink keywords before overwrite() either expands or shrinks them again. This ensures that the usual automatic operations on keywords are turned off during overwrite() and only overwrite() itself acts on them. Reduce manifest calculation to the cases where it is needed. Move helper function for expansion removal outside kwtemplater class.
Fri, 01 Oct 2010 02:13:31 +0200 Use workingctx to detect modified and added files after rollback
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 812
Use workingctx to detect modified and added files after rollback
Fri, 01 Oct 2010 02:13:31 +0200 Rename variable "cfiles" to "changed" for clarity
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 811
Rename variable "cfiles" to "changed" for clarity
Sun, 26 Sep 2010 21:59:47 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 21:59:47 +0200] rev 810
Merge with default
Sun, 26 Sep 2010 19:18:41 +0200 Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 809
Support rollback by restoring expansion to previous values Prevent spurious differences in the working directory after a rollback. Add tests for several rollback situations.
Sun, 26 Sep 2010 19:18:41 +0200 Do not expand at all during diff
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 808
Do not expand at all during diff Always shrink and never expand keywords during a diff operation. Avoid user distraction e.g. because of spurious differences appearing in the commit editor.
Sun, 26 Sep 2010 19:18:41 +0200 Restore restricted read mode value after overwriting
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 807
Restore restricted read mode value after overwriting Even though just enforcing expansion after overwriting files in the working directory caused no problems that we know of, this avoids a potential source of problems (e.g. in collaboration other extensions) at no costs.
Sun, 26 Sep 2010 19:18:41 +0200 test: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 806
test: fix typo, rephrase
Thu, 23 Sep 2010 17:03:23 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 17:03:23 +0200] rev 805
Merge with default
Thu, 23 Sep 2010 16:31:38 +0200 Use note admonition in help text
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 16:31:38 +0200] rev 804
Use note admonition in help text
Thu, 23 Sep 2010 10:33:58 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 10:33:58 +0200] rev 803
Merge with stable
Wed, 22 Sep 2010 18:20:47 -0500 tests: various fixes for new unified test pattern format stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:20:47 -0500] rev 802
tests: various fixes for new unified test pattern format [ original upstream message ]
Wed, 22 Sep 2010 16:06:02 -0500 tests: add glob matching for unified tests stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:02 -0500] rev 801
tests: add glob matching for unified tests This adds a " (glob)" marker that works like a simpler version of (re): "*" is converted to ".*", and "?" is converted to ".". Both special characters can be escaped using "\", and the backslash itself can be escaped as well. Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't supported. [ original upstream message ]
Wed, 22 Sep 2010 16:06:00 -0500 tests: require regexes in unified tests to be marked with " (re)" stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:00 -0500] rev 800
tests: require regexes in unified tests to be marked with " (re)" Consider this test: $ hg glog --template '{rev}:{node|short} "{desc}"\n' @ 2:20c4f79fd7ac "3" | | o 1:38f24201dcab "2" |/ o 0:2a18120dc1c9 "1" Because each line beginning with "|" can be compiled as a regular expression (equivalent to ".*|"), they will match any output. Similarly: $ echo foo The blank output line can be compiled as a regular expression and will also match any output. With this patch, none of the above output lines will be matched as regular expressions. A line must end in " (re)" in order to be matched as one. Lines are still matched literally first, so the following will pass: $ echo 'foo (re)' foo (re) [ original upstream message ]
Wed, 22 Sep 2010 16:05:59 -0500 tests: ensure regexes match to the end of the string stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 799
tests: ensure regexes match to the end of the string Regular expressions in the test suite are currently written assuming that you need a trailing ".*" to avoid matching to the end. Instead of matching regular expressions using "^pattern", this patch makes matching more restrictive by matching "^pattern$". [ original upstream message ]
Wed, 22 Sep 2010 16:05:59 -0500 tests: don't match blank output lines as regexes in unified tests stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 798
tests: don't match blank output lines as regexes in unified tests Currently, the following unified test will pass: $ echo foo A blank output line (a line containing just two spaces) will match any output. The patch modifies the unified test runner to ignore empty strings strings when do regular expression matching. [ original upstream message ]
Wed, 22 Sep 2010 16:05:58 -0500 tests: improve regexes in unified tests stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:58 -0500] rev 797
tests: improve regexes in unified tests [ original upstream message ]
Wed, 22 Sep 2010 23:46:57 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Sep 2010 23:46:57 +0200] rev 796
Merge with stable
Mon, 20 Sep 2010 14:36:36 -0500 tests: add hack to avoid problem with graphlog in unified tests stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 14:36:36 -0500] rev 795
tests: add hack to avoid problem with graphlog in unified tests [ original upstream message ]
Fri, 17 Sep 2010 20:53:56 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 17 Sep 2010 20:53:56 +0200] rev 794
Merge with stable
Thu, 16 Sep 2010 17:51:32 -0500 tests: add exit codes to unified tests stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 17:51:32 -0500] rev 793
tests: add exit codes to unified tests [ original upstream message ]
Sun, 12 Sep 2010 18:05:53 -0500 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' stable
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 792
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge. [ original upstream message ]
Fri, 10 Sep 2010 21:22:11 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 21:22:11 +0200] rev 791
(stable) merge
Fri, 10 Sep 2010 16:58:13 +0200 Explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 16:58:13 +0200] rev 790
Explain file-wise expansion in help
Fri, 03 Sep 2010 15:59:08 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 03 Sep 2010 15:59:08 +0100] rev 789
Merge with stable
Fri, 03 Sep 2010 12:58:51 +0200 diff: recurse into subrepositories with --subrepos/-S flag stable
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 788
diff: recurse into subrepositories with --subrepos/-S flag [ original upstream message ]
Tue, 31 Aug 2010 18:18:28 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 31 Aug 2010 18:18:28 +0100] rev 787
Merge with stable
Mon, 30 Aug 2010 13:15:30 +0900 test-keyword: use regular expressions instead of grepping stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:15:30 +0900] rev 786
test-keyword: use regular expressions instead of grepping [ original upstream message]
Mon, 16 Aug 2010 01:01:41 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:01:41 +0100] rev 785
Merge with stable
Sun, 15 Aug 2010 13:26:12 -0500 tests: drop big sed from test-keyword.t stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Aug 2010 13:26:12 -0500] rev 784
tests: drop big sed from test-keyword.t [ original upstream message ]
Mon, 16 Aug 2010 01:00:29 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:00:29 +0100] rev 783
(stable) merge
Sat, 14 Aug 2010 09:47:57 +0100 tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:57 +0100] rev 782
tests: unify test-keyword
Sat, 14 Aug 2010 09:47:41 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:41 +0100] rev 781
Merge with stable
Fri, 14 May 2010 10:01:09 -0500 rollback: fix up tests stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 780
rollback: fix up tests [ original upstream message ]
Sat, 14 Aug 2010 09:42:14 +0100 Merge after backout stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:42:14 +0100] rev 779
Merge after backout
Sat, 14 Aug 2010 09:30:42 +0100 Backed out changeset bceb04857ce1 (not all upstream hunks applied) stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:30:42 +0100] rev 778
Backed out changeset bceb04857ce1 (not all upstream hunks applied)
Thu, 12 Aug 2010 14:53:34 +0900 tests: catch re.error if test line is not a valid regular expression stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 14:53:34 +0900] rev 777
tests: catch re.error if test line is not a valid regular expression [ original upstream message ]
Mon, 02 Aug 2010 23:27:22 -0500 tests: basic support for unified tests stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:27:22 -0500] rev 776
tests: basic support for unified tests [ original upstream message ]
Mon, 02 Aug 2010 15:44:54 -0500 tests: move script execution in runner helpers stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 15:44:54 -0500] rev 775
tests: move script execution in runner helpers [ original upstream message ]
Mon, 26 Jul 2010 12:34:33 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:34:33 +0200] rev 774
(stable) merge
Mon, 26 Jul 2010 12:32:45 +0200 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:32:45 +0200] rev 773
Move collecting of [keyword] patterns to reposetup (issue2303) When cloning, prevent [keyword] filename patterns configured locally in the source directory to persist during the update in the destination. a) move [keyword] retrieval (back) to reposetup b) remove the corresponding global kwtools attributes Add test cases.
Mon, 19 Jul 2010 08:13:48 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Jul 2010 08:13:48 +0100] rev 772
(stable) merge
Thu, 15 Jul 2010 10:24:31 +0200 Add extra datefilters in a single update call
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jul 2010 10:24:31 +0200] rev 771
Add extra datefilters in a single update call
Wed, 16 Jun 2010 11:08:43 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jun 2010 11:08:43 +0200] rev 770
(stable) merge
Tue, 15 Jun 2010 21:58:53 +0200 Postpone manifest calculation in kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jun 2010 21:58:53 +0200] rev 769
Postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.
Thu, 10 Jun 2010 11:33:01 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Jun 2010 11:33:01 +0100] rev 768
Merge with stable
Sun, 06 Jun 2010 17:25:00 +0900 help: show value requirement and multiple occurrence of options stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jun 2010 17:25:00 +0900] rev 767
help: show value requirement and multiple occurrence of options this helps users to know what kind of option is: - no value is required(flag option) - value is required - value is required, and multiple occurrences are allowed each kinds are shown as below: -f --force force push -e --ssh CMD specify ssh command to use -b --branch BRANCH [+] a specific branch you would like to push if one or more 3rd type options are shown, explanation for '[+]' mark is also shown as footnote. [ original upstream message ]
Wed, 09 Jun 2010 22:50:30 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 22:50:30 +0100] rev 766
(stable) merge
Tue, 01 Jun 2010 01:05:45 +0200 Force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 01:05:45 +0200] rev 765
Force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.
Wed, 09 Jun 2010 17:21:12 +0100 Pass context to kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 17:21:12 +0100] rev 764
Pass context to kwtemplater.overwrite Now that we have retrieved the context in every calling function except commit, pass it as argument to kwtemplater.overwrite to avoid looking it up twice. Reorder arguments to kwtemplater.overwrite to reflect their importance. Turn node argument into a simple boolean and rename it to iswctx.
Tue, 01 Jun 2010 03:45:10 +0200 Retrieve added and modified files from commitctx
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 03:45:10 +0200] rev 763
Retrieve added and modified files from commitctx
Tue, 08 Jun 2010 09:55:08 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Jun 2010 09:55:08 +0100] rev 762
Merge with stable
Mon, 07 Jun 2010 20:03:32 +0200 move working dir/dirstate methods from localrepo to workingctx stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 20:03:32 +0200] rev 761
move working dir/dirstate methods from localrepo to workingctx [ original upstream message ]
Sun, 06 Jun 2010 20:19:24 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Jun 2010 20:19:24 +0100] rev 760
(stable) merge
Thu, 03 Jun 2010 10:37:31 +0100 Use context to detect uncommitted merge
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Jun 2010 10:37:31 +0100] rev 759
Use context to detect uncommitted merge
Sat, 22 May 2010 14:10:49 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 May 2010 14:10:49 +0200] rev 758
(stable) merge
Fri, 21 May 2010 22:12:39 +0200 Offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 757
Offer svn-like default keywordmaps svn-like default keywords can be set in a new configuration section called [keywordset] -- thanks to timeless for the name. Move setup of default keywordmaps into dedicated function used by kwtemplater.__init__ and demo. HeadURL/URL is not supported (by default).
Fri, 21 May 2010 22:12:39 +0200 Add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 756
Add 2 svn-like date filters svnisodate yields the format the date in svn's Id keyword expands to. svnutcdate yields the format svn's Date/LastChangedDate expands to. http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
Tue, 18 May 2010 22:22:59 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 18 May 2010 22:22:59 +0200] rev 755
Merge with stable
Tue, 18 May 2010 16:31:10 +0200 Use our custom hg reStructuredText role some more stable
Martin Geisler <mg@aragost.com> [Tue, 18 May 2010 16:31:10 +0200] rev 754
Use our custom hg reStructuredText role some more I missed these occurrences on my first scan through the source. [ original upstream message ]
Fri, 14 May 2010 17:15:38 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 17:15:38 +0200] rev 753
Merge with stable
Fri, 14 May 2010 10:01:09 -0500 rollback: fix up tests stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 752
rollback: fix up tests [ original upstream message ]
Fri, 14 May 2010 10:56:47 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 10:56:47 +0200] rev 751
(stable) merge
Thu, 13 May 2010 17:24:21 -0500 commit: note new branch heads rather than topological heads stable
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 17:24:21 -0500] rev 750
commit: note new branch heads rather than topological heads Move to using contexts while we're at it. [ original upstream message ]
Sun, 09 May 2010 11:14:43 +0200 Support extensions using dorecord, e.g. crecord
Christian Ebert <blacktrash@gmx.net> [Sun, 09 May 2010 11:14:43 +0200] rev 749
Support extensions using dorecord, e.g. crecord Provide extendable keyword.recordextensions variable, so other extensions beside hgext.record which provide the dorecord function can cooperate with hgext.keyword like so (example from crecord): def extsetup(): try: keyword = extensions.find('keyword') keyword.restricted += ' crecord qcrecord' try: # use record support in keyword.py if present keyword.recordcommands += ' crecord qcrecord' keyword.recordextensions += ' crecord' except AttributeError: pass except KeyError: pass
Wed, 05 May 2010 17:16:00 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 17:16:00 +0200] rev 748
(stable) merge
Wed, 05 May 2010 14:02:45 +0200 Omit setting extra variable for record context
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 14:02:45 +0200] rev 747
Omit setting extra variable for record context Since dc2f37864348 the context is always retrieved in kwtemplater.overwrite().
Tue, 04 May 2010 01:15:34 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 May 2010 01:15:34 +0200] rev 746
(stable) merge
Sun, 02 May 2010 22:39:43 +0200 Simplify record switch in kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net> [Sun, 02 May 2010 22:39:43 +0200] rev 745
Simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible
Sat, 01 May 2010 23:18:42 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:18:42 +0200] rev 744
(stable) merge
Sat, 01 May 2010 20:49:40 +0200 Cleanup test and make it portable
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 20:49:40 +0200] rev 743
Cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record
Fri, 30 Apr 2010 16:30:09 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 16:30:09 +0200] rev 742
Merge with stable
Thu, 29 Apr 2010 22:04:05 -0500 run-tests: add --view switch to use external diff viewer stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 741
run-tests: add --view switch to use external diff viewer [original upstream message ]
Thu, 29 Apr 2010 18:25:45 -0500 run-tests: sort options stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 740
run-tests: sort options [original upstream message ]
Thu, 29 Apr 2010 18:25:45 -0500 run-tests: add -l short option for --local stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 739
run-tests: add -l short option for --local [original upstream message ]
Fri, 30 Apr 2010 15:21:59 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 15:21:59 +0200] rev 738
(stable) merge
Mon, 26 Apr 2010 04:01:13 +0200 Test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 737
Test recording
Mon, 26 Apr 2010 04:01:07 +0200 Support (q)record
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 736
Support (q)record Monkeypatch hgext.dorecord to trigger keyword expansion. Read data from working directory, not from filelog. Prevent keyword expansion from within record's commitfunc, thereby fixing a bug/inconsistency where files which are clean after recording were overwritten twice.
Mon, 26 Apr 2010 03:54:18 +0200 Remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 735
Remove mq commands from restricted list Monkeypatching patch.diff takes care of this since 911f5be5d159. Test mq more thoroughly by loosening [keywordmaps] and comparing the output of hg cat with keyword expansion enabled and disabled.
Fri, 16 Apr 2010 14:30:13 +0200 Replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 734
Replace deprecated mq commands in test
Fri, 23 Apr 2010 10:37:08 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 23 Apr 2010 10:37:08 +0200] rev 733
Merge with stable
Thu, 22 Apr 2010 10:24:49 +0200 Use hg role in help strings stable
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:24:49 +0200] rev 732
Use hg role in help strings [ original upstream message ]
Tue, 20 Apr 2010 02:37:20 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 20 Apr 2010 02:37:20 +0200] rev 731
Merge with stable
Sat, 17 Apr 2010 13:38:42 -0500 keyword: monkeypatch patch so that optional args can be passed as kwargs stable
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:38:42 -0500] rev 730
keyword: monkeypatch patch so that optional args can be passed as kwargs [ original upstream message ]
Thu, 15 Apr 2010 22:16:14 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Apr 2010 22:16:14 +0200] rev 729
Merge with stable
Thu, 15 Apr 2010 20:25:07 +0200 run-tests.py: can't remove from os.environ on solaris stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:07 +0200] rev 728
run-tests.py: can't remove from os.environ on solaris [ original upstream message ]
Wed, 14 Apr 2010 15:23:22 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Apr 2010 15:23:22 +0200] rev 727
Merge with stable
Wed, 14 Apr 2010 17:58:10 +0900 pylint, pyflakes: remove unused or duplicate imports stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 14 Apr 2010 17:58:10 +0900] rev 726
pylint, pyflakes: remove unused or duplicate imports [ original upstream message ]
Wed, 14 Apr 2010 00:24:47 -0500 Fix --blacklist when --jobs > 1 in run_tests.py. stable
Ry4an Brase <ry4an-hg@ry4an.org> [Wed, 14 Apr 2010 00:24:47 -0500] rev 725
Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway. [ original upstream message ]
Wed, 14 Apr 2010 09:08:47 +0200 run-tests.py: reset env variables set by hooks stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:08:47 +0200] rev 724
run-tests.py: reset env variables set by hooks [ original upstream message ]
Tue, 13 Apr 2010 10:28:48 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:28:48 +0200] rev 723
Merge with stable
Tue, 23 Mar 2010 15:23:04 +0100 run-tests: force to test pure on pypy as well stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:23:04 +0100] rev 722
run-tests: force to test pure on pypy as well [ original upstream message ]
Tue, 23 Mar 2010 15:22:17 +0100 Fix run-tests.py -jX after 2ed667a9dfcb stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:22:17 +0100] rev 721
Fix run-tests.py -jX after 2ed667a9dfcb [ original upstream message ]
Tue, 23 Mar 2010 11:37:31 +0100 tests: adapt the test runner to work with jython stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:31 +0100] rev 720
tests: adapt the test runner to work with jython [ original upstream message ]
Mon, 22 Mar 2010 01:36:12 -0400 run-tests: make sure GREP_OPTIONS isn't set stable
Brodie Rao <brodie@bitheap.org> [Mon, 22 Mar 2010 01:36:12 -0400] rev 719
run-tests: make sure GREP_OPTIONS isn't set This can interfere with test output, especially for options like --color. [ original upstream message ]
Thu, 11 Mar 2010 15:32:24 +0100 tests: use external coverage, mandate newer version stable
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 15:32:24 +0100] rev 718
tests: use external coverage, mandate newer version This removes the option for including the stdlib in coverage reports. [ original upstream message ]
Thu, 05 Nov 2009 15:19:54 +0100 templater: readable dates older than 24 months revert to ISO8601 (issue1006) stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:19:54 +0100] rev 717
templater: readable dates older than 24 months revert to ISO8601 (issue1006) [ original upstream message ]
Tue, 13 Apr 2010 10:13:41 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:41 +0200] rev 716
(stable) merge
Tue, 13 Apr 2010 10:13:06 +0200 Add forgotten comment
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:06 +0200] rev 715
Add forgotten comment
Mon, 12 Apr 2010 17:34:12 +0200 Make the templater a local variable
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 714
Make the templater a local variable
Tue, 13 Apr 2010 10:05:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:05:51 +0200] rev 713
Merge with stable
Mon, 12 Apr 2010 17:21:30 -0700 rollback: improve message stable
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 712
rollback: improve message [ original upstream message ]
Fri, 09 Apr 2010 17:23:37 -0500 rollback: add dry-run argument, emit transaction description stable
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 711
rollback: add dry-run argument, emit transaction description [ original upstream message ]
Tue, 16 Mar 2010 22:29:16 +0100 Do not bother about detecting extension path in demo
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:29:16 +0100] rev 710
Do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.
Mon, 12 Apr 2010 14:12:56 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 14:12:56 +0200] rev 709
Merge with stable
Mon, 05 Apr 2010 15:25:08 -0500 keywords: build a new templater to work around caching interaction stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 708
keywords: build a new templater to work around caching interaction
Tue, 30 Mar 2010 11:12:09 +0100 (0.9.2compat) improve quoting of environment variable in test 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:12:09 +0100] rev 707
(0.9.2compat) improve quoting of environment variable in test
Tue, 30 Mar 2010 11:08:13 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:08:13 +0100] rev 706
Merge with stable
Wed, 24 Mar 2010 01:43:24 +0100 Tests with spaces in paths stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 24 Mar 2010 01:43:24 +0100] rev 705
Tests with spaces in paths This allows most tests to succeed with ./run-tests.py --tmpdir='/tmp/hg test' and introduces other tests for spaces and shell quoting [ original upstream message ]
Wed, 17 Mar 2010 23:16:44 +0100 (0.9.2compat) get applicable changes from default 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 23:16:44 +0100] rev 704
(0.9.2compat) get applicable changes from default
Wed, 17 Mar 2010 15:04:07 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 15:04:07 +0100] rev 703
(stable) merge Even though this is a fake standalone branch, we do not include the patch that removed extension path detection in kwdemo.
Tue, 16 Mar 2010 22:28:58 +0100 Make kwdemo less verbose
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:58 +0100] rev 702
Make kwdemo less verbose 1) Set the branchname always silently with dirstate.setbranch(). We create a branch so that testing the {branches} template does not come up empty. But kwdemo is hardly the place to inform the user by inference why {branches} is empty on the default branch. "demobranch" is ascii and cannot be changed, so using the internal command instead of commands.branch() is safe. 2) Do not show full path to temporary directory (distracting long lines on Mac OS X). 3) No special debug output. Output only related to keyword, no internals like unsetting of commit hooks etc.
Tue, 16 Mar 2010 22:28:23 +0100 1 variable name for overwriting candidates
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 701
1 variable name for overwriting candidates
Tue, 16 Mar 2010 22:27:22 +0100 Do not customize ui.note() when overwriting
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:27:22 +0100] rev 700
Do not customize ui.note() when overwriting Behaviour change: hg commit --verbose now prints out the names of the files which are overwritten.
Thu, 18 Feb 2010 05:55:05 +0100 Mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Feb 2010 05:55:05 +0100] rev 699
Mark improved demo commit message for translation s/config/configuration/ Inside the quoted command put the message in single quotes in case the translation contains apostrophes.
Thu, 11 Mar 2010 19:56:41 +0100 (0.9.2compat) update copyright _and_ licence 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:56:41 +0100] rev 698
(0.9.2compat) update copyright _and_ licence
Thu, 11 Mar 2010 19:48:38 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:48:38 +0100] rev 697
(stable) merge
Thu, 11 Mar 2010 18:49:41 +0100 Update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 696
Update copyright
Thu, 11 Mar 2010 18:49:14 +0100 Remove deprecated options
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 695
Remove deprecated options
Sun, 07 Mar 2010 22:57:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:57:55 +0100] rev 694
Merge with stable
Tue, 09 Feb 2010 01:12:29 +0100 run-tests.py: skipped tests shouldn't change working directory stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 09 Feb 2010 01:12:29 +0100] rev 693
run-tests.py: skipped tests shouldn't change working directory [ original upstream message ]
Tue, 29 Dec 2009 19:02:26 -0200 run-tests.py: clears http_proxy for all tests stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Dec 2009 19:02:26 -0200] rev 692
run-tests.py: clears http_proxy for all tests [ original upstream message ]
Sun, 07 Mar 2010 22:48:01 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:48:01 +0100] rev 691
(stable) merge
Sun, 07 Mar 2010 21:50:36 +0100 (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:50:36 +0100] rev 690
(0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown Switch long option name from --untracked to --unknown.
Sun, 07 Mar 2010 21:09:04 +0100 (0.9.2compat) use status' names for readability 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:09:04 +0100] rev 689
(0.9.2compat) use status' names for readability
Sun, 07 Mar 2010 20:59:43 +0100 Remove spurious locks, improve handling of wlock
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 20:59:43 +0100] rev 688
Remove spurious locks, improve handling of wlock - kwcommitctx is inside the wlock of repo.commit: no lock - _kwfwrite only needs wlock wlock outside try block, so we don't need to import lock.release _kwfwrite should even be safer that way, as we moved the status call inside the try-except block. Thanks to Benoit Boissinot for help.
Sun, 07 Mar 2010 19:56:37 +0100 Use status' names instead of index
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 19:56:37 +0100] rev 687
Use status' names instead of index
Wed, 17 Feb 2010 21:57:52 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:57:52 +0100] rev 686
(stable) merge
Wed, 17 Feb 2010 21:56:15 +0100 Do not postpone commit hooks
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:56:15 +0100] rev 685
Do not postpone commit hooks With 0e64d814d7d0 in place, this hack is not needed any more.
Wed, 17 Feb 2010 11:15:18 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with stable
Tue, 09 Feb 2010 14:12:22 -0600 fix up a bunch of check-code warnings stable
Matt Mackall <mpm@selenic.com> [Tue, 09 Feb 2010 14:12:22 -0600] rev 683
fix up a bunch of check-code warnings [ original upstream message ]
Sat, 06 Feb 2010 15:18:36 +0100 run-tests: kill daemons on ^C with -j. stable
Brendan Cully <brendan@kublai.com> [Sat, 06 Feb 2010 15:18:36 +0100] rev 682
run-tests: kill daemons on ^C with -j. This is not perfect, but the problem is fundamentally racy. [ original upstream message ]
Thu, 10 Dec 2009 17:21:31 +0900 run-tests: split tests/blacklist in tests/blacklists/* stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 10 Dec 2009 17:21:31 +0900] rev 681
run-tests: split tests/blacklist in tests/blacklists/* Following discussions with Gilles Morris [1], it seems that it is preferable to use several blacklist files in a blacklists/ directory. It is easier to add an unversioned file for experiments than modifying a tracked file. Also fall back to a simpler syntax, giving up ConfigParser, now that section names are not needed anymore. And allow --blacklist parameter to be a complete path, instead of only one of the filenames contained in tests/blacklists/ [1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html [ original upstream message ]
Mon, 25 Jan 2010 00:05:27 -0600 many, many trivial check-code fixups stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:27 -0600] rev 680
many, many trivial check-code fixups [ original upstream message ]
Tue, 16 Feb 2010 21:04:04 +0100 filelog: sort meta entries, ensure deterministic order stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 16 Feb 2010 21:04:04 +0100] rev 679
filelog: sort meta entries, ensure deterministic order [ original upstream message ]
Fri, 05 Feb 2010 18:08:07 +0000 (0.9.2compat) fix utcdate filter 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 18:08:07 +0000] rev 678
(0.9.2compat) fix utcdate filter
Fri, 05 Feb 2010 17:57:36 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 17:57:36 +0000] rev 677
Merge with stable
Fri, 05 Feb 2010 16:50:31 +0000 Fix utcdate filter stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 16:50:31 +0000] rev 676
Fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.
Wed, 20 Jan 2010 10:14:36 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jan 2010 10:14:36 +0100] rev 675
Merge with stable
Tue, 19 Jan 2010 22:20:08 -0600 Update license to GPLv2+ stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:08 -0600] rev 674
Update license to GPLv2+ [ original upstream message ]
Thu, 24 Dec 2009 11:02:48 +0000 (0.9.2compat) load extensions with "ext =" 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 11:02:48 +0000] rev 673
(0.9.2compat) load extensions with "ext ="
Thu, 24 Dec 2009 10:54:00 +0000 (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:54:00 +0000] rev 672
(0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted See 52b03aad673b, 13a6a2c0440f.
Thu, 24 Dec 2009 10:15:49 +0000 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:15:49 +0000] rev 671
(stable) merge
Thu, 24 Dec 2009 10:14:36 +0000 run-tests.py: update
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:14:36 +0000] rev 670
run-tests.py: update
Wed, 23 Dec 2009 17:46:48 +0000 tests: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 17:46:48 +0000] rev 669
tests: load extensions with "ext ="
Wed, 23 Dec 2009 12:04:17 +0000 Go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:17 +0000] rev 668
Go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.
Wed, 23 Dec 2009 12:04:04 +0000 Do not monkeypatch diff when in restricted mode
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:04 +0000] rev 667
Do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.
Sun, 29 Nov 2009 11:27:33 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
Fri, 27 Nov 2009 18:26:25 +0000 keyword: clarify object of backwards compatibility stable
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 665
keyword: clarify object of backwards compatibility [ original upstream message ]
Sat, 28 Nov 2009 19:51:21 +0000 (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Nov 2009 19:51:21 +0000] rev 664
(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output Keep $RCSFile$ for backwards compatibility.
Fri, 27 Nov 2009 18:04:02 +0000 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
Thu, 26 Nov 2009 10:51:17 +0100 The CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 662
The CVS keyword is $RCSfile$, not $RCSFile$ http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords Fix default keyword map accordingly. Keep $RCSFile$ for Mercurial backwards compatibility.
Fri, 27 Nov 2009 18:03:29 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
Thu, 26 Nov 2009 20:50:16 +0100 keyword: sort demo output to ensure deterministic output stable
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 660
keyword: sort demo output to ensure deterministic output [ original upstream message ]
Mon, 19 Oct 2009 22:42:05 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
Mon, 19 Oct 2009 22:40:48 +0200 (0.9.2compat) update wiki url 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:40:48 +0200] rev 658
(0.9.2compat) update wiki url
Fri, 16 Oct 2009 23:57:34 +0200 hg.clone: report branch name on update stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 657
hg.clone: report branch name on update [ original upstream message ]
Wed, 24 Jun 2009 15:32:37 +0200 change wiki/bts URLs to point to new hostname stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 15:32:37 +0200] rev 656
change wiki/bts URLs to point to new hostname [ original upstream message ]
Mon, 19 Oct 2009 22:37:14 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
Thu, 01 Oct 2009 13:39:15 +0200 Uppercase short option for kwfiles --all, like hg status -A
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 654
Uppercase short option for kwfiles --all, like hg status -A Deprecate kwfiles -a.
Thu, 01 Oct 2009 13:39:15 +0200 Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 653
Make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.
Thu, 01 Oct 2009 13:39:15 +0200 Make kwfiles --all show unknown files too
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 652
Make kwfiles --all show unknown files too More consistent and similar to hg status.
Thu, 01 Oct 2009 13:39:15 +0200 kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 651
kwfiles --unknown instead of --untracked Use the same option name as "hg status". Retrieve option in _status(). Mark --untracked as deprecated.
Thu, 01 Oct 2009 20:42:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
Thu, 17 Sep 2009 22:39:38 -0700 hg: say 'hg update' instead of 'hg up' in merge status message stable
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 649
hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change. [ original upstream message ]
Sat, 19 Sep 2009 12:06:50 +0200 (0.9.2compat) do not mark debug message for translation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:06:50 +0200] rev 648
(0.9.2compat) do not mark debug message for translation
Sat, 19 Sep 2009 12:04:38 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Sat, 19 Sep 2009 01:15:38 +0200 do not attempt to translate ui.debug output stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 646
do not attempt to translate ui.debug output [ original upstream message ]
Sat, 19 Sep 2009 12:00:41 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Sat, 19 Sep 2009 12:00:02 +0200 (0.9.2compat): run kwdemo before setting up [keyword] files 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:02 +0200] rev 644
(0.9.2compat): run kwdemo before setting up [keyword] files Ensures that kwdemo runs correctly without further configuration. Also no need to specify --default option.
Thu, 10 Sep 2009 23:15:37 +0200 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 643
test: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.
Fri, 28 Aug 2009 16:18:28 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
Thu, 27 Aug 2009 00:00:15 +0200 test-keyword: update output to match 5d49fdef6fd0 stable
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:00:15 +0200] rev 641
test-keyword: update output to match 5d49fdef6fd0 [ original upstream description ]
Wed, 05 Aug 2009 17:25:33 +0200 (0.9.2compat) update and rewrap documentation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:25:33 +0200] rev 640
(0.9.2compat) update and rewrap documentation
Wed, 05 Aug 2009 17:18:32 +0200 (0.9.2compat) prefer util.datestr over time module import 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:18:32 +0200] rev 639
(0.9.2compat) prefer util.datestr over time module import We keep the function in this branch to catch the TypeError.
Wed, 05 Aug 2009 17:01:55 +0200 (0.9.2compat) remove "help keyword" from test 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:01:55 +0200] rev 638
(0.9.2compat) remove "help keyword" from test
Wed, 05 Aug 2009 16:57:21 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
Wed, 05 Aug 2009 16:56:49 +0200 Use util.datestr for utcdate filter, make it accessable in variable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:49 +0200] rev 636
Use util.datestr for utcdate filter, make it accessable in variable lambda syntax mimicking templatefilters.py
Wed, 05 Aug 2009 16:56:44 +0200 Reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:44 +0200] rev 635
Reference templating help, add utcdate filter example
Wed, 05 Aug 2009 16:56:36 +0200 Remove "help keyword" from test
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:36 +0200] rev 634
Remove "help keyword" from test Testing help output does not make sense as we have no way to check for errors in content which would be the only reasonable test here.
Sun, 26 Jul 2009 10:45:35 +0100 Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:45:35 +0100] rev 633
Refactor kwdemo and make output translatable Better reflect the actual behaviour of the extension: - Make map arguments and -f/--rcfile not mutually exclusive but extend the current configuration - Map arguments and -f/--rcfile both override the defaults even when -d/--default is specified - -d/--default only overrides the current configuration Inform the user about extending/overriding behaviour, but only at the beginning; the following messages become terser, making the output translatable without too much code clutter. Rephrase help (use "short/long" option notation etc.).
Mon, 03 Aug 2009 11:53:13 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:53:13 +0200] rev 632
(stable) merge
Mon, 03 Aug 2009 11:51:41 +0200 Update copyright
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:51:41 +0200] rev 631
Update copyright
Mon, 03 Aug 2009 11:49:46 +0200 (0.9.2compat) update copyright 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:49:46 +0200] rev 630
(0.9.2compat) update copyright
Mon, 03 Aug 2009 11:09:02 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:09:02 +0200] rev 629
Merge with stable
Mon, 03 Aug 2009 00:01:50 +0200 help: use field lists for lists of extensions stable
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:01:50 +0200] rev 628
help: use field lists for lists of extensions [ original upstream message ]
Sun, 02 Aug 2009 17:17:17 +0200 minirst: indent literal blocks with two spaces stable
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 17:17:17 +0200] rev 627
minirst: indent literal blocks with two spaces The vast majority* of them are formatted like this in the source, so this basically reverts the output to how it looked before we got the minirst parser. *: the help on templating use four spaces for some examples and will now shown with an indentation of just two spaces. [ original upstream message ]
Sun, 26 Jul 2009 10:40:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:40:59 +0100] rev 626
Merge with stable
Sun, 26 Jul 2009 01:53:06 +0200 keyword: wrap docstrings at 70 characters stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:53:06 +0200] rev 625
keyword: wrap docstrings at 70 characters [ original upstream description ]
Thu, 16 Jul 2009 23:25:26 +0200 commands: use minirst parser when displaying help stable
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 624
commands: use minirst parser when displaying help [ original upstream description ]
Thu, 23 Jul 2009 20:00:23 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 20:00:23 +0100] rev 623
(stable) merge
Thu, 23 Jul 2009 07:37:09 +0100 (0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix) 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 07:37:09 +0100] rev 622
(0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix)
Thu, 23 Jul 2009 07:26:16 +0100 Argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 07:26:16 +0100] rev 621
Argument to "kwdemo --rcfile" must be string (bugfix)
Wed, 22 Jul 2009 08:28:30 +0100 Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Jul 2009 08:28:30 +0100] rev 620
Reformat kwfiles help for minirst parser
Sat, 11 Jul 2009 01:25:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jul 2009 01:25:51 +0200] rev 619
Merge with stable
Thu, 09 Jul 2009 23:59:03 +0200 mq: qpop now tells which patches are popped stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 09 Jul 2009 23:59:03 +0200] rev 618
mq: qpop now tells which patches are popped When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output. [ original upstream message ]
Fri, 10 Jul 2009 12:40:24 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:40:24 +0200] rev 617
Merge with stable
Fri, 10 Jul 2009 12:39:58 +0200 (0.9.2compat) empty string as default value for hgcmd 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:39:58 +0200] rev 616
(0.9.2compat) empty string as default value for hgcmd
Fri, 10 Jul 2009 12:37:34 +0200 (0.9.2compat) use all caps NOTE: in help string 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:37:34 +0200] rev 615
(0.9.2compat) use all caps NOTE: in help string
Thu, 09 Jul 2009 22:52:39 +0200 keyword: use all caps for 'note:' in help string stable
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 22:52:39 +0200] rev 614
keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'. [ original upstream message ]
Fri, 10 Jul 2009 01:52:11 +0200 (0.9.2compat) prefer self.func over repo.func in kwrepo 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:52:11 +0200] rev 613
(0.9.2compat) prefer self.func over repo.func in kwrepo Avoid nesting by falling back on parent class member function.
Fri, 10 Jul 2009 01:33:01 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:33:01 +0200] rev 612
(stable) merge
Thu, 09 Jul 2009 11:59:12 +0200 Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Jul 2009 11:59:12 +0200] rev 611
Eliminate potential reference cycles from kwrepo - delete kwrepo.commitctx after using the tweaked version - prefer self.hook over repo.hook to avoid nesting Also pass arguments to commit as arbitrary list. Thanks to Simon Heimberg and Matt Mackall for guidance.
Wed, 08 Jul 2009 03:25:07 +0200 (0.9.2compat) kwdemo: get rid of subfunction and ease translation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:25:07 +0200] rev 610
(0.9.2compat) kwdemo: get rid of subfunction and ease translation
Tue, 07 Jul 2009 23:30:53 +0200 Collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net> [Tue, 07 Jul 2009 23:30:53 +0200] rev 609
Collect kwmaps using a generator expression Allowed for Python 2.4.
Wed, 08 Jul 2009 03:09:07 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:09:07 +0200] rev 608
Merge with stable
Wed, 08 Jul 2009 02:50:01 +0200 (0.9.2compat) warp docstrings at 78 chars 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 02:50:01 +0200] rev 607
(0.9.2compat) warp docstrings at 78 chars
Tue, 07 Jul 2009 23:54:42 +0200 keyword: wrapped docstrings at 78 characters stable
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 606
keyword: wrapped docstrings at 78 characters [ original upstream description ]
Wed, 08 Jul 2009 01:02:51 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 01:02:51 +0200] rev 605
(stable) merge
Sat, 04 Jul 2009 15:26:14 +0200 Remove unused import
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Jul 2009 15:26:14 +0200] rev 604
Remove unused import
Thu, 02 Jul 2009 10:56:01 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jul 2009 10:56:01 +0200] rev 603
(stable) merge
Mon, 29 Jun 2009 23:46:28 +0200 Break overlong line
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 23:46:28 +0200] rev 602
Break overlong line
Wed, 01 Jul 2009 17:36:36 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:36:36 +0200] rev 601
(stable) merge
Wed, 01 Jul 2009 17:34:39 +0200 Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:34:39 +0200] rev 600
Make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.
Mon, 29 Jun 2009 19:10:48 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 19:10:48 +0200] rev 599
(stable) merge
Mon, 29 Jun 2009 18:55:09 +0200 (0.9.2compat) lowercase status flags of untracked files in kwfile output 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:55:09 +0200] rev 598
(0.9.2compat) lowercase status flags of untracked files in kwfile output Improve help as well, like in default branch.
Mon, 29 Jun 2009 18:37:08 +0200 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:37:08 +0200] rev 597
Improve help for kwfiles - just use "files" instead of "filenames" (analogous to "hg status -h") - reference the extension help wrt pattern configuration Kudos to timeless for helpful suggestions.
Mon, 29 Jun 2009 18:37:08 +0200 Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:37:08 +0200] rev 596
Lowercase status flags of untracked files in kwfile output Document the flags and their meanings in the command help (thanks to timeless for bringing this to my attention).
Sat, 27 Jun 2009 15:59:18 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:59:18 +0200] rev 595
Merge with stable
Sat, 27 Jun 2009 15:58:46 +0200 (0.9.2compat) improve help for kwfiles 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:58:46 +0200] rev 594
(0.9.2compat) improve help for kwfiles
Sat, 27 Jun 2009 13:05:25 +0200 keyword: improve help for kwfiles stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 13:05:25 +0200] rev 593
keyword: improve help for kwfiles
Sat, 27 Jun 2009 15:50:52 +0200 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:50:52 +0200] rev 592
Improve help for kwfiles
Thu, 25 Jun 2009 12:00:30 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 12:00:30 +0200] rev 591
(stable) merge
Thu, 25 Jun 2009 11:58:30 +0200 Make kwdemo more translation friendly
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 11:58:30 +0200] rev 590
Make kwdemo more translation friendly
Wed, 24 Jun 2009 14:29:48 +0200 (0.9.2compat) update synopsis 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:29:48 +0200] rev 589
(0.9.2compat) update synopsis
Wed, 24 Jun 2009 14:27:27 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:27:27 +0200] rev 588
Merge with stable
Wed, 24 Jun 2009 13:42:34 +0200 extensions: change descriptions for hook-providing extensions stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 13:42:34 +0200] rev 587
extensions: change descriptions for hook-providing extensions Thanks to timeless and Dave Townsend for advice! [ original upstream message ]
Wed, 24 Jun 2009 12:25:56 +0200 extensions: fix up description lines some more stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:25:56 +0200] rev 586
extensions: fix up description lines some more [ original upstream message ]
Tue, 23 Jun 2009 18:12:44 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jun 2009 18:12:44 +0200] rev 585
Merge with stable
Mon, 22 Jun 2009 15:48:08 +0200 extensions: improve the consistency of synopses stable
C?dric Duval <cedricduval@free.fr> [Mon, 22 Jun 2009 15:48:08 +0200] rev 584
extensions: improve the consistency of synopses Trying as much as possible to consistently: - use a present tense predicate followed by a direct object - verb referring directly to the functionality provided (ie. not "add command that does this" but simple "do that") - keep simple and to the point, leaving details for the long help (width is tight, possibly even more so for translations) Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom Podlaski Christiansen and others for the helpful suggestions. [ original upstream message ]
Sun, 21 Jun 2009 23:17:37 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Jun 2009 23:17:37 +0100] rev 583
Merge with stable
Sat, 20 Jun 2009 20:57:13 +0200 help: remove per-extension paragraph on how to enable it stable
C?dric Duval <cedricduval@free.fr> [Sat, 20 Jun 2009 20:57:13 +0200] rev 582
help: remove per-extension paragraph on how to enable it The central place to find this information is the "extensions" help topic. [ original upstream message ]
Thu, 18 Jun 2009 12:45:39 +0100 (0.9.2compat) concise help title 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:45:39 +0100] rev 581
(0.9.2compat) concise help title
Thu, 18 Jun 2009 12:43:19 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:43:19 +0100] rev 580
(stable) merge
Thu, 18 Jun 2009 01:21:26 +0100 Concise help title
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 01:21:26 +0100] rev 579
Concise help title
Mon, 15 Jun 2009 11:10:15 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jun 2009 11:10:15 +0100] rev 578
Merge with stable
Mon, 15 Jun 2009 00:03:26 +0200 Add patch.eol to ignore EOLs when patching (issue1019) stable
Patrick Mezard <pmezard@gmail.com> [Mon, 15 Jun 2009 00:03:26 +0200] rev 577
Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result. [ original upstream message ]
Tue, 09 Jun 2009 22:42:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:39 +0200] rev 576
Merge with stable
Tue, 09 Jun 2009 22:42:23 +0200 (0.9.2compat) update doc strings and help 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:23 +0200] rev 575
(0.9.2compat) update doc strings and help
Tue, 09 Jun 2009 22:32:14 +0200 (0.9.2compat) improve English; from stable 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:32:14 +0200] rev 574
(0.9.2compat) improve English; from stable
Tue, 09 Jun 2009 09:25:34 -0400 keyword: improve English stable
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 573
keyword: improve English [ original upstream message ]
Tue, 09 Jun 2009 10:34:01 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 10:34:01 +0200] rev 572
Merge with stable
Mon, 08 Jun 2009 18:14:44 -0500 merge: allow merging going backwards stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 571
merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right? [ original upstream message ]
Sun, 07 Jun 2009 19:25:53 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:53 +0200] rev 570
(stable) merge
Sun, 07 Jun 2009 19:25:10 +0200 Remove doc string for standalone version
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:25:10 +0200] rev 569
Remove doc string for standalone version default and stable branches only for development and history.
Sun, 07 Jun 2009 19:23:23 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:23:23 +0200] rev 568
Merge with stable
Sun, 17 May 2009 01:24:45 +0200 tests: fix doc string in get-with-headers.py stable
Martin Geisler <mg@lazybytes.net> [Sun, 17 May 2009 01:24:45 +0200] rev 567
tests: fix doc string in get-with-headers.py [ original upstream message ]
Thu, 25 Dec 2008 17:49:08 +0100 test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py stable
Gilles Moris <gilles.moris@free.fr> [Thu, 25 Dec 2008 17:49:08 +0100] rev 566
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here. [ original upstream message ]
Sun, 07 Jun 2009 19:18:59 +0200 (stable) merge for run-tests.py stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:18:59 +0200] rev 565
(stable) merge for run-tests.py
Sun, 07 Jun 2009 19:16:14 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:16:14 +0200] rev 564
Merge with stable
Sun, 07 Jun 2009 19:15:09 +0200 (stable) fix import gone wrong in 43d8c042ca20 stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:15:09 +0200] rev 563
(stable) fix import gone wrong in 43d8c042ca20
Sun, 07 Jun 2009 19:07:29 +0200 Add run-tests.py from main and update README
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 19:07:29 +0200] rev 562
Add run-tests.py from main and update README
Sun, 07 Jun 2009 18:59:18 +0200 Refer users to distribution or 0.9.2compat branch
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:59:18 +0200] rev 561
Refer users to distribution or 0.9.2compat branch
Sun, 07 Jun 2009 18:51:53 +0200 (0.9.2compat) document Mercurial version range for standalone extension 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 18:51:53 +0200] rev 560
(0.9.2compat) document Mercurial version range for standalone extension
Sun, 07 Jun 2009 01:31:03 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Jun 2009 01:31:03 +0200] rev 559
Merge with stable
Fri, 19 Dec 2008 16:47:36 -0600 resolve: require -a switch to resolve all files stable
Matt Mackall <mpm@selenic.com> [Fri, 19 Dec 2008 16:47:36 -0600] rev 558
resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer [ original upstream message ]
Thu, 04 Jun 2009 09:16:22 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Jun 2009 09:16:22 +0200] rev 557
Merge with stable
Mon, 01 Jun 2009 14:11:32 -0500 commit: drop the now-unused files parameter stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:32 -0500] rev 556
commit: drop the now-unused files parameter [ original upstream message ]
Mon, 01 Jun 2009 01:51:50 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 01:51:50 +0200] rev 555
Merge with stable
Sun, 31 May 2009 14:55:51 +0200 fixed typos found in translatable strings stable
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:55:51 +0200] rev 554
fixed typos found in translatable strings This is from a spell-check of hg.pot. [ original upstream message ]
Wed, 27 May 2009 20:40:11 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:40:11 +0200] rev 553
(stable) merge with default
Wed, 27 May 2009 20:34:38 +0200 keyword: rename matcher() to match() mimicking changes in main
Christian Ebert <blacktrash@gmx.net> [Wed, 27 May 2009 20:34:38 +0200] rev 552
keyword: rename matcher() to match() mimicking changes in main
Tue, 26 May 2009 18:24:06 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 26 May 2009 18:24:06 +0200] rev 551
Merge with stable
Sun, 24 May 2009 02:56:14 -0500 match: add some default args stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 550
match: add some default args [ original upstream message ]
Sun, 24 May 2009 02:56:14 -0500 match: change all users of util.matcher to match.match stable
Matt Mackall <mpm@selenic.com> [Sun, 24 May 2009 02:56:14 -0500] rev 549
match: change all users of util.matcher to match.match [ original upstream message ]
Mon, 25 May 2009 20:05:25 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 May 2009 20:05:25 +0200] rev 548
Merge with stable
Tue, 19 May 2009 03:59:58 +0200 update --clean: do not unlink added files (issue575) stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 19 May 2009 03:59:58 +0200] rev 547
update --clean: do not unlink added files (issue575) [ original upstream message ]
Tue, 19 May 2009 05:48:42 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 19 May 2009 05:48:42 +0200] rev 546
Merge with stable
Mon, 18 May 2009 17:36:24 -0500 commit: move editor outside transaction stable
Matt Mackall <mpm@selenic.com> [Mon, 18 May 2009 17:36:24 -0500] rev 545
commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories) [ original upstream message ]
Fri, 15 May 2009 01:37:50 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 May 2009 01:37:50 +0200] rev 544
Merge with stable
Thu, 14 May 2009 13:20:40 -0500 commit: move commit editor to cmdutil, pass as function stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 543
commit: move commit editor to cmdutil, pass as function [ original upstream message ]
Thu, 14 May 2009 13:20:40 -0500 commit: drop unused p1 and p2 args stable
Matt Mackall <mpm@selenic.com> [Thu, 14 May 2009 13:20:40 -0500] rev 542
commit: drop unused p1 and p2 args [ original upstream message ]
Tue, 28 Apr 2009 09:42:44 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 28 Apr 2009 09:42:44 +0100] rev 541
Merge with stable
Sun, 26 Apr 2009 01:08:54 +0200 updated license to be explicit about GPL version 2 stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 01:08:54 +0200] rev 540
updated license to be explicit about GPL version 2 [ original upstream message ]
Mon, 27 Apr 2009 18:35:45 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 27 Apr 2009 18:35:45 +0100] rev 539
Merge with stable
Sun, 26 Apr 2009 16:50:44 -0500 replace util.sort with sorted built-in stable
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:44 -0500] rev 538
replace util.sort with sorted built-in This is marginally faster for small and moderately-sized lists [ original upstream message ]
Sun, 26 Apr 2009 15:04:03 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Apr 2009 15:04:03 +0100] rev 537
Merge with stable
Sun, 26 Apr 2009 14:29:02 +0200 tests: removed redundant "-d '0 0'" from test scripts stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 14:29:02 +0200] rev 536
tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default. [ original upstream message ]
Wed, 22 Apr 2009 10:28:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Apr 2009 10:28:29 +0100] rev 535
Merge with stable
Wed, 22 Apr 2009 02:01:22 +0200 switch lock releasing in the extensions from gc to explicit stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Wed, 22 Apr 2009 02:01:22 +0200] rev 534
switch lock releasing in the extensions from gc to explicit [ original upstream message ]
Tue, 21 Apr 2009 11:37:50 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 11:37:50 +0100] rev 533
Merge with stable
Tue, 21 Apr 2009 09:56:07 +0100 keyword: set overwrite message only once, not for each file stable
Christian Ebert <blacktrash@gmx.net> [Tue, 21 Apr 2009 09:56:07 +0100] rev 532
keyword: set overwrite message only once, not for each file [ original upstream message ]
Mon, 20 Apr 2009 21:16:13 -0300 keyword, i18n: avoid untranslated strings as message parameters stable
Wagner Bruna <wbruna@yahoo.com> [Mon, 20 Apr 2009 21:16:13 -0300] rev 531
keyword, i18n: avoid untranslated strings as message parameters [ original upstream message ]
Wed, 08 Apr 2009 23:13:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Apr 2009 23:13:51 +0200] rev 530
Merge with stable
Tue, 07 Apr 2009 22:58:05 +0200 expand "repo" to "repository" in help texts stable
Martin Geisler <mg@lazybytes.net> [Tue, 07 Apr 2009 22:58:05 +0200] rev 529
expand "repo" to "repository" in help texts [ original upstream message ]
Sun, 05 Apr 2009 12:15:32 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Apr 2009 12:15:32 +0200] rev 528
Merge with stable
Sat, 04 Apr 2009 23:17:53 +0200 keyword: word-wrap help texts at 70 characters stable
Martin Geisler <mg@daimi.au.dk> [Sat, 04 Apr 2009 23:17:53 +0200] rev 527
keyword: word-wrap help texts at 70 characters [ original upstream description ]
Wed, 18 Mar 2009 13:37:10 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 Mar 2009 13:37:10 +0100] rev 526
Merge with stable
Tue, 17 Mar 2009 13:43:11 -0500 bundlerepo: reintroduce dirstate stable
Matt Mackall <mpm@selenic.com> [Tue, 17 Mar 2009 13:43:11 -0500] rev 525
bundlerepo: reintroduce dirstate [ original upstream description ]
Thu, 05 Mar 2009 06:47:41 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 05 Mar 2009 06:47:41 +0100] rev 524
Merge with stable
Sat, 14 Feb 2009 22:40:39 +0100 add --git option to commands supporting --patch (log, incoming, history, tip) stable
Jim Correia <jim.correia@pobox.com> [Sat, 14 Feb 2009 22:40:39 +0100] rev 523
add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension. [ original upstream descrition]
Wed, 19 Nov 2008 13:27:57 +0100 patch: pass an opener to patchfile stable
Patrick Mezard <pmezard@gmail.com> [Wed, 19 Nov 2008 13:27:57 +0100] rev 522
patch: pass an opener to patchfile [ original upstream description ]
Wed, 04 Mar 2009 13:06:16 -0600 merge: better error messages to lead users to hg update --clean to abandon merges. stable
Augie Fackler <durin42@gmail.com> [Wed, 04 Mar 2009 13:06:16 -0600] rev 521
merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533. [ original upstream description ]
Sat, 03 Jan 2009 17:15:21 +0100 mq: lowercase output stable
Martin Geisler <mg@daimi.au.dk> [Sat, 03 Jan 2009 17:15:21 +0100] rev 520
mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot. [ original upstream description ]
Wed, 17 Dec 2008 15:22:45 +0100 (0.9.2compat) do not use builtin format 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 15:22:45 +0100] rev 519
(0.9.2compat) do not use builtin format
Wed, 17 Dec 2008 14:55:20 +0100 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Dec 2008 14:55:20 +0100] rev 518
(stable) merge with default
Tue, 16 Dec 2008 09:58:41 +0100 keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Dec 2008 09:58:41 +0100] rev 517
keyword: simplify repo.local and bundle check (as in 2f4a399a8787)
Fri, 05 Dec 2008 14:09:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Dec 2008 14:09:59 +0100] rev 516
Merge with stable
Sun, 28 Sep 2008 20:40:38 +0200 get-with-headers: fix stream modes under Windows stable
Patrick Mezard <pmezard@gmail.com> [Sun, 28 Sep 2008 20:40:38 +0200] rev 515
get-with-headers: fix stream modes under Windows [ original upstream descripton ]
Wed, 28 Nov 2007 08:38:42 -0800 hgweb: return meaningful HTTP status codes instead of nonsense stable
Bryan O'Sullivan <bos@serpentine.com> [Wed, 28 Nov 2007 08:38:42 -0800] rev 514
hgweb: return meaningful HTTP status codes instead of nonsense [ original upstream description ]
Thu, 29 Jun 2006 16:44:23 -0700 Add a test for getting raw files via the web UI. stable
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 16:44:23 -0700] rev 513
Add a test for getting raw files via the web UI. [ original upstream description ]
Sun, 19 Oct 2008 12:23:58 +0200 hgweb: nodeids should be aligned in raw changesets stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Oct 2008 12:23:58 +0200] rev 512
hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it. [ original upstream description ]
Sat, 12 Jul 2008 19:12:18 +0100 notify: mime-encode messages stable
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Jul 2008 19:12:18 +0100] rev 511
notify: mime-encode messages - addresses will be properly encoded - message bodies will also be encoded as we are not sending patches that are meant to be applied - update test output - adapt test-keyword to ignore the new headers [ original upstream description ]
Wed, 26 Nov 2008 09:35:38 +0100 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Nov 2008 09:35:38 +0100] rev 510
(stable) merge with default
Tue, 25 Nov 2008 18:13:05 +0100 Do not shadow builtin format (detected by pychecker)
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:05 +0100] rev 509
Do not shadow builtin format (detected by pychecker)
Tue, 25 Nov 2008 18:13:54 +0100 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Nov 2008 18:13:54 +0100] rev 508
(stable) merge with default
Fri, 14 Nov 2008 22:29:03 +0100 keyword: move common code out of commit condition
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 22:29:03 +0100] rev 507
keyword: move common code out of commit condition
Fri, 14 Nov 2008 23:01:00 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Nov 2008 23:01:00 +0100] rev 506
Merge with stable
Fri, 14 Nov 2008 19:10:09 +0100 keyword: be more efficient about ctx usage stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 19:10:09 +0100] rev 505
keyword: be more efficient about ctx usage [ original uptstream description ]
Fri, 14 Nov 2008 13:59:25 +0100 cmdutil: use change contexts for cset-printer and cset-templater stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 14 Nov 2008 13:59:25 +0100] rev 504
cmdutil: use change contexts for cset-printer and cset-templater [ original uptstream description ]
Mon, 03 Nov 2008 23:16:39 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Nov 2008 23:16:39 +0100] rev 503
Merge with stable
Mon, 03 Nov 2008 16:48:23 +0100 patch: turn patch.diff() into a generator stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 03 Nov 2008 16:48:23 +0100] rev 502
patch: turn patch.diff() into a generator This should even be a little faster than passing in an fp argument. [ original upstream description ]
Thu, 23 Oct 2008 10:25:24 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Oct 2008 10:25:24 +0200] rev 501
Merge with stable
Wed, 22 Oct 2008 17:34:52 -0500 extensions: use new wrapper functions stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Oct 2008 17:34:52 -0500] rev 500
extensions: use new wrapper functions [ original upstream description]
Sat, 18 Oct 2008 20:51:12 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 18 Oct 2008 20:51:12 +0200] rev 499
Merge with stable
Sat, 18 Oct 2008 16:56:39 +0200 help: better documentation intro for a few extensions stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 18 Oct 2008 16:56:39 +0200] rev 498
help: better documentation intro for a few extensions [ original upstream description ]
Sat, 18 Oct 2008 16:50:03 +0200 show enabled extensions in hg help stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 18 Oct 2008 16:50:03 +0200] rev 497
show enabled extensions in hg help [ original upstream description ]
Wed, 15 Oct 2008 15:52:34 +0200 untest
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:52:34 +0200] rev 496
untest
Wed, 15 Oct 2008 15:16:15 +0200 cross them fingahs
Peter Gervai <grin@grin.hu> [Wed, 15 Oct 2008 15:16:15 +0200] rev 495
cross them fingahs
Tue, 02 Sep 2008 08:48:48 -0400 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Sep 2008 08:48:48 -0400] rev 494
Merge with stable
Tue, 02 Sep 2008 01:19:12 +0200 fix test output broken by a04d8cadb6af stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Sep 2008 01:19:12 +0200] rev 493
fix test output broken by a04d8cadb6af
Sun, 24 Aug 2008 23:44:52 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 23:44:52 +0200] rev 492
Merge with stable
Fri, 22 Aug 2008 22:32:53 +0200 Have verbose and debug flag print the changeset rev and hash when committing. stable
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 22:32:53 +0200] rev 491
Have verbose and debug flag print the changeset rev and hash when committing. Besides updating the tests output, I had to push back at the end the test for issue1193 in test-commit, solved by cset 4386a7706828, because it was using the current date for commit and was randomizing the subsequent hash. [ original upstream description ]
Sun, 24 Aug 2008 22:13:39 +0200 Backed out changeset d557749c627a stable
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:13:39 +0200] rev 490
Backed out changeset d557749c627a Replace this change with a better one. [ original upstream description ]
Sun, 24 Aug 2008 20:13:45 +0200 (0.9.2compat) remove new verbose commit message for backwards compatibility 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:13:45 +0200] rev 489
(0.9.2compat) remove new verbose commit message for backwards compatibility
Sun, 24 Aug 2008 20:02:02 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:02:02 +0200] rev 488
(stable) merge with default
Fri, 22 Aug 2008 13:25:35 +0200 Have verbose flag print the changeset hash when committing stable
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 487
Have verbose flag print the changeset hash when committing [ original upstream message ]
Fri, 22 Aug 2008 11:53:30 +0200 (0.9.2compat) add merge, resolve to restricted 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 11:53:30 +0200] rev 486
(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.
Fri, 22 Aug 2008 08:26:18 +0200 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 485
Avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.
Thu, 21 Aug 2008 21:32:06 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 21:32:06 +0200] rev 484
(stable) merge with default
Thu, 21 Aug 2008 19:07:33 +0200 (0.9.2compat) fix test compatibility 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 19:07:33 +0200] rev 483
(0.9.2compat) fix test compatibility Comment out non-backwards compatible hgweb test (at default position). Make kwexpand nonexistent work on Windows (originally by pmezard).
Thu, 21 Aug 2008 10:20:44 +0200 Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 10:20:44 +0200] rev 482
Thorough hgweb testing - test hgweb while keyword extension is _enabled_ - check expansion with hgweb.file - besides log and diff, also check annotate for not expanding
Thu, 07 Aug 2008 11:20:34 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 11:20:34 +0200] rev 481
(stable) merge with default
Wed, 30 Jul 2008 20:05:14 +0200 (0.9.2compat) add verify to nokwcommands 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 20:05:14 +0200] rev 480
(0.9.2compat) add verify to nokwcommands
Wed, 30 Jul 2008 16:26:38 +0200 Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 16:26:38 +0200] rev 479
Add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.
Mon, 30 Jun 2008 12:42:48 +0200 (0.9.2compat) context, status refactor keeping backwards compatible fallback 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:42:48 +0200] rev 478
(0.9.2compat) context, status refactor keeping backwards compatible fallback
Mon, 30 Jun 2008 12:33:36 +0200 (0.9.2compat) ddb8a222249b is backwards compatible 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:33:36 +0200] rev 477
(0.9.2compat) ddb8a222249b is backwards compatible
Sat, 28 Jun 2008 15:49:54 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Jun 2008 15:49:54 +0200] rev 476
Merge with stable
Fri, 27 Jun 2008 18:28:45 -0500 util: add sort helper stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 18:28:45 -0500] rev 475
util: add sort helper [ original upstream description]
Fri, 27 Jun 2008 13:43:29 -0500 status: clean up all users for unknown files stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 13:43:29 -0500] rev 474
status: clean up all users for unknown files [ original upstream description]
Thu, 26 Jun 2008 14:35:50 -0500 repo.status: eliminate list_ stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 473
repo.status: eliminate list_ [ original upstream description]
Thu, 26 Jun 2008 14:35:50 -0500 add __len__ and __iter__ methods to repo and revlog stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 472
add __len__ and __iter__ methods to repo and revlog [ original upstream description]
Thu, 26 Jun 2008 14:35:50 -0500 manifest: remove execf/linkf methods stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 471
manifest: remove execf/linkf methods [ original upstream description]
Thu, 26 Jun 2008 14:35:46 -0500 use repo[changeid] to get a changectx stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:46 -0500] rev 470
use repo[changeid] to get a changectx [ original upstream description]
Thu, 26 Jun 2008 13:46:34 -0500 simplify flag handling stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 13:46:34 -0500] rev 469
simplify flag handling add _checklink var to dirstate introduce dirstate.flagfunc switch users of util.execfunc/linkfunc to flagfunc change manifestdict.set to take a flags string change ctx.fileflags to ctx.flags change gitmode func to a dict remove util.execfunc/linkfunc [ original upstream description]
Thu, 26 Jun 2008 13:46:29 -0500 use repo.changectx(None) to get a workingctx stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 13:46:29 -0500] rev 468
use repo.changectx(None) to get a workingctx [ original upstream description]
Wed, 25 Jun 2008 17:35:20 -0500 context: avoid using None for working parent stable
Matt Mackall <mpm@selenic.com> [Wed, 25 Jun 2008 17:35:20 -0500] rev 467
context: avoid using None for working parent [ original upstream description ]
Wed, 25 Jun 2008 17:34:28 -0500 use repo.changectx rather than context.changectx stable
Matt Mackall <mpm@selenic.com> [Wed, 25 Jun 2008 17:34:28 -0500] rev 466
use repo.changectx rather than context.changectx [ original upstream description ]
Thu, 12 Jun 2008 02:27:06 +0200 (stable) mimic cmdutil.bail_if_changed even more stable
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:27:06 +0200] rev 465
(stable) mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
Fri, 13 Jun 2008 17:41:26 +0200 (0.9.2compat) secure keyword arguments in backwards compatible wrappers 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 13 Jun 2008 17:41:26 +0200] rev 464
(0.9.2compat) secure keyword arguments in backwards compatible wrappers Explicitly assign _all_ keyword args when TypeErrors must be detected.
Thu, 12 Jun 2008 11:10:04 +0200 keyword: disable expansion for annotate stable
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:10:04 +0200] rev 463
keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.
Thu, 12 Jun 2008 16:32:16 +0200 (0.9.2compat) disable expansion for annotate 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 16:32:16 +0200] rev 462
(0.9.2compat) disable expansion for annotate
Thu, 12 Jun 2008 11:10:04 +0200 keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:10:04 +0200] rev 461
keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.
Thu, 12 Jun 2008 02:35:38 +0200 Merge after backout
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:35:38 +0200] rev 460
Merge after backout Revert to dispatch._parse for grabbing current command name.
Thu, 12 Jun 2008 02:33:41 +0200 Backed out changeset 10ebb9f44b99
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:33:41 +0200] rev 459
Backed out changeset 10ebb9f44b99 Tests with "hg annotate" reveal that dispatch._runcommand is unreliable for our purpose.
Fri, 06 Jun 2008 17:21:00 +0200 (0.9.2compat) get some changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Jun 2008 17:21:00 +0200] rev 458
(0.9.2compat) get some changes from default branch We stay with old-fashioned command _parsing because a _*runcommand method was introduced after 0.9.2
Fri, 06 Jun 2008 17:08:56 +0200 keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Jun 2008 17:08:56 +0200] rev 457
keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
Sun, 01 Jun 2008 13:35:12 +0200 keyword: use dirstate.parents to obtain current first parent
Christian Ebert <blacktrash@gmx.net> [Sun, 01 Jun 2008 13:35:12 +0200] rev 456
keyword: use dirstate.parents to obtain current first parent This should be quicker than changectx().node()
Sun, 01 Jun 2008 23:47:32 +0200 keyword: monkeypatch dispatch._runcommand instead of _parse
Christian Ebert <blacktrash@gmx.net> [Sun, 01 Jun 2008 23:47:32 +0200] rev 455
keyword: monkeypatch dispatch._runcommand instead of _parse We want the current command, and hooking into this method makes it more transparent what we are doing.
Wed, 14 May 2008 02:47:38 +0200 (stable) merge with default to fix import from crew stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:47:38 +0200] rev 454
(stable) merge with default to fix import from crew 1 hunk that removed "files" argument from patch.diff forgotten by me.
Wed, 14 May 2008 02:25:52 +0200 Incorporate latest changes in backwards compatible way 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:25:52 +0200] rev 453
Incorporate latest changes in backwards compatible way
Wed, 14 May 2008 02:24:40 +0200 Fix arguments for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:24:40 +0200] rev 452
Fix arguments for patch.diff monkey
Tue, 13 May 2008 08:33:23 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:33:23 +0200] rev 451
Merge with stable
Tue, 13 May 2008 08:32:01 +0200 (stable) ignore .DS_Store stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:32:01 +0200] rev 450
(stable) ignore .DS_Store
Mon, 12 May 2008 11:37:08 -0500 match: remove files arg from repo.status and friends stable
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 449
match: remove files arg from repo.status and friends [ original upstream message ]
Mon, 12 May 2008 11:37:08 -0500 match: remove files argument from patch.diff stable
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 448
match: remove files argument from patch.diff [ original message from upstream ]
Mon, 12 May 2008 11:37:07 -0500 walk: remove remaining users of cmdutils.matchpats stable
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 447
walk: remove remaining users of cmdutils.matchpats [ original message from upstream ]
Thu, 10 Apr 2008 01:48:29 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:48:29 +0200] rev 446
Merge with stable
Thu, 10 Apr 2008 01:46:06 +0200 (stable) patches from default in 4b2c266bf059 stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:46:06 +0200] rev 445
(stable) patches from default in 4b2c266bf059 Revert to util.binary, as checks entire data for \0 now.
Wed, 09 Apr 2008 13:40:16 +0200 (0.9.2compat) backwards compatible changes from default 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 13:40:16 +0200] rev 444
(0.9.2compat) backwards compatible changes from default uisetup was introduced after 0.9.3, so not used. Therefore different handling of monkeypatches.
Wed, 09 Apr 2008 09:13:17 +0200 Reduce opt=arg syntax even more
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 09:13:17 +0200] rev 443
Reduce opt=arg syntax even more
Wed, 09 Apr 2008 00:55:21 +0200 Check for '\0' in entire data before acting
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 00:55:21 +0200] rev 442
Check for '\0' in entire data before acting util.binary might not be safe enough, as it fails eg. on certain pdf files (issue1066). In some cases this might even be a speed gain as there will be no vain re.sub(n)/search on huge data.
Mon, 07 Apr 2008 18:46:48 +0200 Make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 441
Make overwrite() arguments mandatory
Mon, 07 Apr 2008 18:46:48 +0200 Compact argument passing to wrapped methods
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 440
Compact argument passing to wrapped methods
Mon, 07 Apr 2008 18:46:48 +0200 Privatize remaining monkeypatches by moving them into reposetup
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 439
Privatize remaining monkeypatches by moving them into reposetup Make it more transparent if and when monkeypatches are needed.
Mon, 07 Apr 2008 14:05:20 +0200 Collect filename patterns, wrap dispatch._parse in uisetup
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 14:05:20 +0200] rev 438
Collect filename patterns, wrap dispatch._parse in uisetup Store [keyword] config in kwtools. hgcmd defaults to empty string.
Mon, 31 Mar 2008 13:41:04 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 13:41:04 +0200] rev 437
Merge with stable
Mon, 31 Mar 2008 11:03:23 +0200 Adapt to new webcommands with "clean" monkey patches
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 11:03:23 +0200] rev 436
Adapt to new webcommands with "clean" monkey patches
Mon, 31 Mar 2008 10:50:10 +0200 (0.9.2compat) fix and simplify webcommands monkey 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 10:50:10 +0200] rev 435
(0.9.2compat) fix and simplify webcommands monkey
Sun, 30 Mar 2008 18:25:25 +0200 (0.9.2compat) add test for web changeset 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 18:25:25 +0200] rev 434
(0.9.2compat) add test for web changeset web filediff has no backwards compatible url, so omit. Also remove clone updating status from new hg versions.
Sun, 30 Mar 2008 17:13:02 +0200 (0.9.2compat) fix webcommand monkey patches, and adapt to most recent changes 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 17:13:02 +0200] rev 433
(0.9.2compat) fix webcommand monkey patches, and adapt to most recent changes
Sun, 30 Mar 2008 17:04:37 +0200 (0.9.2compat) no conditional for web file match disabling 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 17:04:37 +0200] rev 432
(0.9.2compat) no conditional for web file match disabling
Fri, 28 Mar 2008 19:40:44 +0100 hgweb: refactor hgweb code stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 19:40:44 +0100] rev 431
hgweb: refactor hgweb code [ original upstream description ]
Sun, 23 Mar 2008 13:34:56 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Mar 2008 13:34:56 +0100] rev 430
Merge with stable
Sat, 22 Mar 2008 18:33:10 +0100 tests: add tests for hgweb to test-keyword stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 18:33:10 +0100] rev 429
tests: add tests for hgweb to test-keyword [ original upstream description ]
Fri, 21 Mar 2008 15:38:02 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Mar 2008 15:38:02 +0100] rev 428
Merge with stable
Fri, 21 Mar 2008 14:52:24 +0100 clone: print "updating working directory" status message stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 21 Mar 2008 14:52:24 +0100] rev 427
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved [ original upstream description ]
Thu, 20 Mar 2008 14:14:15 -0500 tests: remove some unnecessary sleeps stable
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 14:14:15 -0500] rev 426
tests: remove some unnecessary sleeps [ original upstream description ]
Tue, 11 Mar 2008 23:55:38 +0100 Ignore .DS_Store
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:55:38 +0100] rev 425
Ignore .DS_Store
Tue, 11 Mar 2008 23:54:10 +0100 (0.9.2compat) ignore .DS_Store 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:54:10 +0100] rev 424
(0.9.2compat) ignore .DS_Store
Fri, 07 Mar 2008 02:21:34 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:21:34 +0100] rev 423
Merge with stable
Fri, 07 Mar 2008 02:17:21 +0100 (0.9.2compat) expand * import 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:17:21 +0100] rev 422
(0.9.2compat) expand * import
Thu, 06 Mar 2008 22:23:26 +0100 Expand import * to allow Pyflakes to find problems stable
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:26 +0100] rev 421
Expand import * to allow Pyflakes to find problems [ original upstream description ]
Fri, 22 Feb 2008 14:23:48 +0100 (0.9.2compat) get fix from stable branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Feb 2008 14:23:48 +0100] rev 420
(0.9.2compat) get fix from stable branch
Thu, 21 Feb 2008 16:22:31 -0300 keyword: remove "identify" and "remove" from nokwcommands stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 419
keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list. [ original upstream description ]
Fri, 15 Feb 2008 20:18:56 +0100 Merge stable with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:18:56 +0100] rev 418
Merge stable with default
Fri, 15 Feb 2008 20:17:33 +0100 (0.9.2compat) incorporate changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:17:33 +0100] rev 417
(0.9.2compat) incorporate changes from default branch
Fri, 15 Feb 2008 17:57:45 +0100 Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:57:45 +0100] rev 416
Rename kwx to kwtools
Fri, 15 Feb 2008 17:54:58 +0100 Fix getnode doc, add doc for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:54:58 +0100] rev 415
Fix getnode doc, add doc for patch.diff monkey
Thu, 14 Feb 2008 18:55:49 +0100 (0.9.2compat) FIX typo in hgweb monkeys 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:55:49 +0100] rev 414
(0.9.2compat) FIX typo in hgweb monkeys
Thu, 14 Feb 2008 18:50:00 +0100 Remove whitespace at eol
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:50:00 +0100] rev 413
Remove whitespace at eol
Thu, 14 Feb 2008 18:49:21 +0100 (0.9.2compat) remove whitespace at eol 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:49:21 +0100] rev 412
(0.9.2compat) remove whitespace at eol
Thu, 14 Feb 2008 15:55:21 +0100 (0.9.2compat) get changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 15:55:21 +0100] rev 411
(0.9.2compat) get changes from default branch Note: test not yet updated, as <0.9.4 complains about symlink patch, works "in principle" though.
Thu, 14 Feb 2008 16:11:54 +0100 Do not inspect node1 for diff if node2 is given
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 16:11:54 +0100] rev 410
Do not inspect node1 for diff if node2 is given
Thu, 14 Feb 2008 13:30:17 +0100 Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:30:17 +0100] rev 409
Add test for patch.diff monkey
Thu, 14 Feb 2008 13:26:51 +0100 Make main class and hg command accessible
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:26:51 +0100] rev 408
Make main class and hg command accessible Switch from global vars to top level dictionary. Goal: make it easier for external tools (like tortoisehg) to hook into keyword extension.
Thu, 14 Feb 2008 13:20:16 +0100 Move expand/shrink decisions into kwtemplater
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:20:16 +0100] rev 407
Move expand/shrink decisions into kwtemplater - do not clobber wrapper code - get rid of clumsy kwtemplater attributes
Thu, 14 Feb 2008 01:38:28 +0100 Remove obsolete variable declaration
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:38:28 +0100] rev 406
Remove obsolete variable declaration
Thu, 14 Feb 2008 01:22:22 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:22:22 +0100] rev 405
Merge with stable
Wed, 13 Feb 2008 23:49:57 +0100 Monkeypatch patch.diff for non-interactive diffs stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Feb 2008 23:49:57 +0100] rev 404
Monkeypatch patch.diff for non-interactive diffs Avoid clobbering diffs with expanded keywords eg. for notify extension.
Tue, 12 Feb 2008 23:09:53 +0100 (stable) merge with default branch stable
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 23:09:53 +0100] rev 403
(stable) merge with default branch
Tue, 12 Feb 2008 21:38:30 +0100 (0.9.2compat) add glog to nokwcommands 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:38:30 +0100] rev 402
(0.9.2compat) add glog to nokwcommands
Tue, 12 Feb 2008 21:37:13 +0100 Add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:37:13 +0100] rev 401
Add glog to nokwcommands
Sun, 10 Feb 2008 17:09:22 +0100 (0.9.2compat) use different names for web methods 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 17:09:22 +0100] rev 400
(0.9.2compat) use different names for web methods Makes it clearer that these are not redefinitions of the same methods.
Sun, 10 Feb 2008 14:57:48 +0100 (0.9.2compat) web as in default where possible 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 14:57:48 +0100] rev 399
(0.9.2compat) web as in default where possible
Sun, 10 Feb 2008 08:35:55 +0100 Switch off expansion for web diffs
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 08:35:55 +0100] rev 398
Switch off expansion for web diffs
Sun, 10 Feb 2008 01:28:16 +0100 (0.9.2compat) incorporate changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 01:28:16 +0100] rev 397
(0.9.2compat) incorporate changes from default branch _iskwfile used by 2 functions again.
Sun, 10 Feb 2008 00:32:14 +0100 Make restrict entirely a kwtemplater attribute
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:32:14 +0100] rev 396
Make restrict entirely a kwtemplater attribute
Sun, 10 Feb 2008 00:15:03 +0100 keyword: declare globals in a more compact way
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:15:03 +0100] rev 395
keyword: declare globals in a more compact way
Sun, 10 Feb 2008 00:13:57 +0100 keyword: avoid os import by using util.splitpath
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:13:57 +0100] rev 394
keyword: avoid os import by using util.splitpath
Sat, 09 Feb 2008 22:17:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:17:31 +0100] rev 393
Merge with stable
Sat, 09 Feb 2008 20:17:09 +0100 test-keyword: make it run under Windows stable
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:09 +0100] rev 392
test-keyword: make it run under Windows - don't cat symlink, content differs - rewrite OS specific messages - generate symlink with a bundle [ original upstream message ]
Sat, 09 Feb 2008 20:17:06 +0100 keyword: fix symlink detection under Windows stable
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:06 +0100] rev 391
keyword: fix symlink detection under Windows [ original upstream description ]
Sat, 09 Feb 2008 19:40:30 +0100 keyword: fix mq repository detection under Windows stable
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 19:40:30 +0100] rev 390
keyword: fix mq repository detection under Windows [ original upstream description ]
Sat, 09 Feb 2008 09:42:00 +0100 (stable) merge with default branch stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:42:00 +0100] rev 389
(stable) merge with default branch
Sat, 09 Feb 2008 09:31:13 +0100 (0.9.2compat) make patchfile monkey work with 0.9.5 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:31:13 +0100] rev 388
(0.9.2compat) make patchfile monkey work with 0.9.5
Fri, 08 Feb 2008 10:14:47 +0100 (0.9.2compat) incorporate changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Feb 2008 10:14:47 +0100] rev 387
(0.9.2compat) incorporate changes from default branch Testing reveals no name conflict with RuleDispatch's dispatch module. At least not with 0.9.* release versions.
Thu, 07 Feb 2008 15:13:37 +0100 Ignore everything starting with .hg
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 15:13:37 +0100] rev 386
Ignore everything starting with .hg Tough luck for those who want keywords in .hgignore ;)
Thu, 07 Feb 2008 10:32:05 +0100 Monkeypatch dispatch._parse to avoid running it twice
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 10:32:05 +0100] rev 385
Monkeypatch dispatch._parse to avoid running it twice Inspired by Thomas Arendsen Hain.
Thu, 07 Feb 2008 01:49:17 +0100 Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 01:49:17 +0100] rev 384
Do not set up kwrepo when pulling from bundlerepo Spotted and test case provided by pmezard.
Wed, 06 Feb 2008 23:32:21 +0100 Fix pychecker warning about shadowed variable
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 23:32:21 +0100] rev 383
Fix pychecker warning about shadowed variable Also no underscore prefix for restrict inside reposetup.
Wed, 06 Feb 2008 22:26:50 +0100 Safeguard anything under .hg, and the .hg_archival.txt file
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 22:26:50 +0100] rev 382
Safeguard anything under .hg, and the .hg_archival.txt file
Wed, 06 Feb 2008 18:46:49 +0100 Prevent expansion in queue repo and for email
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:46:49 +0100] rev 381
Prevent expansion in queue repo and for email Saveguard needed for global [keyword] filename patterns.
Wed, 06 Feb 2008 18:38:14 +0100 (0.9.2compat) discard wread/wwrite approach 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:38:14 +0100] rev 380
(0.9.2compat) discard wread/wwrite approach
Wed, 06 Feb 2008 18:35:16 +0100 (0.9.2compat) get changes from stable branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:35:16 +0100] rev 379
(0.9.2compat) get changes from stable branch
Wed, 06 Feb 2008 17:25:37 +0100 Discard wread/wwrite approach, merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 17:25:37 +0100] rev 378
Discard wread/wwrite approach, merge with stable A basic "hg update" did not give correct results.
Wed, 06 Feb 2008 11:32:34 +0100 Fix filewise expansion for hgweb
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 11:32:34 +0100] rev 377
Fix filewise expansion for hgweb Also make changectx argument to kwtemplater.expand.
Wed, 06 Feb 2008 00:24:49 +0100 Test unbundle null revision containing empty symlink
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 00:24:49 +0100] rev 376
Test unbundle null revision containing empty symlink Spotted by pmezard.
Tue, 05 Feb 2008 16:09:21 -0600 keyword: fix my string pasting thinko stable
Matt Mackall <mpm@selenic.com> [Tue, 05 Feb 2008 16:09:21 -0600] rev 375
keyword: fix my string pasting thinko Spotted by Maxim Dounin [ original upstream description ]
Tue, 05 Feb 2008 18:40:32 +0100 Make nokwcommands, restricted string variables at top level stable
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:40:32 +0100] rev 374
Make nokwcommands, restricted string variables at top level - prettier syntax conforming eg. to commands.norepo - possibly easier to hook from outside
(0) -1000 -896 tip