Commit ff2344a
authored
feat(import) --sync / --prune flags, options.pin, CRDT action model (#520)
`vcspull import` silently skipped repos whose remote URL had changed,
forcing users to delete their config and re-run from scratch. Repos
removed from the remote stayed in config forever.
This branch adds full bidirectional reconciliation to `vcspull import`
and applies a consistent CRDT action model (pure classifier -> enum ->
apply) across all five config-mutation operations.
New flags:
--sync Add new repos, update changed URLs, prune entries
no longer on the remote (scoped by provenance tag).
--prune Prune stale entries only (no URL updates).
--prune-untracked
Extend --sync/--prune to also remove entries that
lack any import provenance (manually added repos or
entries from before provenance tracking). Requires
--sync or --prune. A confirmation prompt lists
exactly what would be removed.
Provenance tracking (metadata.imported_from):
When --sync or --prune is used, each imported repo is tagged with
"{service}:{target}" (e.g. "github:myorg"). Pruning is scoped by
this tag -- only entries matching the current import source are
candidates for removal. Manually added repos and repos from other
sources are never pruned. Pruning is config-only; cloned
directories on disk are not deleted.
options.pin -- per-repo, per-operation mutation guard:
pin: true block ALL operations
pin: {import: true} block import only
allow_overwrite: false shorthand for pin: {import: true}
pin_reason is shown in log output when a repo is skipped. Pin
awareness has been added to import, add, discover, fmt, and the
duplicate-workspace-root merge resolver.
CRDT action model:
Every config-mutation command now follows the same three-step
pattern: pure classifier -> enum action -> apply.
import: ADD, SKIP_UNCHANGED, SKIP_EXISTING, UPDATE_URL,
SKIP_PINNED, PRUNE
add: ADD, SKIP_EXISTING, SKIP_PINNED
discover: ADD, SKIP_EXISTING, SKIP_PINNED
fmt: NORMALIZE, NO_CHANGE, SKIP_PINNED
merge: KEEP_EXISTING, KEEP_INCOMING
Bug fixes:
vcspull add, discover, and fmt all called save_config_yaml()
unconditionally, silently corrupting .json config files by
overwriting them with YAML content. All save sites now check
the file extension and call the correct serialiser.26 files changed
Lines changed: 6096 additions & 105 deletions
File tree
- docs
- cli
- import
- configuration
- examples
- src/vcspull
- cli
- import_cmd
- tests
- cli
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
36 | 134 | | |
37 | 135 | | |
38 | 136 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
112 | 138 | | |
113 | 139 | | |
114 | 140 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
228 | 258 | | |
229 | 259 | | |
230 | 260 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
35 | 67 | | |
36 | 68 | | |
37 | 69 | | |
| |||
0 commit comments