Code cleaning

The --version-suffix parameter permit to add it if need.

.forgejo/workflows/release.yaml

@@ -0,0 +1,81 @@
+---
+name: Build and publish Debian package
+on: [create]
+jobs:
+  build:
+    runs-on: docker
+    container:
+      image: docker.io/brenard/debian-python-deb:latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Build Debian package
+        env:
+          MAINTAINER_NAME: ${{ vars.MAINTAINER_NAME }}
+          MAINTAINER_EMAIL: ${{ vars.MAINTAINER_EMAIL }}
+          DEBIAN_CODENAME: ${{ vars.DEBIAN_CODENAME }}
+        run: |
+          echo "${{ secrets.GPG_KEY }}"|base64 -d|gpg --import
+          ./build.sh
+          rm -fr dist/gitdch-*
+          mv gitdch dist/
+      - name: Upload Debian package files
+        uses: actions/upload-artifact@v3
+        with:
+          name: dist
+          path: |
+            dist
+
+  publish-forgejo:
+    runs-on: docker
+    container:
+      image: docker.io/brenard/debian-python-deb:latest
+    steps:
+      - name: Download Debian package files
+        uses: actions/download-artifact@v3
+        with:
+          name: dist
+
+      - name: Create the release
+        id: create-release
+        shell: bash
+        run: |
+          mkdir release
+          mv *.deb release/
+          mv gitdch release/
+          {
+            echo 'release_note<<EOF'
+            cat release_notes.md
+            echo 'EOF'
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Publish release on Forgejo
+        uses: actions/forgejo-release@v1
+        with:
+          direction: upload
+          url: https://gitea.zionetrix.net
+          token: ${{ secrets.forgejo_token }}
+          release-dir: release
+          release-notes: ${{ steps.create-release.outputs.release_note }}
+
+  publish-aptly:
+    runs-on: docker
+    container:
+      image: docker.io/brenard/aptly-publish:latest
+    steps:
+      - name: "Download Debian package files"
+        uses: actions/download-artifact@v3
+        with:
+          name: dist
+
+      - name: "Publish Debian package on Aptly repository"
+        uses: https://gitea.zionetrix.net/bn8/aptly-publish@master
+        with:
+          api_url: ${{ vars.apt_api_url }}
+          api_username: ${{ vars.apt_api_username }}
+          api_password: ${{ secrets.apt_api_password }}
+          repo_name: ${{ vars.apt_repo_name }}
+          path: "./"
+          source_name: ${{ vars.apt_source_name }}

.forgejo/workflows/tests.yaml

@@ -0,0 +1,21 @@
+---
+name: Run tests
+on: [push]
+jobs:
+  test-precommit:
+    runs-on: docker
+    container:
+      image: docker.io/brenard/python-pre-commit:latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install python dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          apt-get update
+          apt-get -y install --no-install-recommends python3-git git
+      - name: Run pre-commit
+        run: pre-commit run --all-files

.pre-commit-config.yaml

@@ -0,0 +1,64 @@
+# Pre-commit hooks to run tests and ensure code is cleaned.
+# See https://pre-commit.com for more information
+---
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.6
+    hooks:
+      - id: ruff
+        args: ["--fix"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        args: ["--keep-percent-format", "--py37-plus"]
+  - repo: https://github.com/psf/black
+    rev: 23.11.0
+    hooks:
+      - id: black
+        args: ["--target-version", "py37", "--line-length", "100"]
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        args: ["--profile", "black", "--line-length", "100"]
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+      - id: flake8
+        args: ["--max-line-length=100"]
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.2
+    hooks:
+      - id: codespell
+        args:
+          - --ignore-words-list=exten
+          - --skip="./.*,*.csv,*.json,*.ini,*.subject,*.txt,*.html,*.log,*.conf"
+          - --quiet-level=2
+          - --ignore-regex=.*codespell-ignore$
+          # - --write-changes  # Uncomment to write changes
+        exclude_types: [csv, json]
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.32.0
+    hooks:
+      - id: yamllint
+        ignore: .github/
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.7.1
+    hooks:
+      - id: prettier
+        args: ["--print-width", "100"]
+  - repo: local
+    hooks:
+      - id: pylint
+        name: pylint
+        entry: pylint
+        language: system
+        types: [python]
+        require_serial: true
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.5
+    hooks:
+      - id: bandit
+        args: [--skip, "B101", --recursive]
+minimum_pre_commit_version: 3.2.0

.woodpecker.yml

@@ -1,70 +0,0 @@
-clone:
-  git:
-    image: woodpeckerci/plugin-git
-    tags: true
-
-pipeline:
-  test-pylint:
-    group: test
-    image: pipelinecomponents/pylint
-    commands:
-      - pip install GitPython --quiet
-      - pylint gitdch
-
-  test-flake8:
-    group: test
-    image: pipelinecomponents/flake8
-    commands:
-      - flake8 gitdch
-
-  build:
-    image: brenard/debian-python-deb
-    when:
-      event: tag
-    commands:
-      - echo "$GPG_KEY"|base64 -d|gpg --import
-      - ./build.sh --quiet
-      - rm -fr dist/gitdch-*
-    secrets: [ maintainer_name, maintainer_email, gpg_key, debian_codename ]
-
-  publish-dryrun:
-    group: publish
-    image: alpine
-    when:
-      event: tag
-    commands:
-      - ls dist/*
-
-  publish-gitea:
-    group: publish
-    image: plugins/gitea-release
-    when:
-      event: tag
-    settings:
-      api_key:
-        from_secret: gitea_token
-      base_url: https://gitea.zionetrix.net
-      note: dist/release_notes.md
-      files:
-        - gitdch
-        - dist/*.deb
-      checksum:
-        - md5
-        - sha512
-
-  publish-apt:
-    group: publish
-    image: brenard/aptly-publish
-    when:
-      event: tag
-    settings:
-      api_url:
-        from_secret: apt_api_url
-      api_username:
-        from_secret: apt_api_username
-      api_password:
-        from_secret: apt_api_password
-      repo_name:
-        from_secret: apt_repo_name
-      path: dist
-      source_name: gitdch

.yamllint.yml

@@ -0,0 +1,7 @@
+---
+extends: default
+
+rules:
+  line-length:
+    max: 100
+    level: warning

README.md

@@ -8,33 +8,42 @@ numbered using ''git describe --always --tags'' command.
 # Installation
 
 ## Dependencies
+
 ```
 apt install git python3-git
 ```
 
 ## Using git
+
 ```
 git clone https://gogs.zionetrix.net/bn8/gitdch.git /usr/local/src/gitdch
 ln -s /usr/local/src/gitdch/gitdch /usr/local/bin/gitdch
 ```
 
 ## Using wget
+
 ```
 wget -O /usr/local/bin/gitdch https://gogs.zionetrix.net/bn8/gitdch/raw/master/gitdch
 chmod +x /usr/local/bin/gitdch
 ```
 
 ## Using curl
+
 ```
 curl -o /usr/local/bin/gitdch https://gogs.zionetrix.net/bn8/gitdch/raw/master/gitdch
 chmod +x /usr/local/bin/gitdch
 ```
 
 # Usage
-```
-usage: gitdch [-h] [-d] [-v] [-w] [-l LOGFILE] [-q] [-p GIT_PATH] [-o OUTPUT] [-n PACKAGE_NAME] [-V VERSION] [--version-suffix VERSION_SUFFIX] [-c CODE_NAME] [-u URGENCY]
 
-Generate Debian package changelog from git
+```
+usage: gitdch [-h] [-d] [-v] [-w] [-l LOGFILE] [-q] [-p GIT_PATH] [-o OUTPUT] [-A]
+              [-n PACKAGE_NAME] [-V VERSION] [--version-suffix VERSION_SUFFIX]
+              [-c CODE_NAME] [-u URGENCY] [-N MAINTAINER_NAME] [-E MAINTAINER_EMAIL]
+              [-R RELEASE_NOTES] [--revision REVISION] [-C CLEAN_TAGS_REGEX]
+              [-x EXCLUDE]
+
+Generate Debian package changelog from git (version: 0.0)
 
 optional arguments:
   -h, --help            show this help message and exit
@@ -43,21 +52,46 @@ optional arguments:
   -w, --warning         Show warning messages
   -l LOGFILE, --log-file LOGFILE
                         Log file path
-  -q, --quiet           Quiet mode: do not log on console (only if log file is provided)
+  -q, --quiet           Quiet mode: do not log on console (only if log file is
+                        provided)
   -p GIT_PATH, --path GIT_PATH
                         Git repository path (default: ./)
   -o OUTPUT, --output OUTPUT
                         Generated Debian changelog output path (default: stdout)
+  -A, --append          Append mode: if the output changelog file already exists,
+                        append generated changelog lines at the beginning of the file
+                        (optional, default: overwriting the file)
   -n PACKAGE_NAME, --package-name PACKAGE_NAME
                         Package name
   -V VERSION, --version VERSION
-                        Currrent version (default: autodetected using git describe --always --tags)
+                        Current version (default: autodetected using git describe
+                        --always --tags)
   --version-suffix VERSION_SUFFIX
                         Suffix for autodetected version
   -c CODE_NAME, --code-name CODE_NAME
                         Debian code name (default: unstable)
   -u URGENCY, --urgency URGENCY
                         Package urgency (default: medium)
+  -N MAINTAINER_NAME, --maintainer-name MAINTAINER_NAME
+                        Maintainer name (default: last commit author name)
+  -E MAINTAINER_EMAIL, --maintainer-email MAINTAINER_EMAIL
+                        Maintainer email (default: last commit author email)
+  -R RELEASE_NOTES, --release-notes RELEASE_NOTES
+                        Specify an optional Markdown release notes output path
+  --revision REVISION   Specify the revision to use to generate the changelog (see
+                        git-rev-parse for viable options, optional, default:
+                        generate the changelog with all commits of the current
+                        branch)
+  -C CLEAN_TAGS_REGEX, --clean-tags-regex CLEAN_TAGS_REGEX
+                        Clean tags regex: you could specify regex to clean tag names
+                        when computing package versions. For instance, to drop a
+                        "-eeXXX" suffix of tag names, specify -C "\-ee[0-9]{3}$"
+                        (optional, multiple regex allowed)
+  -x EXCLUDE, --exclude EXCLUDE
+                        Commit exclusion regex: you could specify regex to exclude
+                        some commits from generated changelog entries. For instance,
+                        to exclude commits with message starting with "CI: ",
+                        specify -x "^CI: " (optional, multiple regex allowed)
 ```
 
 ## Copyright
@@ -71,4 +105,3 @@ This program is free software; you can redistribute it and/or modify it under th
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-

build.sh

@@ -24,7 +24,7 @@ sed -i "s/^VERSION *=.*$/VERSION = '$VERSION'/" $BDIR/gitdch
 
 if [ -z "$DEBIAN_CODENAME" ]
 then
-	echo "Retreive debian codename using lsb_release..."
+	echo "Retrieve debian codename using lsb_release..."
 	DEBIAN_CODENAME=$( lsb_release -c -s )
 else
 	echo "Use debian codename from environment ($DEBIAN_CODENAME)"
@@ -49,6 +49,11 @@ fi
 	--code-name $DEBIAN_CODENAME \
 	--output $BDIR/debian/changelog \
 	--release-notes dist/release_notes.md \
+	--exclude "^CI: " \
+	--exclude "\.woodpecker\.yml" \
+	--exclude "build\.sh" \
+	--exclude "README\.md" \
+	--exclude "^Merge branch " \
 	"${GITDCH_ARGS[@]}"
 
 if [ -n "$MAINTAINER_NAME" -a -n "$MAINTAINER_EMAIL" ]

gitdch

@@ -7,148 +7,148 @@ import logging
 import os
 import re
 import sys
+import textwrap
 
 import git
+from git.exc import GitCommandError
 
-VERSION = '0.0'
-DEFAULT_GIT_PATCH = './'
-DEFAULT_CODE_NAME = 'unstable'
-DEFAULT_URGENCY = 'medium'
+VERSION = "0.0"
+DEFAULT_GIT_PATCH = "./"
+DEFAULT_CODE_NAME = "unstable"
+DEFAULT_URGENCY = "medium"
 
-parser = argparse.ArgumentParser(
-    description='{0} (version: {1})'.format(__doc__, VERSION)
+parser = argparse.ArgumentParser(description=f"{__doc__} (version: {VERSION})")
+
+parser.add_argument("-d", "--debug", action="store_true", help="Show debug messages")
+
+parser.add_argument("-v", "--verbose", action="store_true", help="Show verbose messages")
+
+parser.add_argument("-w", "--warning", action="store_true", help="Show warning messages")
+
+parser.add_argument("-l", "--log-file", help="Log file path")
+
+parser.add_argument(
+    "-q",
+    "--quiet",
+    action="store_true",
+    help="Quiet mode: do not log on console (only if log file is provided)",
 )
 
 parser.add_argument(
-    '-d', '--debug',
-    action='store_true',
-    help='Show debug messages'
+    "-p",
+    "--path",
+    help=f"Git repository path (default: {DEFAULT_GIT_PATCH})",
+    default=DEFAULT_GIT_PATCH,
 )
 
 parser.add_argument(
-    '-v', '--verbose',
-    action='store_true',
-    help='Show verbose messages'
+    "-o",
+    "--output",
+    help="Generated Debian changelog output path (default: stdout)",
 )
 
 parser.add_argument(
-    '-w', '--warning',
-    action='store_true',
-    help='Show warning messages'
-)
-
-parser.add_argument(
-    '-l',
-    '--log-file',
-    action="store",
-    type=str,
-    dest="logfile",
-    help="Log file path"
-)
-
-parser.add_argument(
-    '-q', '--quiet',
-    action='store_true',
-    help='Quiet mode: do not log on console (only if log file is provided)'
-)
-
-parser.add_argument(
-    '-p',
-    '--path',
-    type=str,
-    dest='git_path',
-    help='Git repository path (default: %s)' % DEFAULT_GIT_PATCH,
-    default=DEFAULT_GIT_PATCH
-)
-
-parser.add_argument(
-    '-o',
-    '--output',
-    type=str,
-    dest='output',
-    help='Generated Debian changelog output path (default: stdout)',
-)
-
-parser.add_argument(
-    '-n',
-    '--package-name',
-    type=str,
-    dest='package_name',
-    help='Package name'
-)
-
-parser.add_argument(
-    '-V',
-    '--version',
-    type=str,
-    dest='version',
+    "-A",
+    "--append",
+    action="store_true",
     help=(
-        'Currrent version (default: autodetected using git describe '
-        '--always --tags)')
+        "Append mode: if the output changelog file already exists, append "
+        "generated changelog lines at the beginning of the file (optional, "
+        "default: overwriting the file)"
+    ),
+)
+
+parser.add_argument("-n", "--package-name", help="Package name")
+
+parser.add_argument(
+    "-V",
+    "--version",
+    help=("Current version (default: autodetected using git describe " "--always --tags)"),
 )
 
 parser.add_argument(
-    '--version-suffix',
-    type=str,
-    dest='version_suffix',
-    help='Suffix for autodetected version'
+    "--version-suffix",
+    help="Suffix for autodetected version",
 )
 
 parser.add_argument(
-    '-c',
-    '--code-name',
-    type=str,
-    dest='code_name',
-    help='Debian code name (default: %s)' % DEFAULT_CODE_NAME,
-    default=DEFAULT_CODE_NAME
+    "-c",
+    "--code-name",
+    help=f"Debian code name (default: {DEFAULT_CODE_NAME})",
+    default=DEFAULT_CODE_NAME,
 )
 
 parser.add_argument(
-    '-u',
-    '--urgency',
-    type=str,
-    dest='urgency',
-    help='Package urgency (default: %s)' % DEFAULT_URGENCY,
-    default=DEFAULT_URGENCY
+    "-u",
+    "--urgency",
+    help=f"Package urgency (default: {DEFAULT_URGENCY})",
+    default=DEFAULT_URGENCY,
 )
 
 parser.add_argument(
-    '-N',
-    '--maintainer-name',
-    type=str,
-    dest='maintainer_name',
-    help='Maintainer name (default: last commit author name)'
+    "-N",
+    "--maintainer-name",
+    help="Maintainer name (default: last commit author name)",
 )
 
 parser.add_argument(
-    '-E',
-    '--maintainer-email',
-    type=str,
-    dest='maintainer_email',
-    help='Maintainer email (default: last commit author email)'
+    "-E",
+    "--maintainer-email",
+    help="Maintainer email (default: last commit author email)",
 )
 
 parser.add_argument(
-    '-R',
-    '--release-notes',
-    type=str,
-    dest='release_notes',
-    help='Specify an optional Markdown release notes output path'
+    "-R",
+    "--release-notes",
+    help="Specify an optional Markdown release notes output path",
 )
 
+parser.add_argument(
+    "--revision",
+    help=(
+        "Specify the revision to use to generate the changelog (see "
+        "git-rev-parse for viable options, optional, default: generate the "
+        "changelog with all commits of the current branch) "
+    ),
+)
+
+parser.add_argument(
+    "-C",
+    "--clean-tags-regex",
+    action="append",
+    type=re.compile,
+    help=(
+        "Clean tags regex: you could specify regex to clean tag names when "
+        'computing package versions. For instance, to drop a "-eeXXX" suffix '
+        'of tag names, specify -C "\\-ee[0-9]{3}$" (optional, multiple regex '
+        "allowed)"
+    ),
+    default=[],
+)
+
+parser.add_argument(
+    "-x",
+    "--exclude",
+    action="append",
+    type=re.compile,
+    help=(
+        "Commit exclusion regex: you could specify regex to exclude some "
+        "commits from generated changelog entries. For instance, to exclude "
+        'commits with message starting with "CI: ", specify -x "^CI: " '
+        "(optional, multiple regex allowed)"
+    ),
+    default=[],
+)
 
 options = parser.parse_args()
 
 if not options.package_name:
-    parser.error(
-        'You must provide package name using -n/--package-name paramter')
+    parser.error("You must provide package name using -n/--package-name parameter")
 
 # Initialize log
 log = logging.getLogger()
 logformat = logging.Formatter(
-    '%(asctime)s - {} - %(levelname)s : %(message)s'.format(
-        os.path.basename(sys.argv[0])
-    )
+    f"%(asctime)s - {os.path.basename(sys.argv[0])} - %(levelname)s : %(message)s"
 )
 # Set root logger to DEBUG (filtering done by handlers)
 log.setLevel(logging.DEBUG)
@@ -161,65 +161,90 @@ elif options.verbose:
 elif options.warning:
     log_level = logging.WARNING
 
-if options.logfile:
-    logfile = logging.FileHandler(options.logfile)
-    logfile.setFormatter(logformat)
-    logfile.setLevel(log_level if log_level is not None else logging.INFO)
-    log.addHandler(logfile)
+if options.log_file:
+    log_file = logging.FileHandler(options.log_file)
+    log_file.setFormatter(logformat)
+    log_file.setLevel(log_level if log_level is not None else logging.INFO)
+    log.addHandler(log_file)
 
-if not options.quiet or not options.logfile:
+if not options.quiet or not options.log_file:
     logconsole = logging.StreamHandler()
     logconsole.setLevel(log_level if log_level is not None else logging.FATAL)
     logconsole.setFormatter(logformat)
     log.addHandler(logconsole)
 
-repo = git.Repo(options.git_path)
-
-log.info('Generate changelog from git commits')
-
-versions = []
-tag_commits = dict(
-    (tag.commit.binsha, tag)
-    for tag in repo.tags
-)
+repo = git.Repo(options.path)
 
 
 def clean_deb_version(version_name):
-    """ Clean debian version name """
-    version_name = re.sub('^[^0-9]*', '', version_name)
+    """Clean debian version name"""
+    version_name = re.sub("^[^0-9]*", "", version_name)
+    for clean_regex in options.clean_tags_regex:
+        version_name = clean_regex.sub("", version_name)
     if options.version_suffix:
         version_name += options.version_suffix
     return version_name
 
 
+if not options.version:
+    log.info("Detect current version from git tags & commits")
+    options.version = clean_deb_version(repo.git.describe("--always", "--tags"))
+    log.info("Current version detected: %s", options.version)
+
+if options.output and options.append and not options.revision:
+    log.info(
+        "Append mode enabled but no revision specify, try to detect it from "
+        "last modification of the changelog file"
+    )
+    try:
+        last_change_commit = next(repo.iter_commits(paths=options.output))
+        # pylint: disable=consider-using-f-string
+        options.revision = f"{last_change_commit}..HEAD"
+        log.info(
+            'Last change commit of the output file is "%s": use revision "%s"',
+            last_change_commit,
+            options.revision,
+        )
+    except StopIteration:
+        log.warning(
+            "Fail to auto-detect last change commit of changelog file: it "
+            "seem not tracked. Continue without revision."
+        )
+    except GitCommandError:
+        log.warning(
+            "Fail to auto-detect last change commit of changelog file. May "
+            "be it's outside of the git repository. Continue without "
+            "revision."
+        )
+        # Reset repo object of to avoid BrokenPipeError
+        repo = git.Repo(options.path)
+
+log.info("Generate changelog from git commits")
+
+versions = []
+tag_commits = {tag.commit.binsha: tag for tag in repo.tags}
+
+
 def add_version():
-    """ Add version info """
-    if messages:
-        log.info('Add version %s:\n  - %s', version, '\n  - '.join(messages))
-        versions.append({
-            'name': version,
-            'tag': tag,
-            'commit': version_commit,
-            'messages': messages,
-        })
+    """Add version info"""
+    global messages  # pylint: disable=global-statement
+    if not version_commit:
+        return
+    if not messages:
+        messages = [f"Release version {version}"]
+    log.info("Add version %s:\n  - %s", version, "\n  - ".join(messages))
+    versions.append({"name": version, "tag": tag, "commit": version_commit, "messages": messages})
 
 
 tag = None
 version_commit = None
-version = (
-    options.version or
-    clean_deb_version(
-        repo.git.describe('--always', '--tags')
-    )
-)
+version = options.version
 messages = []
-for commit in repo.iter_commits():
-    if version_commit is None:
-        version_commit = commit
-    log.debug('Commit %s', commit)
+for commit in repo.iter_commits(rev=options.revision):
+    log.debug("Commit %s (%s)", commit, commit.summary)
     if commit.binsha in tag_commits:
         new_tag = tag_commits[commit.binsha]
-        log.debug('Reach new tag %s', new_tag)
+        log.debug("Reach new tag %s", new_tag)
 
         add_version()
 
@@ -227,59 +252,76 @@ for commit in repo.iter_commits():
         version = clean_deb_version(tag.name)
         version_commit = commit
         messages = []
-        log.debug('Iter commits for version %s')
-    messages.append(commit.summary)
+        log.debug("Iter commits for version %s", version)
+    if version_commit is None:
+        version_commit = commit
+    excluded = False
+    for regex in options.exclude:
+        if regex.search(commit.summary):
+            excluded = True
+            log.debug(
+                'Exclude commit %s ("%s", match with "%s")',
+                commit,
+                commit.summary,
+                regex.pattern,
+            )
+    if not excluded:
+        messages.append(commit.summary)
 add_version()
-log.info('%d versions found', len(versions))
+log.info("%d versions found", len(versions))
 
 changelog_lines = []
 for version in versions:
     # pylint: disable=consider-using-f-string
     changelog_lines.append(
-        '{package} ({version}-1) {code_name}; urgency={urgency}\n\n'.format(
+        "{package} ({version}) {code_name}; urgency={urgency}\n\n".format(
             package=options.package_name,
-            version=version['name'],
+            version=version["name"],
             code_name=options.code_name,
-            urgency=options.urgency
+            urgency=options.urgency,
         )
     )
 
-    # pylint: disable=consider-using-f-string
-    changelog_lines.extend([
-      '  * {0}\n'.format(message)
-      for message in version['messages']
-    ])
+    for message in version["messages"]:
+        for idx, line in enumerate(textwrap.wrap(message, 76, break_long_words=True)):
+            # pylint: disable=consider-using-f-string
+            changelog_lines.append("{}{}\n".format("  * " if not idx else "    ", line))
 
     # pylint: disable=consider-using-f-string
     changelog_lines.append(
         "\n -- {name} <{email}>  {date}\n\n".format(
             name=(
-                options.maintainer_name if options.maintainer_name
-                else version['commit'].author.name),
+                options.maintainer_name
+                if options.maintainer_name
+                else version["commit"].author.name
+            ),
             email=(
-                options.maintainer_email if options.maintainer_email
-                else version['commit'].author.email),
-            date=version['commit'].committed_datetime.strftime(
-                "%a, %d %b %Y %H:%M:%S %z")
+                options.maintainer_email
+                if options.maintainer_email
+                else version["commit"].author.email
+            ),
+            date=version["commit"].committed_datetime.strftime("%a, %d %b %Y %H:%M:%S %z"),
         )
     )
 
 if options.output:
-    log.info('Write generated Debian changelog in file %s', options.output)
-    with open(options.output, 'w', encoding='utf8') as fd:
+    log.info("Write generated Debian changelog in file %s", options.output)
+    if options.append and os.path.exists(options.output):
+        with open(options.output, encoding="utf8") as fd:
+            changelog_lines += [""]
+            changelog_lines += fd.readlines()
+    with open(options.output, "w", encoding="utf8") as fd:
         fd.writelines(changelog_lines)
 else:
-    print(''.join(changelog_lines))
+    print("".join(changelog_lines))
 
 if options.release_notes:
-    log.info('Generate Markdown release notes')
-    release_notes_lines = ['# Changelog:\n\n']
-    release_notes_lines.extend([
-        '* {0}\n'.format(message)
-        for message in versions[0]['messages']
-    ])
-    log.info(
-        'Write generated Markdown release notes in file %s',
-        options.release_notes)
-    with open(options.release_notes, 'w', encoding='utf8') as fd:
+    log.info("Generate Markdown release notes")
+    release_notes_lines = ["# Changelog:\n\n"]
+    if versions:
+        release_notes_lines.extend([f"* {message}\n" for message in versions[0]["messages"]])
+    else:
+        release_notes_lines.extend([f"* Release version {options.version}\n"])
+    log.info("Write generated Markdown release notes in file %s", options.release_notes)
+    with open(options.release_notes, "w", encoding="utf8") as fd:
         fd.writelines(release_notes_lines)