You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by kf...@collab.net on 2004/11/24 17:50:36 UTC
Re: svn commit: r12003 - in trunk/subversion: include libsvn_fs_base libsvn_fs_fs mod_dav_svn
cmpilato@tigris.org writes:
> --- trunk/subversion/mod_dav_svn/repos.c (original)
> +++ trunk/subversion/mod_dav_svn/repos.c Tue Nov 23 12:23:17 2004
> @@ -2354,6 +2354,7 @@
> {
> svn_error_t *serr;
> dav_error *err;
> + const char *src_repos_path, *dst_repos_path;
>
> /* ### source must be from a collection under baseline control. the
> ### baseline will (implicitly) indicate the source revision, and the
> @@ -2395,12 +2396,29 @@
> if (err)
> return err;
> }
> -
> - serr = svn_fs_copy (src->info->root.root, /* the root object of src rev*/
> - src->info->repos_path, /* the relative path of src */
> - dst->info->root.root, /* the root object of dst txn*/
> - dst->info->repos_path, /* the relative path of dst */
> - src->pool);
> +
> + serr = svn_path_get_absolute(&src_repos_path,
> + svn_repos_path(src->info->repos->repos,
> + src->pool),
> + src->pool);
> + if (!serr)
> + serr = svn_path_get_absolute(&dst_repos_path,
> + svn_repos_path(dst->info->repos->repos,
> + dst->pool),
> + dst->pool);
> +
> + if (!serr)
> + {
> + if (strcmp(src_repos_path, dst_repos_path) != 0)
> + return dav_new_error
> + (dst->pool, HTTP_INTERNAL_SERVER_ERROR, 0,
> + "Copy source and destination are in different repositories.");
> + serr = svn_fs_copy (src->info->root.root, /* root object of src rev*/
> + src->info->repos_path, /* relative path of src */
> + dst->info->root.root, /* root object of dst txn*/
> + dst->info->repos_path, /* relative path of dst */
> + src->pool);
> + }
> if (serr)
> return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
> "Unable to make a filesystem copy.",
This is the minorest of nits, but there seems to be an inconsistent
space-before-paren style going on here. I don't know whether that was
already true in this file, but in any case, it's inconsistent even
within the block of added lines above.
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r12003 - in trunk/subversion: include libsvn_fs_base libsvn_fs_fs mod_dav_svn
Posted by "C. Michael Pilato" <cm...@collab.net>.
kfogel@collab.net writes:
> "C. Michael Pilato" <cm...@collab.net> writes:
> > Not when you realize that the inconsistent parts aren't actually
> > added, but indented lines. All the new code uses the
> > no-space-before-paren mod_dav_svn standard. I just failed to catch
> > the inconsistency in the existing code during my edit.
>
> Oh, duh. Well, anyway, I've fixed the formatting throughout that file
> now, see r12023. Just couldn't take it anymore, I guess :-).
Thankya.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r12003 - in trunk/subversion: include libsvn_fs_base libsvn_fs_fs mod_dav_svn
Posted by kf...@collab.net.
"C. Michael Pilato" <cm...@collab.net> writes:
> Not when you realize that the inconsistent parts aren't actually
> added, but indented lines. All the new code uses the
> no-space-before-paren mod_dav_svn standard. I just failed to catch
> the inconsistency in the existing code during my edit.
Oh, duh. Well, anyway, I've fixed the formatting throughout that file
now, see r12023. Just couldn't take it anymore, I guess :-).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r12003 - in trunk/subversion: include libsvn_fs_base libsvn_fs_fs mod_dav_svn
Posted by "C. Michael Pilato" <cm...@collab.net>.
kfogel@collab.net writes:
> > -
> > - serr = svn_fs_copy (src->info->root.root, /* the root object of src rev*/
> > - src->info->repos_path, /* the relative path of src */
> > - dst->info->root.root, /* the root object of dst txn*/
> > - dst->info->repos_path, /* the relative path of dst */
> > - src->pool);
[...]
> > + serr = svn_fs_copy (src->info->root.root, /* root object of src rev*/
> > + src->info->repos_path, /* relative path of src */
> > + dst->info->root.root, /* root object of dst txn*/
> > + dst->info->repos_path, /* relative path of dst */
> > + src->pool);
> > + }
> This is the minorest of nits, but there seems to be an inconsistent
> space-before-paren style going on here. I don't know whether that was
> already true in this file, but in any case, it's inconsistent even
> within the block of added lines above.
Not when you realize that the inconsistent parts aren't actually
added, but indented lines. All the new code uses the
no-space-before-paren mod_dav_svn standard. I just failed to catch
the inconsistency in the existing code during my edit.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org