git2svn 0.4.0__tar.gz

git2svn-0.4.0/LICENSE.md

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf
+      of the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if distributed along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!) The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Simon Hartmann
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

git2svn-0.4.0/PKG-INFO

@@ -0,0 +1,148 @@
+Metadata-Version: 2.4
+Name: git2svn
+Version: 0.4.0
+Summary: CLI utility to synchronize changes from a local Git repository to a local SVN working copy
+Author: Simon
+License: Apache-2.0
+Project-URL: Homepage, https://github.com/simon123h/git2svn
+Project-URL: Documentation, https://github.com/simon123h/git2svn#readme
+Project-URL: Repository, https://github.com/simon123h/git2svn.git
+Project-URL: Issues, https://github.com/simon123h/git2svn/issues
+Project-URL: Changelog, https://github.com/simon123h/git2svn/releases
+Keywords: git,svn,subversion,synchronize,replay,stage,vcs
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development :: Version Control
+Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Provides-Extra: dev
+Requires-Dist: coverage>=7.0.0; extra == "dev"
+Requires-Dist: ruff>=0.8.0; extra == "dev"
+Dynamic: license-file
+
+# Git-to-SVN Synchronization CLI (`git2svn`)
+
+<p align="center">
+  <a href="https://github.com/simon123h/git2svn/actions/workflows/ci.yml"><img src="https://github.com/simon123h/git2svn/actions/workflows/ci.yml/badge.svg?branch=main" alt="Build Status"></a>
+  <a href="https://codecov.io/gh/simon123h/git2svn"><img src="https://codecov.io/gh/simon123h/git2svn/branch/main/graph/badge.svg" alt="Coverage"></a>
+  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=blue" alt="PyPI Version"></a>
+  <img src="https://img.shields.io/badge/Python-v3.11+-3776AB?logo=python&logoColor=white" alt="Python Version">
+  <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Ftokei.kojix2.net%2Fbadge%2Fgithub%2Fsimon123h%2Fgit2svn%2Flines" alt="Lines of Code">
+  <a href="https://github.com/simon123h/git2svn/releases"><img src="https://badgen.net/github/release/simon123h/git2svn?color=orange" alt="Latest Release"></a>
+  <a href="LICENSE.md"><img src="https://img.shields.io/badge/license-Apache--2.0-blue" alt="License"></a>
+</p>
+
+A lightweight, zero-dependency Python 3 CLI utility to bridge local Git development workspaces with a Subversion (SVN) monorepo working copy. It provides two symmetrical, intuitive commands to either stage changes for manual review (`stage`) or sequentially commit them into SVN history (`replay`).
+
+---
+
+## Key Highlights
+
+- **Zero External Dependencies:** Built purely on Python 3 standard library and standard `git`/`svn` CLI tools.
+- **Smart CRLF/LF Normalization:** Automatically reconciles line endings post-patch, preventing Subversion `E135000: Inconsistent line ending style` commit failures.
+- **Clean Intent Model:**
+  - `stage`: **Never commits.** Staged in SVN (`svn add`, `svn rm`) for inspection in TortoiseSVN or CLI before manual commit.
+  - `replay`: **Always commits.** Sequentially ports Git commits into SVN with original author messages and a stateful conflict recovery lifecycle.
+- **Flexible Reference Syntax:** Accepts single commits (`abc1234`), range notation (`main..feature`), or two positional arguments (`main feature`).
+- **Binary & Snapshot Support:** Direct object DB extraction (`--copy`) for binary assets and whole-tree alignment (`--snapshot`).
+
+---
+
+## Quick Start
+
+### Installation
+
+Install via `pipx` (recommended) or `pip`:
+
+```bash
+# Using pipx (isolated global CLI command):
+pipx install git2svn
+
+# Or via standard pip:
+pip install git2svn
+```
+
+Alternatively, run directly from source without installing:
+
+```bash
+git clone https://github.com/simon123h/git2svn.git
+cd git2svn
+python3 -m git2svn --help
+```
+
+### Basic Commands
+
+```bash
+# Optional: Set default SVN path in your Git repository so you don't need -s on every command
+git config git2svn.svnDir /path/to/svn
+
+# 1. Stage a single Git commit into SVN for review (uncommitted)
+git2svn stage a1b2c3d4 -s /path/to/svn
+
+# 2. Squash an entire feature branch into an uncommitted SVN changeset
+git2svn stage main..feature/login
+
+# 3. Replay an entire feature branch commit-by-commit into SVN history
+git2svn replay main..feature/login
+
+# 4. Resume an interrupted replay after resolving conflicts
+git2svn replay --continue
+```
+
+---
+
+## Architecture at a Glance
+
+```mermaid
+flowchart TD
+    Git[Git Workspace] -->|git diff / name-status| Bridge[git2svn CLI]
+    Bridge -->|git apply or object extraction| SVN[SVN Working Copy]
+    Bridge -->|Smart CRLF / LF normalization| SVN
+    Bridge -->|svn add --parents / svn rm| SVN
+    SVN -->|Review & Manual svn commit| Upstream[(SVN Server)]
+    Bridge -.->|replay auto svn commit -F| Upstream
+```
+
+---
+
+## Documentation
+
+Comprehensive documentation-as-code is maintained in the [`docs/`](docs/) folder:
+
+- **[User Guide](docs/user-guide/README.md):** Complete CLI options, [command reference](docs/user-guide/commands.md), the [Git Integration Branch Workflow](docs/user-guide/integration-workflow.md), and [troubleshooting FAQ](docs/user-guide/troubleshooting.md).
+- **[Architecture Documentation](docs/arc42/README.md):** Architectural design, package building blocks, runtime sequence diagrams, [cross-cutting concepts](docs/arc42/concepts.md), and [Architecture Decision Records (ADRs)](docs/arc42/adrs.md).
+- **[Requirements Specification](docs/req42.md):** Detailed stakeholders, functional requirements, and quality goals.
+- **[Contributing Guidelines](CONTRIBUTING.md):** Development setup, coding conventions, Conventional Commits, and test instructions.
+
+---
+
+## Development & Testing
+
+```bash
+# Run unit & integration tests
+python3 -m unittest discover tests
+
+# Lint and format with Ruff
+ruff check --fix .
+ruff format .
+
+# Enable pre-commit hook
+git config core.hooksPath .githooks
+# or use pre-commit framework: pre-commit install
+```
+
+
+---
+
+## License
+
+Distributed under the [Apache-2.0 License](LICENSE.md).

