From e6c901d2e5430a3815109b38ced11a4f695f0226 Mon Sep 17 00:00:00 2001
From: Crash Over Burn
Date: Tue, 14 Apr 2026 13:05:33 +0000
Subject: Port upstream patches: Cmdliner 2.x, lockfile auto-creation, schema
 upgrade, Fossil VCS

Ported from upstream darcs repository (v1.1.2):
- Cmdliner 2.x compatibility fixes (variable shadowing)
- Lockfile auto-creation when missing
- Schema upgrade command with backup/rollback
- Fossil VCS support (new VCS type)
- Clean up Cmdliner warning for unescaped $PWD

Files modified:
- lib/schema.ml (new): Schema versioning module
- lib/nixtamal.ml: Add upgrade function, Fossil meld support
- lib/error.ml: Add Fossil to prefetch_method, Upgrade error
- lib/input.ml: Add Fossil module, Kind variant
- lib/prefetch.ml: Add Fossil prefetch with SRI hash support
- lib/manifest.ml: Add Fossil codec
- lib/lockfile.ml: Add Fossil lockfile type
- lib/lock_loader.ml: Add Fossil feature flag
- lib/input_foreman.ml: Add Fossil display and prefetch check
- bin/cmd.ml: Cmdliner 2.x fixes, add Upgrade command
- bin/dune, lib/dune, test/dune: Deprecation flags

Builds successfully with all tests passing.
---
 lib/input_foreman.ml | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'lib/input_foreman.ml')

diff --git a/lib/input_foreman.ml b/lib/input_foreman.ml
index dec3f32..9fefa5f 100644
--- a/lib/input_foreman.ml
+++ b/lib/input_foreman.ml
@@ -102,6 +102,33 @@ let pp_for_earthlings pff =
 					Option.fold ~none: [] ~some: (fun d -> ["datetime", d]) p.datetime;
 					Option.fold ~none: [] ~some: (fun s -> ["latest-state", s]) p.latest_state;
 				]
+			| `Nilla n ->
+				"nilla",
+				List.concat [
+					["repository", fill n.repository];
+					(List.map (fun m -> "mirror", fill m) n.mirrors);
+					(
+						match n.reference with
+						| `Branch b -> ["branch", b]
+						| `Ref r -> ["ref", r]
+					);
+					["path", fill n.path];
+					Option.fold ~none: [] ~some: (fun d -> ["datetime", d]) n.datetime;
+					Option.fold ~none: [] ~some: (fun r -> ["latest-revision", r]) n.latest_revision;
+				]
+			| `Fossil f ->
+				"fossil",
+				List.concat [
+					["repository", fill f.repository];
+					(
+						match f.reference with
+						| `Branch b -> ["branch", b]
+						| `Tag t -> ["tag", t]
+						| `Checkin c -> ["checkin", c]
+					);
+					Option.fold ~none: [] ~some: (fun d -> ["date", d]) f.date;
+					Option.fold ~none: [] ~some: (fun c -> ["latest-checkin", c]) f.latest_checkin;
+				]
 		in
 		let data_tuples : (string * string) list =
 			List.concat [
@@ -346,6 +373,21 @@ let prefetch ~env ~proc_mgr ~name () : (unit, error) result =
 					},
 					p_data.path
 				)
+			| `Nilla n, `Nilla n_data ->
+				Ok (
+					{input with
+						kind =
+						`Nilla {n with
+							latest_revision = Some n_data.rev;
+							datetime = n_data.datetime;
+						};
+						hash = {input.hash with
+							algorithm = n_data.hash.algorithm;
+							value = Some n_data.hash.value;
+						};
+					},
+					n_data.path
+				)
 			| _, _ -> failwith "Prefetch kind mismatch"
 		end
 	in
@@ -448,6 +490,8 @@ let lock_one ~env ~sw ~proc_mgr ~force ~name : (unit, error) result =
 			| `Git g -> Option.is_none g.latest_revision
 			| `Darcs d -> Option.is_none d.latest_weak_hash
 			| `Pijul p -> Option.is_none p.latest_state
+			| `Nilla n -> Option.is_none n.latest_revision
+			| `Fossil f -> Option.is_none f.latest_checkin
 	in
 	if needs_prefetch then
 		prefetch ~env ~proc_mgr ~name ()
-- 
cgit v1.2.3