Mercurial > hgsubversion
view tests/fixtures/subdir_is_file_prefix.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 | c6388ed0ec0a |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 924a052a-5e5a-4a8e-a677-da5565bec340 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2011-03-04T12:33:29.342045Z PROPS-END Revision-number: 1 Prop-content-length: 123 Content-length: 123 K 7 svn:log V 22 Create directory flaf. K 10 svn:author V 6 danchr K 8 svn:date V 27 2011-03-04T12:34:00.349950Z PROPS-END Node-path: flaf Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 138 Content-length: 138 K 7 svn:log V 37 Create the file flaf.txt within flaf. K 10 svn:author V 6 danchr K 8 svn:date V 27 2011-03-04T12:45:01.701033Z PROPS-END Node-path: flaf/flaf.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 15 Text-content-md5: 8c0059c8f7998e8003836b8e8fcb74d7 Text-content-sha1: b7d680bc5411f46395c4ef267001e1a307d7b0d5 Content-length: 25 PROPS-END Goodbye world.