git2svn-0.4.0/README.md

@@ -0,0 +1,117 @@
+# Git-to-SVN Synchronization CLI (`git2svn`)
+
+<p align="center">
+  <a href="https://github.com/simon123h/git2svn/actions/workflows/ci.yml"><img src="https://github.com/simon123h/git2svn/actions/workflows/ci.yml/badge.svg?branch=main" alt="Build Status"></a>
+  <a href="https://codecov.io/gh/simon123h/git2svn"><img src="https://codecov.io/gh/simon123h/git2svn/branch/main/graph/badge.svg" alt="Coverage"></a>
+  <a href="https://pypi.org/project/git2svn/"><img src="https://img.shields.io/pypi/v/git2svn?color=blue" alt="PyPI Version"></a>
+  <img src="https://img.shields.io/badge/Python-v3.11+-3776AB?logo=python&logoColor=white" alt="Python Version">
+  <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Ftokei.kojix2.net%2Fbadge%2Fgithub%2Fsimon123h%2Fgit2svn%2Flines" alt="Lines of Code">
+  <a href="https://github.com/simon123h/git2svn/releases"><img src="https://badgen.net/github/release/simon123h/git2svn?color=orange" alt="Latest Release"></a>
+  <a href="LICENSE.md"><img src="https://img.shields.io/badge/license-Apache--2.0-blue" alt="License"></a>
+</p>
+
+A lightweight, zero-dependency Python 3 CLI utility to bridge local Git development workspaces with a Subversion (SVN) monorepo working copy. It provides two symmetrical, intuitive commands to either stage changes for manual review (`stage`) or sequentially commit them into SVN history (`replay`).
+
+---
+
+## Key Highlights
+
+- **Zero External Dependencies:** Built purely on Python 3 standard library and standard `git`/`svn` CLI tools.
+- **Smart CRLF/LF Normalization:** Automatically reconciles line endings post-patch, preventing Subversion `E135000: Inconsistent line ending style` commit failures.
+- **Clean Intent Model:**
+  - `stage`: **Never commits.** Staged in SVN (`svn add`, `svn rm`) for inspection in TortoiseSVN or CLI before manual commit.
+  - `replay`: **Always commits.** Sequentially ports Git commits into SVN with original author messages and a stateful conflict recovery lifecycle.
+- **Flexible Reference Syntax:** Accepts single commits (`abc1234`), range notation (`main..feature`), or two positional arguments (`main feature`).
+- **Binary & Snapshot Support:** Direct object DB extraction (`--copy`) for binary assets and whole-tree alignment (`--snapshot`).
+
+---
+
+## Quick Start
+
+### Installation
+
+Install via `pipx` (recommended) or `pip`:
+
+```bash
+# Using pipx (isolated global CLI command):
+pipx install git2svn
+
+# Or via standard pip:
+pip install git2svn
+```
+
+Alternatively, run directly from source without installing:
+
+```bash
+git clone https://github.com/simon123h/git2svn.git
+cd git2svn
+python3 -m git2svn --help
+```
+
+### Basic Commands
+
+```bash
+# Optional: Set default SVN path in your Git repository so you don't need -s on every command
+git config git2svn.svnDir /path/to/svn
+
+# 1. Stage a single Git commit into SVN for review (uncommitted)
+git2svn stage a1b2c3d4 -s /path/to/svn
+
+# 2. Squash an entire feature branch into an uncommitted SVN changeset
+git2svn stage main..feature/login
+
+# 3. Replay an entire feature branch commit-by-commit into SVN history
+git2svn replay main..feature/login
+
+# 4. Resume an interrupted replay after resolving conflicts
+git2svn replay --continue
+```
+
+---
+
+## Architecture at a Glance
+
+```mermaid
+flowchart TD
+    Git[Git Workspace] -->|git diff / name-status| Bridge[git2svn CLI]
+    Bridge -->|git apply or object extraction| SVN[SVN Working Copy]
+    Bridge -->|Smart CRLF / LF normalization| SVN
+    Bridge -->|svn add --parents / svn rm| SVN
+    SVN -->|Review & Manual svn commit| Upstream[(SVN Server)]
+    Bridge -.->|replay auto svn commit -F| Upstream
+```
+
+---
+
+## Documentation
+
+Comprehensive documentation-as-code is maintained in the [`docs/`](docs/) folder:
+
+- **[User Guide](docs/user-guide/README.md):** Complete CLI options, [command reference](docs/user-guide/commands.md), the [Git Integration Branch Workflow](docs/user-guide/integration-workflow.md), and [troubleshooting FAQ](docs/user-guide/troubleshooting.md).
+- **[Architecture Documentation](docs/arc42/README.md):** Architectural design, package building blocks, runtime sequence diagrams, [cross-cutting concepts](docs/arc42/concepts.md), and [Architecture Decision Records (ADRs)](docs/arc42/adrs.md).
+- **[Requirements Specification](docs/req42.md):** Detailed stakeholders, functional requirements, and quality goals.
+- **[Contributing Guidelines](CONTRIBUTING.md):** Development setup, coding conventions, Conventional Commits, and test instructions.
+
+---
+
+## Development & Testing
+
+```bash
+# Run unit & integration tests
+python3 -m unittest discover tests
+
+# Lint and format with Ruff
+ruff check --fix .
+ruff format .
+
+# Enable pre-commit hook
+git config core.hooksPath .githooks
+# or use pre-commit framework: pre-commit install
+```
+
+
+---
+
+## License
+
+Distributed under the [Apache-2.0 License](LICENSE.md).

