You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/05/14 19:59:29 UTC
svn propchange: r1338314 - svn:log
Author: stsp
Revision: 1338314
Modified property: svn:log
Modified: svn:log at Mon May 14 17:59:29 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon May 14 17:59:29 2012
@@ -1,33 +1,7 @@
-Rewrite the client-side diff code for showing added/deleted diff targets,
-fixing inconsistencies with paths shown in diff output.
-
-For related discussion, see this #svn-dev IRC conversation at
- http://colabti.org/irclogger/irclogger_log/svn-dev?date=2012-05-03#l726
-and also this thread on the dev@ list:
- Date: Mon, 19 Mar 2012 21:54:58 +0100
- From: Dmitry Pavlenko
- To: dev@
- Subject: paths in diff output (possible bug)
- Message-Id: <20...@tmatesoft.com>
- http://svn.haxx.se/dev/archive-2012-03/0385.shtml
-
* subversion/libsvn_client/diff.c
- (diff_prepare_repos_repos): Remove the hack of finding an existing common
- ancestor if one target does not exist. Instead, return node kinds of both
- diff targets to allow the caller to handle the handle this case instead.
- (make_regular_props_array): New helper that transforms a prop-hash retrieved
- from the RA layer into a changed-props array expected by diff callbacks.
- (diff_repos_repos_added_or_deleted_file,
- diff_repos_repos_added_or_deleted_dir,
- diff_repos_repos_added_or_deleted_target): New functions that handle added
- and deleted diff targets during repos<->repos diffs. Files content is
- retrieved from the RA layer and diffed against the empty file via the
- diff callabacks. File and directory properties are reported as added or
- deleted to the diff callbacks.
- (diff_repos_repos, diff_summarize_repos_repos): If one of the diff targets
- does not exist, invoke the new diff_repos_repos_added_or_deleted_target()
- function instead of using the diff editor.
+ (diff_repos_repos_added_or_deleted_file): Avoid direct use of the temporary
+ file handle by deleting the temporary file upon pool cleanup instead of when
+ the file is closed. This allows us to flush buffers to disk by closing the
+ 'content' stream rather than calling flush() on the file handle.
-* subversion/tests/cmdline/log_tests.py
- (log_diff_moved): Adjust expected output and remove XFail for DAV RA layers.
- This test now passes over all RA layers.
+Suggested by: rhuijben