Mercurial > hg
view tests/svn/encoding.svndump @ 23976:344939126579 stable
largefiles: don't interfere with logging normal files
The previous code was adding standin files to the matcher's file list when
neither the standin file nor the original existed in the context. Somehow, this
was confusing the logging code into behaving differently from when the extension
wasn't loaded.
It seems that this was an attempt to support naming a directory that only
contains largefiles, as a test fails if the else clause is dropped entirely.
Therefore, only append the "standin" if it is a directory. This was found by
running the test suite with --config extensions.largefiles=.
The first added test used to log an additional cset that wasn't logged normally.
The only relation it had to file 'a' is that 'a' was the source of a move, but
it isn't clear why having '.hglf/a' in the list causes this change:
@@ -47,6 +47,11 @@
Make sure largefiles doesn't interfere with logging a regular file
$ hg log a --config extensions.largefiles=
+ changeset: 3:2ca5ba701980
+ user: test
+ date: Thu Jan 01 00:00:04 1970 +0000
+ summary: d
+
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
The second added test used to complain about a file not being in the parent
revision:
@@ -1638,10 +1643,8 @@
Ensure that largefiles doesn't intefere with following a normal file
$ hg --config extensions.largefiles= log -f d -T '{desc}' -G
- @ c
- |
- o a
-
+ abort: cannot follow file not in parent revision: ".hglf/d"
+ [255]
$ hg log -f d/a -T '{desc}' -G
@ c
|
Note that there is still something fishy with the largefiles code, because when
using a glob pattern like this:
$ hg log 'glob:sub/*'
the pattern list would contain '.hglf/glob:sub/*'. None of the tests show this
(this test lives in test-largefiles.t at 1349), it was just something that I
noticed when the code was loaded up with print statements.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 30 Jan 2015 20:44:11 -0500 |
parents | 0332f8b44e54 |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-06-21T16:34:55.835945Z PROPS-END Revision-number: 1 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 10 init projA K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:34:55.909545Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 106 Content-length: 106 K 7 svn:log V 5 hello K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:34:56.150049Z PROPS-END Node-path: trunk/à Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/à/é Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff Content-length: 12 PROPS-END d Node-path: trunk/é Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 9ffbf43126e33be52cd2bf7e01d627f9 Text-content-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff Content-length: 12 PROPS-END e Revision-number: 3 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 10 copy files K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:34:59.089402Z PROPS-END Node-path: trunk/è Node-kind: file Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/é Text-copy-source-md5: 9ffbf43126e33be52cd2bf7e01d627f9 Text-copy-source-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff Node-path: trunk/ù Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/à Node-path: trunk/à Node-action: delete Node-path: trunk/é Node-action: delete Revision-number: 4 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 remove files K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:35:00.165121Z PROPS-END Node-path: trunk/è Node-action: delete Node-path: trunk/ù Node-action: delete Revision-number: 5 Prop-content-length: 120 Content-length: 120 K 7 svn:log V 18 branch to branché K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:35:03.079138Z PROPS-END Node-path: branches/branché Node-kind: dir Node-action: add Node-copyfrom-rev: 4 Node-copyfrom-path: trunk Revision-number: 6 Prop-content-length: 121 Content-length: 121 K 7 svn:log V 19 branch to branchée K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:35:06.060801Z PROPS-END Node-path: branches/branchée Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branché Revision-number: 7 Prop-content-length: 110 Content-length: 110 K 7 svn:log V 9 tag trunk K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:35:09.061530Z PROPS-END Node-path: tags/branché Node-kind: dir Node-action: add Node-copyfrom-rev: 6 Node-copyfrom-path: trunk Revision-number: 8 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 tag branché K 10 svn:author V 7 pmezard K 8 svn:date V 27 2009-06-21T16:35:11.068562Z PROPS-END Node-path: tags/branchée Node-kind: dir Node-action: add Node-copyfrom-rev: 6 Node-copyfrom-path: branches/branchée