git2svn-0.4.0/git2svn/__init__.py

@@ -0,0 +1,56 @@
+"""
+git2svn: A consolidated CLI utility to synchronize changes from a local Git repository
+to a local Subversion (SVN) working copy.
+"""
+
+from __future__ import annotations
+
+from .cli import build_parser, main, parse_cli_args
+from .core import Synchronizer
+from .eol import detect_file_eol, normalize_file_eol
+from .git import FileChange, GitRepo, parse_name_status, parse_name_status_z, parse_ref_arguments
+from .patcher import Patcher
+from .state import (
+    clean_conflict_artifacts,
+    clear_replay_state,
+    find_conflict_artifacts,
+    load_replay_state,
+    save_replay_state,
+)
+from .svn import SvnWorkspace
+
+__version__ = "0.4.0"
+
+
+def get_version() -> str:
+    """Return package version from installed distribution metadata or fallback to __version__."""
+    try:
+        from importlib.metadata import version
+
+        return version("git2svn")
+    except Exception:
+        return __version__
+
+
+__all__ = [
+    "Synchronizer",
+    "GitRepo",
+    "SvnWorkspace",
+    "Patcher",
+    "FileChange",
+    "parse_ref_arguments",
+    "parse_name_status",
+    "parse_name_status_z",
+    "detect_file_eol",
+    "normalize_file_eol",
+    "save_replay_state",
+    "load_replay_state",
+    "clear_replay_state",
+    "find_conflict_artifacts",
+    "clean_conflict_artifacts",
+    "build_parser",
+    "parse_cli_args",
+    "main",
+    "get_version",
+    "__version__",
+]

git2svn-0.4.0/git2svn/__main__.py

@@ -0,0 +1,6 @@
+import sys
+
+from git2svn.cli import main
+
+if __name__ == "__main__":
+    sys.exit(main())