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.
(0) -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 +30000 tip