public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/changelog-add-note)] gcc-changelog: Add note about ChangeLog entries
@ 2021-05-24 7:16 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2021-05-24 7:16 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:7a8e19e68c9c73ce18aeea02fc7e82fd4326a5a2
commit 7a8e19e68c9c73ce18aeea02fc7e82fd4326a5a2
Author: Martin Liska <mliska@suse.cz>
Date: Mon May 24 09:16:01 2021 +0200
gcc-changelog: Add note about ChangeLog entries
contrib/ChangeLog:
* gcc-changelog/git_commit.py: Add note that ChangeLog entries
are added automatically.
* gcc-changelog/test_email.py: Update test.
Diff:
---
contrib/gcc-changelog/git_commit.py | 8 +++++---
contrib/gcc-changelog/test_email.py | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 4958ab9c159..bd8c1ff7af2 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -326,9 +326,11 @@ class GitCommit:
# All modified files are only MISC files
return
elif project_files:
- self.errors.append(Error('ChangeLog, DATESTAMP, BASE-VER and '
- 'DEV-PHASE updates should be done '
- 'separately from normal commits'))
+ err = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates ' \
+ 'should be done separately from normal commits\n' \
+ '(note: ChangeLog entries will be automatically ' \
+ 'added by a cron job)'
+ self.errors.append(Error(err))
return
all_are_ignored = (len(project_files) + len(ignored_files)
diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py
index 7472762e66d..6d6596370c4 100755
--- a/contrib/gcc-changelog/test_email.py
+++ b/contrib/gcc-changelog/test_email.py
@@ -258,7 +258,7 @@ class TestGccChangelog(unittest.TestCase):
email = self.from_patch_glob('0001-Add-patch_are')
msg = 'ChangeLog, DATESTAMP, BASE-VER and DEV-PHASE updates should ' \
'be done separately from normal commits'
- assert email.errors[0].message == msg
+ assert email.errors[0].message.startswith(msg)
def test_strict_mode_normal_patch(self):
email = self.get_git_email('0001-Just-test-it.patch')
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-24 7:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-24 7:16 [gcc(refs/users/marxin/heads/changelog-add-note)] gcc-changelog: Add note about ChangeLog entries Martin Liska
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).