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/06/28 14:34:00 UTC
svn commit: r1354980 - /subversion/trunk/subversion/svn/log-cmd.c
Author: stsp
Date: Thu Jun 28 12:33:59 2012
New Revision: 1354980
URL: http://svn.apache.org/viewvc?rev=1354980&view=rev
Log:
* subversion/svn/log-cmd.c
(match_search_pattern): If matching the search pattern against changed
paths, match any copy-from paths in the log entry, too.
Modified:
subversion/trunk/subversion/svn/log-cmd.c
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1354980&r1=1354979&r2=1354980&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Thu Jun 28 12:33:59 2012
@@ -185,9 +185,18 @@ match_search_pattern(const char *search_
hi = apr_hash_next(hi))
{
const char *path = svn__apr_hash_index_key(hi);
+ svn_log_changed_path2_t *log_item;
if (apr_fnmatch(pattern, path, flags) == APR_SUCCESS)
return TRUE;
+
+ /* Match copy-from paths, too. */
+ log_item = svn__apr_hash_index_val(hi);
+ if (log_item->copyfrom_path
+ && SVN_IS_VALID_REVNUM(log_item->copyfrom_rev)
+ && apr_fnmatch(pattern,
+ log_item->copyfrom_path, flags) == APR_SUCCESS)
+ return TRUE;
}
}