[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r28065 - trunk/subversion/libsvn_fs_util

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-11-29 03:02:02 CET

On Nov 26, 2007 7:57 PM, <glasser@tigris.org> wrote:
> Author: glasser
> Date: Mon Nov 26 19:57:19 2007
> New Revision: 28065
>
> Log:
> * subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
> (index_path_mergeinfo) Don't use a "mergeinfo" hash as a
> "mergeinfo_for_paths" hash. Just pass NULL for result and use the
> "cache" argument to get your answer.
>
>
> Modified:
> trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
>
> Modified: trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c?pathrev=28065&r1=28064&r2=28065
> ==============================================================================
> --- trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c (original)
> +++ trunk/subversion/libsvn_fs_util/mergeinfo-sqlite-index.c Mon Nov 26 19:57:19 2007
> @@ -108,9 +108,9 @@
> apr_pool_t *subpool = svn_pool_create(pool);
> apr_hash_t *cache = apr_hash_make(subpool);
> remove_mergeinfo = TRUE;
> - SVN_ERR(get_mergeinfo_for_path(db, path, new_rev - 1, mergeinfo, cache,
> + SVN_ERR(get_mergeinfo_for_path(db, path, new_rev - 1, NULL, cache,
> svn_mergeinfo_inherited, subpool));
> - mergeinfo = apr_hash_get(mergeinfo, path, APR_HASH_KEY_STRING);
> + mergeinfo = apr_hash_get(cache, path, APR_HASH_KEY_STRING);
> if (mergeinfo)
> mergeinfo = svn_mergeinfo_dup(mergeinfo, pool);

Oops, this was wrong (though the original code was too). Right after
the apr_hash_get we need a

if (mergeinfo == NEGATIVE_CACHE_RESULT)
  mergeinfo = NULL;

I'm off on a branch now and don't have time to build and test on trunk
though :( Will deal with soon if nobody else does first.

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 29 03:02:13 2007

This is an archived mail posted to the Subversion Dev mailing list.