summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2020-05-19 21:16:10 +0200
committerMartin Liska <mliska@suse.cz>2020-05-19 21:17:09 +0200
commit4a5d072ad97d7d4fd003efff953a6202afd176a0 (patch)
treed0ca35c3c88180e16949e85b476f970ebe3d4d3e /contrib
parentc0d8623ce5aa6d92c2e6c62e1bee66272a011f59 (diff)
Use commit timestamp in git_update_version.py.
* gcc-changelog/git_commit.py: Add param use_commit_ts for to_changelog_entries. * gcc-changelog/git_update_version.py: Se use_commit_ts to True.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ChangeLog6
-rwxr-xr-xcontrib/gcc-changelog/git_commit.py4
-rwxr-xr-xcontrib/gcc-changelog/git_update_version.py2
3 files changed, 9 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 5ef08f41a92..f3de87b43d9 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,5 +1,11 @@
2020-05-19 Martin Liska <mliska@suse.cz>
+ * gcc-changelog/git_commit.py: Add param use_commit_ts
+ for to_changelog_entries.
+ * gcc-changelog/git_update_version.py: Se use_commit_ts to True.
+
+2020-05-19 Martin Liska <mliska@suse.cz>
+
* mklog.py: Skip GTY for struct names. Make flake8 happy.
* test_mklog.py: Add test for GTY.
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 5214cc36538..f6b9c5b1586 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -500,11 +500,11 @@ class GitCommit:
err = Error(msg % (entry.folder, changelog_location), file)
self.errors.append(err)
- def to_changelog_entries(self):
+ def to_changelog_entries(self, use_commit_ts=False):
for entry in self.changelog_entries:
output = ''
timestamp = entry.datetime
- if not timestamp:
+ if not timestamp or use_commit_ts:
timestamp = self.date.strftime('%Y-%m-%d')
authors = entry.authors if entry.authors else [self.author]
# add Co-Authored-By authors to all ChangeLog entries
diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 2de44f27580..f38e011df45 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -38,7 +38,7 @@ def prepend_to_changelog_files(repo, folder, git_commit):
print(error)
# TODO: add error message
return
- for entry, output in git_commit.to_changelog_entries():
+ for entry, output in git_commit.to_changelog_entries(use_commit_ts=True):
# TODO
full_path = os.path.join(folder, entry, 'ChangeLog.test')
print('writting to %s' % full_path)