Author: dannas
Date: Sat Jul 10 17:22:21 2010
New Revision: 962890
URL: http://svn.apache.org/viewvc?rev=962890&view=rev
Log:
Only mark paths that contains diffs as visited. Previously we assumed
that all paths that had been invoked by the diff callbacks would have
changes that should be printed. But that's not certain if we for instance
ignore eol differences.
* subversion/libsvn_client/diff.c
(diff_content_changed): Only mark the path as visited if libsvn_diff
says that we have a diff.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=962890&r1=962889&r2=962890&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Sat Jul 10 17:22:21 2010
@@ -863,6 +863,11 @@ diff_content_changed(const char *path,
diff_cmd_baton->header_encoding, rel_to_dir,
diff_cmd_baton->options.for_internal->show_c_function,
subpool));
+
+ /* We have a printed a diff for this path, mark it as visited. */
+ apr_hash_set(diff_cmd_baton->visited_paths, path,
+ APR_HASH_KEY_STRING, path);
+
}
}
@@ -873,8 +878,6 @@ diff_content_changed(const char *path,
/* Destroy the subpool. */
svn_pool_destroy(subpool);
- apr_hash_set(diff_cmd_baton->visited_paths, path, APR_HASH_KEY_STRING, path);
-
return SVN_NO_ERROR;
}
