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 2015/08/06 17:07:01 UTC
svn commit: r1694519 - in
/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer:
log.c logic.c mergeinfo-normalizer.h
Author: stefan2
Date: Thu Aug 6 15:07:01 2015
New Revision: 1694519
URL: http://svn.apache.org/r1694519
Log:
On the svn-mergeinfo-normalizer branch:
Add ability to stop the log scan for deletion at a given revision.
* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
(svn_min__find_deletion): Add end revision parameter.
* tools/client-side/svn-mergeinfo-normalizer/log.c
(svn_min__find_deletion): Stop log scan at the given revision.
* tools/client-side/svn-mergeinfo-normalizer/logic.c
(show_obsoletes_summary): Update caller.
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c?rev=1694519&r1=1694518&r2=1694519&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/log.c Thu Aug 6 15:07:01 2015
@@ -439,13 +439,17 @@ svn_min__operative_outside_subtree(svn_m
svn_revnum_t
svn_min__find_deletion(svn_min__log_t *log,
- const char *path)
+ const char *path,
+ svn_revnum_t end_rev)
{
int i, k;
for (i = log->entries->nelts - 1; i >= 0; --i)
{
const log_entry_t *entry = APR_ARRAY_IDX(log->entries, i,
const log_entry_t *);
+ if (entry->revision < end_rev)
+ break;
+
if (!entry->deletions)
continue;
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1694519&r1=1694518&r2=1694519&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c Thu Aug 6 15:07:01 2015
@@ -1004,7 +1004,7 @@ show_obsoletes_summary(svn_min__branch_l
const char *path = APR_ARRAY_IDX(paths, i, const char *);
svn_pool_clear(iterpool);
- deletion_rev = log ? svn_min__find_deletion(log, path)
+ deletion_rev = log ? svn_min__find_deletion(log, path, 0)
: SVN_INVALID_REVNUM;
if (SVN_IS_VALID_REVNUM(deletion_rev))
Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h?rev=1694519&r1=1694518&r2=1694519&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h Thu Aug 6 15:07:01 2015
@@ -188,8 +188,9 @@ svn_min__operative_outside_subtree(svn_m
apr_pool_t *result_pool);
svn_revnum_t
-svn_min__find_deletion(svn_min__log_t *log,
- const char *path);
+svn_min__find_deletion(svn_min__log_t* log,
+ const char* path,
+ svn_revnum_t end_rev);
apr_array_header_t *
svn_min__find_deletions(svn_min__log_t *log,