Author: svn-role
Date: Sat Jan 20 04:00:02 2024
New Revision: 1915337
URL: http://svn.apache.org/viewvc?rev=1915337&view=rev
Log:
Merge r1914518 from trunk:
* r1914518
Fix inconsistency in path argment on Config.which_group()
Justification:
Bug fix.
Votes:
+1: futatuki, dsahlberg
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1914518
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1915337&r1=1915336&r2=1915337&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jan 20 04:00:02 2024
@@ -44,13 +44,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1914518
- Fix inconsistency in path argment on Config.which_group()
- Justification:
- Bug fix.
- Votes:
- +1: futatuki, dsahlberg
-
* r1915316
swig-py: Fix `none_dealloc` error caused by reference count issue in
`apply_textdelta` invoked from `svn.repos.replay()`.
Modified: subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py?rev=1915337&r1=1915336&r2=1915337&view=diff
==============================================================================
--- subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/branches/1.14.x/tools/hook-scripts/mailer/mailer.py Sat Jan 20
04:00:02 2024
@@ -473,7 +473,7 @@ class Commit(Messenger):
# collect the set of groups and the unique sets of params for the options
self.groups = { }
for path, change in self.changelist:
- for (group, params) in self.cfg.which_groups(path, log):
+ for (group, params) in self.cfg.which_groups(to_str(path), log):
# turn the params into a hashable object and stash it away
param_list = sorted(params.items())
# collect the set of paths belonging to this group
@@ -1475,9 +1475,9 @@ class Config:
"Return the path's associated groups."
groups = []
for group, pattern, exclude_pattern, repos_params, search_logmsg_re in
self._group_re:
- match = pattern.match(to_str(path))
+ match = pattern.match(path)
if match:
- if exclude_pattern and exclude_pattern.match(to_str(path)):
+ if exclude_pattern and exclude_pattern.match(path):
continue
params = repos_params.copy()
params.update(match.groupdict())
