Wed, 22 Sep 2010 18:29:41 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:29:41 -0500] rev 12380
merge with stable
Wed, 22 Sep 2010 17:13:49 -0500 tests: fix unzip -l variability stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 17:13:49 -0500] rev 12379
tests: fix unzip -l variability
Wed, 22 Sep 2010 23:51:10 +0200 mq: always require --force when pushing patches (issue2363) stable
Patrick Mezard <pmezard@gmail.com> [Wed, 22 Sep 2010 23:51:10 +0200] rev 12378
mq: always require --force when pushing patches (issue2363) --force was not necessary when passing --rev since 55578a8d7e84, but this behaviour is usually harmful when branch names are passed instead of explicit revisions.
Wed, 22 Sep 2010 18:20:47 -0500 tests: various fixes for new unified test pattern format
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:20:47 -0500] rev 12377
tests: various fixes for new unified test pattern format
Wed, 22 Sep 2010 16:06:02 -0500 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:02 -0500] rev 12376
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.
Wed, 22 Sep 2010 16:06:00 -0500 tests: require regexes in unified tests to be marked with " (re)"
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:00 -0500] rev 12375
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)
Wed, 22 Sep 2010 16:05:59 -0500 tests: ensure regexes match to the end of the string
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 12374
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$".
Wed, 22 Sep 2010 16:05:59 -0500 tests: don't match blank output lines as regexes in unified tests
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 12373
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.
Wed, 22 Sep 2010 16:05:58 -0500 tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:58 -0500] rev 12372
tests: improve regexes in unified tests
Wed, 22 Sep 2010 00:14:57 +0200 templater: add hex filter.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Wed, 22 Sep 2010 00:14:57 +0200] rev 12371
templater: add hex filter.
Tue, 21 Sep 2010 18:40:33 +0200 tests: unify test-convert-svn-*
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 21 Sep 2010 18:40:33 +0200] rev 12370
tests: unify test-convert-svn-*
Mon, 06 Sep 2010 17:35:49 +0200 merge: delay writing the mergestate during until commit is called
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Sep 2010 17:35:49 +0200] rev 12369
merge: delay writing the mergestate during until commit is called This speeds up merges of lots of files considerably.
Wed, 22 Sep 2010 15:33:08 -0500 tests: fix touch -t with RHEL
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 15:33:08 -0500] rev 12368
tests: fix touch -t with RHEL
Tue, 21 Sep 2010 18:36:23 +0200 tests: compatibility fix.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 21 Sep 2010 18:36:23 +0200] rev 12367
tests: compatibility fix. 'touch -d *' doesn't work on Mac OS X. In order to prevent this from occuring again, a check for the case is added to 'check-code.py'.
Tue, 21 Sep 2010 16:44:13 -0500 tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com> [Tue, 21 Sep 2010 16:44:13 -0500] rev 12366
tests: drop a bunch of sed calls from unified tests
Tue, 21 Sep 2010 16:00:02 -0500 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com> [Tue, 21 Sep 2010 16:00:02 -0500] rev 12365
tests: cleanup exit code handling in unified tests
Tue, 21 Sep 2010 12:41:24 -0500 check-code: add some basic support for unified tests
Matt Mackall <mpm@selenic.com> [Tue, 21 Sep 2010 12:41:24 -0500] rev 12364
check-code: add some basic support for unified tests
Tue, 21 Sep 2010 23:58:32 +0200 test-subrepo-recursion: sort archive output for portability
Patrick Mezard <pmezard@gmail.com> [Tue, 21 Sep 2010 23:58:32 +0200] rev 12363
test-subrepo-recursion: sort archive output for portability
Tue, 21 Sep 2010 23:38:26 +0200 Merge with crew
Patrick Mezard <pmezard@gmail.com> [Tue, 21 Sep 2010 23:38:26 +0200] rev 12362
Merge with crew
Tue, 21 Sep 2010 23:37:47 +0200 Merge with stable
Patrick Mezard <pmezard@gmail.com> [Tue, 21 Sep 2010 23:37:47 +0200] rev 12361
Merge with stable
Tue, 21 Sep 2010 23:14:58 +0200 context: fix filectx.undelete() (issue2388) stable
Patrick Mezard <pmezard@gmail.com> [Tue, 21 Sep 2010 23:14:58 +0200] rev 12360
context: fix filectx.undelete() (issue2388)
Mon, 20 Sep 2010 17:01:12 -0500 tests: fix hgweb template change stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 17:01:12 -0500] rev 12359
tests: fix hgweb template change
Mon, 20 Sep 2010 23:42:23 +0200 Merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 23:42:23 +0200] rev 12358
Merge with crew
Mon, 20 Sep 2010 22:41:10 +0200 Restore lexists() changes lost in e0ee3e822a9a merge
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 22:41:10 +0200] rev 12357
Restore lexists() changes lost in e0ee3e822a9a merge
Mon, 20 Sep 2010 17:01:12 -0500 tests: fix hgweb template change
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 17:01:12 -0500] rev 12356
tests: fix hgweb template change
Mon, 20 Sep 2010 16:56:57 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:56:57 -0500] rev 12355
merge with stable
Mon, 20 Sep 2010 16:56:44 -0500 merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:56:44 -0500] rev 12354
merge with crew
Sun, 19 Sep 2010 21:20:38 -0500 hgweb: be consistent with the background highlighting on closed branches (Issue2386) stable
Ryan Phillips <ryan@trolocsis.com> [Sun, 19 Sep 2010 21:20:38 -0500] rev 12353
hgweb: be consistent with the background highlighting on closed branches (Issue2386) The coal and paper web themes will highlight closed branches as a visual cue to the user. This patch makes the other two themes constistent. For users with difficulty differentiating colors, it would be better to split out closed branches to a new table or optionally hide them.
Mon, 20 Sep 2010 13:31:02 +0200 mq: fix the deprecation comment for qsave & qrestore. stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 20 Sep 2010 13:31:02 +0200] rev 12352
mq: fix the deprecation comment for qsave & qrestore. Changeset bcf90e712dc3 deprecated qsave and qrestore. In the deprecating comment, users were referred to 'rebase --mq' which -- at the time the message was written -- didn't exist. Currently, on the default branch, rebase *does* take a '--mq' option, but it probably doesn't do what Dirkjan expected it to do when he wrote the message. In the original, deprecating commit, little context was provided as to why this change was made. Based on my recollection, concensus at the Paris Sprint in February 2010 was that one of the problems with MQ was that it exposed far too many commands. Notable among these were qsave & qrestore: very few core developers understood what they did and even fewer (none, IIRC) actually used them. However, they couldn't be removed; not only do the usual backwards compatibility reasons apply, but the hg book refers to them.
Mon, 20 Sep 2010 16:40:36 -0500 revsets: reduce cost of outgoing in the optimizer
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:40:36 -0500] rev 12351
revsets: reduce cost of outgoing in the optimizer
Thu, 02 Sep 2010 15:00:45 +0200 test-convert-hg-startrev: enable convert.hg.saverev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 02 Sep 2010 15:00:45 +0200] rev 12350
test-convert-hg-startrev: enable convert.hg.saverev.
Sat, 18 Sep 2010 08:30:11 +0200 transplant: fix var name conflict introduced by 2912881c2a98
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Sat, 18 Sep 2010 08:30:11 +0200] rev 12349
transplant: fix var name conflict introduced by 2912881c2a98
Mon, 20 Sep 2010 16:25:29 -0500 bundle: fix shrink-revlog bundle usage
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:25:29 -0500] rev 12348
bundle: fix shrink-revlog bundle usage
Mon, 20 Sep 2010 16:14:05 -0500 bundlerepo: restore close() method
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:14:05 -0500] rev 12347
bundlerepo: restore close() method
Mon, 20 Sep 2010 16:00:15 -0500 tests: drop final true command from unified tests
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 16:00:15 -0500] rev 12346
tests: drop final true command from unified tests
Mon, 20 Sep 2010 22:29:13 +0200 Merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 22:29:13 +0200] rev 12345
Merge with stable
Mon, 20 Sep 2010 21:46:56 +0200 Use lexists() instead of exists() where appropriate stable
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 21:46:56 +0200] rev 12344
Use lexists() instead of exists() where appropriate
Mon, 20 Sep 2010 21:46:39 +0200 convert/svn: fix broken symlink renames in svn sink stable
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 21:46:39 +0200] rev 12343
convert/svn: fix broken symlink renames in svn sink
Mon, 20 Sep 2010 21:46:39 +0200 rename: do not overwrite existing broken symlinks stable
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 21:46:39 +0200] rev 12342
rename: do not overwrite existing broken symlinks
Mon, 20 Sep 2010 21:42:11 +0200 patch: do not overwrite broken untracked symlinks stable
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 21:42:11 +0200] rev 12341
patch: do not overwrite broken untracked symlinks
Mon, 20 Sep 2010 21:42:11 +0200 patch: fix target when patching broken symlinks (issue2368) stable
Patrick Mezard <pmezard@gmail.com> [Mon, 20 Sep 2010 21:42:11 +0200] rev 12340
patch: fix target when patching broken symlinks (issue2368)
Mon, 20 Sep 2010 15:50:36 -0500 tests: fixup tests using unzip -l
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 15:50:36 -0500] rev 12339
tests: fixup tests using unzip -l
Mon, 20 Sep 2010 14:36:36 -0500 tests: add hack to avoid problem with graphlog in unified tests
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 14:36:36 -0500] rev 12338
tests: add hack to avoid problem with graphlog in unified tests
Mon, 20 Sep 2010 14:32:21 -0500 bundle: encapsulate all bundle streams in unbundle class
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 14:32:21 -0500] rev 12337
bundle: encapsulate all bundle streams in unbundle class
Sun, 19 Sep 2010 13:12:45 -0500 bundle: move chunk parsing into unbundle class
Matt Mackall <mpm@selenic.com> [Sun, 19 Sep 2010 13:12:45 -0500] rev 12336
bundle: move chunk parsing into unbundle class
Sun, 19 Sep 2010 12:51:54 -0500 bundle: get rid of chunkiter
Matt Mackall <mpm@selenic.com> [Sun, 19 Sep 2010 12:51:54 -0500] rev 12335
bundle: get rid of chunkiter
Sun, 19 Sep 2010 12:38:44 -0500 bundle: refactor progress callback
Matt Mackall <mpm@selenic.com> [Sun, 19 Sep 2010 12:38:44 -0500] rev 12334
bundle: refactor progress callback This lets us eliminate the chunk iterator so we can have the bundle class parse headers.
Sat, 18 Sep 2010 18:20:34 -0500 bundle: make getchunk() a method
Matt Mackall <mpm@selenic.com> [Sat, 18 Sep 2010 18:20:34 -0500] rev 12333
bundle: make getchunk() a method
Fri, 17 Sep 2010 19:24:29 -0500 bundlerepo: use bundle objects everywhere
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:24:29 -0500] rev 12332
bundlerepo: use bundle objects everywhere
Fri, 17 Sep 2010 19:03:13 -0500 bundlerepo: drop unused close() method
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:03:13 -0500] rev 12331
bundlerepo: drop unused close() method
Fri, 17 Sep 2010 19:02:32 -0500 bundle: make unbundle object seekable
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:02:32 -0500] rev 12330
bundle: make unbundle object seekable This is only for uncompressed bundles used by bundlerepo.
Fri, 17 Sep 2010 19:02:26 -0500 bundle: push chunkbuffer down into decompress
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 19:02:26 -0500] rev 12329
bundle: push chunkbuffer down into decompress We replace the fixup iterator with a file-like object so that uncompressed file streams can be passed end to end through the stack.
Fri, 17 Sep 2010 17:03:08 -0500 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 17:03:08 -0500] rev 12328
tests: fix a bunch of pointless #s in unified tests
Fri, 17 Sep 2010 17:03:04 -0500 tests: exit 0 no longer needed on unified tests
Matt Mackall <mpm@selenic.com> [Fri, 17 Sep 2010 17:03:04 -0500] rev 12327
tests: exit 0 no longer needed on unified tests
Mon, 20 Sep 2010 15:33:12 -0500 tests: update debugcomplete output
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 15:33:12 -0500] rev 12326
tests: update debugcomplete output
Mon, 20 Sep 2010 15:31:48 -0500 merge with abuehl
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 15:31:48 -0500] rev 12325
merge with abuehl
Sun, 19 Sep 2010 23:42:18 +0200 tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com> [Sun, 19 Sep 2010 23:42:18 +0200] rev 12324
tests: unify some of test-mq*
Mon, 20 Sep 2010 15:46:17 +0200 subrepo: add support for 'hg archive'
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:46:17 +0200] rev 12323
subrepo: add support for 'hg archive'
Mon, 20 Sep 2010 15:44:30 +0200 subrepo: introduce files and filedata methods for subrepo classes
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:44:30 +0200] rev 12322
subrepo: introduce files and filedata methods for subrepo classes
Mon, 20 Sep 2010 15:42:58 +0200 merge with stable
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:42:58 +0200] rev 12321
merge with stable
Fri, 17 Sep 2010 10:21:02 -0500 revset: handle re.compile() errors in grep() stable
Brodie Rao <brodie@bitheap.org> [Fri, 17 Sep 2010 10:21:02 -0500] rev 12320
revset: handle re.compile() errors in grep() Raise error.ParseError instead of allowing re.error to bubble up.
Mon, 20 Sep 2010 15:33:39 +0200 archive: set date to 1980 for very old zip files stable
Martin Geisler <mg@aragost.com> [Mon, 20 Sep 2010 15:33:39 +0200] rev 12319
archive: set date to 1980 for very old zip files The zip file format stores the date using "MS-DOS format" which apparently means that they use 1980 as their epoch. Python's zipfile module emits deprecation warnings of this form /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct integer overflow masking is deprecated self.fp.write(zinfo.FileHeader()) /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.fp.write(zinfo.FileHeader()) /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: struct integer overflow masking is deprecated self.z.close() /home/mg/src/mercurial-crew/mercurial/archival.py:169: DeprecationWarning: 'H' format requires 0 <= number <= 65535 self.z.close() when it is given such old timestamps. This fixes this by silently clamping the date to 1980.
Fri, 17 Sep 2010 12:45:13 -0500 Merge with stable
Steve Borho <steve@borho.org> [Fri, 17 Sep 2010 12:45:13 -0500] rev 12318
Merge with stable
Fri, 17 Sep 2010 12:44:35 -0500 test-eol-update: record new results as correct stable
Steve Borho <steve@borho.org> [Fri, 17 Sep 2010 12:44:35 -0500] rev 12317
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
(0) -10000 -3000 -1000 -300 -100 -64 +64 +100 +300 +1000 +3000 +10000 +30000 tip