public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Tobias Burnus <burnus@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-4741] gcc-changelog/git_email.py: Support older unidiff.PatchSet
Date: Fri, 16 Dec 2022 10:02:42 +0000 (GMT)	[thread overview]
Message-ID: <20221216100242.723613830FC0@sourceware.org> (raw)

https://gcc.gnu.org/g:8f2a8be579fc6acadb9fc356701fcb5e7b0feed5

commit r13-4741-g8f2a8be579fc6acadb9fc356701fcb5e7b0feed5
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Fri Dec 16 11:01:22 2022 +0100

    gcc-changelog/git_email.py: Support older unidiff.PatchSet
    
    Commit "unidiff: use newline='\n' argument",
    r13-4603-gb045179973161115c7ea029b2788f5156fc55cda, added support CR
    on a line, but that broke support for older unidiff.PatchSet.
    
    This patch uses a fallback for git_email.py (drop argument) if not
    available (TypeError exception) but keeps using it in test_email.py
    unconditionally.
    
    contrib/ChangeLog:
    
            * gcc-changelog/git_email.py (GitEmail:__init__): Support older
            unidiff.PatchSet that do not have a newline= argument
            of from_filename.

Diff:
---
 contrib/gcc-changelog/git_email.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/gcc-changelog/git_email.py b/contrib/gcc-changelog/git_email.py
index ef50ebfb7fd..093c887ba4c 100755
--- a/contrib/gcc-changelog/git_email.py
+++ b/contrib/gcc-changelog/git_email.py
@@ -39,7 +39,11 @@ unidiff_supports_renaming = hasattr(PatchedFile(), 'is_rename')
 class GitEmail(GitCommit):
     def __init__(self, filename):
         self.filename = filename
-        diff = PatchSet.from_filename(filename, newline='\n')
+        try:
+          diff = PatchSet.from_filename(filename, newline='\n')
+        except TypeError:
+          # Older versions don't have the newline argument
+          diff = PatchSet.from_filename(filename)
         date = None
         author = None
         subject = ''

                 reply	other threads:[~2022-12-16 10:02 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221216100242.723613830FC0@sourceware.org \
    --to=burnus@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).