Add SPDX license identifier to source files (#1453)

SPDX license identifiers help tools to identify the right licenses.
Especially detecting that the user can choose to GPL 2+ or Apache 2.0 is
difficult to detect, it can be misinterpreted that the user has to
comply with both licenses.

Fixes #1451

COPYING

@@ -2,6 +2,8 @@ Dulwich may be used under the conditions of either of two licenses,
 the Apache License (version 2.0 or later) or the GNU General Public License,
 version 2.0 or later.
 
+SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

README.rst

@@ -10,6 +10,8 @@ doesn't call out to git directly but instead uses pure Python.
 
 **License**: Apache License, version 2 or GNU General Public License, version 2 or later.
 
+SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+
 The project is named after the part of London that Mr. and Mrs. Git live in
 the particular Monty Python sketch.
 

bin/dul-receive-pack

@@ -2,6 +2,7 @@
 # dul-receive-pack - git-receive-pack in python
 # Copyright (C) 2008 John Carr <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

bin/dul-upload-pack

@@ -2,6 +2,7 @@
 # dul-upload-pack - git-upload-pack in python
 # Copyright (C) 2008 John Carr <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

bin/dulwich

@@ -2,6 +2,7 @@
 # command-line interface for Dulwich
 # Copyright (C) 2020 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

devscripts/PREAMBLE.py

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

devscripts/replace-preamble.sh

@@ -1,3 +1,5 @@
 #!/usr/bin/zsh
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+
 perl -i -p0e "s{\Q$(cat PREAMBLE.py.old)\E}{$(cat devscripts/PREAMBLE.py)}g" dulwich/**/*.py bin/dul*
 perl -i -p0e "s{\Q$(cat PREAMBLE.c.old)\E}{$(cat devscripts/PREAMBLE.c)}g" dulwich/*.c

dulwich/__init__.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2007 James Westby <[email protected]>
 # Copyright (C) 2008 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/archive.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2015 Jonas Haag <[email protected]>
 # Copyright (C) 2015 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/bundle.py

@@ -1,6 +1,7 @@
 # bundle.py -- Bundle format support
 # Copyright (C) 2020 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/cli.py

@@ -3,6 +3,7 @@
 # Copyright (C) 2008-2011 Jelmer Vernooij <[email protected]>
 # vim: expandtab
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/client.py

@@ -1,6 +1,7 @@
 # client.py -- Implementation of the client side git protocols
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/cloud/gcs.py

@@ -1,6 +1,7 @@
 # object_store.py -- Object store for git objects
 # Copyright (C) 2021 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/config.py

@@ -1,6 +1,7 @@
 # config.py - Reading and writing Git config files
 # Copyright (C) 2011-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/contrib/__init__.py

@@ -1,6 +1,7 @@
 # __init__.py -- Contrib module for Dulwich
 # Copyright (C) 2014 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/contrib/diffstat.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
 
+# SPDX-License-Identifier: MIT
 # Copyright (c) 2020 Kevin B. Hendricks, Stratford Ontario Canada
 # All rights reserved.
 #

dulwich/contrib/paramiko_vendor.py

@@ -1,6 +1,7 @@
 # paramiko_vendor.py -- paramiko implementation of the SSHVendor interface
 # Copyright (C) 2013 Aaron O'Mullan <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/contrib/release_robot.py

@@ -1,5 +1,6 @@
 # release_robot.py
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/contrib/requests_vendor.py

@@ -1,6 +1,7 @@
 # requests_vendor.py -- requests implementation of the AbstractHttpGitClient interface
 # Copyright (C) 2022 Eden Shalit <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/contrib/swift.py

@@ -3,6 +3,7 @@
 #
 # Author: Fabien Boucher <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/credentials.py

@@ -2,6 +2,7 @@
 
 # Copyright (C) 2022 Daniele Trifirò <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/diff_tree.py

@@ -1,6 +1,7 @@
 # diff_tree.py -- Utilities for diffing files and trees.
 # Copyright (C) 2010 Google, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/errors.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2007 James Westby <[email protected]>
 # Copyright (C) 2009-2012 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/fastexport.py

@@ -1,6 +1,7 @@
 # __init__.py -- Fast export/import functionality
 # Copyright (C) 2010-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/file.py

@@ -1,6 +1,7 @@
 # file.py -- Safe access to git files
 # Copyright (C) 2010 Google, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/graph.py

@@ -1,6 +1,7 @@
 # vim:ts=4:sw=4:softtabstop=4:smarttab:expandtab
 # Copyright (c) 2020 Kevin B. Hendricks, Stratford Ontario Canada
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/greenthreads.py

@@ -3,6 +3,7 @@
 #
 # Author: Fabien Boucher <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/hooks.py

@@ -1,6 +1,7 @@
 # hooks.py -- for dealing with git hooks
 # Copyright (C) 2012-2013 Jelmer Vernooij and others.
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/ignore.py

@@ -1,5 +1,6 @@
 # Copyright (C) 2017 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/index.py

@@ -1,6 +1,7 @@
 # index.py -- File parser/writer for the git index file
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/lfs.py

@@ -1,6 +1,7 @@
 # lfs.py -- Implementation of the LFS
 # Copyright (C) 2020 Jelmer Vernooij
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/line_ending.py

@@ -1,6 +1,7 @@
 # line_ending.py -- Line ending conversion functions
 # Copyright (C) 2018-2018 Boris Feld <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/log_utils.py

@@ -1,6 +1,7 @@
 # log_utils.py -- Logging utilities for Dulwich
 # Copyright (C) 2010 Google, Inc.
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/lru_cache.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2006, 2008 Canonical Ltd
 # Copyright (C) 2022 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/mailmap.py

@@ -1,6 +1,7 @@
 # mailmap.py -- Mailmap reader
 # Copyright (C) 2018 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/object_store.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #                         and others
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/objects.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2007 James Westby <[email protected]>
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/objectspec.py

@@ -1,6 +1,7 @@
 # objectspec.py -- Object specification
 # Copyright (C) 2014 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/pack.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2007 James Westby <[email protected]>
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/patch.py

@@ -1,6 +1,7 @@
 # patch.py -- For dealing with packed-style patches.
 # Copyright (C) 2009-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/porcelain.py

@@ -1,6 +1,7 @@
 # porcelain.py -- Porcelain-like layer on top of Dulwich
 # Copyright (C) 2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/protocol.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2008 John Carr <[email protected]>
 # Copyright (C) 2008-2012 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/reflog.py

@@ -1,6 +1,7 @@
 # reflog.py -- Parsing and writing reflog files
 # Copyright (C) 2015 Jelmer Vernooij and others.
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/refs.py

@@ -1,6 +1,7 @@
 # refs.py -- For dealing with git refs
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/repo.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2007 James Westby <[email protected]>
 # Copyright (C) 2008-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/server.py

@@ -2,6 +2,7 @@
 # Copyright (C) 2008 John Carr <[email protected]>
 # Copyright(C) 2011-2012 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/stash.py

@@ -1,6 +1,7 @@
 # stash.py
 # Copyright (C) 2018 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/submodule.py

@@ -1,6 +1,7 @@
 # config.py - Reading and writing Git config files
 # Copyright (C) 2011-2013 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/tests/__init__.py

@@ -1,6 +1,7 @@
 # __init__.py -- The tests for dulwich
 # Copyright (C) 2024 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or

dulwich/tests/test_object_store.py

@@ -1,6 +1,7 @@
 # test_object_store.py -- tests for object_store.py
 # Copyright (C) 2008 Jelmer Vernooij <[email protected]>
 #
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or