Author: gstein
Date: Fri Apr 19 20:49:08 2024
New Revision: 1917167

URL: http://svn.apache.org/viewvc?rev=1917167&view=rev
Log:
Minor tweaks to start thinking about email using just URLs to keep the
message within the size limit.

* tools/hook-scripts/mailer/mailer.py:
  (generate_content): renamed to ...
  (generate_commit): ... this
  (Commit.generate):
    (long_commit): tweak comment. follow rename.
    (short_commit): new function for shorter emails
    (): pass short_commit to .send()

Modified:
    subversion/trunk/tools/hook-scripts/mailer/mailer.py

Modified: subversion/trunk/tools/hook-scripts/mailer/mailer.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/mailer/mailer.py?rev=1917167&r1=1917166&r2=1917167&view=diff
==============================================================================
--- subversion/trunk/tools/hook-scripts/mailer/mailer.py (original)
+++ subversion/trunk/tools/hook-scripts/mailer/mailer.py Fri Apr 19 20:49:08 
2024
@@ -529,10 +529,17 @@ class Commit(Messenger):
       subject_line = self.make_subject(self.basic_subject, group, params)
 
       def long_commit(writer):
-        # generate the content for this group and set of params
-        generate_content(writer, self.cfg, self.repos, self.changelist,
-                         group, params, paths, iterpool)
-      failed |= output.send(subject_line, group, params, long_commit, None)
+        # generate commit message (with diffs) for this group and params
+        generate_commit(writer, self.cfg, self.repos, self.changelist,
+                        group, params, paths, iterpool)
+
+      def short_commit(writer):
+        # generate a shorter message, using URLs instead of diffs
+        generate_urls(writer, self.cfg, self.repos, self.changelist,
+                      group, params, paths, iterpool)
+
+      failed |= output.send(subject_line, group, params,
+                            long_commit, short_commit)
       svn.core.svn_pool_clear(iterpool)
 
     svn.core.svn_pool_destroy(iterpool)
@@ -764,8 +771,8 @@ class DiffURLSelections:
     return self._get_url('modify', repos_rev, change)
 
 
-def generate_content(writer, cfg, repos, changelist, group, params, paths,
-                     pool):
+def generate_commit(writer, cfg, repos, changelist, group, params, paths,
+                    pool):
 
   svndate = repos.get_rev_prop(svn.core.SVN_PROP_REVISION_DATE, pool)
   ### pick a different date format?


Reply via email to