git2svn 0.4.0__tar.gz → 0.4.1__tar.gz

git2svn-0.4.1/.githooks/pre-commit

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Git pre-commit hook to enforce code formatting and linting via ruff
+
+set -e
+
+# Check if currently on 'trunk' branch and ensure no merge commits are being created
+CURRENT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null || true)
+if [ "$CURRENT_BRANCH" = "trunk" ]; then
+    if [ -f .git/MERGE_HEAD ]; then
+        echo "[git2svn pre-commit hook] ERROR: Merge commits are not permitted on 'trunk'." >&2
+        echo "[git2svn pre-commit hook] git2svn replay requires a strictly linear history." >&2
+        echo "[git2svn pre-commit hook] Please rebase your feature branch and use fast-forward: 'git merge --ff-only <branch>'" >&2
+        exit 1
+    fi
+fi
+
+# Check if ruff is available
+if command -v ruff >/dev/null 2>&1; then
+    RUFF_CMD="ruff"
+elif python3 -m ruff --version >/dev/null 2>&1; then
+    RUFF_CMD="python3 -m ruff"
+else
+    echo "[git2svn pre-commit hook] WARNING: 'ruff' not found in PATH or python environment. Skipping formatting checks."
+    exit 0
+fi
+
+echo "[git2svn pre-commit hook] Checking code formatting..."
+$RUFF_CMD format --check .
+
+echo "[git2svn pre-commit hook] Checking code linting..."
+$RUFF_CMD check .
+
+echo "[git2svn pre-commit hook] All checks passed!"
+

git2svn-0.4.1/.github/dependabot.yml

@@ -0,0 +1,41 @@
+version: 2
+updates:
+  # Maintain Python dev dependencies in pyproject.toml
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "Europe/Zurich"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "python"
+    groups:
+      pip-minor-patch:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+
+  # Maintain GitHub Actions dependencies
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "Europe/Zurich"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "github-actions"
+    groups:
+      actions-minor-patch:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"

git2svn-0.4.1/.github/workflows/ci.yml

