Mercurial > hgsubversion
view tests/fixtures/symlinks.svndump @ 937:fb6f6b7fa5a5
editor: implement file batons
The concept of current.file is incorrect, svn_delta.h documents open
file lifetime as:
* 5. When the producer calls @c open_file or @c add_file, either:
*
* (a) The producer must follow with any changes to the file
* (@c change_file_prop and/or @c apply_textdelta, as applicable),
* followed by a @c close_file call, before issuing any other file
* or directory calls, or
*
* (b) The producer must follow with a @c change_file_prop call if
* it is applicable, before issuing any other file or directory
* calls; later, after all directory batons including the root
* have been closed, the producer must issue @c apply_textdelta
* and @c close_file calls.
So, an open file can be kept open until after the root directory is
closed and have deltas applied afterwards. In the meantime, other files
may have been opened and patched, overwriting the current.file variable.
This patch fixes it by introducing file batons bound to file paths, and
using them to deduce the correct target in apply_textdelta(). In theory,
open files could be put in a staging area until they are closed and
moved in the RevisionData. But the current code registers files copied
during a directory copy as open files and these will not receive a
close_file() event. This separation will be enforced later.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 23 Sep 2012 19:52:48 +0200 |
| parents | b3128fec5d54 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: bcc1a3f4-ccae-49ba-b1c5-003ce86e3e31 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-12-15T21:58:13.685247Z PROPS-END Revision-number: 1 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 init project K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:13.747067Z 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 Revision-number: 2 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 add symlinks K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:14.243223Z 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/linka Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 39 K 11 svn:special V 1 * PROPS-END link a Node-path: trunk/linka Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 39 K 11 svn:special V 1 * PROPS-END link a Node-path: trunk/linka2 Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 39 K 11 svn:special V 1 * PROPS-END link a Revision-number: 3 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 15 moving symlinks K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:17.162148Z PROPS-END Node-path: trunk/d2 Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/d Prop-content-length: 34 Content-length: 34 K 13 svn:mergeinfo V 0 PROPS-END Node-path: trunk/linkaa Node-kind: file Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/linka Text-copy-source-md5: c118dba188202a1efc975bef6064180b Text-copy-source-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Prop-content-length: 57 Content-length: 57 K 11 svn:special V 1 * K 13 svn:mergeinfo V 0 PROPS-END Node-path: trunk/linka Node-action: delete Node-path: trunk/d Node-action: delete Revision-number: 4 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 15 update symlinks K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:18.188491Z PROPS-END Node-path: trunk/d2/linka Node-kind: file Node-action: change Text-content-length: 6 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79 Text-content-sha1: 7325442a5f7383205e66db563025d51535883784 Content-length: 6 link b Node-path: trunk/linkaa Node-kind: file Node-action: change Text-content-length: 6 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79 Text-content-sha1: 7325442a5f7383205e66db563025d51535883784 Content-length: 6 link b Revision-number: 5 Prop-content-length: 110 Content-length: 110 K 7 svn:log V 9 undo link K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:19.297689Z PROPS-END Node-path: trunk/d2/linka Node-action: delete Node-path: trunk/linka2 Node-kind: file Node-action: replace Prop-content-length: 10 Text-content-length: 6 Text-content-md5: edc3d3797971f12c7f5e1d106dd5cee2 Text-content-sha1: eff1098d818d1f471af4a2cbdb0223e4e030a158 Content-length: 16 PROPS-END data2 Node-path: trunk/linkaa Node-kind: file Node-action: change Prop-content-length: 34 Text-content-length: 5 Text-content-md5: 6137cde4893c59f76f005a8123d8e8e6 Text-content-sha1: c5d84736ba451747dd5f0eb9d17e104f3697ef47 Content-length: 39 K 13 svn:mergeinfo V 0 PROPS-END data Revision-number: 6 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 15 recreate a link K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-08T14:57:19.667088Z PROPS-END Node-path: trunk/linka3 Node-kind: file Node-action: add Prop-content-length: 59 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 65 K 11 svn:special V 1 * K 14 svn:needs-lock V 1 * PROPS-END link a Revision-number: 7 Prop-content-length: 128 Content-length: 128 K 7 svn:log V 27 delete property from a link K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-08T14:57:40.331635Z PROPS-END Node-path: trunk/linka3 Node-kind: file Node-action: change Prop-content-length: 33 Content-length: 33 K 11 svn:special V 1 * PROPS-END Revision-number: 8 Prop-content-length: 145 Content-length: 145 K 7 svn:log V 44 add an uglily named file and a symlink to it K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-08T15:11:12.267958Z PROPS-END Node-path: trunk/link to this Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Node-path: trunk/linka4 Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 17 Text-content-md5: aecd1324085a1fc5b7aa8950f92dcfb9 Text-content-sha1: d22de0907c0b1878b057c873092e82fd9c50849b Content-length: 50 K 11 svn:special V 1 * PROPS-END link link to this