Merge gitdb and smmap into the GitPython repository

.github/dependabot.yml

@@ -6,11 +6,6 @@ updates:
   schedule:
     interval: weekly
 
-- package-ecosystem: gitsubmodule
-  directory: "/"
-  schedule:
-    interval: weekly
-
 - package-ecosystem: pre-commit
   directory: "/"
   schedule:

.github/workflows/alpine-test.yml

@@ -63,17 +63,13 @@ jobs:
     - name: Install project and test dependencies
       run: |
         . .venv/bin/activate
-        pip install '.[test]'
+        pip install ./smmap ./gitdb '.[test]'
 
     - name: Show POSIX file ownership
       run: |
         ls -ld -- \
           "$(pwd)" \
           "$(pwd)/.git" \
-          "$(pwd)/git/ext/gitdb" \
-          "$(pwd)/git/ext/gitdb/.git" \
-          "$(pwd)/git/ext/gitdb/gitdb/ext/smmap" \
-          "$(pwd)/git/ext/gitdb/gitdb/ext/smmap/.git" \
           "${HOME:?HOME is not set}/.gitconfig" \
           2>&1 || true
 

.github/workflows/codeql.yml

@@ -62,6 +62,10 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
+        config: |
+          paths-ignore:
+            - gitdb/gitdb/test/**
+            - smmap/smmap/test/**
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.

.github/workflows/cygwin-test.yml

@@ -57,8 +57,6 @@ jobs:
       run: |
         git config --global --add safe.directory "$(pwd)"
         git config --global --add safe.directory "$(pwd)/.git"
-        git config --global --add safe.directory "$(pwd)/git/ext/gitdb"
-        git config --global --add safe.directory "$(pwd)/git/ext/gitdb/gitdb/ext/smmap"
         git config --global core.autocrlf false
 
     - name: Prepare this repo for tests
@@ -84,7 +82,7 @@ jobs:
 
     - name: Install project and test dependencies
       run: |
-        pip install '.[test]'
+        pip install ./smmap ./gitdb '.[test]'
 
     - name: Show POSIX file ownership
       # Cygwin's `ls -ld` reports the NTFS Owner SID via Cygwin's SID-to-uid
@@ -96,12 +94,6 @@ jobs:
         ls -ld -- \
           "$(pwd)" \
           "$(pwd)/.git" \
-          "$(pwd)/git/ext/gitdb" \
-          "$(pwd)/git/ext/gitdb/.git" \
-          "$(pwd)/.git/modules/gitdb" \
-          "$(pwd)/git/ext/gitdb/gitdb/ext/smmap" \
-          "$(pwd)/git/ext/gitdb/gitdb/ext/smmap/.git" \
-          "$(pwd)/.git/modules/gitdb/modules/smmap" \
           "${HOME:?HOME is not set}/.gitconfig" \
           2>&1 || true
 
@@ -114,12 +106,6 @@ jobs:
         $paths = @(
           "$pwd",
           "$pwd\.git",
-          "$pwd\git\ext\gitdb",
-          "$pwd\git\ext\gitdb\.git",
-          "$pwd\.git\modules\gitdb",
-          "$pwd\git\ext\gitdb\gitdb\ext\smmap",
-          "$pwd\git\ext\gitdb\gitdb\ext\smmap\.git",
-          "$pwd\.git\modules\gitdb\modules\smmap",
           "$env:USERPROFILE\.gitconfig"
         )
         foreach ($p in $paths) {

.github/workflows/dependencies.yml

@@ -0,0 +1,42 @@
+name: Dependency packages
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ${{ matrix.python-version == '3.7' && 'ubuntu-22.04' || 'ubuntu-latest' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        project: [smmap, gitdb]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t"]
+
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-python@v7
+      with:
+        python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
+    - name: Install test dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install pytest flake8 ./smmap
+        if test "${{ matrix.project }}" = gitdb; then python -m pip install ./gitdb; fi
+    - name: Lint
+      run: flake8 "${{ matrix.project }}/${{ matrix.project }}" --count --select=E9,F63,F7,F82 --show-source --statistics
+    - name: Test
+      run: |
+        if test "${{ matrix.project }}" = gitdb; then
+          GITDB_TEST_GIT_REPO_BASE="$(git rev-parse --git-common-dir)" pytest -o addopts= -v gitdb/gitdb/test
+        else
+          pytest -o addopts= -v smmap/smmap/test
+        fi

.github/workflows/pythonpackage.yml

@@ -89,7 +89,7 @@ jobs:
 
     - name: Install project and test dependencies
       run: |
-        pip install '.[test]'
+        pip install ./smmap ./gitdb '.[test]'
 
     - name: Show POSIX file ownership
       # Linux and macOS only. On Windows, Git Bash's `ls -ld` reports a
@@ -101,10 +101,6 @@ jobs:
         ls -ld -- \
           "$(pwd)" \
           "$(pwd)/.git" \
-          "$(pwd)/git/ext/gitdb" \
-          "$(pwd)/git/ext/gitdb/.git" \
-          "$(pwd)/git/ext/gitdb/gitdb/ext/smmap" \
-          "$(pwd)/git/ext/gitdb/gitdb/ext/smmap/.git" \
           "${HOME:?HOME is not set}/.gitconfig" \
           2>&1 || true
 
@@ -118,10 +114,6 @@ jobs:
         $paths = @(
           "$pwd",
           "$pwd\.git",
-          "$pwd\git\ext\gitdb",
-          "$pwd\git\ext\gitdb\.git",
-          "$pwd\git\ext\gitdb\gitdb\ext\smmap",
-          "$pwd\git\ext\gitdb\gitdb\ext\smmap\.git",
           "$env:USERPROFILE\.gitconfig"
         )
         foreach ($p in $paths) {

.pre-commit-config.yaml

@@ -1,3 +1,5 @@
+exclude: ^(?:gitdb|smmap)/
+
 repos:
 - repo: https://github.com/codespell-project/codespell
   rev: v2.4.2

README.md

@@ -101,15 +101,13 @@ In the less common case that you do not want to install test dependencies, `pip
 
 #### With editable *dependencies* (not preferred, and rarely needed)
 
-In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediately reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.
-
-If you want to do that *and* you want the versions in GitPython's git submodules to be used, then pass `-e git/ext/gitdb` and/or `-e git/ext/gitdb/gitdb/ext/smmap` to `pip install`. This can be done in any order, and in separate `pip install` commands or the same one, so long as `-e` appears before *each* path. For example, you can install GitPython, gitdb, and smmap editably in the currently active virtual environment this way:
+GitPython, [gitdb](gitdb), and [smmap](smmap) live in this repository as independently packaged projects. To work on all three at once, install each one editably in the same virtual environment:
 
 ```sh
-pip install -e ".[test]" -e git/ext/gitdb -e git/ext/gitdb/gitdb/ext/smmap
+pip install -e smmap -e gitdb -e ".[test]"
 ```
 
-The submodules must have been cloned for that to work, but that will already be the case if you have run `./init-tests-after-clone.sh`. You can use `pip list` to check which packages are installed editably and which are installed normally.
+You can use `pip list` to check which packages are installed editably and which are installed normally.
 
 To reiterate, this approach should only rarely be used. For most development it is preferable to allow the gitdb and smmap dependencices to be retrieved automatically from PyPI in their latest stable packaged versions.
 

doc/source/intro.rst

@@ -97,11 +97,6 @@ and cloned using::
 
 	$ git clone https://github.com/gitpython-developers/GitPython git-python
 
-Initialize all submodules to obtain the required dependencies with::
-
-    $ cd git-python
-    $ git submodule update --init --recursive
-
 Finally verify the installation by running unit tests::
 
     $ python -m unittest

git/objects/fun.py

@@ -115,11 +115,11 @@ def tree_entries_from_data(data: bytes) -> List[EntryTup]:
         # Default encoding for strings in git is UTF-8.
         # Only use the respective unicode object if the byte stream was encoded.
         name_bytes = data[ns:i]
-        name = safe_decode(name_bytes)
+        name = safe_decode(bytes(name_bytes))
 
         # Byte is NULL, get next 20.
         i += 1
-        sha = data[i : i + 20]
+        sha = bytes(data[i : i + 20])
         i = i + 20
         out.append((sha, mode, name))
     # END for each byte in data stream

gitdb/.coveragerc

@@ -0,0 +1,7 @@
+[run]
+source = gitdb
+
+; to make nosetests happy
+[report]
+include = */gitdb/*
+omit = */gitdb/ext/*

gitdb/.gitignore

@@ -0,0 +1,10 @@
+MANIFEST
+.coverage
+build/
+dist/
+*.pyc
+*.o
+*.so
+.noseids
+*.sublime-workspace
+*.egg-info

gitdb/AUTHORS

@@ -0,0 +1,4 @@
+Creator: Sebastian Thiel
+
+Contributors:
+  - Ram Rachum (@cool-RR)

gitdb/LICENSE

@@ -0,0 +1,42 @@
+Copyright (C) 2010, 2011 Sebastian Thiel and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+* Redistributions of source code must retain the above copyright 
+notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright 
+notice, this list of conditions and the following disclaimer in the 
+documentation and/or other materials provided with the distribution.
+
+* Neither the name of the GitDB project nor the names of 
+its contributors may be used to endorse or promote products derived 
+from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Additional Licenses
+-------------------
+The files at 
+gitdb/test/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx
+and 
+gitdb/test/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack 
+are licensed under GNU GPL as part of the git source repository, 
+see http://en.wikipedia.org/wiki/Git_%28software%29 for more information.
+
+They are not required for the actual operation, which is why they are not found 
+in the distribution package.

gitdb/MANIFEST.in

@@ -0,0 +1,18 @@
+include VERSION
+include LICENSE
+include CHANGES
+include AUTHORS
+include README
+include MANIFEST.in
+
+include gitdb/_fun.c
+include gitdb/_delta_apply.c
+include gitdb/_delta_apply.h
+
+graft gitdb/test
+
+global-exclude .git*
+global-exclude *.pyc
+global-exclude *.so
+global-exclude *.dll
+global-exclude *.o

gitdb/Makefile

@@ -0,0 +1,7 @@
+.PHONY: all clean
+
+all:
+	@grep -Ee '^[a-z].*:' Makefile | cut -d: -f1 | grep -vF all
+
+clean:
+	rm -rf build/ dist/ .eggs/ .tox/

gitdb/README.rst

@@ -0,0 +1,69 @@
+GitDB
+=====
+
+GitDB allows you to access bare git repositories for reading and writing. It aims at allowing full access to loose objects as well as packs with performance and scalability in mind. It operates exclusively on streams, allowing to handle large objects with a small memory footprint.
+
+Installation
+============
+
+.. image:: https://img.shields.io/pypi/v/gitdb.svg
+    :target: https://pypi.python.org/pypi/gitdb/
+    :alt: Latest Version
+.. image:: https://img.shields.io/pypi/pyversions/gitdb.svg
+    :target: https://pypi.python.org/pypi/gitdb/
+    :alt: Supported Python versions
+.. image:: https://readthedocs.org/projects/gitdb/badge/?version=latest
+    :target: https://readthedocs.org/projects/gitdb/?badge=latest
+    :alt: Documentation Status
+
+From `PyPI <https://pypi.python.org/pypi/gitdb>`_::
+
+ pip install gitdb
+
+SPEEDUPS
+========
+
+If you want to go up to 20% faster, you can install gitdb-speedups with::
+
+ pip install gitdb-speedups
+
+However, please note that gitdb-speedups is not currently maintained.
+
+REQUIREMENTS
+============
+
+* smmap - declared as a dependency, automatically installed
+* pytest - for running the tests
+
+SOURCE
+======
+
+The source is available in the GitPython repository on GitHub:
+
+https://github.com/gitpython-developers/GitPython/tree/main/gitdb
+
+Run the tests with::
+
+ pytest
+
+DEVELOPMENT
+===========
+
+.. image:: https://github.com/gitpython-developers/GitPython/actions/workflows/dependencies.yml/badge.svg
+    :target: https://github.com/gitpython-developers/GitPython/actions/workflows/dependencies.yml
+
+The library is considered mature, and not under active development. Its primary (known) use is in GitPython.
+
+INFRASTRUCTURE
+==============
+
+* Discussions
+    * https://github.com/gitpython-developers/GitPython/discussions
+
+* Issue Tracker
+    * https://github.com/gitpython-developers/GitPython/issues
+
+LICENSE
+=======
+
+New BSD License

gitdb/SECURITY.md

@@ -0,0 +1,3 @@
+# Security Policy
+
+See [GitPython](https://github.com/gitpython-developers/GitPython/blob/main/SECURITY.md). Vulnerabilities found in `gitdb` can be reported there.

gitdb/doc/.gitignore

@@ -0,0 +1 @@
+build/