@@ -0,0 +1,88 @@
+name: CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  lint-and-format:
+    name: Lint & Format (Ruff)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v7
+
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.12"
+
+      - name: Install Ruff
+        run: pip install ruff
+
+      - name: Run Ruff Lint Checks
+        run: ruff check .
+
+      - name: Verify Formatting with Ruff
+        run: ruff format --check .
+
+  test:
+    name: Test on Python ${{ matrix.python-version }} (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.11", "3.12", "3.13"]
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v7
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v7
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Subversion (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y subversion git
+
+      - name: Install Subversion (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install subversion git
+
+      - name: Install Subversion (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          choco install tortoisesvn -y --params:"/NoRestart"
+          # Add TortoiseSVN CLI tools to PATH if present
+          echo "C:\Program Files\TortoiseSVN\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Install Dependencies
+        run: pip install -e .[dev]
+
+      - name: Run Unit & Integration Tests (with Coverage)
+        if: runner.os == 'Linux' && matrix.python-version == '3.12'
+        run: |
+          coverage run -m unittest discover tests
+          coverage xml
+
+      - name: Run Unit & Integration Tests
+        if: runner.os != 'Linux' || matrix.python-version != '3.12'
+        run: python -m unittest discover tests
+
+      - name: Upload Coverage to Codecov
+        if: runner.os == 'Linux' && matrix.python-version == '3.12'
+        uses: codecov/codecov-action@v7
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: coverage.xml
+          flags: unittests
+          fail_ci_if_error: false
+

git2svn-0.4.1/.github/workflows/release.yml

@@ -0,0 +1,189 @@
+name: Release Pipeline
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+    inputs:
+      bump:
+        description: 'Semantic Version Bump'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+          - custom
+      custom_version:
+        description: 'Custom Version (only if "custom" selected above, e.g. v0.3.1)'
+        required: false
+        default: ''
+
+permissions:
+  contents: write
+  id-token: write  # Required for PyPI Trusted Publishing (OIDC)
+
+jobs:
+  tag-release:
+    runs-on: ubuntu-latest
+    outputs:
+      tag: ${{ steps.resolve_tag.outputs.tag }}
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Resolve Release Tag
+        id: resolve_tag
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "push" ]; then
+            TAG="${{ github.ref_name }}"
+            echo "Triggered by tag push: $TAG"
+          else
+            # Triggered via workflow_dispatch button -> compute next semver
+            LATEST_TAG=$(git tag --sort=-v:refname | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | head -n 1 || true)
+            if [ -z "$LATEST_TAG" ]; then
+              LATEST_TAG="v0.3.0"
+            fi
+            echo "Latest stable tag: $LATEST_TAG"
+
+            RAW_VER="${LATEST_TAG#v}"
+            IFS='.' read -r MAJOR MINOR PATCH <<< "$RAW_VER"
+
+            BUMP="${{ github.event.inputs.bump }}"
+            CUSTOM="${{ github.event.inputs.custom_version }}"
+
+            if [ "$BUMP" = "patch" ]; then
+              TAG="v${MAJOR}.${MINOR}.$((PATCH + 1))"
+            elif [ "$BUMP" = "minor" ]; then
+              TAG="v${MAJOR}.$((MINOR + 1)).0"
+            elif [ "$BUMP" = "major" ]; then
+              TAG="v$((MAJOR + 1)).0.0"
+            elif [ "$BUMP" = "custom" ]; then
+              if [ -z "$CUSTOM" ]; then
+                echo "Error: custom_version cannot be empty when bump=custom" >&2
+                exit 1
+              fi
+              if [[ ! "$CUSTOM" =~ ^v ]]; then
+                TAG="v${CUSTOM}"
+              else
+                TAG="${CUSTOM}"
+              fi
+            fi
+
+            echo "Computed new tag: $TAG"
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git tag -a "$TAG" -m "Release $TAG"
+            git push origin "$TAG"
+          fi
+
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+
+  build-and-publish:
+    needs: tag-release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ needs.tag-release.outputs.tag }}
+
+      - name: Fetch All Tags
+        run: |
+          git fetch --tags --force
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install Build Tools
+        run: |
+          pip install build setuptools-scm
+
+      - name: Build Wheel & Sdist
+        env:
+          TAG: ${{ needs.tag-release.outputs.tag }}
+        run: |
+          export SETUPTOOLS_SCM_PRETEND_VERSION="${TAG#v}"
+          echo "Building package for release version: $SETUPTOOLS_SCM_PRETEND_VERSION"
+          python -m build
+
+      - name: Create GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ needs.tag-release.outputs.tag }}
+        run: |
+          EXTRA_FLAGS=()
+          if [[ "$TAG" =~ (alpha|beta|rc|dev) ]]; then
+            EXTRA_FLAGS+=(--prerelease)
+          fi
+
+          START_TAG=$(git tag --sort=-v:refname | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | grep -v "^${TAG}$" | head -n 1 || true)
+          if [ -z "$START_TAG" ]; then
+            START_TAG=$(git describe --tags --abbrev=0 "${TAG}^" 2>/dev/null || true)
+          fi
+
+          RANGE="${START_TAG}..${TAG}"
+          if [ -z "$START_TAG" ]; then
+            RANGE="${TAG}"
+          fi
+
+          REPO_URL="https://github.com/${{ github.repository }}"
+          NOTES_FILE="/tmp/release_notes.md"
+          echo "## What's Changed" > "$NOTES_FILE"
+          echo "" >> "$NOTES_FILE"
+
+          FEATS=$(git log "$RANGE" --grep="^feat" --pretty=format:"* %s ([%h]($REPO_URL/commit/%H))" || true)
+          FIXES=$(git log "$RANGE" --grep="^fix" --pretty=format:"* %s ([%h]($REPO_URL/commit/%H))" || true)
+          MAINT=$(git log "$RANGE" --grep="^chore" --grep="^perf" --grep="^refactor" --grep="^docs" --pretty=format:"* %s ([%h]($REPO_URL/commit/%H))" || true)
+
+          HAS_CONTENT=false
+          if [ -n "$FEATS" ]; then
+            echo "### 🚀 Features" >> "$NOTES_FILE"
+            echo "$FEATS" >> "$NOTES_FILE"
+            echo "" >> "$NOTES_FILE"
+            HAS_CONTENT=true
+          fi
+
+          if [ -n "$FIXES" ]; then
+            echo "### 🐛 Bug Fixes" >> "$NOTES_FILE"
+            echo "$FIXES" >> "$NOTES_FILE"
+            echo "" >> "$NOTES_FILE"
+            HAS_CONTENT=true
+          fi
+
+          if [ -n "$MAINT" ]; then
+            echo "### 🧰 Maintenance & Documentation" >> "$NOTES_FILE"
+            echo "$MAINT" >> "$NOTES_FILE"
+            echo "" >> "$NOTES_FILE"
+            HAS_CONTENT=true
+          fi
+
+          if [ "$HAS_CONTENT" = false ]; then
+            git log "$RANGE" --pretty=format:"* %s ([%h]($REPO_URL/commit/%H))" >> "$NOTES_FILE" || true
+            echo "" >> "$NOTES_FILE"
+          fi
+
+          if [ -n "$START_TAG" ]; then
+            echo "**Full Changelog**: $REPO_URL/compare/${START_TAG}...${TAG}" >> "$NOTES_FILE"
+          fi
+
+          gh release create "$TAG" dist/* \
+            --title "$TAG" \
+            --notes-file "$NOTES_FILE" \
+            "${EXTRA_FLAGS[@]}"
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        continue-on-error: true  # Allows pipeline to succeed even before PyPI Trusted Publishing is registered
+        with:
+          packages-dir: dist/
+          skip-existing: true
+          print-hash: true

git2svn-0.4.1/.gitignore

@@ -0,0 +1,13 @@
+__pycache__/
+*.py[cod]
+*$py.class
+.pytest_cache/
+*.rej
+*.orig
+build/
+dist/
+*.egg-info/
+.coverage
+coverage.xml
+htmlcov/
+git2svn/_version.py

git2svn-0.4.1/.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.0
+    hooks:
+      # Run the linter
+      - id: ruff
+        args: [--fix]
+      # Run the formatter
+      - id: ruff-format

git2svn-0.4.1/CONTRIBUTING.md

@@ -0,0 +1,90 @@
+# Contributing to git2svn
+
+Thank you for contributing to `git2svn`! This document outlines our development workflow, coding standards, and contribution guidelines.
+
+---
+
+## 1. Development Environment Setup
+
+`git2svn` is built entirely on the Python 3 standard library with zero runtime dependencies. Only development tooling (Ruff) is required.
+
+### 1.1 Requirements
+* Python `>= 3.11`
+* `git` CLI (standard installation)
+* `svn` CLI (Apache Subversion command-line client)
+* `ruff` for code formatting and linting
+
+### 1.2 Installation for Development
+```bash
+# Clone the repository
+git clone https://github.com/your-org/git2svn.git
+cd git2svn
+
+# Optional: create a virtual environment
+python3 -m venv .venv
+source .venv/bin/activate
+
+# Install dev dependencies (ruff)
+pip install -e ".[dev]"
+```
+
+---
+
+## 2. Coding Standards & Conventions
+
+### 2.1 Commit Messages
+All commit messages **must** strictly adhere to the [Conventional Commits](https://www.conventionalcommits.org/) specification:
+```text
+<type>(<optional scope>): <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+* **Allowed Types:** `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `build`, `ci`, `chore`.
+* **Example:** `feat(patch): replace patch with git apply and add EOL normalization`
+
+### 2.2 Code Formatting & Linting
+We use [Ruff](https://astral.sh/ruff) configured in `pyproject.toml` (target Python 3.11+, line length 120):
+```bash
+# Check code for lint errors and auto-fix what's safe
+ruff check --fix .
+
+# Format code
+ruff format .
+
+# Check formatting without modifying
+ruff format --check .
+```
+All code must pass `ruff check .` and `ruff format --check .` with zero errors or warnings before committing.
+
+### 2.3 Documentation-as-Code
+* All architecture documentation resides in [`docs/arc42.md`](docs/arc42.md) following the [arc42 template](https://arc42.org/).
+* All requirements documentation resides in [`docs/req42.md`](docs/req42.md) following the [req42 framework](https://req42.de/).
+* CLI workflows and command guides reside in [`docs/user-guide.md`](docs/user-guide.md).
+* Diagrams are embedded directly using **Mermaid.js** code blocks (`mermaid`).
+
+---
+
+## 3. Testing Guidelines
+
+### 3.1 Running Tests
+Run the test suite using Python's built-in `unittest` runner:
+```bash
+python3 -m unittest discover tests
+```
+
+### 3.2 Writing Tests
+* Any new feature or bugfix must include corresponding automated tests in `tests/`.
+* Mock external network or real SVN servers where appropriate, but use real temporary Git repositories and directory structures (`tempfile.TemporaryDirectory`) for unit and integration testing.
+* When adding newline/patch logic, test both `\r\n` (CRLF) and `\n` (LF) scenarios to prevent regressions with SVN `E135000` mixed line endings.
+
+---
+
+## 4. Pull Request Process
+
+1. Create a feature branch off `main` (e.g. `feat/my-new-option`).
+2. Make your changes adhering to conventional commits.
+3. Run `ruff check .`, `ruff format --check .`, and `python3 -m unittest discover tests`.
+4. Ensure documentation in `docs/` and `README.md` is updated if CLI syntax or architecture changed.
+5. Open a Pull Request with a clear description of the problem solved.

{git2svn-0.4.0 → git2svn-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git2svn
-Version: 0.4.0
+Version: 0.4.1
 Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
 Author: Simon
 License: Apache-2.0
@@ -27,6 +27,7 @@ License-File: LICENSE.md
 Provides-Extra: dev
 Requires-Dist: coverage>=7.0.0; extra == "dev"
 Requires-Dist: ruff>=0.8.0; extra == "dev"
+Requires-Dist: setuptools-scm>=8.0; extra == "dev"
 Dynamic: license-file
 
 # Git-to-SVN Synchronization CLI (`git2svn`)