Mercurial > hg
view tests/svn/replace.svndump @ 23923:ab6fd3205dad stable
largefiles: fix commit of a directory with no largefile changes (issue4330)
When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory. The directory is
then dropped from the list, so that committing a directory with no normal file
changes works. It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.
The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list. It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:
abort: .hglf/foo/bar: no match under directory!
This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().
The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences. It is not necessary to append '.'
for Windows to run the largefiles tests cleanly. But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory. The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory. This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4. It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit. I dont have access to an OS X machine ATM to test
there.
Maybe there's a better way to do this. But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this. There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is. The
added tests confirm this.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 18 Jan 2015 15:15:40 -0500 |
| parents | 5fb924ee44d5 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 97a955ef-0269-44f2-a58f-abd4ad400b2b Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-11-26T18:01:12.912988Z PROPS-END Revision-number: 1 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 initial K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-11-26T18:01:13.106933Z PROPS-END Node-path: branches 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 Node-path: trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b Content-length: 12 PROPS-END a Node-path: trunk/d Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/d/b Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 3b5d5c3712955042212316173ccf37be Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b Content-length: 12 PROPS-END b Node-path: trunk/d2 Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/d2/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b Content-length: 12 PROPS-END a Node-path: trunk/dlink Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: cca56829f18345718a4980bb02b6d8c3 Text-content-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49 Content-length: 39 K 11 svn:special V 1 * PROPS-END link d Node-path: trunk/dlink2 Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: cca56829f18345718a4980bb02b6d8c3 Text-content-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49 Content-length: 39 K 11 svn:special V 1 * PROPS-END link d Node-path: trunk/dlink3 Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: cca56829f18345718a4980bb02b6d8c3 Text-content-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49 Content-length: 39 K 11 svn:special V 1 * PROPS-END link d Revision-number: 2 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 15 clobber symlink K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-11-26T18:01:14.073483Z PROPS-END Node-path: trunk/dlink3 Node-kind: file Node-action: change Prop-content-length: 10 Text-content-length: 2 Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff Content-length: 12 PROPS-END d Revision-number: 3 Prop-content-length: 106 Content-length: 106 K 7 svn:log V 8 clobber1 K 10 svn:author V 4 evil K 8 svn:date V 27 2010-11-26T18:01:16.205184Z PROPS-END Node-path: trunk/a Node-kind: dir Node-action: delete Node-path: trunk/a Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/d Node-path: trunk/dlink Node-kind: dir Node-action: delete Node-path: trunk/dlink Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/d Revision-number: 4 Prop-content-length: 106 Content-length: 106 K 7 svn:log V 8 clobber2 K 10 svn:author V 4 evil K 8 svn:date V 27 2010-11-26T18:01:16.395962Z PROPS-END Node-path: trunk/dlink3 Node-kind: file Node-action: delete Node-path: trunk/dlink3 Node-kind: file Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: trunk/dlink2 Text-copy-source-md5: cca56829f18345718a4980bb02b6d8c3 Text-copy-source-sha1: 7c54cc5d472b78c94a04382df34b0f4f0f4f2d49 Revision-number: 5 Prop-content-length: 106 Content-length: 106 K 7 svn:log V 5 adddb K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-11-26T18:01:16.445072Z PROPS-END Node-path: trunk/d2/b Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 3b5d5c3712955042212316173ccf37be Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b Content-length: 12 PROPS-END b Revision-number: 6 Prop-content-length: 107 Content-length: 107 K 7 svn:log V 6 branch K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-11-26T18:01:19.075874Z PROPS-END Node-path: branches/branch Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: trunk Node-path: branches/branch/d2/c Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1 Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69 Content-length: 12 PROPS-END c Node-path: branches/branch/d2/b Node-action: delete Revision-number: 7 Prop-content-length: 109 Content-length: 109 K 7 svn:log V 10 clobberdir K 10 svn:author V 4 evil K 8 svn:date V 27 2010-11-26T18:01:21.202158Z PROPS-END Node-path: trunk/d2 Node-kind: dir Node-action: delete Node-path: trunk/d2 Node-kind: dir Node-action: add Node-copyfrom-rev: 6 Node-copyfrom-path: branches/branch/d2