Merge pull request #73 from iamvirul/feature/git-like-versioning

feat(version): Git-like versioning with branch, checkout, and tree (v1.5.0)

Author: iamvirul

.github/workflows/ci.yml

@@ -183,30 +183,6 @@ jobs:
           install-mode: goinstall
           args: --timeout=5m --out-format=colored-line-number
 
-  security:
-    name: Security Scan
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.25.8'
-          cache-dependency-path: go.sum
-
-      - name: Run gosec
-        uses: securego/gosec@master
-        with:
-          args: '-exclude=G304 -exclude-generated -severity medium ./...'
-
-      - name: Run govulncheck
-        run: |
-          go install golang.org/x/vuln/cmd/govulncheck@latest
-          govulncheck ./...
-
   build:
     name: Build
     runs-on: ubuntu-latest

.github/workflows/security.yml

@@ -0,0 +1,32 @@
+name: Security Scan
+
+on:
+  push:
+    branches: [ main, development ]
+  pull_request:
+    branches: [ main, development ]
+
+jobs:
+  security:
+    name: Security Scan
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25.8'
+          cache-dependency-path: go.sum
+
+      - name: Run gosec
+        uses: securego/gosec@master
+        with:
+          args: '-exclude=G304 -exclude-generated -severity medium ./...'
+
+      - name: Run govulncheck
+        run: |
+          go install golang.org/x/vuln/cmd/govulncheck@latest
+          govulncheck ./...

.gitignore

@@ -1,7 +1,9 @@
 bin/
-deepdiffdb
+/deepdiffdb
 diff-output/
 coverage.out
 coverage-integration.out
 coverage.txt
 *.out
+
+.deepdiffdb/

CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- **Git-like branch support for `version`** — `version branch`, `version checkout`, `version tree`
+  - `version branch` — lists all branches with current marker and tip hash; creates a new branch when a name is given; `--from <hash>` to branch from a specific commit
+  - `version checkout <branch>` — switches HEAD to a symbolic ref pointing to the named branch; new commits advance only the checked-out branch tip
+  - `version tree` — ASCII commit graph showing all branches with lane columns, `HEAD -> branch` decoration, short hash, date, and message (newest-first)
+  - HEAD is now stored as a Git-style symbolic ref (`ref: refs/heads/main`) rather than a bare hash; branch tips live in `.deepdiffdb/refs/heads/<name>`
+  - New `internal/version` files: `branch.go`, `tree.go`
+  - 39 new unit tests covering store symbolic refs, branch lifecycle, and tree rendering (`tests/version/`)
+
+## [1.5.0] - 2026-03-31
+
+### Added
+- **Git-like versioning for DB diffs** (issue #16)
+  - New `version` command group: `init`, `commit`, `log`, `diff`, `rollback`
+  - `version init` — creates a `.deepdiffdb/` repository (objects store + HEAD pointer) in the current directory
+  - `version commit` — runs a full schema+data diff and stores the result as a SHA-256 content-addressable commit; records both schema snapshots so rollback SQL can be generated offline
+  - `version log` — walks the commit chain from HEAD, showing author, date, and drift markers (`[schema drift]`, `[data changes]`)
+  - `version diff <hash1> <hash2>` — compares dev schema snapshots of two commits; reports added/removed tables and column/index changes
+  - `version rollback <hash>` — generates driver-aware rollback SQL by inverting the stored diff; inherits safety defaults from `schema-migrate` (destructive ops commented out); supports `--out <file>` and `--driver` overrides
+  - Commit objects stored as JSON in `.deepdiffdb/objects/<sha256>.json`
+  - New `internal/version` package (`model.go`, `store.go`, `rollback.go`)
+- **Sample 17: Git-like Versioning** (`samples/17-git-like-versioning/`)
+  - Two MySQL 8 containers (prod 3320, dev 3321) with a `shop` e-commerce schema
+  - Three migration scripts simulating a real sprint cycle (V1 baseline → V2 FK+email → V3 reviews table)
+  - Automated `scripts/demo.sh` end-to-end walkthrough writing rollback SQL to `diff-output/`
+
 ## [1.0.0] - 2026-03-22
 
 ### Added

README.md

@@ -1,6 +1,7 @@
 # DeepDiff DB
 
 [![CI](https://github.com/iamvirul/deepdiff-db/actions/workflows/ci.yml/badge.svg)](https://github.com/iamvirul/deepdiff-db/actions/workflows/ci.yml)
+[![Security Scan](https://github.com/iamvirul/deepdiff-db/actions/workflows/security.yml/badge.svg)](https://github.com/iamvirul/deepdiff-db/actions/workflows/security.yml)
 [![Release](https://img.shields.io/github/v/release/iamvirul/deepdiff-db?color=6366f1)](https://github.com/iamvirul/deepdiff-db/releases/latest)
 [![codecov](https://codecov.io/gh/iamvirul/deepdiff-db/branch/main/graph/badge.svg?token=Y9IORTUBAH)](https://codecov.io/gh/iamvirul/deepdiff-db)
 [![Go Report Card](https://goreportcard.com/badge/github.com/iamvirul/deepdiff-db)](https://goreportcard.com/report/github.com/iamvirul/deepdiff-db)
@@ -46,6 +47,7 @@ DeepDiff DB makes the entire process deterministic, reviewable, and safe by:
 - **Enhanced error handling** - Rich error messages with actionable suggestions
 - **Streaming large datasets** - Keyset-paginated batch hashing keeps memory bounded at any table size
 - **Parallel table hashing** - Hash multiple tables concurrently with configurable worker pool
+- **Git-like versioning** - Commit diff snapshots, browse history, compare versions, generate rollback SQL
 
 ### Safety Features
 
@@ -479,6 +481,61 @@ Continues from a previous session by loading existing resolutions.
 **Output Files:**
 - `resolutions.json` - Saved resolution decisions
 
+### version
+
+Git-like versioning for database diffs. Stores schema and data diff snapshots as commits, enabling history browsing, inter-version comparison, and rollback SQL generation — all without a live database connection.
+
+```bash
+deepdiffdb version <subcommand> [flags]
+```
+
+#### Subcommands
+
+| Subcommand | Description |
+|---|---|
+| `version init` | Initialise a `.deepdiffdb/` repository in the current directory |
+| `version commit` | Run a full diff and store the result as a new commit |
+| `version log` | Show the commit history from most recent to oldest |
+| `version diff <h1> <h2>` | Compare schema evolution between two commits |
+| `version rollback <hash>` | Generate rollback SQL to undo the changes in a commit |
+| `version branch [<name>]` | List branches, or create a new one |
+| `version checkout <branch>` | Switch to a branch |
+| `version tree` | Show ASCII commit graph for all branches |
+
+#### Example Workflow
+
+```bash
+# Initialise once per project
+deepdiffdb version init
+
+# Commit a baseline snapshot
+deepdiffdb version commit --config deepdiffdb.config.yaml --message "V1: baseline" --author "Alice"
+
+# Create a feature branch and switch to it
+deepdiffdb version branch feature
+deepdiffdb version checkout feature
+
+# After applying schema changes to dev, commit on the feature branch
+deepdiffdb version commit --config deepdiffdb.config.yaml --message "V2: add reviews table" --author "Bob"
+
+# Switch back to main and commit a hotfix
+deepdiffdb version checkout main
+deepdiffdb version commit --config deepdiffdb.config.yaml --message "V2: hotfix index" --author "Alice"
+
+# Browse history with an ASCII branch graph
+deepdiffdb version tree
+
+# See what changed between two commits
+deepdiffdb version diff <hash_v1> <hash_v2>
+
+# Generate rollback SQL for a commit
+deepdiffdb version rollback --out rollback.sql <hash_v2>
+```
+
+**Storage:** Commits are stored as zlib-compressed objects in `.deepdiffdb/objects/<2-char>/<62-char>` (Git-style fanout, content-addressable by SHA-256). Branch tips live in `.deepdiffdb/refs/heads/<name>`; HEAD is a symbolic ref (`ref: refs/heads/main`). Add `.deepdiffdb/` to your `.gitignore` or commit it to share history with your team.
+
+**Rollback SQL:** Each commit stores full schema snapshots, so rollback SQL can be generated at any time without a live database. Destructive operations (DROP TABLE, DROP COLUMN) are commented out by default — identical safety behaviour to `schema-migrate`.
+
 ## Usage Examples
 
 ### Basic Workflow

ROADMAP.md

@@ -8,9 +8,9 @@ We release a new version every **Saturday**. Each release includes one or more f
 
 ---
 
-## Current Status: v1.0 — Production Ready 🎉
+## Current Status: v1.5.0 — Git-like Versioning 🎉
 
-**Last Release:** 2026-03-22
+**Last Release:** 2026-03-31
 
 **Current Features:**
 - Schema drift detection and standalone schema migration (`schema-migrate`)
@@ -31,12 +31,24 @@ We release a new version every **Saturday**. Each release includes one or more f
 - Parallel table hashing — `--parallel N` / `performance.max_parallel_tables`
 - Bounded O(batch_size) memory during hashing regardless of table size
 - Per-batch memory telemetry at DEBUG log level (`alloc_mb`, `batch`)
-- **NEW:** Oracle Database support — pure Go driver, no Instant Client required
+- Oracle Database support — pure Go driver, no Instant Client required
+- **NEW:** Git-like versioning — `version init/commit/log/diff/rollback` with SHA-256 content-addressable commit objects and offline rollback SQL generation
 
 ---
 
 ## Completed Releases
 
+### v1.5.0: Git-like Versioning for DB Diffs (Released 2026-03-31)
+
+**Features Delivered:**
+- `version init` — initialises `.deepdiffdb/` repository (objects store + HEAD file) in the working directory
+- `version commit` — runs a full schema+data diff and stores a SHA-256 content-addressable commit object capturing both schema snapshots, drift result, and data diff
+- `version log` — walks the commit chain from HEAD with author, timestamp, and drift markers
+- `version diff <h1> <h2>` — compares dev schema snapshots of two commits and reports schema evolution (added/removed tables, column/index changes)
+- `version rollback <hash>` — generates driver-aware rollback SQL offline by inverting the stored diff; same safety defaults as `schema-migrate` (destructive ops commented out by default); `--out` and `--driver` flags
+- New `internal/version` package: `model.go`, `store.go`, `rollback.go`
+- Sample 17: Git-like Versioning — two MySQL 8 containers, three-sprint demo, automated `demo.sh`
+
 ### v0.6: Enhanced Error Handling & Logging (Released 2026-01-06)
 
 **Features Delivered:**
@@ -169,10 +181,13 @@ We release a new version every **Saturday**. Each release includes one or more f
 
 ### Phase 2 Features
 
-1. **Git-like Versioning for DB Diffs**
-   - Store diff history
-   - Diff between any two versions
-   - Rollback capabilities
+1. ~~**Git-like Versioning for DB Diffs**~~ ✅ **Released in v1.5.0 (2026-03-31)**
+   - ~~Store diff history~~ → `version commit` — SHA-256 content-addressable commit objects in `.deepdiffdb/objects/`
+   - ~~Diff between any two versions~~ → `version diff <h1> <h2>` — schema evolution comparison
+   - ~~Rollback capabilities~~ → `version rollback <hash>` — driver-aware rollback SQL generation
+   - `version init` — repository initialisation
+   - `version log` — full commit history with drift markers
+   - See [Sample 17](https://github.com/iamvirul/deepdiff-db/tree/main/samples/17-git-like-versioning) for end-to-end demo
 
 2. **CI/CD Integration**
    - GitHub Actions plugin