aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2007-01-03 13:49:45 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2007-01-03 13:49:45 +0000
commite95b85e5666db657c4e7d1b252dca0a0ffe6090a (patch)
treed58d1876252cea98beef4c980a12c6439d27dbb8
parent9e4787788d045c125a1981015e0b2056ee9eed61 (diff)
downloadmgarepo-e95b85e5666db657c4e7d1b252dca0a0ffe6090a.tar
mgarepo-e95b85e5666db657c4e7d1b252dca0a0ffe6090a.tar.gz
mgarepo-e95b85e5666db657c4e7d1b252dca0a0ffe6090a.tar.bz2
mgarepo-e95b85e5666db657c4e7d1b252dca0a0ffe6090a.tar.xz
mgarepo-e95b85e5666db657c4e7d1b252dca0a0ffe6090a.zip
Make the changelog show the revision number from ignored commits that are
newer than the not ignored ones. Releases containing only SILENT commit messages will be shown, but without log lines (probably the changelog template should handle this case).
-rw-r--r--RepSys/log.py6
-rw-r--r--repsys.conf2
2 files changed, 3 insertions, 5 deletions
diff --git a/RepSys/log.py b/RepSys/log.py
index f3f2bab..2651d19 100644
--- a/RepSys/log.py
+++ b/RepSys/log.py
@@ -198,10 +198,10 @@ def parse_raw_date(rawdate):
def filter_log_lines(lines):
# lines in commit messages containing SILENT at any position will be
# skipped; commits with their log messages beggining with SILENT in the
- # first positionj of the first line will be completely ignored.
+ # first positionj of the first line will have all lines ignored.
ignstr = config.get("log", "ignore-string", "SILENT")
if len(lines) and lines[0].startswith(ignstr):
- return None
+ return []
filtered = [line for line in lines if ignstr not in line]
return filtered
@@ -220,8 +220,6 @@ def make_release(author=None, revision=None, date=None, lines=None,
rel.released = released
for entry in entries:
lines = filter_log_lines(entry.lines)
- if lines is None:
- continue
revision = _Revision()
revision.revision = entry.revision
revision.lines = format_lines(lines)
diff --git a/repsys.conf b/repsys.conf
index e87b119..f74d866 100644
--- a/repsys.conf
+++ b/repsys.conf
@@ -10,7 +10,7 @@ oldurl = svn+ssh://svn.mandriva.com/svn/packages/misc
# will be constructed (default zero, i.e., oldest
# commit)
revision-offset = 0
-# commits containing this string won't be shown in the changelog:
+# commit lines containing this string won't be shown in the changelog:
ignore-string = SILENT
[template]