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/23 18:05:15 UTC
svn commit: r1341927 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: stsp
Date: Wed May 23 16:05:14 2012
New Revision: 1341927
URL: http://svn.apache.org/viewvc?rev=1341927&view=rev
Log:
Fix repos->wc diff of copied/moved directories, i.e. "svn diff -rN DIR"
where DIR is a locally copied or moved-here directory.
Before this commit, the resulting diff would always show the contents
of DIR as being deleted. Now, a diff against the copy source as of rN
is shown, which matches the behaviour described in 'svn help diff'.
* subversion/libsvn_client/diff.c
(diff_cmd_baton): Add repos_wc_diff_target_is_copy boolean, required
to decide whether revision numbers passed into file_added() and
file_changed() can be trusted.
(diff_file_added, diff_file_changed): During a repos->wc diff of a copied
directory, use revision numbers from the diff baton. Both revisions passed
in are SVN_INVALID_REVNUM because the diff target is a local copy.
(diff_repos_wc): When performing a repos->wc diff of a copied directory,
instead of crawling the working copy to create a report, describe the copy
source to the reporter directly. This way, diffing a copy with local
modifications results in similar output as if the copy source was modified
and then diffed (but the source need not be present in the working copy).
Suggested by: rhuijben
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=1341927&r1=1341926&r2=1341927&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Wed May 23 16:05:14 2012
@@ -800,6 +800,9 @@ struct diff_cmd_baton {
/* The anchor to prefix before wc paths */
const char *anchor;
+ /* Whether the local diff target of a repos->wc diff is a copy. */
+ svn_boolean_t repos_wc_diff_target_is_copy;
+
/* A hashtable using the visited paths as keys.
* ### This is needed for us to know if we need to print a diff header for
* ### a path that has property changes. */
@@ -1132,6 +1135,19 @@ diff_file_changed(svn_wc_notify_state_t
{
struct diff_cmd_baton *diff_cmd_baton = diff_baton;
+ /* During repos->wc diff of a copy revision numbers obtained
+ * from the working copy are always SVN_INVALID_REVNUM. */
+ if (diff_cmd_baton->repos_wc_diff_target_is_copy)
+ {
+ if (rev1 == SVN_INVALID_REVNUM &&
+ diff_cmd_baton->revnum1 != SVN_INVALID_REVNUM)
+ rev1 = diff_cmd_baton->revnum1;
+
+ if (rev2 == SVN_INVALID_REVNUM &&
+ diff_cmd_baton->revnum2 != SVN_INVALID_REVNUM)
+ rev2 = diff_cmd_baton->revnum2;
+ }
+
if (diff_cmd_baton->anchor)
path = svn_dirent_join(diff_cmd_baton->anchor, path, scratch_pool);
if (tmpfile1)
@@ -1178,6 +1194,19 @@ diff_file_added(svn_wc_notify_state_t *c
{
struct diff_cmd_baton *diff_cmd_baton = diff_baton;
+ /* During repos->wc diff of a copy revision numbers obtained
+ * from the working copy are always SVN_INVALID_REVNUM. */
+ if (diff_cmd_baton->repos_wc_diff_target_is_copy)
+ {
+ if (rev1 == SVN_INVALID_REVNUM &&
+ diff_cmd_baton->revnum1 != SVN_INVALID_REVNUM)
+ rev1 = diff_cmd_baton->revnum1;
+
+ if (rev2 == SVN_INVALID_REVNUM &&
+ diff_cmd_baton->revnum2 != SVN_INVALID_REVNUM)
+ rev2 = diff_cmd_baton->revnum2;
+ }
+
if (diff_cmd_baton->anchor)
path = svn_dirent_join(diff_cmd_baton->anchor, path, scratch_pool);
@@ -2926,6 +2955,10 @@ diff_repos_wc(const char *path_or_url1,
const char *anchor_abspath;
svn_node_kind_t kind1;
svn_node_kind_t kind2;
+ svn_boolean_t is_copy;
+ svn_revnum_t copyfrom_rev;
+ const char *copy_source_repos_relpath;
+ const char *copy_source_repos_root_url;
SVN_ERR_ASSERT(! svn_path_is_url(path2));
@@ -3020,9 +3053,6 @@ diff_repos_wc(const char *path_or_url1,
}
/* Else, use the diff editor to generate the diff. */
- SVN_ERR(svn_ra_reparent(ra_session, anchor_url, pool));
- SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth,
- SVN_RA_CAPABILITY_DEPTH, pool));
SVN_ERR(svn_wc__get_diff_editor(&diff_editor, &diff_edit_baton,
ctx->wc_ctx,
anchor_abspath,
@@ -3038,32 +3068,88 @@ diff_repos_wc(const char *path_or_url1,
callbacks, callback_baton,
ctx->cancel_func, ctx->cancel_baton,
pool, pool));
+ SVN_ERR(svn_ra_reparent(ra_session, anchor_url, pool));
+ SVN_ERR(svn_ra_has_capability(ra_session, &server_supports_depth,
+ SVN_RA_CAPABILITY_DEPTH, pool));
if (depth != svn_depth_infinity)
diff_depth = depth;
else
diff_depth = svn_depth_unknown;
- /* Tell the RA layer we want a delta to change our txn to URL1 */
- SVN_ERR(svn_ra_do_diff3(ra_session,
- &reporter, &reporter_baton,
- rev,
- target,
- diff_depth,
- ignore_ancestry,
- TRUE, /* text_deltas */
- url1,
- diff_editor, diff_edit_baton, pool));
-
- /* Create a txn mirror of path2; the diff editor will print
- diffs in reverse. :-) */
- SVN_ERR(svn_wc_crawl_revisions5(ctx->wc_ctx, abspath2,
- reporter, reporter_baton,
- FALSE, depth, TRUE, (! server_supports_depth),
- FALSE,
- ctx->cancel_func, ctx->cancel_baton,
- NULL, NULL, /* notification is N/A */
- pool));
+ /* Check if our diff target is a copied node. */
+ SVN_ERR(svn_wc__node_get_origin(&is_copy,
+ ©from_rev,
+ ©_source_repos_relpath,
+ ©_source_repos_root_url,
+ NULL, NULL,
+ ctx->wc_ctx, abspath2,
+ FALSE, pool, pool));
+ if (is_copy)
+ {
+ const char *copyfrom_url;
+ const char *copyfrom_parent_url;
+ const char *copyfrom_basename;
+ svn_depth_t copy_depth;
+
+ callback_baton->repos_wc_diff_target_is_copy = TRUE;
+
+ /* We're diffing a locally copied/moved directory.
+ * Describe the copy source to the reporter instead of the copy itself.
+ * Doing the latter would generate a single add_directory() call to the
+ * diff editor which results in an unexpected diff (the copy would
+ * be shown as deleted). */
+
+ copyfrom_url = apr_pstrcat(pool, copy_source_repos_root_url, "/",
+ copy_source_repos_relpath, (char *)NULL);
+ svn_uri_split(©from_parent_url, ©from_basename,
+ copyfrom_url, pool);
+ SVN_ERR(svn_ra_reparent(ra_session, copyfrom_parent_url, pool));
+
+ /* Tell the RA layer we want a delta to change our txn to URL1 */
+ SVN_ERR(svn_ra_do_diff3(ra_session,
+ &reporter, &reporter_baton,
+ rev,
+ copyfrom_basename,
+ diff_depth,
+ ignore_ancestry,
+ TRUE, /* text_deltas */
+ url1,
+ diff_editor, diff_edit_baton, pool));
+
+ /* Report the copy source. */
+ SVN_ERR(svn_wc__node_get_depth(©_depth, ctx->wc_ctx, abspath2,
+ pool));
+ SVN_ERR(reporter->set_path(reporter_baton, "", copyfrom_rev,
+ copy_depth, FALSE, NULL, pool));
+
+ /* Finish the report to generate the diff. */
+ SVN_ERR(reporter->finish_report(reporter_baton, pool));
+ }
+ else
+ {
+ /* Tell the RA layer we want a delta to change our txn to URL1 */
+ SVN_ERR(svn_ra_do_diff3(ra_session,
+ &reporter, &reporter_baton,
+ rev,
+ target,
+ diff_depth,
+ ignore_ancestry,
+ TRUE, /* text_deltas */
+ url1,
+ diff_editor, diff_edit_baton, pool));
+
+ /* Create a txn mirror of path2; the diff editor will print
+ diffs in reverse. :-) */
+ SVN_ERR(svn_wc_crawl_revisions5(ctx->wc_ctx, abspath2,
+ reporter, reporter_baton,
+ FALSE, depth, TRUE,
+ (! server_supports_depth),
+ FALSE,
+ ctx->cancel_func, ctx->cancel_baton,
+ NULL, NULL, /* notification is N/A */
+ pool));
+ }
return SVN_NO_ERROR;
}