Mon, 31 Oct 2011 20:58:49 +0900 i18n-ja: synchronized with b357a972d6cd stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Oct 2011 20:58:49 +0900] rev 15394
i18n-ja: synchronized with b357a972d6cd
Mon, 31 Oct 2011 21:06:18 +0900 minirst: use unicode string as intermediate form for replacement stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Oct 2011 21:06:18 +0900] rev 15393
minirst: use unicode string as intermediate form for replacement # this change redones part of 521c8e0c93bf, backed out by 0ad0ebe67815 Some character encodings use ASCII characters other than control/alphabet/digit as a part of multi-bytes characters, so direct replacing with such characters on strings in local encoding causes invalid byte sequences. [mpm: test changed to simple doctest]
Mon, 31 Oct 2011 15:41:39 -0500 util: add a doctest for empty sha() calls stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 15:41:39 -0500] rev 15392
util: add a doctest for empty sha() calls
Thu, 20 Oct 2011 17:24:59 -0400 largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp stable
Hao Lian <hao@fogcreek.com> [Thu, 20 Oct 2011 17:24:59 -0400] rev 15391
largefiles: replace tempfile.NamedTemporaryFile with tempfile.mkstemp This is consistent with the rest of Mercurial's code, mirroring the try-finally-unlink structure elsewhere. Furthermore, it fixes the case where largefiles throws an IOError on Windows when the temporary file is opened a second time by copytocacheabsolute. This patch creates the temporary file in the repo's largefiles store rather than /tmp, which might be a different filesystem.
Mon, 31 Oct 2011 14:22:11 -0500 util: allow sha1() with no args stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 14:22:11 -0500] rev 15390
util: allow sha1() with no args Normally this works because we replace util.sha1 with hashlib.sha1 after first use, but if the first user doesn't provide an arg, it breaks.
Mon, 31 Oct 2011 14:22:11 -0500 tests: use md5sum.py instead of sha1sum, add check stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Oct 2011 14:22:11 -0500] rev 15389
tests: use md5sum.py instead of sha1sum, add check
Mon, 31 Oct 2011 00:42:32 +0900 setup: set whole env for running hg even if .hg doesn't exist (issue3073) stable
Yuya Nishihara <yuya@tcha.org> [Mon, 31 Oct 2011 00:42:32 +0900] rev 15388
setup: set whole env for running hg even if .hg doesn't exist (issue3073) The issue was partially fixed by b357a972d6cd, but there were missing variables to run build_hgextindex.
Sun, 30 Oct 2011 12:10:11 -0500 keyword: backout realpath change (issue3071) stable
Matt Mackall <mpm@selenic.com> [Sun, 30 Oct 2011 12:10:11 -0500] rev 15387
keyword: backout realpath change (issue3071)
Sun, 30 Oct 2011 12:10:09 -0500 strip: backout 73307643a09f (issue3077) stable
Matt Mackall <mpm@selenic.com> [Sun, 30 Oct 2011 12:10:09 -0500] rev 15386
strip: backout 73307643a09f (issue3077)
Sat, 29 Oct 2011 17:38:13 -0500 largefiles: avoid checking requirements on every command stable
Matt Mackall <mpm@selenic.com> [Sat, 29 Oct 2011 17:38:13 -0500] rev 15385
largefiles: avoid checking requirements on every command When largefiles is enabled, commands on large repositories which don't require largefiles could be slowed down substantially. Disable checking this for every command.
Fri, 28 Oct 2011 18:50:54 +0200 largefiles: shorten test suite by using log --template stable
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:50:54 +0200] rev 15384
largefiles: shorten test suite by using log --template
Fri, 28 Oct 2011 18:48:24 +0200 largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on stable
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:48:24 +0200] rev 15383
largefiles: fix bad bug where transplanting a changeset with a largefile will result in an old largefile being comitted later on
Fri, 28 Oct 2011 18:17:44 +0200 largefiles: test that a largefile cannot accidentally be re-added as a regular file stable
Na'Tosha Bard <natosha@unity3d.com> [Fri, 28 Oct 2011 18:17:44 +0200] rev 15382
largefiles: test that a largefile cannot accidentally be re-added as a regular file
Sat, 29 Oct 2011 11:02:23 -0500 backout dbdb777502dc (issue3077) (issue3071) stable
Matt Mackall <mpm@selenic.com> [Sat, 29 Oct 2011 11:02:23 -0500] rev 15381
backout dbdb777502dc (issue3077) (issue3071) Using util.realpath turns out to create complex issues on both Mac and Windows. Back this change out for the release.
Fri, 28 Oct 2011 15:00:21 +0200 largefiles: fix uppercase in abort message stable
Martin Geisler <mg@aragost.com> [Fri, 28 Oct 2011 15:00:21 +0200] rev 15380
largefiles: fix uppercase in abort message
Fri, 28 Oct 2011 12:59:50 +0200 Makefile: adjust example, test-merge1 is now test-merge1.t stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Oct 2011 12:59:50 +0200] rev 15379
Makefile: adjust example, test-merge1 is now test-merge1.t
Fri, 28 Oct 2011 12:44:19 +0200 tests: use $DAEMON_PIDS and killdaemons in largefiles test stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Oct 2011 12:44:19 +0200] rev 15378
tests: use $DAEMON_PIDS and killdaemons in largefiles test $DAEMON_PIDS is used by tests to make sure there will be no leftover processes, the cycling through ports is needed because they are not available for a new bind that quickly on some systems. There are not enough $HGPORT variables available for each hg serve, so use the killdaemons script before reusing ports.
Fri, 28 Oct 2011 11:16:39 +0200 tests: make largefiles test use $HGPORT instead of 8001 stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Oct 2011 11:16:39 +0200] rev 15377
tests: make largefiles test use $HGPORT instead of 8001
Thu, 27 Oct 2011 18:35:07 -0500 merge in another fix on the wrong branch stable
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2011 18:35:07 -0500] rev 15376
merge in another fix on the wrong branch
Thu, 27 Oct 2011 11:57:08 -0700 hgweb: fix dynamic date calculation not working under Safari stable
Brodie Rao <brodie@bitheap.org> [Thu, 27 Oct 2011 11:57:08 -0700] rev 15375
hgweb: fix dynamic date calculation not working under Safari While Chrome, Firefox, and IE 6+ support the current date format being passed to Date(), Safari doesn't: > new Date('Mon Oct 24 13:58:01 2011 +0200') Invalid Date However, the rfc822date format--officially supported by ECMAScript[1]--does work: > new Date('Mon, 24 Oct 2011 13:58:01 +0200') Mon Oct 24 2011 04:58:01 GMT-0700 (PDT) This change replaces all instances of {date|date} in HTML with {date|rfc822date}. For elements that only have the "age" class, there's no outward change for users with JavaScript enabled. For elements with both the "age" and "date" classes, the full date displayed uses the new format. Tested in IE 6, Safari 5.1.1, Google Chrome 15, and Firefox 7.0.1. [1]: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/parse
Thu, 27 Oct 2011 18:15:34 -0500 tests: fix spurious largefiles test failure on Cygwin stable
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2011 18:15:34 -0500] rev 15374
tests: fix spurious largefiles test failure on Cygwin
Wed, 26 Oct 2011 18:47:12 +0200 revert: fix missing removes when parent was changed in dirstate stable
Peer Stritzinger <peer@stritzinger.com> [Wed, 26 Oct 2011 18:47:12 +0200] rev 15373
revert: fix missing removes when parent was changed in dirstate When dirstate parent is changed with dirstate.setparent before a revert so it no longer points to where the dirstate refered to, revert does not remove all files it should: Revert to a different revision needs also to remove files that are not found through disptables and not in the context or parent manifest.
Thu, 27 Oct 2011 17:22:04 -0500 check-code: fix issues with finding patterns in unified tests, fix tests stable
Matt Mackall <mpm@selenic.com> [Thu, 27 Oct 2011 17:22:04 -0500] rev 15372
check-code: fix issues with finding patterns in unified tests, fix tests - old-style patterns without ^ were getting improperly anchored - finditer was matching against beginning of line poorly - \s was matching newlines - [^x] was matching newlines so we: - remove earlier hacks for multiline matching - fix unified test anchoring by adding .* - replace \s with [ \t] - replace [^x] with [^\nx] - force all matches into multiline mode so ^ anchors work This uncovers a number of test issues that are then repaired.
Tue, 25 Oct 2011 11:45:28 -0400 largefiles: remove lfutil.createdir, replace calls with util.makedirs stable
Hao Lian <hao@fogcreek.com> [Tue, 25 Oct 2011 11:45:28 -0400] rev 15371
largefiles: remove lfutil.createdir, replace calls with util.makedirs
Wed, 26 Oct 2011 14:22:19 -0500 largefiles: fix typo stable
Eli Carter <eli.carter@tektronix.com> [Wed, 26 Oct 2011 14:22:19 -0500] rev 15370
largefiles: fix typo
Wed, 26 Oct 2011 13:48:33 -0500 largefiles: bugfix for symlink handling with testcase stable
Eli Carter <eli.carter@tektronix.com> [Wed, 26 Oct 2011 13:48:33 -0500] rev 15369
largefiles: bugfix for symlink handling with testcase The code was using the size of a symlink's target, thus wrongly making symlinks to large files into largefiles themselves. This can be demonstrated by deleting the symlink and then doing an 'hg up' or 'hg up -C' to restore the symlink.
Wed, 26 Oct 2011 22:35:15 +0200 i18n-it: fixed wrong message
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Wed, 26 Oct 2011 22:35:15 +0200] rev 15368
i18n-it: fixed wrong message
Wed, 26 Oct 2011 12:56:27 -0500 setup: set env global earlier (3073) stable
Matt Mackall <mpm@selenic.com> [Wed, 26 Oct 2011 12:56:27 -0500] rev 15367
setup: set env global earlier (3073)
Tue, 25 Oct 2011 08:56:59 -0400 largefiles: test reverting largefiles (coverage creeping ever upwards) stable
Greg Ward <greg@gerg.ca> [Tue, 25 Oct 2011 08:56:59 -0400] rev 15366
largefiles: test reverting largefiles (coverage creeping ever upwards) This reveals a small bug: revert reports "reverting .hglf/largefile" when it really should report "reverting largefile". I don't see an easy fix, though (short of using ui.pushbuffer() to interfere with revert's output).
Mon, 24 Oct 2011 21:33:23 -0400 largefiles: test "update --check" stable
Greg Ward <greg@gerg.ca> [Mon, 24 Oct 2011 21:33:23 -0400] rev 15365
largefiles: test "update --check" It works fine; I'm just getting the test coverage up.
Wed, 26 Oct 2011 12:56:27 -0500 tests: fix check-code detection of anchored expressions, fix echo -n usage stable
Matt Mackall <mpm@selenic.com> [Wed, 26 Oct 2011 12:56:27 -0500] rev 15364
tests: fix check-code detection of anchored expressions, fix echo -n usage
Mon, 24 Oct 2011 13:41:19 +0200 diffstat: be more picky when marking file as 'binary' (issue2816) stable
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Oct 2011 13:41:19 +0200] rev 15363
diffstat: be more picky when marking file as 'binary' (issue2816) The 'Bin' marker was added to every changed file for which we could not find any diff changes. This included binary files but also copy/renames and mode changes. Since Mercurial regular diff format emits a 'Binary file XXX has changed' line when fed with binary files, we use that and the usual git marker to tell them from other cases. In particular, new empty files are no longer reported as binary. Still, this fix is not complete since copy/renames/mode changes are now reported as '0' lines changes, instead of 'Bin'.
Mon, 24 Oct 2011 10:41:10 -0200 i18n-pt_BR: synchronized with b74f74b482d8 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 24 Oct 2011 10:41:10 -0200] rev 15362
i18n-pt_BR: synchronized with b74f74b482d8
Mon, 24 Oct 2011 17:01:49 -0500 graft: add a test stable
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2011 17:01:49 -0500] rev 15361
graft: add a test
Mon, 24 Oct 2011 16:57:14 -0500 graft: fix duplicate filter logic stable
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2011 16:57:14 -0500] rev 15360
graft: fix duplicate filter logic
Mon, 24 Oct 2011 16:57:14 -0500 graft: fix duplicate scan message stable
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2011 16:57:14 -0500] rev 15359
graft: fix duplicate scan message
Mon, 24 Oct 2011 16:57:14 -0500 util: don't complain about '..' in path components not working on Windows stable
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2011 16:57:14 -0500] rev 15358
util: don't complain about '..' in path components not working on Windows
Mon, 24 Oct 2011 12:09:12 -0500 graft: fix formatting of message stable
Matt Mackall <mpm@selenic.com> [Mon, 24 Oct 2011 12:09:12 -0500] rev 15357
graft: fix formatting of message
Mon, 24 Oct 2011 13:58:01 +0200 largfiles: drop unused import stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Oct 2011 13:58:01 +0200] rev 15356
largfiles: drop unused import
Mon, 24 Oct 2011 13:51:24 +0200 consistency: use util.realpath instead of os.path.realpath where useful stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Oct 2011 13:51:24 +0200] rev 15355
consistency: use util.realpath instead of os.path.realpath where useful exceptions: hg: os.path.realpath used before util can be imported tests/run-tests.py: may not import mercurial modules
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 15354
keyword: use util.realpath instead of os.path.realpath This makes test-keyword.t pass on Python 2.4.1 (e.g. Debian sarge)
Mon, 24 Oct 2011 13:32:23 +0200 posix: workaround for os.path.realpath bug in Python 2.4.1 and before stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Oct 2011 13:32:23 +0200] rev 15353
posix: workaround for os.path.realpath bug in Python 2.4.1 and before os.path.realpath didn't resolve symlinks that were the first component of the path, see http://bugs.python.org/issue1213894
Mon, 24 Oct 2011 10:08:58 +0200 largefiles: improve markup in module help text stable
Martin Geisler <mg@aragost.com> [Mon, 24 Oct 2011 10:08:58 +0200] rev 15352
largefiles: improve markup in module help text
Mon, 24 Oct 2011 09:54:02 +0200 largefiles: remove redundant documentation stable
Martin Geisler <mg@aragost.com> [Mon, 24 Oct 2011 09:54:02 +0200] rev 15351
largefiles: remove redundant documentation The extension help text already covered what was in usage.txt and design.txt is now moved to the wiki: http://mercurial.selenic.com/wiki/LargefilesExtension
Sun, 23 Oct 2011 14:25:48 -0400 largefiles: use ui.configpath() where appropriate stable
Greg Ward <greg@gerg.ca> [Sun, 23 Oct 2011 14:25:48 -0400] rev 15350
largefiles: use ui.configpath() where appropriate
Sun, 23 Oct 2011 10:23:31 -0400 largefiles: drop more unnecessary compatibility checks stable
Greg Ward <greg@gerg.ca> [Sun, 23 Oct 2011 10:23:31 -0400] rev 15349
largefiles: drop more unnecessary compatibility checks
Sun, 23 Oct 2011 16:32:27 -0500 windows: sanity-check symlink placeholders stable
Matt Mackall <mpm@selenic.com> [Sun, 23 Oct 2011 16:32:27 -0500] rev 15348
windows: sanity-check symlink placeholders On Windows, we store symlinks as plain files with the link contents. Via user error or NFS/Samba assistance, these files often end up with 'normal' file contents. Committing these changes thus gives an invalid symlink that can't be checked out on Unix. Here we filter out any modified symlink placeholders that look suspicious when computing status: - more than 1K (looks more like a normal file) - contain NULs (not allowed on Unix, probably a binary) - contains \n (filenames can't contain \n, very unusual for symlinks, very common for files)
Sun, 23 Oct 2011 21:59:15 +0200 largefiles: use util.sha1() instead of hashlib.sha1() everywhere stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 23 Oct 2011 21:59:15 +0200] rev 15347
largefiles: use util.sha1() instead of hashlib.sha1() everywhere
Sun, 23 Oct 2011 21:22:55 +0200 tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 23 Oct 2011 21:22:55 +0200] rev 15346
tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions
Sat, 22 Oct 2011 23:42:48 +0200 convert: add missing import of util, needed for svn < 1.6 stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Oct 2011 23:42:48 +0200] rev 15345
convert: add missing import of util, needed for svn < 1.6
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 15344
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.
Sat, 22 Oct 2011 15:39:51 -0400 largefiles: test "lfconvert --to-normal" with rename/remove/merge stable
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 15:39:51 -0400] rev 15343
largefiles: test "lfconvert --to-normal" with rename/remove/merge This gets us very close to full test coverage of lfconvert. The only features not tested are: - .hgtags conversion - abort when largefile becomes symlink
Sat, 22 Oct 2011 15:16:52 -0400 largefiles: test lfconvert with rename, remove, and merge stable
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 15:16:52 -0400] rev 15342
largefiles: test lfconvert with rename, remove, and merge
Sat, 22 Oct 2011 14:52:05 -0400 largefiles: beef up test-lfconvert.t so it's more thorough stable
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 14:52:05 -0400] rev 15341
largefiles: beef up test-lfconvert.t so it's more thorough - instead of converting a single changeset with a single file, convert two changesets which each add a mix of normal and large files - make one of the large files not-so-large, but identified as large by filename - use shorter, simpler filenames - put some files in a subdirectory - test that file contents are correctly converted - drop unnecessary cleanup step
Sat, 22 Oct 2011 14:20:17 -0400 largefiles: rearrange how lfconvert detects non-local repos stable
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 14:20:17 -0400] rev 15340
largefiles: rearrange how lfconvert detects non-local repos Mainly this is so we can test that code; it has the side benefit of not requiring network I/O to reject non-local repo URLs.
Sat, 22 Oct 2011 14:17:19 -0400 largefiles: test lfconvert error handling; remove redundant code stable
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 14:17:19 -0400] rev 15339
largefiles: test lfconvert error handling; remove redundant code
Sat, 22 Oct 2011 13:48:56 -0400 largefiles: extract test-lfconvert.t from test-largefiles.t stable
Greg Ward <greg@gerg.ca> [Sat, 22 Oct 2011 13:48:56 -0400] rev 15338
largefiles: extract test-lfconvert.t from test-largefiles.t test-largefiles.t is getting pretty big, and there's lots more to test in lfconvert. And lfconvert is a fairly orthogonal feature to the rest of largefiles.
Sat, 22 Oct 2011 16:12:33 -0500 windows: recompute flags when committing a merge (issue1802) stable
Matt Mackall <mpm@selenic.com> [Sat, 22 Oct 2011 16:12:33 -0500] rev 15337
windows: recompute flags when committing a merge (issue1802) Before this patch, Windows always did the wrong thing with exec bits when committing a merge: consult the flags in first parent. Now we manually recompute the result of merging flags at commit time, which almost always does the right thing (except when there are conflicts between symlink and exec flags). To do this, we: - pull flag synthesis out into its own function - delay building this function unless it's needed - add a merge case that compares flags in local and other against the ancestor This has been tested in multiple ways on Linux: - running the whole test suite with both old and new code in place, checking for differences in each flags() result - running the whole test suite while comparing real on-disk flags against synthetic ones for merges - test-issue1802 (from Martin Geisler) which disables exec bit checking on Unix
Fri, 21 Oct 2011 15:09:33 -0500 largefiles: test interaction between largefiles and vanilla clients and servers stable
Andrew Pritchard <awpritchard@gmail.com> [Fri, 21 Oct 2011 15:09:33 -0500] rev 15336
largefiles: test interaction between largefiles and vanilla clients and servers This reintroduces tests for the case described by issue3066, among others: - vanilla clients and servers should still be able to talk to largefiles clients and servers about vanilla repos - vanilla clients should not attempt to clone largefiles repos over http and should report a useful error message (issue3066; this appears to work correctly) - vanilla clients should not attempt to clone largefiles repos over ssh, again with a useful error message - largefiles clients should not attempt to push largefile changes to vanilla servers
Sat, 22 Oct 2011 11:21:00 -0500 tests: darcs > 2.5 got "smart" about encoding, disable encoding tests stable
Matt Mackall <mpm@selenic.com> [Sat, 22 Oct 2011 11:21:00 -0500] rev 15335
tests: darcs > 2.5 got "smart" about encoding, disable encoding tests We can no longer convert a repo with mixed encodings, nor can I even figure out how to get Darcs to display such messages.
Fri, 21 Oct 2011 16:52:23 -0500 check-code: catch BaseException and os.path.relpath stable
Matt Mackall <mpm@selenic.com> [Fri, 21 Oct 2011 16:52:23 -0500] rev 15334
check-code: catch BaseException and os.path.relpath
Fri, 21 Oct 2011 16:52:16 -0500 largefiles: py2.4 doesn't have BaseException stable
Matt Mackall <mpm@selenic.com> [Fri, 21 Oct 2011 16:52:16 -0500] rev 15333
largefiles: py2.4 doesn't have BaseException ..and it's the wrong base class anyway.
Thu, 20 Oct 2011 21:56:30 -0400 largefiles: rename lfconvert --tonormal option to --to-normal stable
Greg Ward <greg@gerg.ca> [Thu, 20 Oct 2011 21:56:30 -0400] rev 15332
largefiles: rename lfconvert --tonormal option to --to-normal
Thu, 20 Oct 2011 22:01:05 -0400 largefiles: test lfconvert --tonormal stable
Greg Ward <greg@gerg.ca> [Thu, 20 Oct 2011 22:01:05 -0400] rev 15331
largefiles: test lfconvert --tonormal
Thu, 20 Oct 2011 22:24:24 -0400 largefiles: use smaller files in test script stable
Greg Ward <greg@gerg.ca> [Thu, 20 Oct 2011 22:24:24 -0400] rev 15330
largefiles: use smaller files in test script
Thu, 20 Oct 2011 22:22:24 -0400 largefiles: test that minimum size can be a float stable
Greg Ward <greg@gerg.ca> [Thu, 20 Oct 2011 22:22:24 -0400] rev 15329
largefiles: test that minimum size can be a float This allows us to drop the existing test of --lfsize, since it's redundant with the new test.
Thu, 20 Oct 2011 22:14:11 -0400 largefiles: polish comments in test script stable
Greg Ward <greg@gerg.ca> [Thu, 20 Oct 2011 22:14:11 -0400] rev 15328
largefiles: polish comments in test script
Fri, 21 Oct 2011 11:10:43 -0500 import: abort usefully if no patch name given stable
Kevin Bullock <kbullock@ringworld.org> [Fri, 21 Oct 2011 11:10:43 -0500] rev 15327
import: abort usefully if no patch name given
Fri, 21 Oct 2011 14:15:58 +0200 revset: disambiguous the node variable stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Fri, 21 Oct 2011 14:15:58 +0200] rev 15326
revset: disambiguous the node variable The module could be confused with the function.
Fri, 21 Oct 2011 12:12:21 -0500 revset: deal with empty lists in formatspec stable
Matt Mackall <mpm@selenic.com> [Fri, 21 Oct 2011 12:12:21 -0500] rev 15325
revset: deal with empty lists in formatspec
Fri, 21 Oct 2011 12:07:27 +0100 keyword: correct grammar in iskwfile docstring stable
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Oct 2011 12:07:27 +0100] rev 15324
keyword: correct grammar in iskwfile docstring
Thu, 20 Oct 2011 17:40:25 -0400 largefiles: remove all uses of os.path.relpath for 2.4 compatibility stable
Benjamin Pollack <benjamin@bitquabit.com> [Thu, 20 Oct 2011 17:40:25 -0400] rev 15323
largefiles: remove all uses of os.path.relpath for 2.4 compatibility
Thu, 20 Oct 2011 16:43:31 +0200 mq: avoid data loss upon qfold + qmv (issue3058) stable
Patrick Mezard <pmezard@gmail.com> [Thu, 20 Oct 2011 16:43:31 +0200] rev 15322
mq: avoid data loss upon qfold + qmv (issue3058) When renaming a patch A as B where B was previously qfolded into A and therefore marked as removed, a versioned MQ would first restore B before marking it as a copy of A, thus losing A changes. The undelete() call is probably a left-over, wctx.copy() explicitely handles the case where the destination is removed. Also note that status command represents "hg rm b; hg mv a b" as: A b a R a which explains the first hunk in test-mq-qrename.t.
Fri, 21 Oct 2011 00:33:08 +0200 subrepos: abort commit by default if a subrepo is dirty (BC) stable
Martin Geisler <mg@lazybytes.net> [Fri, 21 Oct 2011 00:33:08 +0200] rev 15321
subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g
Thu, 20 Oct 2011 17:05:13 -0400 largefiles: use XDG and OS X-specific cache locations by default (issue3067) stable
Benjamin Pollack <benjamin@bitquabit.com> [Thu, 20 Oct 2011 17:05:13 -0400] rev 15320
largefiles: use XDG and OS X-specific cache locations by default (issue3067)
Wed, 19 Oct 2011 20:40:55 -0400 largefiles: remove redundant any_ function stable
Benjamin Pollack <benjamin@bitquabit.com> [Wed, 19 Oct 2011 20:40:55 -0400] rev 15319
largefiles: remove redundant any_ function
Thu, 20 Oct 2011 09:35:37 -0500 largefiles: testcase to simulate inter-user clone on local machine stable
Eli Carter <eli.carter@tektronix.com> [Thu, 20 Oct 2011 09:35:37 -0500] rev 15318
largefiles: testcase to simulate inter-user clone on local machine
Thu, 20 Oct 2011 13:24:11 -0400 largefiles: make the store primary, and the user cache secondary stable
Benjamin Pollack <benjamin@bitquabit.com> [Thu, 20 Oct 2011 13:24:11 -0400] rev 15317
largefiles: make the store primary, and the user cache secondary This uses the now-properly-named functions and methods from the previous patch to actually deliver the desired behavior
Thu, 20 Oct 2011 13:24:09 -0400 largefiles: rename functions and methods to match desired behavior stable
Benjamin Pollack <benjamin@bitquabit.com> [Thu, 20 Oct 2011 13:24:09 -0400] rev 15316
largefiles: rename functions and methods to match desired behavior The original intent was that the largefiles would primarily be in the repository, with the global cache being only that--a cache. The naming conventions and actual intent have both strayed. In this first patch, the naming conventions are switched to match the actual intent, as are the configuration options.
Thu, 20 Oct 2011 13:24:08 -0400 largefiles: fix documentation to match desired behavior stable
Benjamin Pollack <benjamin@bitquabit.com> [Thu, 20 Oct 2011 13:24:08 -0400] rev 15315
largefiles: fix documentation to match desired behavior
Thu, 20 Oct 2011 17:47:33 +0200 runrst: improve error message when Docutils is missing stable
Martin Geisler <mg@aragost.com> [Thu, 20 Oct 2011 17:47:33 +0200] rev 15314
runrst: improve error message when Docutils is missing Peter Toft told me he had installed a 'python-doc' package instead of the correct 'python-docutils' and he suggested that we add the URL to Docutils in our error message.
Tue, 18 Oct 2011 17:28:26 -0500 largefiles: fix newline for lfconverted repos stable
Eli Carter <eli.carter@tektronix.com> [Tue, 18 Oct 2011 17:28:26 -0500] rev 15313
largefiles: fix newline for lfconverted repos
Wed, 19 Oct 2011 15:37:03 -0500 largefiles: remove 1.9 compat code stable
Eli Carter <eli.carter@tektronix.com> [Wed, 19 Oct 2011 15:37:03 -0500] rev 15312
largefiles: remove 1.9 compat code
Wed, 19 Oct 2011 17:16:25 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Wed, 19 Oct 2011 17:16:25 -0500] rev 15311
merge with i18n
Tue, 18 Oct 2011 09:51:02 -0200 i18n-pt_BR: synchronized with ab341fbb05b1 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 18 Oct 2011 09:51:02 -0200] rev 15310
i18n-pt_BR: synchronized with ab341fbb05b1
Tue, 18 Oct 2011 09:50:57 -0200 i18n-pt_BR: msgmerge with ab341fbb05b1 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 18 Oct 2011 09:50:57 -0200] rev 15309
i18n-pt_BR: msgmerge with ab341fbb05b1
Tue, 18 Oct 2011 09:38:14 -0200 bisect: add i18n contexts stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 18 Oct 2011 09:38:14 -0200] rev 15308
bisect: add i18n contexts
Tue, 18 Oct 2011 09:38:10 -0200 import: add i18n context stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 18 Oct 2011 09:38:10 -0200] rev 15307
import: add i18n context
Sun, 16 Oct 2011 10:24:45 -0400 largefiles: fix some badly named function parameters stable
Greg Ward <greg@gerg.ca> [Sun, 16 Oct 2011 10:24:45 -0400] rev 15306
largefiles: fix some badly named function parameters overrides.py contains several functions that temporarily override scmutil.match(), which always takes a changectx object as the first parameter. But these overrides name that parameter either 'repo' or 'ctxorrepo', which is misleading. So rename them to 'ctx' and remove the special type-sensitive handling of the one called 'ctxorrepo'.
Sun, 16 Oct 2011 10:29:51 -0400 largefiles: tidy imports stable
Greg Ward <greg@gerg.ca> [Sun, 16 Oct 2011 10:29:51 -0400] rev 15305
largefiles: tidy imports - no need to defensively import scmutil - remove duplicate - unwrap non-long line
Tue, 18 Oct 2011 20:06:23 -0400 largefiles: rename config setting 'size' to 'minsize' stable
Greg Ward <greg@gerg.ca> [Tue, 18 Oct 2011 20:06:23 -0400] rev 15304
largefiles: rename config setting 'size' to 'minsize'
Tue, 18 Oct 2011 16:40:59 -0500 largefiles: include 'largefiles' in converted repository requirements stable
Eli Carter <eli.carter@tektronix.com> [Tue, 18 Oct 2011 16:40:59 -0500] rev 15303
largefiles: include 'largefiles' in converted repository requirements
Tue, 18 Oct 2011 17:09:03 -0400 largefiles: string formatting typo in basestore._openstore where comma is used instead of modulo stable
Hao Lian <hao@fogcreek.com> [Tue, 18 Oct 2011 17:09:03 -0400] rev 15302
largefiles: string formatting typo in basestore._openstore where comma is used instead of modulo
Tue, 18 Oct 2011 11:09:11 -0500 largefiles: fix test typo stable
Eli Carter <eli.carter@tektronix.com> [Tue, 18 Oct 2011 11:09:11 -0500] rev 15301
largefiles: fix test typo
Tue, 18 Oct 2011 10:32:12 -0500 convert: fix typo stable
Eli Carter <eli.carter@tektronix.com> [Tue, 18 Oct 2011 10:32:12 -0500] rev 15300
convert: fix typo
Tue, 18 Oct 2011 09:59:04 -0500 largefiles: fix typo stable
Eli Carter <eli.carter@tektronix.com> [Tue, 18 Oct 2011 09:59:04 -0500] rev 15299
largefiles: fix typo
Wed, 19 Oct 2011 17:40:27 +0200 largefiles: test that merging does not result in wrong versions of largefiles stable
Na'Tosha Bard <natosha@unity3d.com> [Wed, 19 Oct 2011 17:40:27 +0200] rev 15298
largefiles: test that merging does not result in wrong versions of largefiles
Wed, 19 Oct 2011 17:02:59 +0200 largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large) stable
Na'Tosha Bard <natosha@unity3d.com> [Wed, 19 Oct 2011 17:02:59 +0200] rev 15297
largefiles: expand test suite some more (test rebasing, rollback, update --clean, and verify --large)
Mon, 17 Oct 2011 17:27:33 -0500 check-code: report suspicious string joins stable
Matt Mackall <mpm@selenic.com> [Mon, 17 Oct 2011 17:27:33 -0500] rev 15296
check-code: report suspicious string joins This detects patterns of the form: ui.write("this is missing" "a space at the join\n")
Mon, 17 Oct 2011 19:10:28 -0200 largefiles: fix typo stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 17 Oct 2011 19:10:28 -0200] rev 15295
largefiles: fix typo
Mon, 17 Oct 2011 19:10:42 -0200 largefiles: make parameter more i18n-friendly stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 17 Oct 2011 19:10:42 -0200] rev 15294
largefiles: make parameter more i18n-friendly
Sun, 16 Oct 2011 01:26:06 +0200 grep: correct handling of matching lines without line ending (issue3050) stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 16 Oct 2011 01:26:06 +0200] rev 15293
grep: correct handling of matching lines without line ending (issue3050) Matching lines without trailing '\n' was missing the last character. That seems to have been an unintended side effect of 261a9f47b44b. The test in dac14cc9711e documents the bad behaviour.
Mon, 17 Oct 2011 11:37:59 +0200 discovery: Fix error print mentioning a 'None' branch stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 17 Oct 2011 11:37:59 +0200] rev 15292
discovery: Fix error print mentioning a 'None' branch When talking to old server discovery use heads of the 'None' branch to refer to topological heads. This use of None should never make it to the end user.
Mon, 17 Oct 2011 14:14:28 -0500 largefiles: remove fixme from docs stable
Matt Mackall <mpm@selenic.com> [Mon, 17 Oct 2011 14:14:28 -0500] rev 15291
largefiles: remove fixme from docs
Mon, 17 Oct 2011 11:54:12 -0200 i18n: import polib 0.6.4 (rev 84598f2b5365) stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 17 Oct 2011 11:54:12 -0200] rev 15290
i18n: import polib 0.6.4 (rev 84598f2b5365) This version fixes some upstream issues observed during the pt_BR translation update: #8 (obsolete entries reappearing); an unidentified issue that made i18n/posplit produce some spurious messages on the resulting po file; possibly others. These bugs probably didn't cause actual differences on the translated output, since an invalid message added to the .mo file wouldn't match an input message most of the time. But they do pollute the .po file contents (and diffs), adding some confusion to the translation process. db957a72fbd7, 4c50552fc9bc and 8ea51e9e7031 were included upstream, so the only remaining difference is the "no-check-code" marking.
Mon, 17 Oct 2011 14:47:36 -0200 rebase: fix typos stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 17 Oct 2011 14:47:36 -0200] rev 15289
rebase: fix typos
Mon, 17 Oct 2011 13:42:42 -0500 auth: fix realm handling with Python < 2.4.3 (issue2739) stable
Matt Mackall <mpm@selenic.com> [Mon, 17 Oct 2011 13:42:42 -0500] rev 15288
auth: fix realm handling with Python < 2.4.3 (issue2739)
Mon, 17 Oct 2011 18:01:38 +0200 subrepo: abort in hgsubrepo._get if the destination is obstructed stable
Martin Geisler <mg@aragost.com> [Mon, 17 Oct 2011 18:01:38 +0200] rev 15287
subrepo: abort in hgsubrepo._get if the destination is obstructed Before, we deleted foo when we determined that there were zero changesets in the foo subrepo. Any files in foo was deleted too. We now delete foo/.hg instead, and the normal checks in hg.clone will then abort if there are untracked files in foo.
Mon, 17 Oct 2011 16:45:19 +0200 subrepo: pull revisions on demand when archiving hg subrepos stable
Martin Geisler <mg@aragost.com> [Mon, 17 Oct 2011 16:45:19 +0200] rev 15286
subrepo: pull revisions on demand when archiving hg subrepos Before, running 'hg archive -S' could result in abort: unknown revision '65903cebad86f1a84bd4f1134f62fa7dcb7a1c98'! if a subrepo was missing completely or had missing changesets. Now, the missing changesets will be pulled or cloned as appropriate. This make Mercurial subrepos match Git subrepos which already took care to fetch any missing commits before starting the archive.
Mon, 17 Oct 2011 14:27:34 +0200 test-check-code.t: test matching try/except/finally introduced in aeeb2afcdc25 stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 17 Oct 2011 14:27:34 +0200] rev 15285
test-check-code.t: test matching try/except/finally introduced in aeeb2afcdc25
Sun, 16 Oct 2011 22:15:43 -0500 merge with crew stable
Matt Mackall <mpm@selenic.com> [Sun, 16 Oct 2011 22:15:43 -0500] rev 15284
merge with crew
Mon, 17 Oct 2011 01:40:50 +0200 merge in commit that shouldn't be on default stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 17 Oct 2011 01:40:50 +0200] rev 15283
merge in commit that shouldn't be on default
Mon, 17 Oct 2011 00:11:56 +0200 tests: don't use 'test -e'
Mads Kiilerich <mads@kiilerich.com> [Mon, 17 Oct 2011 00:11:56 +0200] rev 15282
tests: don't use 'test -e' On Solaris 10: $ test -e f test: argument expected
Sun, 16 Oct 2011 20:26:20 -0500 check-code: support multiline matches like try/except/finally stable
Matt Mackall <mpm@selenic.com> [Sun, 16 Oct 2011 20:26:20 -0500] rev 15281
check-code: support multiline matches like try/except/finally - match one pattern at a time against entire file - find line containing match - sort matches by line number
Sun, 16 Oct 2011 17:22:07 -0500 fix bad tag for 2.0-rc stable
Matt Mackall <mpm@selenic.com> [Sun, 16 Oct 2011 17:22:07 -0500] rev 15280
fix bad tag for 2.0-rc This tag was immediately stripped, but not before escaping onto the hg-stable mirror.
Sun, 16 Oct 2011 11:28:03 +0200 largefiles: use separate try/except and try/finally as needed for python2.4 stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Oct 2011 11:28:03 +0200] rev 15279
largefiles: use separate try/except and try/finally as needed for python2.4 cfccd3bee7b3 introduced a try/except/finally block, which breaks compatibility with python2.4
Sun, 16 Oct 2011 11:12:59 +0200 commands: use separate try/except and try/finally as needed for python2.4 stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Oct 2011 11:12:59 +0200] rev 15278
commands: use separate try/except and try/finally as needed for python2.4 62dc0e7ab092 introduced a try/except/finally block, which breaks compatibility with python2.4
Sat, 15 Oct 2011 14:22:59 -0500 Added signature for changeset fccd350acf79 stable
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:22:59 -0500] rev 15277
Added signature for changeset fccd350acf79
Sat, 15 Oct 2011 14:22:55 -0500 Added tag 2.0-rc for changeset fccd350acf79 stable
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:22:55 -0500] rev 15276
Added tag 2.0-rc for changeset fccd350acf79
Sat, 15 Oct 2011 14:31:29 -0500 Added signature for changeset 384082750f2c stable
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:31:29 -0500] rev 15275
Added signature for changeset 384082750f2c
Sat, 15 Oct 2011 14:31:26 -0500 Added tag 2.0-rc for changeset 384082750f2c stable
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:31:26 -0500] rev 15274
Added tag 2.0-rc for changeset 384082750f2c
Sat, 15 Oct 2011 14:30:50 -0500 merge default into stable for 2.0 code freeze stable 2.0-rc
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:30:50 -0500] rev 15273
merge default into stable for 2.0 code freeze
Sat, 15 Oct 2011 14:19:24 -0500 rebase: simplify check for orphaned descendants
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:19:24 -0500] rev 15272
rebase: simplify check for orphaned descendants
Sat, 15 Oct 2011 14:19:07 -0500 rebase: simplify set generation
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:19:07 -0500] rev 15271
rebase: simplify set generation
Sat, 15 Oct 2011 20:12:32 +0200 rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 15 Oct 2011 20:12:32 +0200] rev 15270
rebase: add --rev option to rebase This option allow a strict set of revision to be specified instead of using -s or -b. Rebase will refuse start if striping rebased changeset will strip non rebased changeset. Rebase will refuse to work on set with multiple root.
Sat, 15 Oct 2011 12:57:47 -0500 rebase: allow revsets for source and base args
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 12:57:47 -0500] rev 15269
rebase: allow revsets for source and base args
Sat, 15 Oct 2011 12:52:43 -0500 revset: fix %r handling in formatspec
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 12:52:43 -0500] rev 15268
revset: fix %r handling in formatspec
Sat, 15 Oct 2011 19:07:51 +0200 rebase: use revset as soon as possible in internal logic
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 15 Oct 2011 19:07:51 +0200] rev 15267
rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py
Sat, 15 Oct 2011 10:20:08 -0500 revset: add %r for embedded revset support to formatspec
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 10:20:08 -0500] rev 15266
revset: add %r for embedded revset support to formatspec This allows folding external revsets or lists of revsets into a revset expression. Revsets are pre-parsed for validity so that syntax errors don't escape.
Sat, 15 Oct 2011 01:06:52 +0200 revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com> [Sat, 15 Oct 2011 01:06:52 +0200] rev 15265
revert: warn that subrepos cannot be reverted (tests added by mpm)
Wed, 12 Oct 2011 21:45:58 -0400 merge: expand environment variables and ~/ in tool.executable
Greg Ward <greg@gerg.ca> [Wed, 12 Oct 2011 21:45:58 -0400] rev 15264
merge: expand environment variables and ~/ in tool.executable hgrc(5) already implies that this works, so we might as well support it. Another approach would be to implement this in util.findexe(): that would benefit other callers of findexe(), e.g. convert and anyone calling the user's editor. But findexe() is really implemented in both posix.py and windows.py, so this would make both of those modules depend on util.py: not good. So keep it narrow and only for merge tools.
Sat, 15 Oct 2011 00:39:06 -0500 minirst: improve test harness
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 00:39:06 -0500] rev 15263
minirst: improve test harness
Sat, 15 Oct 2011 00:39:04 -0500 minirst: add style flag to format
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 00:39:04 -0500] rev 15262
minirst: add style flag to format
Sat, 15 Oct 2011 00:39:01 -0500 minirst: add basic HTML formatting support
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 00:39:01 -0500] rev 15261
minirst: add basic HTML formatting support
Fri, 14 Oct 2011 15:40:50 -0500 graft: use status verbosity for reporting grafts
Matt Mackall <mpm@selenic.com> [Fri, 14 Oct 2011 15:40:50 -0500] rev 15260
graft: use status verbosity for reporting grafts
Fri, 14 Oct 2011 19:10:36 +0200 contrib: add a script to help diagnose raw output of the cmdserver
Idan Kamara <idankk86@gmail.com> [Fri, 14 Oct 2011 19:10:36 +0200] rev 15259
contrib: add a script to help diagnose raw output of the cmdserver
Fri, 14 Oct 2011 19:51:46 +0200 mq: eliminate explicit checks for file existence
Idan Kamara <idankk86@gmail.com> [Fri, 14 Oct 2011 19:51:46 +0200] rev 15258
mq: eliminate explicit checks for file existence
Fri, 14 Oct 2011 02:50:06 +0200 mq: cleanup of lookup - handling of None is not relevant
Mads Kiilerich <mads@kiilerich.com> [Fri, 14 Oct 2011 02:50:06 +0200] rev 15257
mq: cleanup of lookup - handling of None is not relevant Patch specifications in mq is passed around as a string or None. None is generally used when no patch has been specified and there thus is nothing to lookup and the calling code should do something else. One code path did however pass None all the way to lookup. That case was handled in lookup, but there was really need for that, it was undocumented, and it used to cause trouble back when patches was specified as integers.
Sun, 31 Oct 2010 18:29:56 +0100 mq: fix corner cases for handling of patch 0 in qselect
Mads Kiilerich <mads@kiilerich.com> [Sun, 31 Oct 2010 18:29:56 +0100] rev 15256
mq: fix corner cases for handling of patch 0 in qselect Most of the code paths in mq would always pass patch specifications as a string. Patches can be specified by their index, but one code path passed that (through pop) to lookup as an integer - all other code paths used a string. Unfortunately pop and lookup (like many other parts of mq) used the boolean value of the patch specification to see if it was None, and they would thus incorrectly handle patch 0 as None. This patch makes the code comply with the actual internal duck typing of patch specifications: patch indices must be encoded as strings. The (now) unused code for partial and thus incorrect handling of indices as integers is removed.
Thu, 13 Oct 2011 21:42:54 -0400 largefiles: cosmetics, whitespace, code style
Greg Ward <greg@gerg.ca> [Thu, 13 Oct 2011 21:42:54 -0400] rev 15255
largefiles: cosmetics, whitespace, code style This is mainly about keeping code under the 80-column limit with as few backslashes as possible. I am deliberately not making any logic or behaviour changes here and have restrained myself to a few "peephole" refactorings.
Thu, 13 Oct 2011 20:45:49 -0400 largefiles: more work on cleaning up comments
Greg Ward <greg@gerg.ca> [Thu, 13 Oct 2011 20:45:49 -0400] rev 15254
largefiles: more work on cleaning up comments - always say "largefile", not "lfile" - cleanup mangled syntax, hopefully correctly (punctuation: it's your friend!) - wrap to 75 columns (where feasible)
Thu, 13 Oct 2011 20:24:29 -0400 largefiles: improve error reporting
Greg Ward <greg@gerg.ca> [Thu, 13 Oct 2011 20:24:29 -0400] rev 15253
largefiles: improve error reporting - tweak wording of some error messages - use consistent capitalization - always say 'largefile', not 'lfile' - fix I18N problems - only raise Abort for errors the user can do something about
Wed, 12 Oct 2011 20:59:27 -0400 largefiles: improve comments, internal docstrings
Greg Ward <greg@gerg.ca> [Wed, 12 Oct 2011 20:59:27 -0400] rev 15252
largefiles: improve comments, internal docstrings - fix some ungrammatical/unclear/incorrect comments/docstrings - rewrite some really unclear comments/docstrings - make formatting/style more consistent with the rest of Mercurial (lowercase without period unless it's really multiple sentences) - wrap to 75 columns - always say "largefile(s)", not "lfile(s)" (or "big files") - one space between sentences, not two
Thu, 13 Oct 2011 15:15:32 +0200 largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com> [Thu, 13 Oct 2011 15:15:32 +0200] rev 15251
largefiles: flush out tests to cover more operations and known cornercases
Thu, 13 Oct 2011 12:11:25 +0200 largefiles: speed up commit by only rewriting standins for modified largefiles
Na'Tosha Bard <natosha@unity3d.com> [Thu, 13 Oct 2011 12:11:25 +0200] rev 15250
largefiles: speed up commit by only rewriting standins for modified largefiles
Thu, 13 Oct 2011 17:54:38 +0200 tests: add basic tests for doctest syntax
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:38 +0200] rev 15249
tests: add basic tests for doctest syntax
Thu, 13 Oct 2011 17:54:37 +0200 run-tests: end doctest block when seeing a non-command
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:37 +0200] rev 15248
run-tests: end doctest block when seeing a non-command
Thu, 13 Oct 2011 17:54:35 +0200 tests: remove temp doctest file when finished running it
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:35 +0200] rev 15247
tests: remove temp doctest file when finished running it
Thu, 13 Oct 2011 04:27:49 +0200 httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com> [Thu, 13 Oct 2011 04:27:49 +0200] rev 15246
httprepo: make __del__ more stable in error situations Some errors could leave self.urlopener uninitialized and thus cause strange crashes in __del__. This member variable is now "declared statically" and checked for assignment before use.
Sun, 31 Oct 2010 18:29:55 +0100 tests: exercise some corner cases for mq guard selection and --reapply
Mads Kiilerich <mads@kiilerich.com> [Sun, 31 Oct 2010 18:29:55 +0100] rev 15245
tests: exercise some corner cases for mq guard selection and --reapply
Thu, 13 Oct 2011 04:27:49 +0200 tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com> [Thu, 13 Oct 2011 04:27:49 +0200] rev 15244
tests: cleanup of test-fetch.t
Thu, 13 Oct 2011 04:27:49 +0200 tests: cleanup of echo statements left over from test conversion
Mads Kiilerich <mads@kiilerich.com> [Thu, 13 Oct 2011 04:27:49 +0200] rev 15243
tests: cleanup of echo statements left over from test conversion
Wed, 12 Oct 2011 18:59:59 -0500 graft: add examples and information about copied metadata
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:59:59 -0500] rev 15242
graft: add examples and information about copied metadata
Wed, 12 Oct 2011 18:48:57 -0500 graft: add --continue support
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:48:57 -0500] rev 15241
graft: add --continue support
Wed, 12 Oct 2011 18:46:23 -0500 graft: add user, date, and tool options
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:46:23 -0500] rev 15240
graft: add user, date, and tool options
Wed, 12 Oct 2011 18:46:03 -0500 graft: add --edit
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:46:03 -0500] rev 15239
graft: add --edit
Wed, 12 Oct 2011 18:45:36 -0500 graft: add initial implementation
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:45:36 -0500] rev 15238
graft: add initial implementation
Wed, 12 Oct 2011 11:09:57 -0500 bookmarks: delegate writing to the repo just like reading
Augie Fackler <durin42@gmail.com> [Wed, 12 Oct 2011 11:09:57 -0500] rev 15237
bookmarks: delegate writing to the repo just like reading This makes it easier for alternate storage backends to not use flat files for bookmarks storage.
Wed, 12 Oct 2011 22:01:14 +0200 tests: add support for inline doctests in test files
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:14 +0200] rev 15236
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.
Wed, 12 Oct 2011 22:01:13 +0200 tests: add helper script for processing doctests read from stdin
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:13 +0200] rev 15235
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.
Tue, 11 Oct 2011 21:34:55 -0700 subrepo: fix git branch tracking logic (issue2920)
Eric Roshan Eisner <ede@alum.mit.edu> [Tue, 11 Oct 2011 21:34:55 -0700] rev 15234
subrepo: fix git branch tracking logic (issue2920)
Tue, 11 Oct 2011 17:20:03 -0500 alias: don't shadow commands that we only partially matched (issue2993) (BC)
Augie Fackler <durin42@gmail.com> [Tue, 11 Oct 2011 17:20:03 -0500] rev 15233
alias: don't shadow commands that we only partially matched (issue2993) (BC) Previously, if you set an alias for "ci", it'd also shadow "commit" even though you didn't specify that. This occurred for all commands with explicit short variations.
Tue, 11 Oct 2011 18:48:45 +0200 resolve: update documentation to mention the .orig backup
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Oct 2011 18:48:45 +0200] rev 15232
resolve: update documentation to mention the .orig backup
Tue, 11 Oct 2011 18:18:15 -0700 cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu> [Tue, 11 Oct 2011 18:18:15 -0700] rev 15231
cmdutil.bailifchanged: abort for dirty subrepos
Tue, 11 Oct 2011 21:10:03 -0400 largefiles: improve help
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:10:03 -0400] rev 15230
largefiles: improve help Extension help taken from the URL formerly in the text (https://developers.kilnhg.com/Repo/Kiln/largefiles/largefiles/File/usage.txt) and improved.
Tue, 11 Oct 2011 21:11:01 -0400 largefiles: use ui.configlist() to split largefiles.patterns
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:11:01 -0400] rev 15229
largefiles: use ui.configlist() to split largefiles.patterns
Tue, 11 Oct 2011 21:07:08 -0400 largefiles: allow minimum size to be a float
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:07:08 -0400] rev 15228
largefiles: allow minimum size to be a float Some old-fashioned people (e.g. me) think that incompressible binary files >100 kB count as "large".
Tue, 11 Oct 2011 21:11:01 -0400 largefiles: factor out lfutil.getminsize()
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:11:01 -0400] rev 15227
largefiles: factor out lfutil.getminsize()
Tue, 11 Oct 2011 14:01:24 +0200 largefiles: cleanup import, now that we can assume > 1.9 for bundled extension
Na'Tosha Bard <natosha@unity3d.com> [Tue, 11 Oct 2011 14:01:24 +0200] rev 15226
largefiles: cleanup import, now that we can assume > 1.9 for bundled extension
Tue, 11 Oct 2011 13:15:29 +0200 largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com> [Tue, 11 Oct 2011 13:15:29 +0200] rev 15225
largefiles: add test for status
Tue, 11 Oct 2011 10:42:56 +0200 largefiles: remove pre-1.9 code from extension first bundled with 1.9
Na'Tosha Bard <natosha@unity3d.com> [Tue, 11 Oct 2011 10:42:56 +0200] rev 15224
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Tue, 11 Oct 2011 23:16:05 -0500 pyflakes: clean up some import noise
Matt Mackall <mpm@selenic.com> [Tue, 11 Oct 2011 23:16:05 -0500] rev 15223
pyflakes: clean up some import noise
Tue, 11 Oct 2011 20:21:13 -0500 bdiff: fix pointer aliasing
Matt Mackall <mpm@selenic.com> [Tue, 11 Oct 2011 20:21:13 -0500] rev 15222
bdiff: fix pointer aliasing
Tue, 11 Oct 2011 08:32:04 -0500 import: add --edit switch
Matt Mackall <mpm@selenic.com> [Tue, 11 Oct 2011 08:32:04 -0500] rev 15221
import: add --edit switch
Mon, 10 Oct 2011 23:07:09 -0500 transplant: add --edit option
Matt Mackall <mpm@selenic.com> [Mon, 10 Oct 2011 23:07:09 -0500] rev 15220
transplant: add --edit option
Mon, 10 Oct 2011 23:01:25 -0500 rebase: add --edit switch
Matt Mackall <mpm@selenic.com> [Mon, 10 Oct 2011 23:01:25 -0500] rev 15219
rebase: add --edit switch
Mon, 10 Oct 2011 17:57:40 -0500 httpclient: update to 07d8c356f4d1 of py-nonblocking-http
Augie Fackler <durin42@gmail.com> [Mon, 10 Oct 2011 17:57:40 -0500] rev 15218
httpclient: update to 07d8c356f4d1 of py-nonblocking-http This addresses a defect when the server closes the socket before finishing a response (if it crashes, for example) first spotted in Issue2951.
Mon, 10 Oct 2011 13:52:54 +0200 wireproto: do not call pushkey module directly (issue3041)
Andreas Freimuth <andreas.freimuth@united-bits.de> [Mon, 10 Oct 2011 13:52:54 +0200] rev 15217
wireproto: do not call pushkey module directly (issue3041) Call the repos pushkey/listkeys member function instead. So the pushkey-hooks are triggered.
Mon, 10 Oct 2011 17:34:17 +0200 largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com> [Mon, 10 Oct 2011 17:34:17 +0200] rev 15216
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Mon, 10 Oct 2011 17:33:17 +0200 setup: add largefiles to list of packages
Na'Tosha Bard <natosha@unity3d.com> [Mon, 10 Oct 2011 17:33:17 +0200] rev 15215
setup: add largefiles to list of packages
Sun, 09 Oct 2011 16:14:37 -0500 rebase: move updatedirstate into cmdutil so it can be shared
Matt Mackall <mpm@selenic.com> [Sun, 09 Oct 2011 16:14:37 -0500] rev 15214
rebase: move updatedirstate into cmdutil so it can be shared
Sun, 09 Oct 2011 11:03:57 -0500 subrepo: add git to the help topic
Matt Mackall <mpm@selenic.com> [Sun, 09 Oct 2011 11:03:57 -0500] rev 15213
subrepo: add git to the help topic
Sat, 08 Oct 2011 15:19:05 -0500 branch: fix formatting of help note
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 15:19:05 -0500] rev 15212
branch: fix formatting of help note
Sat, 08 Oct 2011 14:18:18 -0500 backout: deprecate/hide support for backing out merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 14:18:18 -0500] rev 15211
backout: deprecate/hide support for backing out merges This has never worked usefully: - it can't undo a completely unwanted merge, as it leaves the merge in the DAG - it can't undo a faulty merge as that means doing a merge correctly, not simply reverting to one or the other parent Both of these kinds of merge also require coordinated action among developers to avoid the bad merge continuing to affect future merges, so we should stop pretending that backout is of any help here. As backing out a merge now requires a hidden option, it can't be done by accident, but will continue to 'work' for anyone who's already dependent on --parent for some unknown reason.
Sat, 08 Oct 2011 13:28:13 -0500 backout: add a note about not working on merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:28:13 -0500] rev 15210
backout: add a note about not working on merges
Sat, 08 Oct 2011 13:23:57 -0500 backout: mark some help verbose
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:23:57 -0500] rev 15209
backout: mark some help verbose
Fri, 07 Oct 2011 17:22:12 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 17:22:12 -0500] rev 15208
merge with stable
Thu, 06 Oct 2011 19:45:26 -0300 acl: more descriptive error messages
Elifarley Callado Coelho Cruz [Thu, 06 Oct 2011 19:45:26 -0300] rev 15207
acl: more descriptive error messages
Thu, 06 Oct 2011 11:10:06 +0200 largefiles: fix commit of specified file on non-windows
Na'Tosha Bard <natosha@unity3d.com> [Thu, 06 Oct 2011 11:10:06 +0200] rev 15206
largefiles: fix commit of specified file on non-windows
Wed, 05 Oct 2011 10:28:39 +0200 convert: detect false cset boundaries in cvsps descriptions
jakob krainz <jakob@hawo-net.de> [Wed, 05 Oct 2011 10:28:39 +0200] rev 15205
convert: detect false cset boundaries in cvsps descriptions
Tue, 04 Oct 2011 19:43:45 -0400 transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca> [Tue, 04 Oct 2011 19:43:45 -0400] rev 15204
transplant: wrap a transaction around the whole command
Fri, 07 Oct 2011 17:08:24 -0500 help: generate command help into a single RST string for formatting
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 17:08:24 -0500] rev 15203
help: generate command help into a single RST string for formatting
(0) -10000 -3000 -1000 -192 +192 +1000 +3000 +10000 +30000 tip