Mercurial > hgsubversion
view tests/fixtures/propset-branch.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 | e2c3349b2cca |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 6506bfb9-9ce8-4b91-8357-4dc8bef2ecc6 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-07-10T11:55:08.483993Z PROPS-END Revision-number: 1 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 21 create initial layout K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:55:57.419315Z 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: 111 Content-length: 111 K 7 svn:log V 10 add a file K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:56:54.708286Z PROPS-END Node-path: trunk/a.txt 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 Revision-number: 3 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 15 create a branch K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:57:29.710978Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 14 set a property K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:58:41.440627Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: change Prop-content-length: 42 Content-length: 42 K 12 the-property V 9 something PROPS-END