From 454a7168b8ab668e55d2587949fe0a5d789637e5 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 08:50:13 -0500 Subject: [PATCH 01/25] docs: add design for content-addressed zettel ID management Replace mutable flat Yin/Yang files with content-addressed delta blobs tracked by a signed append-only object ID log. Introduces add-zettel-ids-yin, add-zettel-ids-yang, and migrate-zettel-ids commands. Uses horizontal versioning (v0=flat files, v1=logged) with box-format signed entries. Co-Authored-By: Claude Opus 4.6 --- .../plans/2026-02-25-add-zettel-ids-design.md | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 docs/plans/2026-02-25-add-zettel-ids-design.md diff --git a/docs/plans/2026-02-25-add-zettel-ids-design.md b/docs/plans/2026-02-25-add-zettel-ids-design.md new file mode 100644 index 000000000..75c35da3e --- /dev/null +++ b/docs/plans/2026-02-25-add-zettel-ids-design.md @@ -0,0 +1,135 @@ +# Add Zettel IDs Design + +## Problem + +Yin/Yang provider files are mutable flat files outside the store concept. They +require manual editing and a `dodder reindex` when the ID pool is exhausted. +This is inconsistent with dodder's content-addressed, append-only model. + +## Design + +Replace flat Yin/Yang files with content-addressed delta blobs tracked by a +signed, append-only object ID log. + +### Version Scheme + +- **v0 (implicit):** Current flat Yin/Yang files at `DirObjectId()`. No log, no + blobs, no signatures. All existing repos use this format today. +- **v1:** Object ID log with signed box-format entries referencing + content-addressed delta blobs. + +### Data Model + +**Object ID log** -- append-only binary log at `DirData("object_id_log")`. +Each entry is a box-format record signed with the repo pub key (same as +inventory list log entries). Entry fields: + +- Side (Yin or Yang) +- TAI timestamp +- MarklId (SHA digest of the delta blob) +- Word count + +**Delta blobs** -- newline-delimited word lists stored in the repo's blob +store. Each blob contains only genuinely new words from that invocation. + +**Uniqueness invariant** -- enforced at write time across both sides. Before +writing, load both Yin and Yang providers from the cache. Any candidate word +already present in either side is rejected. + +**Provider reconstruction** -- at startup, replay the log in order, +concatenating Yin entries and Yang entries separately. Flat Yin/Yang files +under `DirObjectId()` are a cache rebuilt from the log on reindex. If the log +does not exist (v0 repos), fall back to the flat files. + +### Horizontal Versioning + +Follows the standard dodder horizontal versioning pattern: + +- Type string: `!object_id_log-v1` +- `TypeObjectIdLogVCurrent = TypeObjectIdLogV1` +- Architecture A: `CoderToTypedBlob` with `CoderTypeMapWithoutType` +- Future versions add new structs with `Upgrade()` on prior versions +- Orphan `TypeZettelIdListV0` removed as cleanup + +**Interface:** + +```go +type ObjectIdLogEntry interface { + GetSide() Side + GetTai() tai.TAI + GetMarklId() markl.Id + GetWordCount() int +} +``` + +### Commands + +#### `dodder add-zettel-ids-yin` / `dodder add-zettel-ids-yang` + +Two commands, one per side. Both accept raw text on stdin. + +Pipeline: + +1. Read stdin +2. Run `unicorn.ExtractUniqueComponents` on input lines +3. Load both Yin and Yang providers (from cache) +4. Filter candidates: reject any word in either provider +5. If no new words remain, print a message and exit +6. Write the filtered word list as a blob +7. **Acquire repo lock** +8. Append a signed box-format v1 log entry +9. Rebuild the flat file cache for the target side +10. Reset and rebuild the zettel ID availability index + +Output: count of new words added and new total pool size +(`len(Yin) * len(Yang)`). + +#### `dodder migrate-zettel-ids` + +One-time migration from v0 flat files to v1 log. Requires the repo lock. + +1. Read existing flat Yin and Yang files from `DirObjectId()` +2. Write each as a blob to the repo's blob store +3. Append two signed v1 log entries (one for Yin, one for Yang) +4. Rebuild flat file caches from the log +5. Rebuild the zettel ID availability index + +After migration, the log is the sole source of truth. + +### Genesis Changes + +`dodder init` with `-yin`/`-yang` flags now accepts raw text (not +pre-processed word lists): + +1. Run `ExtractUniqueComponents` on each input +2. Enforce cross-side uniqueness +3. Write each word list as a blob +4. Append two signed v1 log entries +5. Write flat file caches for immediate provider use +6. Reset the zettel ID availability index + +### Changes Summary + +**New:** + +- Object ID log entry interface + v1 struct + coder + type string +- Box-format log reader/writer for the object ID log +- `dodder add-zettel-ids-yin` command +- `dodder add-zettel-ids-yang` command +- `dodder migrate-zettel-ids` command + +**Modified:** + +- `genesis.go` -- write blobs + signed log entries instead of `CopyFileLines` +- Provider loading (`object_id_provider`) -- replay log if present, fall back + to flat files +- `echo/ids/types_builtin.go` -- register `TypeObjectIdLogV1`, remove + `TypeZettelIdListV0` +- Directory layout -- add `DirData("object_id_log")` path, add to + `DirsGenesis()` +- `complete.bats` -- add new subcommands to completion test + +**Unchanged:** + +- Coordinate system, zettel ID index, allocation modes, exhaustion handling +- Existing repos continue working until `migrate-zettel-ids` is run From 7a520e1e3fd42702c535611fa4267ef42558bd8a Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 08:54:25 -0500 Subject: [PATCH 02/25] docs: add implementation plan for content-addressed zettel ID management 11-task plan covering type registration, directory layout, log entry types, provider loading, migrate-zettel-ids, add-zettel-ids-yin/yang commands, genesis changes, and test updates. Co-Authored-By: Claude Opus 4.6 --- docs/plans/2026-02-25-add-zettel-ids-plan.md | 462 +++++++++++++++++++ 1 file changed, 462 insertions(+) create mode 100644 docs/plans/2026-02-25-add-zettel-ids-plan.md diff --git a/docs/plans/2026-02-25-add-zettel-ids-plan.md b/docs/plans/2026-02-25-add-zettel-ids-plan.md new file mode 100644 index 000000000..e94272b39 --- /dev/null +++ b/docs/plans/2026-02-25-add-zettel-ids-plan.md @@ -0,0 +1,462 @@ +# Add Zettel IDs Implementation Plan + +> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task. + +**Goal:** Replace mutable flat Yin/Yang provider files with content-addressed delta blobs tracked by a signed append-only object ID log. + +**Architecture:** New object ID log at `DirData("object_id_log")` uses binary stream index encoding with repo pub key signatures. Each log entry references a delta blob of new words. Provider loading replays the log or falls back to flat files for pre-migration repos. Three new commands: `add-zettel-ids-yin`, `add-zettel-ids-yang`, `migrate-zettel-ids`. + +**Tech Stack:** Go, binary stream index encoding (key_bytes fields), content-addressed blob store, horizontal versioning via `triple_hyphen_io` coders. + +**Design doc:** `docs/plans/2026-02-25-add-zettel-ids-design.md` + +**Skills to reference:** +- `features-zettel_ids` — ZettelId system overview +- `design_patterns-horizontal_versioning` — versioned type registration pattern +- `design_patterns-hamster_style` — Go code conventions for dodder +- `robin:bats-testing` — BATS integration test patterns + +--- + +### Task 1: Clean Up Orphan TypeZettelIdListV0 + +**Files:** +- Modify: `go/src/echo/ids/types_builtin.go` — remove `TypeZettelIdListV0` constant and its `registerBuiltinTypeString` call + +**Step 1: Remove the constant** + +In `go/src/echo/ids/types_builtin.go`, delete the `TypeZettelIdListV0` constant (line 52, `"!zettel_id_list-v0"`) and its registration in `init()` (line 131). + +**Step 2: Verify no references exist** + +Use `lux` references tool on the `TypeZettelIdListV0` symbol to confirm nothing else uses it. If references are found, evaluate whether they should point to the new type string instead. + +**Step 3: Run tests** + +Run: `just test-go` +Expected: PASS — this type was marked "not used yet" + +**Step 4: Commit** + +``` +git add go/src/echo/ids/types_builtin.go +git commit -m "chore: remove orphan TypeZettelIdListV0 type string" +``` + +--- + +### Task 2: Register TypeObjectIdLogV1 + +**Files:** +- Modify: `go/src/echo/ids/types_builtin.go` — add new type constants and registration + +**Step 1: Add type constants** + +Add to the const block in `go/src/echo/ids/types_builtin.go`: + +```go +TypeObjectIdLogV1 = "!object_id_log-v1" +TypeObjectIdLogVCurrent = TypeObjectIdLogV1 +``` + +**Step 2: Register in init()** + +Add to the `init()` function: + +```go +registerBuiltinTypeString(TypeObjectIdLogV1, genres.Unknown, false) +``` + +Follow the pattern used by `TypeTomlBlobStoreConfigV1` and similar entries. + +**Step 3: Run tests** + +Run: `just test-go` +Expected: PASS + +**Step 4: Commit** + +``` +git add go/src/echo/ids/types_builtin.go +git commit -m "feat: register TypeObjectIdLogV1 type string" +``` + +--- + +### Task 3: Add DirObjectIdLog to Directory Layout + +**Files:** +- Modify: `go/src/echo/directory_layout/v3.go` — add `DirObjectIdLog()` method +- Modify: `go/src/echo/directory_layout/main.go` — add to `Repo` interface + +**Step 1: Add method to v3** + +In `go/src/echo/directory_layout/v3.go`, add alongside `FileInventoryListLog()`: + +```go +func (layout v3) DirObjectIdLog() string { + return layout.MakeDirData("object_id_log").String() +} +``` + +**Step 2: Add to interface** + +In `go/src/echo/directory_layout/main.go`, add `DirObjectIdLog() string` to the `Repo` interface (or the appropriate sub-interface where `FileInventoryListLog()` is declared). + +**Step 3: Add to DirsGenesis()** + +In `go/src/echo/directory_layout/v3.go`, add `layout.DirObjectIdLog()` to the `DirsGenesis()` return slice. + +**Step 4: Run tests** + +Run: `just test-go` +Expected: PASS + +**Step 5: Commit** + +``` +git add go/src/echo/directory_layout/v3.go go/src/echo/directory_layout/main.go +git commit -m "feat: add DirObjectIdLog to directory layout" +``` + +--- + +### Task 4: Define Object ID Log Entry Interface and V1 Struct + +Determine the correct package for this type by examining the NATO hierarchy. The entry references `markl.Id` (echo-level) and needs to be consumed by the provider (`foxtrot`) and the store (`tango`). It should live at the `foxtrot` or `golf` level — check which is appropriate given existing imports. + +**Files:** +- Create: `go/src//object_id_log/main.go` — interface + Side enum +- Create: `go/src//object_id_log/v1.go` — V1 struct +- Create: `go/src//object_id_log/coding.go` — Architecture A coder + +**Step 1: Define the Side enum** + +```go +type Side uint8 + +const ( + SideYin Side = iota + SideYang +) +``` + +**Step 2: Define the interface** + +```go +type Entry interface { + GetSide() Side + GetTai() tai.TAI + GetMarklId() markl.Id + GetWordCount() int +} +``` + +**Step 3: Define V1 struct** + +```go +type V1 struct { + Side Side `toml:"side"` + Tai tai.TAI `toml:"tai"` + MarklId markl.Id `toml:"markl-id"` + WordCount int `toml:"word-count"` +} +``` + +Implement the `Entry` interface on `V1`. + +**Step 4: Register the coder** + +Follow `golf/blob_store_configs/coding.go` as the template. Create a `Coder` variable using `triple_hyphen_io.CoderToTypedBlob` with a `CoderTypeMapWithoutType` map containing one entry for `ids.TypeObjectIdLogV1`. + +**Step 5: Run tests** + +Run: `just test-go` +Expected: PASS (compiles, no consumers yet) + +**Step 6: Commit** + +``` +git add go/src//object_id_log/ +git commit -m "feat: add object ID log entry interface, V1 struct, and coder" +``` + +--- + +### Task 5: Implement Object ID Log Reader/Writer + +This handles reading/writing the append-only log file using the binary stream index encoding with signatures. + +**Files:** +- Create: `go/src//object_id_log/log.go` — log reader/writer + +**Step 1: Examine the inventory list log writer** + +Study how `writeInventoryListLog()` in `go/src/juliett/env_repo/genesis.go` creates and writes log entries. Study `go/src/lima/stream_index/binary_encoder.go` for the binary field encoding pattern with `RepoPubKey` and `RepoSig` fields. + +**Step 2: Implement the log writer** + +Create a function that: +1. Opens the log file at `DirObjectIdLog()` in append mode +2. Encodes a V1 entry using the box-format binary encoding with repo pub key and signature +3. Writes and closes + +**Step 3: Implement the log reader** + +Create a function that: +1. Opens the log file at `DirObjectIdLog()` +2. Decodes all entries sequentially +3. Returns `[]Entry` (or iterates via callback) + +**Step 4: Run tests** + +Run: `just test-go` +Expected: PASS + +**Step 5: Commit** + +``` +git add go/src//object_id_log/log.go +git commit -m "feat: implement object ID log reader and writer" +``` + +--- + +### Task 6: Update Provider Loading to Support Log Replay + +**Files:** +- Modify: `go/src/foxtrot/object_id_provider/factory.go` — add log-based loading path +- Modify: `go/src/foxtrot/object_id_provider/main.go` — support appending words + +**Step 1: Add log replay to provider factory** + +Modify `New()` in `factory.go` to: +1. Check if the object ID log exists at `DirObjectIdLog()` +2. If it exists: replay the log, concatenating all Yin entries into the yin provider and all Yang entries into the yang provider (fetching each delta blob and appending its words) +3. If it does not exist: fall back to reading flat Yin/Yang files (current behavior) + +**Step 2: Add append support to provider** + +The `provider` type (`[]string`) needs a method to append words from a delta blob. Add a function that reads a blob by MarklId, parses newline-delimited words, and appends them to the provider slice. + +**Step 3: Run tests** + +Run: `just test-go` +Expected: PASS (no logs exist yet, so all repos use fallback path) + +**Step 4: Commit** + +``` +git add go/src/foxtrot/object_id_provider/factory.go go/src/foxtrot/object_id_provider/main.go +git commit -m "feat: support log-based provider loading with flat file fallback" +``` + +--- + +### Task 7: Implement migrate-zettel-ids Command + +**Files:** +- Create: `go/src/yankee/commands_dodder/migrate_zettel_ids.go` + +**Step 1: Write the BATS test** + +Create a test that: +1. Inits a repo with flat Yin/Yang files (old style) +2. Runs `dodder migrate-zettel-ids` +3. Verifies the object ID log was created +4. Verifies `dodder new` still allocates IDs correctly after migration +5. Verifies running `migrate-zettel-ids` a second time is a no-op or errors gracefully + +**Step 2: Run test to verify it fails** + +Run: `just test-bats-targets migrate_zettel_ids.bats` +Expected: FAIL — command does not exist + +**Step 3: Implement the command** + +Register via `utility.AddCmd("migrate-zettel-ids", ...)` in an `init()` function. The command: +1. Opens the repo (requires lock) +2. Checks if the log already exists — if so, print message and exit +3. Reads existing flat Yin file into a string +4. Writes it as a blob to the repo's blob store, gets MarklId +5. Appends a signed V1 log entry (Side=Yin, MarklId, word count) +6. Repeats for Yang +7. Rebuilds flat file caches from the log (validates round-trip) +8. Resets and rebuilds the zettel ID availability index + +**Step 4: Run tests** + +Run: `just test-bats-targets migrate_zettel_ids.bats` +Expected: PASS + +**Step 5: Run full test suite** + +Run: `just test` +Expected: PASS + +**Step 6: Commit** + +``` +git add go/src/yankee/commands_dodder/migrate_zettel_ids.go zz-tests_bats/migrate_zettel_ids.bats +git commit -m "feat: add migrate-zettel-ids command" +``` + +--- + +### Task 8: Implement add-zettel-ids-yin and add-zettel-ids-yang Commands + +**Files:** +- Create: `go/src/yankee/commands_dodder/add_zettel_ids_yin.go` +- Create: `go/src/yankee/commands_dodder/add_zettel_ids_yang.go` + +These two commands share nearly all logic, differing only in the target side. Extract shared logic into a helper or use a shared struct with a side parameter. + +**Step 1: Write the BATS tests** + +Create tests that: +1. Init a repo (using `migrate-zettel-ids` or new genesis) +2. Pipe raw text to `dodder add-zettel-ids-yin` +3. Verify new words were added (check output for count) +4. Verify `dodder peek-zettel-ids` shows a larger pool +5. Pipe text with overlapping words — verify dedup (count should be lower) +6. Pipe text whose words overlap with Yang — verify cross-side rejection +7. Pipe text with no new words — verify no-op message +8. Repeat key tests for `add-zettel-ids-yang` + +**Step 2: Run tests to verify they fail** + +Run: `just test-bats-targets add_zettel_ids.bats` +Expected: FAIL — commands do not exist + +**Step 3: Implement the commands** + +Each command: +1. Reads stdin +2. Runs `unicorn.ExtractUniqueComponents` on the input lines +3. Loads both Yin and Yang providers (from cache) +4. Builds a set of all existing words across both sides +5. Filters candidates: reject any word in the existing set +6. If no new words remain, prints a message and exits +7. Writes the filtered word list as a blob to the repo's blob store +8. **Acquires repo lock** +9. Appends a signed V1 log entry +10. Rebuilds the flat file cache for the target side +11. Resets and rebuilds the zettel ID availability index +12. Prints count of new words added and new total pool size + +Register via `utility.AddCmd("add-zettel-ids-yin", ...)` and `utility.AddCmd("add-zettel-ids-yang", ...)`. + +**Step 4: Run tests** + +Run: `just test-bats-targets add_zettel_ids.bats` +Expected: PASS + +**Step 5: Run full test suite** + +Run: `just test` +Expected: PASS + +**Step 6: Commit** + +``` +git add go/src/yankee/commands_dodder/add_zettel_ids_yin.go go/src/yankee/commands_dodder/add_zettel_ids_yang.go zz-tests_bats/add_zettel_ids.bats +git commit -m "feat: add add-zettel-ids-yin and add-zettel-ids-yang commands" +``` + +--- + +### Task 9: Update Genesis to Use Object ID Log + +**Files:** +- Modify: `go/src/juliett/env_repo/genesis.go` — replace `CopyFileLines` with blob writes + log entries +- Modify: `go/src/xray/command_components_dodder/genesis.go` — update flag descriptions + +**Step 1: Write the BATS test** + +Add a test (or modify existing init tests) that: +1. Inits a repo with `-yin <(raw text)` and `-yang <(raw text)` +2. Verifies the object ID log was created +3. Verifies `dodder new` allocates IDs from the processed words +4. Verifies cross-side uniqueness was enforced during init + +**Step 2: Run test to verify it fails** + +Expected: FAIL — genesis still uses `CopyFileLines` + +**Step 3: Update genesis** + +In `go/src/juliett/env_repo/genesis.go`, replace the `ohio_files.CopyFileLines` calls (lines 63-77) with: +1. Read each input file +2. Run `unicorn.ExtractUniqueComponents` on the lines +3. Enforce cross-side uniqueness (reject words appearing in both) +4. Write each word list as a blob +5. Append two signed V1 log entries +6. Write flat file caches for immediate provider use + +Update `-yin` and `-yang` flag descriptions in `go/src/xray/command_components_dodder/genesis.go` to indicate they accept raw text, not pre-processed word lists. + +**Step 4: Run tests** + +Run: `just test` +Expected: PASS + +**Step 5: Update fixtures** + +Run: `just test-bats-update-fixtures` +Review the diff — genesis output format changed. + +**Step 6: Commit** + +``` +git add go/src/juliett/env_repo/genesis.go go/src/xray/command_components_dodder/genesis.go zz-tests_bats/ +git commit -m "feat: genesis writes object ID log instead of flat files" +``` + +--- + +### Task 10: Update Completion Tests + +**Files:** +- Modify: `zz-tests_bats/complete.bats` — add new subcommands + +**Step 1: Run completion test** + +Run: `just test-bats-targets complete.bats` +Expected: May already FAIL if the new commands are registered but not in the expected output + +**Step 2: Update expected output** + +Add `add-zettel-ids-yin`, `add-zettel-ids-yang`, and `migrate-zettel-ids` to the `complete_subcmd` test's expected output list. + +**Step 3: Run test** + +Run: `just test-bats-targets complete.bats` +Expected: PASS + +**Step 4: Commit** + +``` +git add zz-tests_bats/complete.bats +git commit -m "test: add new zettel ID commands to completion test" +``` + +--- + +### Task 11: Full Test Suite and Fixture Update + +**Step 1: Run full test suite** + +Run: `just test` +Expected: PASS + +**Step 2: Update fixtures if needed** + +Run: `just test-bats-update-fixtures` +Review the diff — commit if changed. + +**Step 3: Final commit** + +``` +git add -A +git commit -m "chore: update fixtures for object ID log changes" +``` From 6612075503e488c960165d53c94b618bfc927d74 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 09:08:26 -0500 Subject: [PATCH 03/25] chore: remove orphan TypeZettelIdListV0 type string Co-Authored-By: Claude Opus 4.6 --- go/src/echo/ids/types_builtin.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/go/src/echo/ids/types_builtin.go b/go/src/echo/ids/types_builtin.go index 9dae70bfe..27dfb2e24 100644 --- a/go/src/echo/ids/types_builtin.go +++ b/go/src/echo/ids/types_builtin.go @@ -49,7 +49,6 @@ const ( TypeTomlTypeVCurrent = TypeTomlTypeV1 TypeTomlWorkspaceConfigV0 = "!toml-workspace_config-v0" TypeTomlWorkspaceConfigVCurrent = TypeTomlWorkspaceConfigV0 - TypeZettelIdListV0 = "!zettel_id_list-v0" // not used yet // Aliases TypeInventoryListVCurrent = TypeInventoryListV2 @@ -128,7 +127,6 @@ func init() { registerBuiltinTypeString(TypeTomlTypeV0, genres.Type, false) registerBuiltinTypeString(TypeTomlTypeV1, genres.Type, true) registerBuiltinTypeString(TypeTomlWorkspaceConfigV0, genres.Unknown, false) - registerBuiltinTypeString(TypeZettelIdListV0, genres.Unknown, false) } // TODO switch to isDefault being a StoreVersion From 3b822eb81285719994a0ee288e170af5f32591b2 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 09:10:11 -0500 Subject: [PATCH 04/25] feat: register TypeObjectIdLogV1 type string Co-Authored-By: Claude Opus 4.6 --- go/src/echo/ids/types_builtin.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/go/src/echo/ids/types_builtin.go b/go/src/echo/ids/types_builtin.go index 27dfb2e24..d35b63f9d 100644 --- a/go/src/echo/ids/types_builtin.go +++ b/go/src/echo/ids/types_builtin.go @@ -23,6 +23,8 @@ const ( TypeLuaTagV1 = "!lua-tag-v1" // Deprecated TypeLuaTagV2 = "!lua-tag-v2" + TypeObjectIdLogV1 = "!object_id_log-v1" + TypeObjectIdLogVCurrent = TypeObjectIdLogV1 TypeTomlBlobStoreConfigSftpExplicitV0 = "!toml-blob_store_config_sftp-explicit-v0" TypeTomlBlobStoreConfigSftpViaSSHConfigV0 = "!toml-blob_store_config_sftp-ssh_config-v0" TypeTomlBlobStoreConfigV0 = "!toml-blob_store_config-v0" @@ -81,6 +83,7 @@ func init() { ) registerBuiltinTypeString(TypeLuaTagV1, genres.Tag, false) registerBuiltinTypeString(TypeLuaTagV2, genres.Tag, false) + registerBuiltinTypeString(TypeObjectIdLogV1, genres.Unknown, false) registerBuiltinTypeString(TypeTomlBlobStoreConfigV0, genres.Unknown, false) registerBuiltinTypeString(TypeTomlBlobStoreConfigV1, genres.Unknown, false) registerBuiltinTypeString(TypeTomlBlobStoreConfigV2, genres.Unknown, false) From 6f309161db33bf162c0bf2ab5c61743e6b8dca53 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 09:12:28 -0500 Subject: [PATCH 05/25] feat: add DirObjectIdLog to directory layout Co-Authored-By: Claude Opus 4.6 --- go/src/echo/directory_layout/main.go | 1 + go/src/echo/directory_layout/v3.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/go/src/echo/directory_layout/main.go b/go/src/echo/directory_layout/main.go index ad73afe59..61e25bd53 100644 --- a/go/src/echo/directory_layout/main.go +++ b/go/src/echo/directory_layout/main.go @@ -33,6 +33,7 @@ type ( DirLostAndFound() string DirObjectId() string + DirObjectIdLog() string FileCacheDormant() string FileCacheObjectId() string diff --git a/go/src/echo/directory_layout/v3.go b/go/src/echo/directory_layout/v3.go index 8d2f2ef36..0de4e7841 100644 --- a/go/src/echo/directory_layout/v3.go +++ b/go/src/echo/directory_layout/v3.go @@ -111,6 +111,10 @@ func (layout v3) DirObjectId() string { return layout.MakeDirData("object_ids").String() } +func (layout v3) DirObjectIdLog() string { + return layout.MakeDirData("object_id_log").String() +} + func (layout v3) FileCacheObjectId() string { return layout.DirDataIndex("object_id") } @@ -123,6 +127,7 @@ func (layout v3) DirsGenesis() []string { return []string{ layout.MakeDirConfig().String(), layout.DirObjectId(), + layout.DirObjectIdLog(), layout.DirDataIndex(), layout.DirLostAndFound(), } From ecc4ef2404dc4a5b7552ba11b3f366b2b8f37f7d Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 09:15:41 -0500 Subject: [PATCH 06/25] feat: add object ID log entry interface, V1 struct, and coder Co-Authored-By: Claude Opus 4.6 --- go/src/foxtrot/object_id_log/coding.go | 23 +++++++++++++++++++ go/src/foxtrot/object_id_log/main.go | 20 +++++++++++++++++ go/src/foxtrot/object_id_log/v1.go | 31 ++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 go/src/foxtrot/object_id_log/coding.go create mode 100644 go/src/foxtrot/object_id_log/main.go create mode 100644 go/src/foxtrot/object_id_log/v1.go diff --git a/go/src/foxtrot/object_id_log/coding.go b/go/src/foxtrot/object_id_log/coding.go new file mode 100644 index 000000000..aa87cef78 --- /dev/null +++ b/go/src/foxtrot/object_id_log/coding.go @@ -0,0 +1,23 @@ +package object_id_log + +import ( + "code.linenisgreat.com/dodder/go/src/_/interfaces" + "code.linenisgreat.com/dodder/go/src/echo/ids" + "code.linenisgreat.com/dodder/go/src/foxtrot/triple_hyphen_io" +) + +var Coder = triple_hyphen_io.CoderToTypedBlob[Entry]{ + Metadata: triple_hyphen_io.TypedMetadataCoder[Entry]{}, + Blob: triple_hyphen_io.CoderTypeMapWithoutType[Entry]( + map[string]interfaces.CoderBufferedReadWriter[*Entry]{ + ids.TypeObjectIdLogV1: triple_hyphen_io.CoderToml[ + Entry, + *Entry, + ]{ + Progenitor: func() Entry { + return &V1{} + }, + }, + }, + ), +} diff --git a/go/src/foxtrot/object_id_log/main.go b/go/src/foxtrot/object_id_log/main.go new file mode 100644 index 000000000..604008a2a --- /dev/null +++ b/go/src/foxtrot/object_id_log/main.go @@ -0,0 +1,20 @@ +package object_id_log + +import ( + "code.linenisgreat.com/dodder/go/src/echo/ids" + "code.linenisgreat.com/dodder/go/src/echo/markl" +) + +type Side uint8 + +const ( + SideYin Side = iota + SideYang +) + +type Entry interface { + GetSide() Side + GetTai() ids.Tai + GetMarklId() markl.Id + GetWordCount() int +} diff --git a/go/src/foxtrot/object_id_log/v1.go b/go/src/foxtrot/object_id_log/v1.go new file mode 100644 index 000000000..914bb3418 --- /dev/null +++ b/go/src/foxtrot/object_id_log/v1.go @@ -0,0 +1,31 @@ +package object_id_log + +import ( + "code.linenisgreat.com/dodder/go/src/echo/ids" + "code.linenisgreat.com/dodder/go/src/echo/markl" +) + +var _ Entry = V1{} + +type V1 struct { + Side Side `toml:"side"` + Tai ids.Tai `toml:"tai"` + MarklId markl.Id `toml:"markl-id"` + WordCount int `toml:"word-count"` +} + +func (v V1) GetSide() Side { + return v.Side +} + +func (v V1) GetTai() ids.Tai { + return v.Tai +} + +func (v V1) GetMarklId() markl.Id { + return v.MarklId +} + +func (v V1) GetWordCount() int { + return v.WordCount +} From 5f69e533ab9826b5577076db2daed4a0388b63eb Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 09:21:27 -0500 Subject: [PATCH 07/25] feat: implement object ID log reader and writer AppendEntry opens the log file in create-or-append mode and encodes a single typed blob entry using the triple_hyphen_io coder. ReadAllEntries decodes all entries sequentially with a shared bufio.Reader, returning an empty slice when the file does not exist. Co-Authored-By: Claude Opus 4.6 --- go/src/foxtrot/object_id_log/log.go | 79 +++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 go/src/foxtrot/object_id_log/log.go diff --git a/go/src/foxtrot/object_id_log/log.go b/go/src/foxtrot/object_id_log/log.go new file mode 100644 index 000000000..f94a22d21 --- /dev/null +++ b/go/src/foxtrot/object_id_log/log.go @@ -0,0 +1,79 @@ +package object_id_log + +import ( + "bufio" + "os" + + "code.linenisgreat.com/dodder/go/src/alfa/errors" + "code.linenisgreat.com/dodder/go/src/charlie/files" + "code.linenisgreat.com/dodder/go/src/echo/ids" + "code.linenisgreat.com/dodder/go/src/foxtrot/triple_hyphen_io" +) + +func AppendEntry( + path string, + entry Entry, +) (err error) { + var file *os.File + + if file, err = files.OpenFile( + path, + os.O_WRONLY|os.O_CREATE|os.O_APPEND, + 0o666, + ); err != nil { + err = errors.Wrap(err) + return err + } + + defer errors.DeferredCloser(&err, file) + + typedBlob := &triple_hyphen_io.TypedBlob[Entry]{ + Type: ids.GetOrPanic(ids.TypeObjectIdLogVCurrent).TypeStruct, + Blob: entry, + } + + if _, err = Coder.EncodeTo(typedBlob, file); err != nil { + err = errors.Wrap(err) + return err + } + + return err +} + +func ReadAllEntries( + path string, +) (entries []Entry, err error) { + var file *os.File + + if file, err = files.Open(path); err != nil { + if errors.IsNotExist(err) { + err = nil + return entries, err + } + + err = errors.Wrap(err) + return entries, err + } + + defer errors.DeferredCloser(&err, file) + + bufferedReader := bufio.NewReader(file) + + for { + var typedBlob triple_hyphen_io.TypedBlob[Entry] + + if _, err = Coder.DecodeFrom(&typedBlob, bufferedReader); err != nil { + if errors.IsEOF(err) { + err = nil + break + } + + err = errors.Wrap(err) + return entries, err + } + + entries = append(entries, typedBlob.Blob) + } + + return entries, err +} From e72c8e374a873c58012c6791011ef110767f2ff6 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 09:24:41 -0500 Subject: [PATCH 08/25] feat: support log-based provider loading with flat file fallback NewFromLog replays object ID log entries to reconstruct yin/yang providers from delta blobs. A BlobResolver function parameter allows the caller at a higher layer to provide blob access. When the log does not exist or is empty, falls back to reading flat Yin/Yang files via the existing New function. Co-Authored-By: Claude Opus 4.6 --- go/src/foxtrot/object_id_provider/factory.go | 55 ++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/go/src/foxtrot/object_id_provider/factory.go b/go/src/foxtrot/object_id_provider/factory.go index 0d55a329b..b917d49fb 100644 --- a/go/src/foxtrot/object_id_provider/factory.go +++ b/go/src/foxtrot/object_id_provider/factory.go @@ -6,6 +6,8 @@ import ( "code.linenisgreat.com/dodder/go/src/alfa/errors" "code.linenisgreat.com/dodder/go/src/echo/directory_layout" + "code.linenisgreat.com/dodder/go/src/echo/markl" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" ) const ( @@ -19,6 +21,10 @@ type Provider struct { yang provider } +// BlobResolver fetches a blob by its MarklId and returns the newline-delimited +// words it contains. +type BlobResolver func(markl.Id) ([]string, error) + func New(ps directory_layout.RepoMutable) (f *Provider, err error) { providerPathYin := path.Join(ps.DirObjectId(), FilePathZettelIdYin) providerPathYang := path.Join(ps.DirObjectId(), FilePathZettelIdYang) @@ -40,6 +46,55 @@ func New(ps directory_layout.RepoMutable) (f *Provider, err error) { return f, err } +// NewFromLog builds a Provider by replaying the object ID log. Each log entry +// references a blob containing delta words; resolveBlob fetches those words. +// When the log does not exist or is empty, it falls back to reading flat files +// via New. +func NewFromLog( + directoryLayout directory_layout.RepoMutable, + resolveBlob BlobResolver, +) (f *Provider, err error) { + logPath := directoryLayout.DirObjectIdLog() + + var entries []object_id_log.Entry + + if entries, err = object_id_log.ReadAllEntries(logPath); err != nil { + err = errors.Wrap(err) + return f, err + } + + if len(entries) == 0 { + return New(directoryLayout) + } + + f = &Provider{ + Locker: &sync.Mutex{}, + } + + for _, entry := range entries { + var words []string + + if words, err = resolveBlob(entry.GetMarklId()); err != nil { + err = errors.Wrapf(err, "resolving blob for log entry") + return f, err + } + + switch entry.GetSide() { + case object_id_log.SideYin: + f.yin = append(f.yin, words...) + + case object_id_log.SideYang: + f.yang = append(f.yang, words...) + + default: + err = errors.ErrorWithStackf("unknown side: %d", entry.GetSide()) + return f, err + } + } + + return f, err +} + func (hf *Provider) Left() provider { return hf.yin } From f40f88308fab49c6e297ddaaa37d8164fa9afa6f Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 10:11:39 -0500 Subject: [PATCH 09/25] feat: add migrate-zettel-ids command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reads existing flat Yin/Yang provider files, writes them as content-addressed blobs, and appends V1 entries to the object ID log. Idempotent — skips migration if log already contains entries. Also renames DirObjectIdLog to FileObjectIdLog (it's a file path, not a directory), removes it from DirsGenesis, and fixes multi-entry log parsing by pre-segmenting entries before decoding. Co-Authored-By: Claude Opus 4.6 --- go/src/echo/directory_layout/main.go | 2 +- go/src/echo/directory_layout/v3.go | 3 +- go/src/foxtrot/object_id_log/log.go | 80 +++++++- go/src/foxtrot/object_id_provider/factory.go | 2 +- .../commands_dodder/migrate_zettel_ids.go | 171 ++++++++++++++++++ zz-tests_bats/complete.bats | 1 + zz-tests_bats/migrate_zettel_ids.bats | 41 +++++ 7 files changed, 288 insertions(+), 12 deletions(-) create mode 100644 go/src/yankee/commands_dodder/migrate_zettel_ids.go create mode 100644 zz-tests_bats/migrate_zettel_ids.bats diff --git a/go/src/echo/directory_layout/main.go b/go/src/echo/directory_layout/main.go index 61e25bd53..3a2980d46 100644 --- a/go/src/echo/directory_layout/main.go +++ b/go/src/echo/directory_layout/main.go @@ -33,7 +33,7 @@ type ( DirLostAndFound() string DirObjectId() string - DirObjectIdLog() string + FileObjectIdLog() string FileCacheDormant() string FileCacheObjectId() string diff --git a/go/src/echo/directory_layout/v3.go b/go/src/echo/directory_layout/v3.go index 0de4e7841..aa432c2ac 100644 --- a/go/src/echo/directory_layout/v3.go +++ b/go/src/echo/directory_layout/v3.go @@ -111,7 +111,7 @@ func (layout v3) DirObjectId() string { return layout.MakeDirData("object_ids").String() } -func (layout v3) DirObjectIdLog() string { +func (layout v3) FileObjectIdLog() string { return layout.MakeDirData("object_id_log").String() } @@ -127,7 +127,6 @@ func (layout v3) DirsGenesis() []string { return []string{ layout.MakeDirConfig().String(), layout.DirObjectId(), - layout.DirObjectIdLog(), layout.DirDataIndex(), layout.DirLostAndFound(), } diff --git a/go/src/foxtrot/object_id_log/log.go b/go/src/foxtrot/object_id_log/log.go index f94a22d21..ff605b6f0 100644 --- a/go/src/foxtrot/object_id_log/log.go +++ b/go/src/foxtrot/object_id_log/log.go @@ -2,7 +2,9 @@ package object_id_log import ( "bufio" + "io" "os" + "strings" "code.linenisgreat.com/dodder/go/src/alfa/errors" "code.linenisgreat.com/dodder/go/src/charlie/files" @@ -57,17 +59,19 @@ func ReadAllEntries( defer errors.DeferredCloser(&err, file) - bufferedReader := bufio.NewReader(file) + segments, err := segmentEntries(bufio.NewReader(file)) + if err != nil { + err = errors.Wrap(err) + return entries, err + } - for { + for _, segment := range segments { var typedBlob triple_hyphen_io.TypedBlob[Entry] - if _, err = Coder.DecodeFrom(&typedBlob, bufferedReader); err != nil { - if errors.IsEOF(err) { - err = nil - break - } - + if _, err = Coder.DecodeFrom( + &typedBlob, + strings.NewReader(segment), + ); err != nil { err = errors.Wrap(err) return entries, err } @@ -77,3 +81,63 @@ func ReadAllEntries( return entries, err } + +func segmentEntries( + reader *bufio.Reader, +) (segments []string, err error) { + var current strings.Builder + boundaryCount := 0 + + for { + var line string + + line, err = reader.ReadString('\n') + + if err != nil && err != io.EOF { + err = errors.Wrap(err) + return segments, err + } + + isEOF := errors.IsEOF(err) + + if isEOF && line == "" { + if current.Len() > 0 { + segments = append(segments, current.String()) + } + + err = nil + + break + } + + trimmed := strings.TrimSuffix(line, "\n") + + if trimmed == triple_hyphen_io.Boundary { + boundaryCount++ + + // A new entry starts at boundary counts 1, 3, 5, ... + // (odd boundaries are the opening --- of metadata). + // The second boundary in each entry is boundary counts 2, 4, 6, ... + // A new entry starts when we see an odd boundary after the first + // entry. + if boundaryCount > 2 && boundaryCount%2 == 1 { + segments = append(segments, current.String()) + current.Reset() + } + } + + current.WriteString(line) + + if isEOF { + if current.Len() > 0 { + segments = append(segments, current.String()) + } + + err = nil + + break + } + } + + return segments, err +} diff --git a/go/src/foxtrot/object_id_provider/factory.go b/go/src/foxtrot/object_id_provider/factory.go index b917d49fb..36105c8e3 100644 --- a/go/src/foxtrot/object_id_provider/factory.go +++ b/go/src/foxtrot/object_id_provider/factory.go @@ -54,7 +54,7 @@ func NewFromLog( directoryLayout directory_layout.RepoMutable, resolveBlob BlobResolver, ) (f *Provider, err error) { - logPath := directoryLayout.DirObjectIdLog() + logPath := directoryLayout.FileObjectIdLog() var entries []object_id_log.Entry diff --git a/go/src/yankee/commands_dodder/migrate_zettel_ids.go b/go/src/yankee/commands_dodder/migrate_zettel_ids.go new file mode 100644 index 000000000..a70ac3279 --- /dev/null +++ b/go/src/yankee/commands_dodder/migrate_zettel_ids.go @@ -0,0 +1,171 @@ +package commands_dodder + +import ( + "bufio" + "io" + "os" + "path" + + "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" + "code.linenisgreat.com/dodder/go/src/alfa/errors" + "code.linenisgreat.com/dodder/go/src/bravo/ui" + "code.linenisgreat.com/dodder/go/src/charlie/files" + "code.linenisgreat.com/dodder/go/src/echo/ids" + "code.linenisgreat.com/dodder/go/src/echo/markl" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/golf/env_ui" + "code.linenisgreat.com/dodder/go/src/juliett/command" + "code.linenisgreat.com/dodder/go/src/victor/local_working_copy" + "code.linenisgreat.com/dodder/go/src/xray/command_components_dodder" +) + +func init() { + utility.AddCmd("migrate-zettel-ids", &MigrateZettelIds{}) +} + +type MigrateZettelIds struct { + command_components_dodder.LocalWorkingCopy +} + +func (cmd MigrateZettelIds) Run(req command.Request) { + req.AssertNoMoreArgs() + + localWorkingCopy := cmd.MakeLocalWorkingCopyWithOptions( + req, + env_ui.Options{}, + local_working_copy.OptionsAllowConfigReadError, + ) + + envRepo := localWorkingCopy.GetEnvRepo() + logPath := envRepo.FileObjectIdLog() + + entries, err := object_id_log.ReadAllEntries(logPath) + + if err != nil { + errors.ContextCancelWithErrorf(req, "reading object id log: %s", err) + return + } + + if len(entries) > 0 { + ui.Out().Print("object id log already contains entries, skipping migration") + return + } + + blobStore := envRepo.GetDefaultBlobStore() + dirObjectId := envRepo.DirObjectId() + + yinPath := path.Join(dirObjectId, object_id_provider.FilePathZettelIdYin) + yangPath := path.Join(dirObjectId, object_id_provider.FilePathZettelIdYang) + + yinMarklId, yinWordCount, err := writeFlatFileAsBlob(blobStore, yinPath) + if err != nil { + errors.ContextCancelWithErrorf(req, "writing yin blob: %s", err) + return + } + + yangMarklId, yangWordCount, err := writeFlatFileAsBlob(blobStore, yangPath) + if err != nil { + errors.ContextCancelWithErrorf(req, "writing yang blob: %s", err) + return + } + + tai := ids.NowTai() + + yinEntry := &object_id_log.V1{ + Side: object_id_log.SideYin, + Tai: tai, + MarklId: yinMarklId, + WordCount: yinWordCount, + } + + if err := object_id_log.AppendEntry(logPath, yinEntry); err != nil { + errors.ContextCancelWithErrorf(req, "appending yin log entry: %s", err) + return + } + + yangEntry := &object_id_log.V1{ + Side: object_id_log.SideYang, + Tai: tai, + MarklId: yangMarklId, + WordCount: yangWordCount, + } + + if err := object_id_log.AppendEntry(logPath, yangEntry); err != nil { + errors.ContextCancelWithErrorf(req, "appending yang log entry: %s", err) + return + } + + ui.Out().Printf( + "migrated zettel ids: yin (%d words, %s), yang (%d words, %s)", + yinWordCount, + yinMarklId, + yangWordCount, + yangMarklId, + ) +} + +func writeFlatFileAsBlob( + blobStore domain_interfaces.BlobStore, + flatFilePath string, +) (id markl.Id, wordCount int, err error) { + var file *os.File + + if file, err = files.Open(flatFilePath); err != nil { + err = errors.Wrap(err) + return id, wordCount, err + } + + defer errors.DeferredCloser(&err, file) + + wordCount, err = countLines(flatFilePath) + if err != nil { + err = errors.Wrap(err) + return id, wordCount, err + } + + var blobWriter domain_interfaces.BlobWriter + + if blobWriter, err = blobStore.MakeBlobWriter(nil); err != nil { + err = errors.Wrap(err) + return id, wordCount, err + } + + defer errors.DeferredCloser(&err, blobWriter) + + if _, err = io.Copy(blobWriter, file); err != nil { + err = errors.Wrap(err) + return id, wordCount, err + } + + id.ResetWithMarklId(blobWriter.GetMarklId()) + + return id, wordCount, err +} + +func countLines(path string) (count int, err error) { + var file *os.File + + if file, err = files.Open(path); err != nil { + err = errors.Wrap(err) + return count, err + } + + defer errors.DeferredCloser(&err, file) + + scanner := bufio.NewScanner(file) + + for scanner.Scan() { + line := scanner.Text() + if line != "" { + count++ + } + } + + if err = scanner.Err(); err != nil { + err = errors.Wrap(err) + return count, err + } + + return count, err +} diff --git a/zz-tests_bats/complete.bats b/zz-tests_bats/complete.bats index 33b35df4a..e48827aee 100644 --- a/zz-tests_bats/complete.bats +++ b/zz-tests_bats/complete.bats @@ -141,6 +141,7 @@ function complete_subcmd { # @test init-workspace last merge-tool + migrate-zettel-ids new organize peek-zettel-ids diff --git a/zz-tests_bats/migrate_zettel_ids.bats b/zz-tests_bats/migrate_zettel_ids.bats new file mode 100644 index 000000000..9c6dcda78 --- /dev/null +++ b/zz-tests_bats/migrate_zettel_ids.bats @@ -0,0 +1,41 @@ +#! /usr/bin/env bats + +setup() { + load "$(dirname "$BATS_TEST_FILE")/common.bash" + + # for shellcheck SC2154 + export output + + copy_from_version "$DIR" + + run_dodder_init_workspace +} + +teardown() { + chflags_and_rm +} + +function migrate_zettel_ids_success { # @test + run_dodder migrate-zettel-ids + assert_success + assert_output --partial "migrated zettel ids" +} + +function migrate_zettel_ids_new_still_works { # @test + run_dodder migrate-zettel-ids + assert_success + + run_dodder new -edit=false + assert_success + assert_output --regexp '\[.+/.+ !md\]' +} + +function migrate_zettel_ids_idempotent { # @test + run_dodder migrate-zettel-ids + assert_success + assert_output --partial "migrated zettel ids" + + run_dodder migrate-zettel-ids + assert_success + assert_output --partial "already contains entries" +} From d04fdb3851b5d941796e3476e5d2fa73285a4ddb Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 10:26:30 -0500 Subject: [PATCH 10/25] feat: add add-zettel-ids-yin and add-zettel-ids-yang commands These commands read text from stdin, extract unique word components, filter against existing words in both Yin and Yang pools (cross-side uniqueness), write new words as content-addressed blobs, append log entries, and update flat file caches. The repo file lock is held during the critical section (log append + flat file update). Pool size output reports the cartesian product (Yin * Yang) which represents the total number of allocatable zettel IDs. Co-Authored-By: Claude Opus 4.6 --- .../commands_dodder/add_zettel_ids_yang.go | 13 + .../commands_dodder/add_zettel_ids_yin.go | 224 ++++++++++++++++++ zz-tests_bats/add_zettel_ids.bats | 146 ++++++++++++ zz-tests_bats/complete.bats | 2 + 4 files changed, 385 insertions(+) create mode 100644 go/src/yankee/commands_dodder/add_zettel_ids_yang.go create mode 100644 go/src/yankee/commands_dodder/add_zettel_ids_yin.go create mode 100644 zz-tests_bats/add_zettel_ids.bats diff --git a/go/src/yankee/commands_dodder/add_zettel_ids_yang.go b/go/src/yankee/commands_dodder/add_zettel_ids_yang.go new file mode 100644 index 000000000..c62b30b8e --- /dev/null +++ b/go/src/yankee/commands_dodder/add_zettel_ids_yang.go @@ -0,0 +1,13 @@ +package commands_dodder + +import ( + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" +) + +func init() { + utility.AddCmd("add-zettel-ids-yang", &AddZettelIds{ + side: object_id_log.SideYang, + flatFileName: object_id_provider.FilePathZettelIdYang, + }) +} diff --git a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go b/go/src/yankee/commands_dodder/add_zettel_ids_yin.go new file mode 100644 index 000000000..8059a04a8 --- /dev/null +++ b/go/src/yankee/commands_dodder/add_zettel_ids_yin.go @@ -0,0 +1,224 @@ +package commands_dodder + +import ( + "bufio" + "io" + "os" + "path" + "strings" + + "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" + "code.linenisgreat.com/dodder/go/src/alfa/errors" + "code.linenisgreat.com/dodder/go/src/alfa/unicorn" + "code.linenisgreat.com/dodder/go/src/bravo/ui" + "code.linenisgreat.com/dodder/go/src/charlie/files" + "code.linenisgreat.com/dodder/go/src/echo/ids" + "code.linenisgreat.com/dodder/go/src/echo/markl" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/golf/env_ui" + "code.linenisgreat.com/dodder/go/src/juliett/command" + "code.linenisgreat.com/dodder/go/src/victor/local_working_copy" + "code.linenisgreat.com/dodder/go/src/xray/command_components_dodder" +) + +func init() { + utility.AddCmd("add-zettel-ids-yin", &AddZettelIds{ + side: object_id_log.SideYin, + flatFileName: object_id_provider.FilePathZettelIdYin, + }) +} + +type AddZettelIds struct { + command_components_dodder.LocalWorkingCopy + side object_id_log.Side + flatFileName string +} + +func (cmd AddZettelIds) Run(req command.Request) { + req.AssertNoMoreArgs() + + candidates := readAndExtractCandidates(req) + + localWorkingCopy := cmd.MakeLocalWorkingCopyWithOptions( + req, + env_ui.Options{}, + local_working_copy.OptionsAllowConfigReadError, + ) + + envRepo := localWorkingCopy.GetEnvRepo() + dirObjectId := envRepo.DirObjectId() + + prov, err := object_id_provider.New(envRepo) + if err != nil { + errors.ContextCancelWithErrorf(req, "loading zettel id provider: %s", err) + return + } + + existingWords := collectExistingWords(prov) + + var filtered []string + + for _, word := range candidates { + cleaned := object_id_provider.Clean(word) + + if cleaned == "" { + continue + } + + if !existingWords[cleaned] { + filtered = append(filtered, cleaned) + } + } + + if len(filtered) == 0 { + ui.Out().Print("no new words to add") + return + } + + blobStore := envRepo.GetDefaultBlobStore() + + blobId, err := writeWordsAsBlob(blobStore, filtered) + if err != nil { + errors.ContextCancelWithErrorf(req, "writing blob: %s", err) + return + } + + lockSmith := envRepo.GetLockSmith() + + if err := lockSmith.Lock(); err != nil { + errors.ContextCancelWithErrorf(req, "acquiring lock: %s", err) + return + } + + defer func() { + if err := lockSmith.Unlock(); err != nil { + errors.ContextCancelWithErrorf(req, "releasing lock: %s", err) + } + }() + + logPath := envRepo.FileObjectIdLog() + flatFilePath := path.Join(dirObjectId, cmd.flatFileName) + + entry := &object_id_log.V1{ + Side: cmd.side, + Tai: ids.NowTai(), + MarklId: blobId, + WordCount: len(filtered), + } + + if err := object_id_log.AppendEntry(logPath, entry); err != nil { + errors.ContextCancelWithErrorf(req, "appending log entry: %s", err) + return + } + + if err := appendWordsToFlatFile(flatFilePath, filtered); err != nil { + errors.ContextCancelWithErrorf(req, "updating flat file cache: %s", err) + return + } + + yinCount := prov.Left().Len() + yangCount := prov.Right().Len() + + if cmd.side == object_id_log.SideYin { + yinCount += len(filtered) + } else { + yangCount += len(filtered) + } + + poolSize := yinCount * yangCount + + ui.Out().Printf( + "added %d words to %s (pool size: %d)", + len(filtered), + cmd.flatFileName, + poolSize, + ) +} + +func readAndExtractCandidates(req command.Request) []string { + reader := bufio.NewReader(os.Stdin) + var lines []string + + for { + line, err := reader.ReadString('\n') + + if err != nil && err != io.EOF { + errors.ContextCancelWithError(req, err) + } + + if len(line) > 0 { + line = strings.TrimRight(line, "\n") + lines = append(lines, line) + } + + if err == io.EOF { + break + } + } + + return unicorn.ExtractUniqueComponents(lines) +} + +func collectExistingWords(prov *object_id_provider.Provider) map[string]bool { + existing := make(map[string]bool) + + for _, word := range prov.Left() { + existing[word] = true + } + + for _, word := range prov.Right() { + existing[word] = true + } + + return existing +} + +func writeWordsAsBlob( + blobStore domain_interfaces.BlobStore, + words []string, +) (id markl.Id, err error) { + var blobWriter domain_interfaces.BlobWriter + + if blobWriter, err = blobStore.MakeBlobWriter(nil); err != nil { + err = errors.Wrap(err) + return id, err + } + + defer errors.DeferredCloser(&err, blobWriter) + + content := strings.Join(words, "\n") + "\n" + + if _, err = io.WriteString(blobWriter, content); err != nil { + err = errors.Wrap(err) + return id, err + } + + id.ResetWithMarklId(blobWriter.GetMarklId()) + + return id, err +} + +func appendWordsToFlatFile(flatFilePath string, words []string) (err error) { + var file *os.File + + if file, err = files.OpenFile( + flatFilePath, + os.O_WRONLY|os.O_APPEND, + 0o666, + ); err != nil { + err = errors.Wrap(err) + return err + } + + defer errors.DeferredCloser(&err, file) + + content := strings.Join(words, "\n") + "\n" + + if _, err = io.WriteString(file, content); err != nil { + err = errors.Wrap(err) + return err + } + + return err +} diff --git a/zz-tests_bats/add_zettel_ids.bats b/zz-tests_bats/add_zettel_ids.bats new file mode 100644 index 000000000..e2c384789 --- /dev/null +++ b/zz-tests_bats/add_zettel_ids.bats @@ -0,0 +1,146 @@ +#! /usr/bin/env bats + +setup() { + load "$(dirname "$BATS_TEST_FILE")/common.bash" + + # for shellcheck SC2154 + export output + + copy_from_version "$DIR" + + run_dodder_init_workspace + + # create the object id log via migration + run_dodder migrate-zettel-ids + assert_success +} + +teardown() { + chflags_and_rm +} + +function add_zettel_ids_yin_success { # @test + input="$(mktemp)" + { + echo "a sentence about ceroplastes" + echo "another line about midtown" + echo "something about harbor" + } >"$input" + + run_dodder add-zettel-ids-yin <"$input" + assert_success + assert_output --partial "added 3 words to Yin" + assert_output --partial "pool size: 54" +} + +function add_zettel_ids_yin_dedup { # @test + input="$(mktemp)" + { + echo "a sentence about ceroplastes" + echo "another line about midtown" + echo "something about harbor" + } >"$input" + + run_dodder add-zettel-ids-yin <"$input" + assert_success + assert_output --partial "added 3 words" + + # same input again should be a no-op since words already exist + run_dodder add-zettel-ids-yin <"$input" + assert_success + assert_output --partial "no new words to add" +} + +function add_zettel_ids_yin_cross_side_rejection { # @test + input="$(mktemp)" + { + echo "something about quatro" + echo "another about newword" + } >"$input" + + # quatro is in Yang, should be rejected; newword is new + run_dodder add-zettel-ids-yin <"$input" + assert_success + assert_output --partial "added 1 words to Yin" + assert_output --partial "pool size: 42" +} + +function add_zettel_ids_yin_no_new_words { # @test + input="$(mktemp)" + { + echo "something about three" + echo "another about four" + } >"$input" + + run_dodder add-zettel-ids-yin <"$input" + assert_success + assert_output --partial "no new words to add" +} + +function add_zettel_ids_yang_success { # @test + input="$(mktemp)" + { + echo "a sentence about ceroplastes" + echo "another line about midtown" + echo "something about harbor" + } >"$input" + + run_dodder add-zettel-ids-yang <"$input" + assert_success + assert_output --partial "added 3 words to Yang" + assert_output --partial "pool size: 54" +} + +function add_zettel_ids_yang_cross_side_rejection { # @test + input="$(mktemp)" + { + echo "something about three" + echo "another about newword" + } >"$input" + + # three is in Yin, should be rejected; newword is new + run_dodder add-zettel-ids-yang <"$input" + assert_success + assert_output --partial "added 1 words to Yang" + assert_output --partial "pool size: 42" +} + +function add_zettel_ids_peek_shows_larger_pool_after_reindex { # @test + input="$(mktemp)" + { + echo "a sentence about ceroplastes" + echo "another line about midtown" + echo "something about harbor" + } >"$input" + + run_dodder add-zettel-ids-yin <"$input" + assert_success + + # reindex rebuilds the zettel ID availability index from flat files + run_dodder reindex + assert_success + + run_dodder peek-zettel-ids 100 + assert_success + + # 9 yin words x 6 yang words = 54 possible, minus some used + # original was 6x6=36, so available count should be higher + after_count="$(echo "$output" | wc -l)" + [[ "$after_count" -gt 34 ]] +} + +function add_zettel_ids_new_still_works { # @test + input="$(mktemp)" + { + echo "a sentence about ceroplastes" + echo "another line about midtown" + echo "something about harbor" + } >"$input" + + run_dodder add-zettel-ids-yin <"$input" + assert_success + + run_dodder new -edit=false + assert_success + assert_output --regexp '\[.+/.+ !md\]' +} diff --git a/zz-tests_bats/complete.bats b/zz-tests_bats/complete.bats index e48827aee..05bee481f 100644 --- a/zz-tests_bats/complete.bats +++ b/zz-tests_bats/complete.bats @@ -86,6 +86,8 @@ function complete_subcmd { # @test assert_success assert_output_unsorted --regexp - <<-'EOM' add + add-zettel-ids-yang + add-zettel-ids-yin blob_store-cat blob_store-cat-ids blob_store-complete.*complete a command-line From 26ab5dca96c7282584a9c6e6329766b3ef5d3db6 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Wed, 25 Feb 2026 21:43:45 -0500 Subject: [PATCH 11/25] feat: update genesis to use object ID log with raw text processing Genesis now processes raw text input through ExtractUniqueComponents, enforces cross-side uniqueness, applies Clean for provider consistency, writes word blobs to the blob store, and appends V1 log entries alongside flat file caches. Also fixes a debug print in Tai.MarshalText that leaked TAI timestamps to stderr, and updates test fixtures and helpers for the new NATO-phonetic word lists (alpha/golf instead of one/uno). Co-Authored-By: Claude Opus 4.6 --- go/src/echo/ids/tai.go | 2 - .../inventory_archive/signature_registry.go | 2 +- go/src/india/blob_stores/pack_v1.go | 2 +- go/src/juliett/env_repo/genesis.go | 220 ++++++++++++++++-- .../xray/command_components_dodder/genesis.go | 4 +- zz-tests_bats/add_zettel_ids.bats | 12 +- zz-tests_bats/common.bash | 30 +-- zz-tests_bats/init.bats | 12 +- zz-tests_bats/migrate_zettel_ids.bats | 7 +- zz-tests_bats/migration/generate_fixture.bats | 2 +- .../v13/.dodder/config/config-mutable | Bin 5203 -> 5202 bytes .../v13/.dodder/local/share/config-seed | 2 +- .../v13/.dodder/local/share/index/Abbr | Bin 1179 -> 1199 bytes .../v13/.dodder/local/share/index/object_id | Bin 146 -> 146 bytes .../local/share/index/object_pointers/Page-0 | Bin 147 -> 147 bytes .../local/share/index/object_pointers/Page-1 | Bin 147 -> 147 bytes .../local/share/index/object_pointers/Page-2 | Bin 49 -> 147 bytes .../local/share/index/object_pointers/Page-3 | Bin 196 -> 245 bytes .../local/share/index/object_pointers/Page-4 | Bin 147 -> 98 bytes .../local/share/index/object_pointers/Page-5 | Bin 0 -> 196 bytes .../local/share/index/object_pointers/Page-6 | Bin 49 -> 0 bytes .../local/share/index/object_pointers/Page-7 | Bin 98 -> 49 bytes .../local/share/index/object_pointers/Page-8 | Bin 196 -> 147 bytes .../local/share/index/object_pointers/Page-9 | Bin 0 -> 49 bytes .../local/share/index/object_pointers/Page-a | Bin 196 -> 147 bytes .../local/share/index/object_pointers/Page-b | Bin 0 -> 98 bytes .../local/share/index/object_pointers/Page-c | Bin 98 -> 98 bytes .../local/share/index/object_pointers/Page-d | Bin 245 -> 49 bytes .../local/share/index/object_pointers/Page-e | Bin 49 -> 49 bytes .../local/share/index/object_pointers/Page-f | Bin 147 -> 98 bytes .../.dodder/local/share/index/objects/Page-0 | Bin 367 -> 367 bytes .../.dodder/local/share/index/objects/Page-1 | Bin 1040 -> 364 bytes .../.dodder/local/share/index/objects/Page-2 | Bin 469 -> 0 bytes .../.dodder/local/share/index/objects/Page-3 | Bin 417 -> 784 bytes .../.dodder/local/share/index/objects/Page-4 | Bin 367 -> 0 bytes .../.dodder/local/share/index/objects/Page-6 | Bin 441 -> 0 bytes .../.dodder/local/share/index/objects/Page-8 | Bin 367 -> 0 bytes .../.dodder/local/share/index/objects/Page-b | Bin 0 -> 914 bytes .../.dodder/local/share/index/objects/Page-c | Bin 420 -> 420 bytes .../.dodder/local/share/index/objects/Page-d | Bin 0 -> 1046 bytes .../.dodder/local/share/inventory_lists_log | 8 +- .../v13/.dodder/local/share/object_id_log | 16 ++ .../v13/.dodder/local/share/object_ids/Yang | 12 +- .../v13/.dodder/local/share/object_ids/Yin | 12 +- ...00d16a722afc516c6cdae7a6dd1c4212b419d2a793 | Bin 0 -> 456 bytes ...4a347a0cf3e192d168b70993d3782161f666ad6ab7 | Bin 280 -> 0 bytes ...d397d37fb025248d485041e48755f04e5c866e6c9e | Bin 283 -> 0 bytes ...b5d2276220658e5ca80ab6a75b350710df0bfce14d | Bin 369 -> 0 bytes ...7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 | Bin 365 -> 0 bytes ...0d705ec9bc6df84f8749957ac11558b21b1924619a | Bin 0 -> 284 bytes ...b82bf8babcff6839f24f285541894f7028a98ef6a0 | Bin 0 -> 43 bytes ...8225b8fdb4f8bbc4235e20b754d27be375de0b5682 | Bin 451 -> 0 bytes ...f22bb4a6d204cf76f618a98ff1bb41515fdfaee443 | Bin 0 -> 376 bytes ...3b60e4ed1679fdb2dc45575a473784c6893285fd3c | Bin 282 -> 0 bytes ...d8f42ee65daba036d5c646f854207f8e6e2fe2386a | Bin 418 -> 0 bytes ...1cae1745b3b532f504bbfb1eed415c43cc18383d12 | Bin 0 -> 371 bytes ...c3240dc50ec02d67bbae42915ee49a95e70fa45290 | Bin 0 -> 283 bytes ...aa6444ea16e768a02975efa32392425a8baaa8b83e | Bin 0 -> 421 bytes ...551f14edadfcdc77b69e7e1208c1b7507cd2883254 | Bin 280 -> 0 bytes ...8eed10e15fc75462a06f50b419bd71d812fd535ec0 | Bin 0 -> 48 bytes ...662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 | Bin 0 -> 281 bytes ...17db89aefbde460db690e716df87ed624fad3dfb52 | Bin 0 -> 281 bytes 62 files changed, 270 insertions(+), 73 deletions(-) create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-5 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-6 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-b delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-4 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-8 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-b create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-d create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/object_id_log create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/6c9e63d20add7931537d00d16a722afc516c6cdae7a6dd1c4212b419d2a793 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/713d169713e60de958884a347a0cf3e192d168b70993d3782161f666ad6ab7 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/35/b319e3ba245cd5b88a51b5d2276220658e5ca80ab6a75b350710df0bfce14d delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/58/47285856a7198c8d143f0d705ec9bc6df84f8749957ac11558b21b1924619a create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/70/98ff5008183cfaa32ba0b82bf8babcff6839f24f285541894f7028a98ef6a0 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/95/bb26257c264038ecd141f22bb4a6d204cf76f618a98ff1bb41515fdfaee443 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9e/a2501e277e52a54c61331cae1745b3b532f504bbfb1eed415c43cc18383d12 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ad/0213ef702cf625e87090c3240dc50ec02d67bbae42915ee49a95e70fa45290 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/af/2a7b05d2a0df28506c9baa6444ea16e768a02975efa32392425a8baaa8b83e delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ca/c5c96c6384232b0e7ba28eed10e15fc75462a06f50b419bd71d812fd535ec0 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e4/4053df6e8efdd7004c89662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e6/c1db44a50102d89905d017db89aefbde460db690e716df87ed624fad3dfb52 diff --git a/go/src/echo/ids/tai.go b/go/src/echo/ids/tai.go index 8fefb38d3..11c508a97 100644 --- a/go/src/echo/ids/tai.go +++ b/go/src/echo/ids/tai.go @@ -14,7 +14,6 @@ import ( "code.linenisgreat.com/dodder/go/src/alfa/errors" "code.linenisgreat.com/dodder/go/src/alfa/pool" "code.linenisgreat.com/dodder/go/src/bravo/ohio" - "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/collections_value" "code.linenisgreat.com/dodder/go/src/charlie/delim_io" "code.linenisgreat.com/dodder/go/src/charlie/doddish" @@ -263,7 +262,6 @@ func (tai *Tai) ReadFrom(r io.Reader) (n int64, err error) { } func (tai Tai) MarshalText() (text []byte, err error) { - ui.Err().Printf(tai.String()) text = []byte(tai.String()) return text, err diff --git a/go/src/echo/inventory_archive/signature_registry.go b/go/src/echo/inventory_archive/signature_registry.go index afb49cd80..9aed0fe04 100644 --- a/go/src/echo/inventory_archive/signature_registry.go +++ b/go/src/echo/inventory_archive/signature_registry.go @@ -5,7 +5,7 @@ import ( ) type SignatureComputerParams struct { - SignatureLen int + SignatureLen int AvgChunkSize int MinChunkSize int MaxChunkSize int diff --git a/go/src/india/blob_stores/pack_v1.go b/go/src/india/blob_stores/pack_v1.go index 7ffe15b91..506bfa148 100644 --- a/go/src/india/blob_stores/pack_v1.go +++ b/go/src/india/blob_stores/pack_v1.go @@ -332,7 +332,7 @@ func (store inventoryArchiveV1) packChunkArchiveV1( sigComputer, sigErr := inventory_archive.SignatureComputerForName( sigConfig.GetSignatureType(), inventory_archive.SignatureComputerParams{ - SignatureLen: sigConfig.GetSignatureLen(), + SignatureLen: sigConfig.GetSignatureLen(), AvgChunkSize: sigConfig.GetAvgChunkSize(), MinChunkSize: sigConfig.GetMinChunkSize(), MaxChunkSize: sigConfig.GetMaxChunkSize(), diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index 74e3d067c..275bbf139 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -1,17 +1,22 @@ package env_repo import ( + "bufio" "encoding/gob" "io" "os" "path/filepath" + "strings" + "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" "code.linenisgreat.com/dodder/go/src/alfa/errors" + "code.linenisgreat.com/dodder/go/src/alfa/unicorn" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" - "code.linenisgreat.com/dodder/go/src/delta/ohio_files" "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/echo/markl" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" + "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" "code.linenisgreat.com/dodder/go/src/foxtrot/triple_hyphen_io" "code.linenisgreat.com/dodder/go/src/hotel/genesis_configs" ) @@ -60,28 +65,14 @@ func (env *Env) Genesis(bigBang BigBang) { env.writeConfig(bigBang) env.writeBlobStoreConfigIfNecessary(bigBang, env.directoryLayoutBlobStore) - if err := ohio_files.CopyFileLines( - bigBang.Yin, - filepath.Join(env.DirObjectId(), "Yin"), - ); err != nil { - env.Cancel(err) - return - } + env.BlobStoreEnv = MakeBlobStoreEnv( + env.Env, + ) - if err := ohio_files.CopyFileLines( - bigBang.Yang, - filepath.Join(env.DirObjectId(), "Yang"), - ); err != nil { - env.Cancel(err) - return - } + env.genesisObjectIds(bigBang) env.writeFile(env.FileConfig(), "") env.writeFile(env.FileCacheDormant(), "") - - env.BlobStoreEnv = MakeBlobStoreEnv( - env.Env, - ) } func (env Env) writeInventoryListLog() { @@ -162,3 +153,194 @@ func (env *Env) writeFile(path string, contents any) { } } } + +func (env *Env) genesisObjectIds(bigBang BigBang) { + if bigBang.Yin == "" && bigBang.Yang == "" { + return + } + + yinLines, err := readFileLines(bigBang.Yin) + if err != nil { + env.Cancel(err) + return + } + + yangLines, err := readFileLines(bigBang.Yang) + if err != nil { + env.Cancel(err) + return + } + + yinWords := unicorn.ExtractUniqueComponents(yinLines) + yangWords := unicorn.ExtractUniqueComponents(yangLines) + + yinWords, yangWords = enforceCrossSideUniqueness(yinWords, yangWords) + + yinWords = cleanWords(yinWords) + yangWords = cleanWords(yangWords) + + blobStore := env.GetDefaultBlobStore() + + yinBlobId, err := genesisWriteWordsAsBlob(blobStore, yinWords) + if err != nil { + env.Cancel(err) + return + } + + yangBlobId, err := genesisWriteWordsAsBlob(blobStore, yangWords) + if err != nil { + env.Cancel(err) + return + } + + logPath := env.FileObjectIdLog() + + yinEntry := &object_id_log.V1{ + Side: object_id_log.SideYin, + Tai: ids.NowTai(), + MarklId: yinBlobId, + WordCount: len(yinWords), + } + + if err := object_id_log.AppendEntry(logPath, yinEntry); err != nil { + env.Cancel(err) + return + } + + yangEntry := &object_id_log.V1{ + Side: object_id_log.SideYang, + Tai: ids.NowTai(), + MarklId: yangBlobId, + WordCount: len(yangWords), + } + + if err := object_id_log.AppendEntry(logPath, yangEntry); err != nil { + env.Cancel(err) + return + } + + yinFlatPath := filepath.Join(env.DirObjectId(), object_id_provider.FilePathZettelIdYin) + yangFlatPath := filepath.Join(env.DirObjectId(), object_id_provider.FilePathZettelIdYang) + + if err := genesisWriteFlatFile(yinFlatPath, yinWords); err != nil { + env.Cancel(err) + return + } + + if err := genesisWriteFlatFile(yangFlatPath, yangWords); err != nil { + env.Cancel(err) + return + } +} + +func readFileLines(path string) (lines []string, err error) { + var file *os.File + + if file, err = files.Open(path); err != nil { + err = errors.Wrap(err) + return lines, err + } + + defer errors.DeferredCloser(&err, file) + + scanner := bufio.NewScanner(file) + + for scanner.Scan() { + lines = append(lines, scanner.Text()) + } + + if err = scanner.Err(); err != nil { + err = errors.Wrap(err) + } + + return lines, err +} + +func enforceCrossSideUniqueness(yin, yang []string) ([]string, []string) { + yinSet := make(map[string]bool, len(yin)) + for _, w := range yin { + yinSet[w] = true + } + + yangSet := make(map[string]bool, len(yang)) + for _, w := range yang { + yangSet[w] = true + } + + var filteredYin []string + + for _, w := range yin { + if !yangSet[w] { + filteredYin = append(filteredYin, w) + } + } + + var filteredYang []string + + for _, w := range yang { + if !yinSet[w] { + filteredYang = append(filteredYang, w) + } + } + + return filteredYin, filteredYang +} + +func cleanWords(words []string) []string { + result := make([]string, 0, len(words)) + + for _, w := range words { + cleaned := object_id_provider.Clean(w) + + if cleaned != "" { + result = append(result, cleaned) + } + } + + return result +} + +func genesisWriteWordsAsBlob( + blobStore domain_interfaces.BlobStore, + words []string, +) (id markl.Id, err error) { + var blobWriter domain_interfaces.BlobWriter + + if blobWriter, err = blobStore.MakeBlobWriter(nil); err != nil { + err = errors.Wrap(err) + return id, err + } + + defer errors.DeferredCloser(&err, blobWriter) + + content := strings.Join(words, "\n") + "\n" + + if _, err = io.WriteString(blobWriter, content); err != nil { + err = errors.Wrap(err) + return id, err + } + + id.ResetWithMarklId(blobWriter.GetMarklId()) + + return id, err +} + +func genesisWriteFlatFile(path string, words []string) (err error) { + var file *os.File + + if file, err = files.CreateExclusiveWriteOnly(path); err != nil { + err = errors.Wrap(err) + return err + } + + defer errors.DeferredCloser(&err, file) + + content := strings.Join(words, "\n") + "\n" + + if _, err = io.WriteString(file, content); err != nil { + err = errors.Wrap(err) + return err + } + + return err +} diff --git a/go/src/xray/command_components_dodder/genesis.go b/go/src/xray/command_components_dodder/genesis.go index 00fcee023..8db578e7c 100644 --- a/go/src/xray/command_components_dodder/genesis.go +++ b/go/src/xray/command_components_dodder/genesis.go @@ -41,14 +41,14 @@ func (cmd *Genesis) SetFlagDefinitions( &cmd.BigBang.Yin, "yin", "", - "File containing list of zettel id left parts", + "File containing raw text from which zettel id left parts are extracted", ) flagSet.StringVar( &cmd.BigBang.Yang, "yang", "", - "File containing list of zettel id right parts", + "File containing raw text from which zettel id right parts are extracted", ) cmd.BigBang.SetDefaults() diff --git a/zz-tests_bats/add_zettel_ids.bats b/zz-tests_bats/add_zettel_ids.bats index e2c384789..fc3b37051 100644 --- a/zz-tests_bats/add_zettel_ids.bats +++ b/zz-tests_bats/add_zettel_ids.bats @@ -54,11 +54,11 @@ function add_zettel_ids_yin_dedup { # @test function add_zettel_ids_yin_cross_side_rejection { # @test input="$(mktemp)" { - echo "something about quatro" + echo "something about golf" echo "another about newword" } >"$input" - # quatro is in Yang, should be rejected; newword is new + # golf is in Yang, should be rejected; newword is new run_dodder add-zettel-ids-yin <"$input" assert_success assert_output --partial "added 1 words to Yin" @@ -68,8 +68,8 @@ function add_zettel_ids_yin_cross_side_rejection { # @test function add_zettel_ids_yin_no_new_words { # @test input="$(mktemp)" { - echo "something about three" - echo "another about four" + echo "something about alpha" + echo "another about bravo" } >"$input" run_dodder add-zettel-ids-yin <"$input" @@ -94,11 +94,11 @@ function add_zettel_ids_yang_success { # @test function add_zettel_ids_yang_cross_side_rejection { # @test input="$(mktemp)" { - echo "something about three" + echo "something about alpha" echo "another about newword" } >"$input" - # three is in Yin, should be rejected; newword is new + # alpha is in Yin, should be rejected; newword is new run_dodder add-zettel-ids-yang <"$input" assert_success assert_output --partial "added 1 words to Yang" diff --git a/zz-tests_bats/common.bash b/zz-tests_bats/common.bash index e37c13630..124f633e9 100644 --- a/zz-tests_bats/common.bash +++ b/zz-tests_bats/common.bash @@ -51,21 +51,21 @@ set_xdg() { DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" >/dev/null 2>&1 && pwd)" cat_yin() ( - echo "one" - echo "two" - echo "three" - echo "four" - echo "five" - echo "six" + echo "the alpha" + echo "the bravo" + echo "the charlie" + echo "the delta" + echo "an echo" + echo "the foxtrot" ) cat_yang() ( - echo "uno" - echo "dos" - echo "tres" - echo "quatro" - echo "cinco" - echo "seis" + echo "the golf" + echo "the hotel" + echo "the india" + echo "the juliet" + echo "the kilo" + echo "the lima" ) cmd_dodder_def_no_debug=( @@ -290,10 +290,10 @@ EOM assert_success - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success - cat >one/uno.zettel <alpha/golf.zettel <lquE8dw^bZRX|3WEX&o8Cw{bnVXqS N=HuA6*+qb#1prgi5P$#x delta 65 zcmcblaam)-5_ZPjlb5oGh=>>&ni`lH8yFj!>X{fC7#owe@4djlb9@p4Vf6285xYgq%oK@ne4-)U0=e;#K^$Nou8YdTT)q&s#|8r zkP8-KOkrREN-;39@M)D4Wu~N7=!Jl(|6MMOj4X_di69~eL==FC47iv+kj0b^HiS7p zCygNk%w)+gNzGw^0I<1?AagfAXDViN6JP`@VNJ{_$Vg-aS&Ct&0?1BWrh?34U;qGf CR4Q)( delta 205 zcmZ3_Ih%9Ce@4dHlb9@pO_&&%85s=0q!E}jp6tVcr5G4l__RujGE-73^g_VY|1MKTMixfKd=QZbB2qzwK9FE41slSYm(P#_ lVdWQZe$Ldy=*Y(i<}>H#r80sH#V}JAWF|KKU`H@8003_007Y5Ws=NflF4L}*007Y5Ws=NflF4L}*exkyF714ov;*HE4H$))lJXNML#+% Yoa^q32>Ya_l&*V1N*O*N}z*;E-IAfFLJGtc^XX7jr# zCz?K8@>+Us_KppuftM!n-{W~zSE^y~^!;|Ias~#N29AUC)y!V~;b=A7v({T<4O<0k YXf2DSov_kbigzK02k>qlmGw# diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-1 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-1 index 29ff19b02d21ba4711614dbbf63a77c703b8fb2c..03ad4f2343b310b5d9d687c4a772119446ca9c6c 100644 GIT binary patch literal 147 zcmWe>`DkMBD%_W8o6gVt*(cBHT9zoJ%$T>3OZ~$9$s&rTyq6dmz`%tGLaRSKuw~1G zr3o+R#YN3=o49`JC(EDtrZJx)ZwmjgxYzmzs+@r#2g=fko9wVjQjoPeeT~NFEtT$@ XrJYy5e9pJ!k*US5nRZt`V`u;X!q74n literal 49 wcmY$~EPE^Ok%@p$Ipaldjzfu7RiW=(uN-`TMODsl)AH(MCI%?D$_QZq0Oh9-f&c&j diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 index 4a6756490d166076a280d1709a81d492942cc53d..e8dc0ebd3677185c4ac42ddd3ae68a76f85305fc 100644 GIT binary patch delta 205 zcmX@Y_?2;@p<%s=WKUoX%XG$XJ~<@;LIqD}uM2u!{I2MMV%Mv_Cm!AG%nKPAz#tz= zn`~{lrR^*mUaGKe#nzOj+bRF=PFWzeXYQ|!g@!SYcbw!_g{WtMX)tXmT>tdI;=cht z0qMKur|Z@(x)mPBcyP`nk$9HtuFpdML)A0Db=aNIITdzbdYs?WrHpe`D(r*1cS!Kf Wvo%*alws-2tyK(l2?Ik8lm!53YeUfh delta 155 zcmey$c!bf=fcM9j&80il1+I5hH_M;AUCsMnBkZ5T$Is?#PaHAY%FoCE1?Qox35H45 z!G4!5AKsF=YAR=Y>e=#!^p_U#>|2a|ni~z0-d+@*2h+lk57lGWR{9_+{HQT|K8xPJ eh>nnN#~x_U5M3TGe@XI%TkMx7Y^qQ#Fbx2^!8Bk1 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 index fb1a6bac31c28f7069207df69fb610aa9670ba34..631f72970804ed1cba66c71e366f1d41dc9d16b1 100644 GIT binary patch literal 98 zcmZ>|RVZHfW>-|tuC34F8pTUQU8#N&9M4+!=msK_pPX2lk9pX76vHDXM`}k&$~#vSl^Yrf+^axmT z6!GY7RlXX~o9(zP#GdyORG|wK#D?IhdPPFQllBdy(lg9>7{gq*U7p$9kwasQh)iE%fpQvR409|Z1Z2$lO diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 new file mode 100644 index 0000000000000000000000000000000000000000..4863f252000c26036f10c1e2a33c20277c8c3096 GIT binary patch literal 49 wcmbPLb3fQ4xo9CneC0;5$a6sv&2?uFM_xZwI7#4X*PKHR%&H6!5Y7mp0TuEPq5uE@ literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-a b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-a index 1ea2e1d72234ea2d625ffe48b8e82d4c7a31b7be..996dc9017ac6dfb8b7d9f6996ee490948413dc75 100644 GIT binary patch literal 147 zcmZ3+`p~s*&+jSb%Q_2|@4Hf4*&?-K`&}1<%I!HT7Zk+vaqnbg0E3%QdY#Ah2~Tal zpB2!xT9z@_E~McEKikJ?%rn`#;#`fpH(4>OLew*a!!%r-er)?Uk4~;IC%?IG3>aT+ bWSt=>$D{CZ>F1T2_xIh0DraEGhiU)-O-wQb literal 196 zcmZ3a`Len7)yb^d^PRtre#`1L-QgP&qEWPr?fpld)4G;_cvKl6Ac_$}FIr_69npVR zA*gp<#b;?frgp9O&oy%_-c&4Id$Y+Gm`~Ba~*dcyc l_5JiabJb4yW!jjpPGgMRdz@kIuP?kZ53g|VgetrVr2+ZBBkceH literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-c b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-c index f2bd74ebd683719721b98de39719a18f6ebfddc8..c8c264db0659344636b64cd2729c1044cbba60d3 100644 GIT binary patch delta 54 zcmYdFGCWklG?n>We$|(M{PlZ<+O0WS&$h8HO_x%Wm2TK+=5NBilaT=oZbIn^h5#*J B5KRC8 delta 55 zcmYdFnrLWfcq(+lg?hgymH${(gdR866uL58)7dE?Yrm8IlVH{A{6);F3=j~`2%!OB Ceh~ox diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d index d28cb40249775992f33db5d1341af1ee0972666c..2abd5a5ec0d26c5b07084c9ab6fa0cd18c73c608 100644 GIT binary patch literal 49 ycmccV9e*wEf$%e@bH4J-&+qn_E0rIaVRx?aiB2?yvJxPiDq_S|WdHMRw-n90jdh)()?YF)zEOFfl;ERYnNoLgCdlI{l8G z(ds+%Kb%!B?tW5oWRF6vXa8S~8A|&(oj70`@}U~8Fo&i^hi4z~aG%X=;<_|g-$SRn zX#Mqy7XpoQ(tS;iv!H9Z^;~J<7q_l>rf%tCeJ0U!wR0ve>84m<_2ZpivTPrP3mj%G<@`~T<$Le(#A(5f2jp5mF~C4RBZT#vc}Y#bUsH$m zpF2%Lsmsrw5Eq_1=zz!G|d~7|%mZc4UHR1pvlZG>-rP diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 index 0760c2aa451b385bd9a97b882180611ec85a819e..8340a55d2387f1082e48ec32827b73d1e2454b0e 100644 GIT binary patch delta 252 zcmV&f7OJI8DuG!=2o$_j3LhSd#oxr}8w#9~Lec2W5PR1^TN#gKy# z000000D$@Wf9u?3hB9tamlz0Cy5FE?k)0$~AWE7>u`uPQYdQlP=lLQy_yXLV zKK&3d+GPs!eH@N;d%)$EdOU(^tMTRk`iv?x*lR1^T#j(~#@ z000000D#Dj_>QiHo)D840XQH#Q%=)4;o2P4H6A_6=BI#X={R2pv@=YDfiPn2(G#A^ Ca%D6C diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-1 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-1 index ccdbf037b16685181af64a37756f8bc47e9dfb3b..47e00219c13131371550db1d3fb0765e7cafb754 100644 GIT binary patch delta 290 zcmV+-0p0$P2Y@p( zinf)IAOL67CE>(X+#$f5ar(PXze&WLGwxAkkDexeswA-O06d zS8f;7GELLEOKKmejWr{<(3fLydmJn44RXza$8mZ`sOPuEmgp5C8xG z004l1;hC`7-K`7&bP@m|X>N99Zgg*Qd0%X4b960sGIKuwWN&0-WpXWVVrpe$bS-3Q olgk4SASdC#w6x%*VCkM-TAW6aua)vS`ENB`@>$sv_&DB${AP`KV*mgE literal 1040 zcmX@h7|h7P;?2*%!pp*xpO?zSsL#SwnwRgW!@!V~lbD@qlw@RT#&DFUO z0$tWn-tK&%9j}7_{jT?CoW8s-`||$)H-?n_l$6vW-J;ZjeBFZ5q@2v;`0Uh5-7-Ul z)D$CAQ$x#mpeVzxzE{qN@0$7NcaYrF^fBqClnH&@&*Uh?tb+!Ng2=B#_rsORs` zw7*Hm{JEmYtc-U;wT|Dak1Y7u^nzbxqSCR8TntWZ4CVRd3i;WttPCZI>AHqc+9*VX z;aXoqvj77KG)%a7eRBJ&k9-Uz0St<{DJV|pH+p;jNTX0$Si;@SM^||Nyve+BpM#1~ zsfm#L$(Khq4TW!b(#cQZ^E5*Z%)e7H98G>w>@=x zXZ|46vL%W4!gC8|r&Y_oEq>m;#@A)F`M zvro1O1xzshB5-nQZ!8P{`Y((V4y_9gaAQcxPf1BF(k)6Y$k#0>P0Gnkj?Yf5)Gae) zNKG*^H8r%12Z}Q6>U-sU_^zp+aoNS=1??}~w}v}&9`1TKak>OY$gcYf(h3t{2IVJZ zr6!l?7H6jGmKnj#0CE{*^}A}=c%v8StbZeVU?%6h^-{~!>ZZz_-kzO0&2EC5UiHP= zLn7~FxUwtl?;aCc&)`+6AiPG)Q2d|#d5_F9llYx@7|Qd@74owc64Mhi^ITaON)pp` zjiIzjhzP^AzJ_K21`uetactYXg$vj5Gn51{DCVZ1IHcd`?foN-LS>UUjs2b0szVdvoiny diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-3 index e8add64d4ddc3085c6a4e1ad4116938871ecc462..3505e7d4ab4d5585ff6e1adbc578bdbc5d2082fe 100644 GIT binary patch delta 459 zcmZ3;Jb`UOze2pmnOBQA*K}>0IzfRU{fg?tBcV^^Kc3CaD&|~0bCEot9VMTX)T{yA6fmqol$%5L&jEnj=TNM7uV!(5hESA?wvd5$mpax?C> z&YO9gBadi=U7o-ZBEqol=!9kg1`uf2aOuzNm8-XNOx9#HR+v?DKiDI=Xdy#<rY@#&aLOm?#eg` zZIQgReDcIJO=A3BzyD;ST-z0U3)9GrW!KDB8EtNlU^2BR+7z3ZQx{q^U;e-5t;5-U z%P;hWsp`9Y%}?i6d2c%X-E5Nu{*Mfsk9MQ^ea4rU3m)B_%*#+B#Gsg&SC*Prl3!FA zpOaZ!qFZKEY|oIApOTVVq?@0Vm6}|lo02)%myur~$n@BTeqXNxBC*ag-}k8*yl%N% SbGfA>&tuKy9Y5CQIs*Va6v1%- delta 170 zcmV;b09F5x2B8Cxk082^>O;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|S;Bvy|y z?cc2Hl0s@<%nGh;%cD)%1@3eIdFUJ9#*mVql9F1aTa;RmuUk-> zl#`hppPgE%TV}|Rnqp*XYG@e`6lK`e_saS3T~j~fvWv$H+F!VD4R_`|-1TnabP0}- zUH2EH6(+(A%1_ElO)k+b&P>-WGlH7|Y9zK|%9s%dDg~ g%$w63lQ->C;#s;yqqbMBke@BuF)k#*b&k?s0N&GvF8}}l diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 deleted file mode 100644 index cf5ede6e10ae2f62167881fa3f237072aa5ab373..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmY#p2xeqp@MdCQU`!CsEEy5hJj6ro5{$~)WFQxz}V1~iBXS>$;8mW z)YQPxz{F99fgvd;F+0^L$;i}=57{RmO0@5|GF zWRVr%#*mVql9F1aTa;RmuUk->l#`hppPgE%TV}|Rnqp*XYG@e`6lK`e_saS3T~j~f zvWv$H+F!VD4R_`|-1TnabP0}-UH2EH6(+(A%1_ElO)k+b&P>-WGlH7|abJmrCsuu3Cfv%HAk=bxF64W5+utwKicv2d!?)gZ$JGwKV!D&=c}BSOYXmZu~j-E zGelsr=jKQcOAcVTTwS7k@MY=_)1^K!K zrAaxN$?@5#mAYky45=wbra)8Ufuan%`d&F7zH91dTz2tzLHi5$t>Mm`hr8ZQoG!r; zvg`hWw8BJ~LHS8psmUd}#hK~4Wkzr_fLsRNy}tP;_Fa8Yr<`$`{ea3BgBx+rJh!Jb zJMF2v(I9t7HaSMALOW^Zk=)lCc9u*yNp43SM9VzW>K7%t}=&+FkI_vXck}q zfrgITJ)btr`pL&oBE+DWnOByYSCU^;8K09`TmrPX*dEP2DVgc1U>Szuj6_h-TqwM{ iMyKD=Gg^IT{)e;b#obRzj_gsW_3ZzvF+*uTrxO4U5RJb8 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-b b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-b new file mode 100644 index 0000000000000000000000000000000000000000..b054ef8b4c3dec0374cfc7a2d59f9e199118e103 GIT binary patch literal 914 zcmY#p2xeqp@MdCQU`!CsEEy5hJj6ro5{$~)WF=##KOXyiBXS>$=JZu z*uc`%!q8ENfgvd;F+0^L$;i}!k(vH3D*GuS#)wCH6dHfoAFZ#mbYMqPkbD z*kKpo#*mVql9F1aTa;RmuUk->l#`hppPgE%TV}|Rnqp*XYG@e`6lI9lIP+=|=bEl< zQzs}eq+d~ecqH_R{KvDoS;d^Ir_TAZq%aX?P<~QYYI2Egab~)1nGxI!AeVtTXw!y` z@;5K5Pu{n+XY+!K*AEv>YWa6ImRaagTZi1?nA&E)l9*;swa*TWx7OV;wcKPY`Y!5W z#$n02zjYVdIQ4*74fSc-r4SXEB_R63* zVIvSH*CBBt%)lbZ#*~;-kdes5sL#ffkzbOUgBBGcE@I1Lc1VlP4nF&2n^3?6<1Ydy zr}oCO@UQ>EIN{K`V7f-djyI1>Ot_}(QY)X&{cc~WlkI0DHCtRWOf$ZQdnSEh z@o-iAJM&&yj7nMJC!GU4Y#$HE@*JuC5O_hkdlRD*4?}r=xk7%nLSlMiW}Yi6LrG$~ zt}&E0L5-;yz3*mySiX#hp(KDoF*gMzO<0S*de5X1@OH&v87*nwQ$>d28U8s}?w3Wp zQOa)eRxMw9zerx}i^E)&S676s1$mAy`*Jhxw$7V*nybAYa o+NSd}fA-0RpcM>&24IP39FTy^rVrnBvwFn zADx{gjq^Pk*neSikJm_m`MDq6wk~sKTT(ZtGH4b6MAJN@BUaG*DK YejWr!_SBDR-G=5O;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|S+p z7|h7P;w{9$BEZI!m{X9E$i%46%9Ng;ljf+yz>t)an4M~rWMpc_aFnM_T;;Jz z*Yt`4UDio0zPvB{^8WxghLrr2l++^KqSS(X-Gb7joXq6-?9@u# zGDC*c6eCkpL(6!eC_}u)nOBQA*K}>0IzfRU{fg?tBcV^^Kc3CaD&|~0byA!n7GMB@h8Z`$b!_W-&dpE~z@V6$g5m^g(O2)8R07_vI4q+j?R%=oP&~sw z=gR%Eh&M{vP2Q^IYws7yi+ypJ%kt`qu(cr1@nv6b#@*I=GjDU`5sk3R6F7?P(Y%?G znVwo)0`h5bMj|N0oo*G1*S*;l)w65sv$#g_5>c0G)s8+b_ulTX(qg-Z@zZ0I`M*Iv?L={AuY40xC9!Z#!%V>HDXWvfAQ%;PaiKWBGxwpEn;)? zfvzf|MKUIwh7=3J^y@$TILy9q;U4BiA*}CPWU5n_cuwL{zc7EYh@vSX;TR*BCIH1z Bll1@q literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log b/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log index 41a0395db..c0b80806b 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log +++ b/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log @@ -2,7 +2,7 @@ ! inventory_list-v2 --- -[2150630315.410550104 @blake2b256-njsg6at8z026537en0v0gthxtk46qdk4cer0s4pq078xutlz8p4qtlqvl2 dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-kf0rur9j24qtj2hf8e3lfyprd988e3w5f3ruw68y2gwsr86mg8477gn2urkl97x0nzd3tu74pyu6fhltaz63kkrf2sgfxjdnt9yrjzqcwtyd6 !inventory_list-v2] -[2150630315.538519645 @blake2b256-gs3y7llf5qlgu95aldlfet6v336x798m0ch58eqs7laut860wkvqn007jx dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-pk756m7ghm27ql3rdr9s0spy7scdshhxfxmkfq6zh3ld3qq7cgwkxhpz0q4k9xwydh4mpwphvfke9zv8nknqqga60ktvydj6p8fd2qcg4xzdv !inventory_list-v2] -[2150630315.555538524 @blake2b256-xke3nca6y3wdtwy22x6ayfmzypjcuh9gp2m2wke4qugd7zluu9xs0m0kdv dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-k388fqw0fzeperpmxxr4cfl5uyclqgghg9xpzy5j8v5jwlx2e2dppnmcztk4w3m5sfl4v3yz9rq8m8mjgga9hr3dchcz2c7e0qnf5pg675ska !inventory_list-v2] -[2150630315.584916789 @blake2b256-wsvpcr8sv0gmmc2dwxpztw8aknuth3prtcstw4xj003hthst26pqxuzrve dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-yp9f5343xrj6w6e6qvd707fz8ruq9hyu8m73qvx6v590xlgu3e6hhs89jeareqn9hr9kumpygzfy6w07xfy20thneddn6wqxks59yqqsq7hrl !inventory_list-v2] +[2150764887.305309581 @blake2b256-4u48kpwj5r0js5rvnw4xg382zmnk3gpfwhh6xgujgfdgh24ghqlqmmeq44 dodder-repo-public_key-v1@ed25519_pub-tu5ve64zpxkg4d54jqsqqe75yhsug40yrlcu6mt2wvy6h9vu7jjq9rennm dodder-object-sig-v2@ed25519_sig-qdft9v93rlvaxfunh66cevaq68tuxu5jsnlv6hgrzt3gdzq7cdw8mq6ww3wgxjfx7dqqrk4wms6nnv3azhh94ctgcvvhaf689p02cps0t6cpl !inventory_list-v2] +[2150764887.427365859 @blake2b256-n639q8380ef22nrpxvw2u969kw6n9agyh0a3am2pt3pucxpc85fqujtnhd dodder-repo-public_key-v1@ed25519_pub-tu5ve64zpxkg4d54jqsqqe75yhsug40yrlcu6mt2wvy6h9vu7jjq9rennm dodder-object-sig-v2@ed25519_sig-a0ylvlgpr6mmdfgchqfu9nkjvds86hznz58f3grutr7cp3a3g898lpkfn5auwmq7xs2hrnx2pfh8epk4p4emnrr988zxy3aewegljqs6tzh6v !inventory_list-v2] +[2150764887.445218 @blake2b256-jkajvftuyeqr3mx3g8ezhd9x6gzv7ahkrz5cludmg9g4lhawu3pse23rdp dodder-repo-public_key-v1@ed25519_pub-tu5ve64zpxkg4d54jqsqqe75yhsug40yrlcu6mt2wvy6h9vu7jjq9rennm dodder-object-sig-v2@ed25519_sig-csjd5ncylr6kg4ekncsdz4phhy8hzfwaex6hg4mwzl2rynwnhf9k58ag356j8wxsja3hq7cu904s6ukds8rhz7j842mfsezm7jrqvpscjvfmy !inventory_list-v2] +[2150764887.473928583 @blake2b256-q9kfuc7jptwhjv2n05qdz6nj9t79zmrvmtn6dhguggftgxwj57fscvp6rh dodder-repo-public_key-v1@ed25519_pub-tu5ve64zpxkg4d54jqsqqe75yhsug40yrlcu6mt2wvy6h9vu7jjq9rennm dodder-object-sig-v2@ed25519_sig-hlykz85x6slnsd2ek9mdvd42x2ecwkqzx5u89vjav9k8u4tjnu0l72w6cd4caf7s3etz2t6y74hkwzeyau6e0m5mxjsylc33s0zckzq2dgr76 !inventory_list-v2] diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log b/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log new file mode 100644 index 000000000..de6961104 --- /dev/null +++ b/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log @@ -0,0 +1,16 @@ +--- +! object_id_log-v1 +--- + +side = 0 +tai = '2150764887.302635814' +markl-id = 'blake2b256-etzujmrrss3jkrnm528w6y8ptlr4gc4qdagtgxdaw8vp9l2ntmqqaldnaj' +word-count = 6 +--- +! object_id_log-v1 +--- + +side = 1 +tai = '2150764887.302672344' +markl-id = 'blake2b256-wzv075qgrq704get5zuzh796hnlksw0jfu592svffacz32vw76sql980vc' +word-count = 6 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yang b/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yang index 6e1fdf137..9320d7230 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yang +++ b/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yang @@ -1,6 +1,6 @@ -uno -dos -tres -quatro -cinco -seis +golf +hotel +india +juliet +kilo +lima diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yin b/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yin index b56606159..9db9bbfd6 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yin +++ b/zz-tests_bats/migration/v13/.dodder/local/share/object_ids/Yin @@ -1,6 +1,6 @@ -one -two -three -four -five -six +alpha +bravo +charlie +delta +echo +foxtrot diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/6c9e63d20add7931537d00d16a722afc516c6cdae7a6dd1c4212b419d2a793 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/6c9e63d20add7931537d00d16a722afc516c6cdae7a6dd1c4212b419d2a793 new file mode 100644 index 0000000000000000000000000000000000000000..10c1e5be109ec1d10183b8cefdf8f39ba2851635 GIT binary patch literal 456 zcmV;(0XP0AwJ-euSp5wEmZWMQFiCU+V57Zt70?ceX6VRgL@*HYCmZW5dFDew5~TuV z0AK)L08uL@7X_v!xB{gRj0Od|;4w*f2BpB%;!xu)ZiMgv3D+3m4EEYtH6z+Tc3z{B)J&doNnKBp!|OK_E7RMeDLcw+o4-^@14g=# z23*{Tw`X5w2LY7Tfs>zD%0he+75fN3!C# z7UT1kcR7@$aeE>58c&bfW;#pG>=>-13lpW-x0m~b=|(Tgq3u%H{Z3H9{i~*poPMZx z?B^O&$+S)?maBnG*N<3*?Nj?U^_s&>#h^&8*FPaUUrK1hcK`@qNFx)ekVYm1GQNg` zh)5>(VG9sPA+|i*Z9FKFH7y_4qFYYjaa1A4(GBl3atVL22FLPb=1z*xMW5$sktSi| yO@l$Sz|+@GPj0lAq&~j4L3GQ+`=ig0Zjc5LGz9>0z>bhu5^=`5VMe(~k_c#G$o*j zbkaJCKm-9scl{wR_hKJ3eEY)f#2QV7NYf}0-|!b|9}tufe$ z4UP~R;2?5**#6qoAE)^8{3f=v{inMdw*$fsgZ!?z`YK?bilh){zmZ8s+{h#w{bJ!T z(1prZZ?%dl9dZBS$$tO^h#Q>~O8D5IYveTv7*IUf&G&w%vf^)F6~b7jKIkK!oxVPD ekl!v_ad^6VBQ|2ewLIsFY0CltUzFb?i68}~oq;_7 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e deleted file mode 100644 index 99ed59aaf26ad709137f584193ad0d6478bc0756..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmV+$0p$KDwJ-euSd|C>29-e`P)GD&M5=yuN%2c9$I2pRCOZLb5Q)DP6sHQgPy;sr zH~=^R4CDD2F5;$mQakk;S%TYA_e0@6l;ghj!RfTs(U|n4gVa0XPaYE)7!>|1{r?L* zArVOtPjG^VX1c+4b)k$HXRV1{O45v9J+;Pty*xn(t_4Q;clQPe8SN(vO_>O;$WWg} z_Bm&8gX|76#NsP^G8~=o@u#Q8kef2$%&<$KGNfedq8AauyLwgHi zm~_U*G)(;|HDtT7N!|ef1)kC2DzmVy;lRAiC;@{*-ZxaN51EE|M)Rj7%_W<#BgTa; hx*E%#opLeZeVTM34^N{^t-Ow9syQgKuSTUCRSk!VwEoHT_RX>h22L&S-3Q8UK3JTo( zM-f^=$#N3qQJZh#2mJdR()OnyX9Eaiqg=4*5B=fdx)s;DAavS-`KLScmS^!@)~h&o z@}cw-8%vZtWQ$uB{7vU1n+%;*cmxxY>%!=900+rLmJrB9mJk9rfkj48gy={YARe@? z|CqVqk7*s^CoQdgf@jb8LRp P0|0fvPV`0jMUn_oU7E6N diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 deleted file mode 100644 index 37303c0cce1660b8e1f192fd90137da03b6cc465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0bGwJ-euSS1Sprd(AVP)R!=;dN3B2~HlVEg4lc!|zjA2luN6Pz~E_P5@2- zN&p6Z&EZ1DDDb_*Bh*Pnv6324g>=$7s(^^IabzyjvlgqIwRC(IorfNT7(Wv7(vt3SU zQt2$VSJBDi;jw~j-}u2@beR{+kdoeuC~VETwOXnwMpm35#2EBNI0{Ok2MY?@csLPU z0u69hY>UmJ&)z^PhdR9)Kzt8Bq8O_ztNYQ%#BlptU-ZwJCodLVleWi{wMOpZ9Yy#o zs}uY+KiH!OhHX3LB%IT3ba#1kzw3;V00+p(wh#p)+d>G;1HlhmfPk?+?j_zvXGwi& zqvGGAL}Wx{O640uHr4uO(ct55^(FStc1;T8PS2OsO8hD|uOwI+53#%%T|QcL0|0fv LPV`0jM3M+n!jGtH diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/58/47285856a7198c8d143f0d705ec9bc6df84f8749957ac11558b21b1924619a b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/58/47285856a7198c8d143f0d705ec9bc6df84f8749957ac11558b21b1924619a new file mode 100644 index 0000000000000000000000000000000000000000..19fc86cc8b99714669d6c97ceda05ee3d366d728 GIT binary patch literal 284 zcmV+%0ptECwJ-euSe*y}2Gv0xKu2@~pw(XciX(k|OAn583=?VK(F`dp8TssxMg%zk zIRG~RcuIw)govbEGHlL{T$vQR98gP=QQdxCni6@@ewC)UI&7f>Ma8Jcz<|(}Bhn(0 zK+&3F1+fT-AdJ778$wC0XS0fkvBp#_sHDQ&gJSU)-{;`B;0S9W7zYS{ny3_BQV)KQ z;l_M&gwOy7O5wOHxCRF((>`Q5*;lLS;tb!7VdLXtY+8;m#@C$OyNy76WTMd@ndq}$ zq=#X#HfDz@E%>|1n(t^Y0RRQ)&(=vTG}*9ie47Le>V0ez`aVQl*BD~V|0nlTZq9>| i-dd)Yu9S>1EEt3`vZvk|URsB*zySgPUzFb?i68}NNP?~a literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/70/98ff5008183cfaa32ba0b82bf8babcff6839f24f285541894f7028a98ef6a0 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/70/98ff5008183cfaa32ba0b82bf8babcff6839f24f285541894f7028a98ef6a0 new file mode 100644 index 0000000000000000000000000000000000000000..ff4e55674a26b4a8853b4ed846c57805c9cc5f25 GIT binary patch literal 43 ycmdPcs{fZELXeRmJwGRnD(J2NMrD{2@<$ulAmW-;J;rB_FkO80uPz~E_WdLCS zT>wT_oE@YvEEeG?D0LnzDD1++iQp0x!(xkrg}A`*y~88YIm#r&)PO1=gO*W+Lp*uV zt+MfOBO1P(P``b{zbKCXBsVb(S&n4fIN{bFt(0U?q~lR6bqoj2rWgu{LtO}9Js1SF zN0gTZvD!Q3T(jzu+`sUHJ>|HtZHG<5xzdg9EN|}jC11o&Uh};D8mf7e&|b)de0Cud za)BYD546w@CWeDT73u1&Rw`aJ9q-v~<*i|9D&u+iMfFc{w{HxzjGoS+>}8B8dJ)Pn zrfX2w`hkyj|2_OixmRUL-H$#ZcH7^JJ>QsV@?z0782|^VkWCY)kWCW;I^%>$KtvP# zzy$~x>EmABZFH8xk^voOqX+%%} zPykH;wK!C_g>~l+jz~sIP$4Nba3F|chp`HXa1!bx-Nn_Tw|&Ma<115I#zpVP_{SS} z#t}MY8YlO#VT-FzdJ49X0l939p@3i^9VEF5K(z|NBubr=HaHQOxsdaA9aFLQ+@@IWH*W zV!K385*R}h4wY41Yc-nAOZ!o#I#5R33?Q_B^7H+kiLo;i||AM%YdKmYZ|ku2?^ zB-5v7#>S^E`&%M+LkeNYF7KI^Cwkb~r?x W@h~ST&p`nL0Cm7l^hNnek_b|S4Xn%n literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c deleted file mode 100644 index 53070c2f2c71e02dcbe3eb8a6a6167322337b543..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0pQwWHOP#jtGW*q%Ogn`6vUiZ3Nf3$5{PnKr+)mNjb6vpyXuR>K|xgD;jNzNr^@ zLLs%#6Nw;3cm2t?d$HJ@7GtX0s+TXn{%W?rw?xmeV1gt56O01{KTWKJhuCAm$AF_g zIzniG1E#;Nn>Bc&?KITNW|l6U?5<}OpNZ_m&qVf7UMw62 zd+mHlPVn2>rE9XLya@mWi63Pnme6Q}l0=>$0Rs*XOfg?hP&T{@u;EHY%a}PQHEI0d gVwIfYj&DI>(-~Kbj1HJGwa>?L0svo>-y?}21!W|A*8l(j diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a deleted file mode 100644 index 33edf054121392489150275c84821d18fe5d7175..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTwmwJ-euSj`Lo24P?uP)B=^SZ%3EE-0(d15p*SlaO1s0m`UM=Ryry09OE5 z0QrCsN}UG@h(3H+4_v_#cpi=n_psr6#|uCPrF51_1ByTf6-E&!;2I@ztW$;SFF8_& z(6q^Xc~!P7ewX2d;#{ECQlTr|#dK0JXhlPz4&lJsEP){4U4ep^rkU&a1?D?0Dz?9= zmc}~^>B}a|NjR)mKdwV{!*3G(jFWbMRydQHz=-rw_6a@!|CDzj3{(H?X>F*?Cf7rX|In5KlYXWHBnAU&~;_xa+U|orrYT zGH29loaNwmjpLEzhdwjypL*eM_(x9BirXkA>kMK<0;yz>Ar^#@1^_L{A^=ca;eZIU MJ<=ED2T3AG0Tuhm)&Kwi diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9e/a2501e277e52a54c61331cae1745b3b532f504bbfb1eed415c43cc18383d12 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9e/a2501e277e52a54c61331cae1745b3b532f504bbfb1eed415c43cc18383d12 new file mode 100644 index 0000000000000000000000000000000000000000..368732a6b6d505efd781d4ff00230cf7df3846c6 GIT binary patch literal 371 zcmV-(0gV1AwJ-euSXB!E=G;~vFiCU+;880Pkv-@qA07FO2nK}q+HYGBx+iIb*sLqo?#xnij|Je&tL6c7ihM1liZ=wT4Kw?tQVsBD`%RK$e)x`+w4zz#}- zQj-KShLw_KZ6J&5{kX2|D8o;R`665~XzjH!sh8qxmYx>WD&xYC7X+iA)IV5I&;^GR z!6i^bUILe4ny)(|-d#=Xb$c~{=sF=*UF+0lnsUv_k{( RO9}%3b-+&aMfpgQ2vRX>u8{x$ literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ad/0213ef702cf625e87090c3240dc50ec02d67bbae42915ee49a95e70fa45290 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ad/0213ef702cf625e87090c3240dc50ec02d67bbae42915ee49a95e70fa45290 new file mode 100644 index 0000000000000000000000000000000000000000..597bd8dcb1ed343f0b4d2a0bf24da1cfac18ad7c GIT binary patch literal 283 zcmV+$0p$KDwJ-euSd|C>29-e`Ku2@~BqN{2Q5D@vrI{?OiaTTR)gCD<8TssxMg%zk zH~=^R%o)}(wpH4u1u8hqF5#=KQC@pHHQcedrgZ$^l)F#0iW*BrdIi#AVDOk@O%Z7c z5YDYe42+Nn0&N=<_hHGMXJ^FUn{TpMTvBoDv)XgEH7d3(JOX1W{s4ia{z}0>Xt6C~ z>|=yKMkWs8tUB5E2+A4+)*DN8IQG%2*N2>=C&Bb^ai=$O&89pWy{hO8cnrS3VYU;+SNl;0zXAO*v+eSZJ| literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/af/2a7b05d2a0df28506c9baa6444ea16e768a02975efa32392425a8baaa8b83e b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/af/2a7b05d2a0df28506c9baa6444ea16e768a02975efa32392425a8baaa8b83e new file mode 100644 index 0000000000000000000000000000000000000000..03c5e62d36885db8bc98340d87260050ef08435a GIT binary patch literal 421 zcmV;W0b2ejwJ-euSmg`=<{)7nP)EA~1RnXL9orP;B%cSODr9evk-dIE8I|c=r~zC6 zRsdK4_23{Vb=)H$Y@$DT&le#}>jRUPa zmu~ZRlc2^)SH-gy+nAI~Q1ZH@^|sQPDClnDdlj8jYuRkb|8YA@^}6_$p_xqDF-P_yj`@Z6?+;>MvAnk#=u~q0WpS#CBO!S zR6}e?1ObI7{2>qRS95dLdy)JaT{>rtE!k=2UqX(-FM${sOE3-${rpG?M^X)b4|8Ka zIYP+5L8=|sjaM&gKhuBB^QO3sAmsRQ|@o`4_4*&(JpRJQh_?g)@cAEqY8vNTIxKZ*awuMSTPMu_?RJEqq6_Jhq eyByyNHWn2eQEBGMPUqH}OA7)3UzFb?i68|-D0-Fv diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ca/c5c96c6384232b0e7ba28eed10e15fc75462a06f50b419bd71d812fd535ec0 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ca/c5c96c6384232b0e7ba28eed10e15fc75462a06f50b419bd71d812fd535ec0 new file mode 100644 index 0000000000000000000000000000000000000000..9be79e52407f34754aafb5020a225e11e1e66f79 GIT binary patch literal 48 zcmdPcs{fZE!jh38F{dCSkt?Yvu`Hh}IU}(sCo`2RB{iockt;PhBcCfRzoMilzk~|_ Dj_DAO literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e4/4053df6e8efdd7004c89662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e4/4053df6e8efdd7004c89662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 new file mode 100644 index 0000000000000000000000000000000000000000..89cd8e122a7f46958f8e5c7aefe9f0af58a4742e GIT binary patch literal 281 zcmV+!0p|WFwJ-euScM1x))YY=Ku2@~BnvjwSA0rT7cyB`6?abJ7WzYB$;fAiG$J_w zH~=>QpD&>qBhmy5Sf8d&bv&cNc89AeUhLl>(NqE}&-H?AX-s*RLI?V3&|_fG3P`0S zz*=h*|GO3r~Y;I5Mx6;cw^feR(rO^9)%g)YEa4t-_v+Bw04oouI2PXL} z?&Wc));=y2DVg3yTzoSD00n5DB`4It@nNyQZ4xlx71`3|yA>>1?Vpi~Qj@Gl-13`x fQtB0AV8zXTd4-&<$c5 zc+rLLF>jFE)oh26Nf)ziL+(~+^>jNO2mkr>_FLM7|8S*vJ*w!F(*#8Y|3*>4C_5+* zW~mk4W~F3$w`B3{d|m Date: Wed, 25 Feb 2026 22:03:34 -0500 Subject: [PATCH 12/25] test: update all BATS tests for NATO phonetic zettel IDs Update 31 test files to reflect the new NATO phonetic word-based zettel ID allocation (alpha/golf, alpha/hotel, bravo/golf, etc.) replacing the old numeric word lists (one/uno, one/dos, two/uno, etc.). Fix sort order in organize and workspace tests where golf < hotel differs from the old dos < uno ordering. Update abbreviated ID references (o/u -> a/g) and directory name assertions (one/ -> alpha/). Co-Authored-By: Claude Opus 4.6 --- zz-tests_bats/add.bats | 48 ++-- zz-tests_bats/checkin.bats | 98 ++++---- zz-tests_bats/checkin_blob.bats | 20 +- zz-tests_bats/checkout.bats | 66 ++--- zz-tests_bats/clean.bats | 86 +++---- zz-tests_bats/clone.bats | 30 +-- zz-tests_bats/complete.bats | 8 +- zz-tests_bats/diff.bats | 8 +- zz-tests_bats/edit.bats | 30 +-- zz-tests_bats/export.bats | 13 +- zz-tests_bats/fix.bats | 10 +- zz-tests_bats/format_object.bats | 12 +- zz-tests_bats/format_organize.bats | 4 +- zz-tests_bats/hide.bats | 12 +- zz-tests_bats/import.bats | 124 ++++----- zz-tests_bats/inventory_list_json.bats | 18 +- zz-tests_bats/mergetool.bats | 64 ++--- zz-tests_bats/migration/main.bats | 16 +- zz-tests_bats/new.bats | 42 ++-- zz-tests_bats/new_no_workspace.bats | 20 +- zz-tests_bats/organize.bats | 336 ++++++++++++------------- zz-tests_bats/pull.bats | 128 +++++----- zz-tests_bats/push.bats | 72 +++--- zz-tests_bats/recursive_tags.bats | 24 +- zz-tests_bats/reindex.bats | 22 +- zz-tests_bats/revert.bats | 14 +- zz-tests_bats/show.bats | 120 ++++----- zz-tests_bats/show_mothers.bats | 14 +- zz-tests_bats/status.bats | 152 +++++------ zz-tests_bats/test.bats | 50 ++-- zz-tests_bats/workspace.bats | 36 +-- 31 files changed, 845 insertions(+), 852 deletions(-) diff --git a/zz-tests_bats/add.bats b/zz-tests_bats/add.bats index d1386407e..802317172 100644 --- a/zz-tests_bats/add.bats +++ b/zz-tests_bats/add.bats @@ -23,11 +23,11 @@ function add { # @test assert_success assert_output - <<-EOM - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] deleted [to_add.md] EOM - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- @@ -62,10 +62,10 @@ function add_with_dupe_added { # @test assert_output_unsorted - <<-EOM deleted [to_add.md] deleted [to_add2.md] - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add to_add2" zz-inbox-2022-11-14] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add to_add2" zz-inbox-2022-11-14] EOM - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- @@ -95,14 +95,14 @@ function add_not_md { # @test assert_success assert_output - <<-EOM [!pdf !toml-type-v1] - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14] - checked out [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14 - one/uno.pdf] - uno.pdf + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14] + checked out [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14 + alpha/golf.pdf] + golf.pdf deleted [to_add.pdf] EOM - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- @@ -130,7 +130,7 @@ function add_1 { # @test assert_success assert_output - <<-EOM - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] deleted [to_add.md] EOM } @@ -161,8 +161,8 @@ function add_2 { # @test assert_output_unsorted - <<-EOM deleted [to_add.md] deleted [to_add2.md] - [one/dos @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [alpha/hotel @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] EOM } @@ -192,13 +192,13 @@ function add_dot { # @test assert_output_unsorted - <<-EOM deleted [to_add.md] deleted [to_add2.md] - [one/dos @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [alpha/hotel @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] EOM } #TODO-P2 add_dedupe: define expected behavior when re-adding a blob that already -# has a zettel. Current behavior: creates a new zettel (one/dos) inheriting +# has a zettel. Current behavior: creates a new zettel (alpha/hotel) inheriting # metadata from the existing zettel, but -tags flag is silently ignored. # Should -tags be merged? Should it reuse the existing zettel ID instead? @@ -225,11 +225,11 @@ function add_several_with_spaces_in_filename { # @test assert_output_unsorted - <<-EOM deleted [to add.md] deleted [to add2.md] - [one/dos @blake2b256-wg3yq6ymccg8mrm3zrsdym3u9dvyq6pfdt2d463e53nw9vxypxeqttduac !md "to add2" zz-inbox-2022-11-14] - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] + [alpha/hotel @blake2b256-wg3yq6ymccg8mrm3zrsdym3u9dvyq6pfdt2d463e53nw9vxypxeqttduac !md "to add2" zz-inbox-2022-11-14] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] EOM - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- @@ -258,10 +258,10 @@ function add_each_blob { # @test assert_success assert_output_unsorted - <<-EOM - one/uno.md] + alpha/golf.md] deleted [to add.md] - checked out [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] + checked out [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] test file EOM } @@ -293,9 +293,9 @@ function add_organize { # @test assert_success assert_output - <<-EOM - [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] - checked out [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 - one/uno.md] + [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] + checked out [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 + alpha/golf.md] test file deleted [to add.md] EOM diff --git a/zz-tests_bats/checkin.bats b/zz-tests_bats/checkin.bats index b0f49d023..c4a630c64 100644 --- a/zz-tests_bats/checkin.bats +++ b/zz-tests_bats/checkin.bats @@ -14,18 +14,18 @@ setup() { assert_success assert_output_unsorted - <<-EOM checked out [md.type @$(get_type_blob_sha) !toml-type-v1] - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run ls assert_success assert_output_unsorted - <<-EOM md.type - one + alpha EOM - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wildly different - etikett-one @@ -35,7 +35,7 @@ setup() { newest body EOM - cat >one/dos.zettel <<-EOM + cat >alpha/hotel.zettel <<-EOM --- # dos wildly different - etikett-two @@ -62,7 +62,7 @@ teardown() { } function dirty_one_virtual() { - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wildly different - etikett-one @@ -75,10 +75,10 @@ function dirty_one_virtual() { } function checkin_simple_one_zettel { # @test - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success assert_output - <<-EOM - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -89,23 +89,23 @@ function checkin_two_zettel_hidden { # @test run_dodder checkin .z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] - [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] EOM } function checkin_simple_one_zettel_virtual_tag { # @test dirty_one_virtual - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success assert_output - <<-EOM - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" %virtual etikett-one] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" %virtual etikett-one] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -113,7 +113,7 @@ function checkin_complex_zettel_tag_negation { # @test run_dodder checkin ^etikett-two.z assert_success assert_output - <<-EOM - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -122,8 +122,8 @@ function checkin_simple_all { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM @@ -131,8 +131,8 @@ function checkin_simple_all { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM } @@ -142,8 +142,8 @@ function checkin_simple_all_dry_run { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM @@ -151,8 +151,8 @@ function checkin_simple_all_dry_run { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -166,15 +166,15 @@ function checkin_simple_typ { # @test run_dodder update :z assert_success assert_output_unsorted - <<-'EOM' -[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] -[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] +[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] +[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder last -format box-archive assert_success assert_output_unsorted --regexp - <<-'EOM' -\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow the first" tag-3 tag-4] -\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] +\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow the first" tag-3 tag-4] +\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] EOM run_dodder show -format blob !md:t @@ -194,7 +194,7 @@ function checkin_simple_typ { # @test assert_success assert_output 'toml' - run_dodder show -format type.vim-syntax-type one/uno + run_dodder show -format type.vim-syntax-type alpha/golf assert_success assert_output 'test' } @@ -253,25 +253,25 @@ function checkin_zettel_typ_has_commit_hook { # @test EOM assert_success assert_output - <<-EOM - [two/uno @blake2b256-hhew85kxn9usmuqxalnupnt2jpwwlje3m68y6v0kyr4yqj9w49vq9w79lk !typ_with_hook "test lua" on_new on_pre_commit] + [bravo/golf @blake2b256-hhew85kxn9usmuqxalnupnt2jpwwlje3m68y6v0kyr4yqj9w49vq9w79lk !typ_with_hook "test lua" on_new on_pre_commit] EOM } function checkin_zettel_with_komment { # @test - run_dodder checkin -print-inventory_list=true -comment "message" one/uno.zettel + run_dodder checkin -print-inventory_list=true -comment "message" alpha/golf.zettel assert_success assert_output --regexp - <<-'EOM' - \[one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one\] + \[alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one\] \[[0-9]+\.[0-9]+ @blake2b256-.* !inventory_list-v2 "message"\] EOM } function checkin_via_organize { # @test export EDITOR="true" - run_dodder checkin -organize one/uno.zettel + run_dodder checkin -organize alpha/golf.zettel assert_success assert_output - <<-'EOM' - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -285,9 +285,9 @@ function checkin_dot_untracked_fs_blob() { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] - [two/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] + [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [bravo/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM } @@ -301,7 +301,7 @@ function checkin_explicit_untracked_fs_blob() { # @test run_dodder checkin test.md assert_success assert_output - <<-EOM - [two/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] + [bravo/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] EOM } @@ -316,9 +316,9 @@ function checkin_dot_organize_exclude_untracked_fs_blob() { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] - [two/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] + [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [bravo/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM } @@ -333,7 +333,7 @@ function checkin_explicit_organize_include_untracked_fs_blob() { # @test run_dodder checkin -organize test.md "$new_blob" - run_dodder checkin-blob -new-tags et3 one/uno "$new_blob" + run_dodder checkin-blob -new-tags et3 alpha/golf "$new_blob" assert_success assert_output - <<-EOM - [one/uno @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] + [alpha/golf @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] EOM - run_dodder show -format text one/uno:z + run_dodder show -format text alpha/golf:z assert_success assert_output --regexp - <<-EOM --- @@ -77,10 +77,10 @@ the body EOM assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run_dodder show -format text one/uno:z + run_dodder show -format text alpha/golf:z assert_success assert_output --regexp - <<-EOM --- @@ -98,13 +98,13 @@ EOM assert_success assert_output --partial 'ok 1 - blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza' - run_dodder checkin-blob -new-tags et3 one/uno blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza + run_dodder checkin-blob -new-tags et3 alpha/golf blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza assert_success assert_output - <<-EOM - [one/uno @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] + [alpha/golf @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] EOM - run_dodder show -format text one/uno:z + run_dodder show -format text alpha/golf:z assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/checkout.bats b/zz-tests_bats/checkout.bats index 574a4666d..49fcf9279 100644 --- a/zz-tests_bats/checkout.bats +++ b/zz-tests_bats/checkout.bats @@ -48,8 +48,8 @@ function checkout_simple_all { # @test checked out [txt.type @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] checked out [bin.type @blake2b256-zhvux7vmpch9f44kvnua7n69f8jzgk5s7p9k2s3kuvkrcpjh07lse493jl !toml-type-v1] checked out [md.type @$(get_type_blob_sha) !toml-type-v1] - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -57,8 +57,8 @@ function checkout_simple_zettel { # @test run_dodder checkout : assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -68,7 +68,7 @@ function checkout_non_binary_simple_zettel { # @test assert_success assert_output_unsorted - <<-EOM deleted [file.txt] - [two/uno @blake2b256-eu5uyveldt6hg5ddd80k0qjsjvkt5d5u24gg36084ehr7yppvkws7cac7g !txt "file"] + [bravo/golf @blake2b256-eu5uyveldt6hg5ddd80k0qjsjvkt5d5u24gg36084ehr7yppvkws7cac7g !txt "file"] EOM run_dodder show -format text !txt:z @@ -89,16 +89,16 @@ function checkout_binary_simple_zettel { # @test assert_success assert_output_unsorted - <<-EOM deleted [file.bin] - [two/uno @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + [bravo/golf @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM run_dodder checkout !bin:z assert_success assert_output_unsorted - <<-EOM - checked out [two/uno.zettel @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + checked out [bravo/golf.zettel @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM - run cat two/uno.zettel + run cat bravo/golf.zettel assert_success assert_output --regexp - <<-EOM --- @@ -116,19 +116,19 @@ function checkout_simple_zettel_blob_only { # @test run_dodder checkout -mode blob :z assert_success assert_output_unsorted - <<-EOM - one/dos.md] - one/uno.md] - checked out [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 - checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + alpha/hotel.md] + alpha/golf.md] + checked out [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 + checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 EOM } function checkout_zettel_several { # @test - run_dodder checkout one/uno one/dos + run_dodder checkout alpha/golf alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -143,33 +143,33 @@ function checkout_simple_type { # @test } function checkout_zettel_blob_then_object { # @test - run_dodder checkout -mode blob one/uno + run_dodder checkout -mode blob alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - one/uno.md] + checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + alpha/golf.md] EOM - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run ls one/ + run ls alpha/ assert_output_unsorted - <<-EOM - uno.zettel + golf.zettel EOM - run_dodder checkout -force one/uno + run_dodder checkout -force alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run ls one/ + run ls alpha/ assert_output - <<-EOM - uno.zettel + golf.zettel EOM } @@ -183,20 +183,20 @@ function mode_both { # @test EOM assert_success assert_output - <<-EOM - [two/uno @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin] + [bravo/golf @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin] EOM - run_dodder checkout -mode both two/uno + run_dodder checkout -mode both bravo/golf assert_success assert_output - <<-EOM - checked out [two/uno.zettel @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin - two/uno.bin] + checked out [bravo/golf.zettel @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin + bravo/golf.bin] EOM - run ls two/ + run ls bravo/ assert_output_unsorted - <<-EOM - uno.bin - uno.zettel + golf.bin + golf.zettel EOM } diff --git a/zz-tests_bats/clean.bats b/zz-tests_bats/clean.bats index 27e3e1ece..c967b7df7 100644 --- a/zz-tests_bats/clean.bats +++ b/zz-tests_bats/clean.bats @@ -19,8 +19,8 @@ function prepare_checkouts() { assert_success assert_output_unsorted - <<-EOM checked out [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -40,9 +40,9 @@ function clean_all { # @test assert_success assert_output_unsorted - <<-EOM deleted [md.type] - deleted [one/] - deleted [one/dos.zettel] - deleted [one/uno.zettel] + deleted [alpha/] + deleted [alpha/hotel.zettel] + deleted [alpha/golf.zettel] EOM run_find @@ -54,9 +54,9 @@ function clean_zettels { # @test run_dodder clean .z assert_success assert_output_unsorted - <<-EOM - deleted [one/dos.zettel] - deleted [one/uno.zettel] - deleted [one/] + deleted [alpha/hotel.zettel] + deleted [alpha/golf.zettel] + deleted [alpha/] EOM run_find @@ -69,7 +69,7 @@ function clean_zettels { # @test function clean_all_dirty_wd { # @test prepare_checkouts - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wildly different - etikett-one @@ -79,7 +79,7 @@ function clean_all_dirty_wd { # @test newest body EOM - cat >one/dos.zettel <<-EOM + cat >alpha/hotel.zettel <<-EOM --- # dos wildly different - etikett-two @@ -113,9 +113,9 @@ function clean_all_dirty_wd { # @test assert_output_unsorted - <<-EOM . ./md.type - ./one - ./one/uno.zettel - ./one/dos.zettel + ./alpha + ./alpha/golf.zettel + ./alpha/hotel.zettel ./da-new.type ./zz-archive.tag EOM @@ -123,7 +123,7 @@ function clean_all_dirty_wd { # @test function clean_all_force_dirty_wd { # @test prepare_checkouts - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wildly different - etikett-one @@ -133,7 +133,7 @@ function clean_all_force_dirty_wd { # @test newest body EOM - cat >one/dos.zettel <<-EOM + cat >alpha/hotel.zettel <<-EOM --- # dos wildly different - tag-two @@ -162,9 +162,9 @@ function clean_all_force_dirty_wd { # @test assert_output_unsorted - <<-EOM deleted [da-new.type] deleted [md.type] - deleted [one/dos.zettel] - deleted [one/uno.zettel] - deleted [one/] + deleted [alpha/hotel.zettel] + deleted [alpha/golf.zettel] + deleted [alpha/] deleted [zz-archive.tag] EOM @@ -175,17 +175,17 @@ function clean_all_force_dirty_wd { # @test function clean_hidden { # @test prepare_checkouts - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder organize -mode commit-directly :z <<-EOM - - [one/uno !md zz-archive tag-3 tag-4] wow the first + - [alpha/golf !md zz-archive tag-3 tag-4] wow the first EOM assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] EOM run_dodder dormant-add zz-archive @@ -195,74 +195,74 @@ function clean_hidden { # @test run_dodder show :z assert_success assert_output - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - run_dodder checkout -force one/uno + run_dodder checkout -force alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] EOM run_dodder clean !md.z assert_success assert_output_unsorted - <<-EOM - deleted [one/] - deleted [one/dos.zettel] - deleted [one/uno.zettel] + deleted [alpha/] + deleted [alpha/hotel.zettel] + deleted [alpha/golf.zettel] EOM } function clean_mode_blob_hidden { # @test prepare_checkouts run_dodder organize -mode commit-directly :z <<-EOM - - [one/uno !md zz-archive tag-3 tag-4] wow the first + - [alpha/golf !md zz-archive tag-3 tag-4] wow the first EOM assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] EOM run_dodder dormant-add zz-archive assert_success assert_output '' - run_dodder checkout -force -mode blob one/uno + run_dodder checkout -force -mode blob alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive - one/uno.md] + checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive + alpha/golf.md] EOM run_dodder clean !md.z assert_success assert_output_unsorted - <<-EOM - deleted [one/uno.md] - deleted [one/dos.zettel] - deleted [one/] + deleted [alpha/golf.md] + deleted [alpha/hotel.zettel] + deleted [alpha/] EOM } function clean_mode_blob { # @test run_dodder_init_workspace - run_dodder checkout -mode blob one/uno + run_dodder checkout -mode blob alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - one/uno.md] + checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + alpha/golf.md] EOM run_dodder clean . assert_success assert_output_unsorted - <<-EOM - deleted [one/uno.md] - deleted [one/] + deleted [alpha/golf.md] + deleted [alpha/] EOM } diff --git a/zz-tests_bats/clone.bats b/zz-tests_bats/clone.bats index d6efda2ec..18facfb92 100644 --- a/zz-tests_bats/clone.bats +++ b/zz-tests_bats/clone.bats @@ -32,7 +32,7 @@ function bootstrap { run_dodder new -edit=false to_add assert_success assert_output - <<-EOM - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder new -edit=false - <<-EOM @@ -48,7 +48,7 @@ function bootstrap { assert_success assert_output - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM ) } @@ -78,7 +78,7 @@ function try_add_new_after_clone { assert_success assert_output - <<-EOM - [two/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [bravo/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM } @@ -96,8 +96,8 @@ function clone_history_zettel_type_tag { # @test assert_output_unsorted --regexp - <<-'EOM' \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] \[konfig @blake2b256-.* !toml-config-v2] - \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - \[one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc \(5 B) copied Blob blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m \(51 B) @@ -120,8 +120,8 @@ function clone_history_zettel_type_tag_stdio_local { # @test assert_output_unsorted --regexp - <<-EOM \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] \[konfig @blake2b256-.+ !toml-config-v2] - \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - \[one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc \(5 B) copied Blob blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m \(51 B) @@ -139,13 +139,13 @@ function clone_history_one_zettel_stdio_local { # @test run_clone_default_with \ test-repo-id-us \ "$(realpath them)" \ - o/d+ + a/h+ assert_success assert_output_unsorted --regexp - <<-'EOM' copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) \[konfig @blake2b256-.* !toml-config-v2] - \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM } @@ -163,8 +163,8 @@ function clone_history_zettel_type_tag_stdio_ssh { # @test assert_output_unsorted --regexp - <<-'EOM' \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] \[konfig @blake2b256-.+ !toml-config-v2] - \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - \[one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc \(5 B) copied Blob blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m \(51 B) @@ -188,8 +188,8 @@ function clone_history_default_allow_conflicts { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM try_add_new_after_clone @@ -218,8 +218,8 @@ function clone_history_zettel_type_tag_port { # @test assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] [konfig @b2c9398d2585afe1be26ed36a13703c051311256dc9dab03cf826b377ba237a6 !toml-config-v2] - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [this_is_the_first] [this_is_the_second] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) diff --git a/zz-tests_bats/complete.bats b/zz-tests_bats/complete.bats index 05bee481f..646a4f498 100644 --- a/zz-tests_bats/complete.bats +++ b/zz-tests_bats/complete.bats @@ -42,8 +42,8 @@ function complete_show_all { # @test .*InventoryList .*InventoryList !md.*Type - one/dos.*Zettel: !md wow ok again - one/uno.*Zettel: !md wow the first + alpha/hotel.*Zettel: !md wow ok again + alpha/golf.*Zettel: !md wow the first tag.*Tag tag.1.*Tag tag.2.*Tag @@ -57,8 +57,8 @@ function complete_show_zettels { # @test run_dodder complete show :z assert_success assert_output_unsorted --regexp - <<-EOM - one/dos.*Zettel: !md wow ok again - one/uno.*Zettel: !md wow the first + alpha/hotel.*Zettel: !md wow ok again + alpha/golf.*Zettel: !md wow the first EOM } diff --git a/zz-tests_bats/diff.bats b/zz-tests_bats/diff.bats index baf222a4d..66c8e3f41 100644 --- a/zz-tests_bats/diff.bats +++ b/zz-tests_bats/diff.bats @@ -29,12 +29,12 @@ function diff_all_same { # @test } function diff_all_diff { # @test - echo wowowow >>one/uno.zettel - run_dodder diff one/uno.zettel + echo wowowow >>alpha/golf.zettel + run_dodder diff alpha/golf.zettel assert_success assert_output - <<-EOM - --- one/uno:zettel - +++ one/uno.zettel + --- alpha/golf:zettel + +++ alpha/golf.zettel @@ -6,3 +6,4 @@ --- diff --git a/zz-tests_bats/edit.bats b/zz-tests_bats/edit.bats index c7eb92676..23805c350 100644 --- a/zz-tests_bats/edit.bats +++ b/zz-tests_bats/edit.bats @@ -20,14 +20,14 @@ function edit_and_change_workspace { # @test assert_success export EDITOR="/bin/bash -c 'echo \"this is the body 2\" > \"\$0\"'" - run_dodder edit one/uno + run_dodder edit alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] EOM - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf assert_success assert_output - <<-EOM this is the body 2 @@ -39,13 +39,13 @@ function edit_and_dont_change_workspace { # @test assert_success export EDITOR="true" - run_dodder edit one/uno + run_dodder edit alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf assert_success assert_output - <<-EOM last time @@ -58,13 +58,13 @@ function edit_and_dont_change_workspace { # @test function edit_and_change_no_workspace { # @test skip export EDITOR="/bin/bash -c 'echo \"this is the body 2\" > \"\$0\"'" - run_dodder edit one/uno + run_dodder edit alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] + [alpha/golf @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] EOM - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf assert_success assert_output - <<-EOM this is the body 2 @@ -74,12 +74,12 @@ function edit_and_change_no_workspace { # @test function edit_and_dont_change_no_workspace { # @test skip export EDITOR="true" - run_dodder edit one/uno + run_dodder edit alpha/golf assert_success assert_output - <<-EOM EOM - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf assert_success assert_output - <<-EOM last time @@ -101,13 +101,13 @@ function edit_and_format_no_workspace { # @test # shellcheck disable=SC2016 export EDITOR='bash -c "editor $0"' - run_dodder edit one/uno + run_dodder edit alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd] EOM - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf assert_success assert_output - <<-EOM last time diff --git a/zz-tests_bats/export.bats b/zz-tests_bats/export.bats index 79ede1248..fed2e99f5 100644 --- a/zz-tests_bats/export.bats +++ b/zz-tests_bats/export.bats @@ -23,15 +23,8 @@ function basic { # @test \[konfig @blake2b256-.+ .* !toml-config-v2] \[!md @blake2b256-.+ .* !toml-type-v1] - EOM - - assert_output_unsorted --regexp - <<-'EOM' - \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* !md@.* "wow ok again" tag-3 tag-4] - EOM - assert_output_unsorted --regexp - <<-'EOM' - \[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* !md@.* "wow the first" tag-3 tag-4] - EOM - assert_output_unsorted --regexp - <<-'EOM' - \[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* !md@.* "wow ok" tag-1 tag-2] + \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* !md@.* "wow ok again" tag-3 tag-4] + \[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* !md@.* "wow the first" tag-3 tag-4] + \[alpha/golf @blake2b256-.+ .* !md@.* "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/fix.bats b/zz-tests_bats/fix.bats index 63d9079d3..8e4be3d17 100644 --- a/zz-tests_bats/fix.bats +++ b/zz-tests_bats/fix.bats @@ -30,10 +30,10 @@ function can_update_blob { # @test run_dodder new -edit=false "$expected" assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- @@ -52,10 +52,10 @@ EOM echo the body but new } >"$new_akte" - run_dodder checkin-blob -new-tags et3 one/uno "$new_akte" + run_dodder checkin-blob -new-tags et3 alpha/golf "$new_akte" assert_success assert_output - <<-EOM - [one/uno @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] + [alpha/golf @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] EOM # then @@ -69,7 +69,7 @@ EOM echo the body but new } >"$expected" - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/format_object.bats b/zz-tests_bats/format_object.bats index 186d64dc1..e244237a2 100644 --- a/zz-tests_bats/format_object.bats +++ b/zz-tests_bats/format_object.bats @@ -36,7 +36,7 @@ function format_simple { # @test deleted [md.type] EOM - run_dodder format-object -mode both one/uno text + run_dodder format-object -mode both alpha/golf text assert_success assert_output --regexp - <<-EOM --- @@ -49,9 +49,9 @@ function format_simple { # @test last time EOM - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wow the second - tag-3 @@ -62,7 +62,7 @@ function format_simple { # @test last time but new EOM - run_dodder format-object -mode both one/uno.zettel text + run_dodder format-object -mode both alpha/golf.zettel text assert_success assert_output --regexp - <<-EOM --- @@ -86,7 +86,7 @@ function show_simple_one_zettel_binary { # @test assert_output_unsorted - <<-EOM deleted [file.bin] [!bin !toml-type-v1] - [two/uno @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + [bravo/golf @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM run_dodder checkout !bin:t @@ -110,7 +110,7 @@ function show_simple_one_zettel_binary { # @test [!bin @blake2b256-zhvux7vmpch9f44kvnua7n69f8jzgk5s7p9k2s3kuvkrcpjh07lse493jl !toml-type-v1] EOM - run_dodder format-object -mode both two/uno + run_dodder format-object -mode both bravo/golf assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/format_organize.bats b/zz-tests_bats/format_organize.bats index aff9ea5f5..e0c3e0bbc 100644 --- a/zz-tests_bats/format_organize.bats +++ b/zz-tests_bats/format_organize.bats @@ -223,9 +223,9 @@ function format_organize_recognized_fs_blob_with_newlines() { # @test skip run_dodder_init_disable_age run_dodder format-organize - <<-EOM - - [one/uno !pdf payee-x-heloc zz-inbox + - [alpha/golf !pdf payee-x-heloc zz-inbox "heloc-board/CO-OP Modified Clarity Comittment - letterhead.pdf"] CO-OP Modified Clarity Comittment - letterhead - - [two/dos !pdf area-money-tax + - [bravo/hotel !pdf area-money-tax heloc-board/2022 taxes.pdf] us tax return EOM assert_success diff --git a/zz-tests_bats/hide.bats b/zz-tests_bats/hide.bats index cadab28ae..d644a4361 100644 --- a/zz-tests_bats/hide.bats +++ b/zz-tests_bats/hide.bats @@ -17,8 +17,8 @@ function mark_one_as_hidden { # @test run_dodder show :z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder dormant-add tag-3 @@ -32,8 +32,8 @@ function mark_one_as_hidden { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder dormant-remove tag-3 @@ -43,7 +43,7 @@ function mark_one_as_hidden { # @test run_dodder show :z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM } diff --git a/zz-tests_bats/import.bats b/zz-tests_bats/import.bats index 111293a86..6586060e6 100644 --- a/zz-tests_bats/import.bats +++ b/zz-tests_bats/import.bats @@ -60,15 +60,15 @@ function import { # @test assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @$(get_type_blob_sha) .* !toml-type-v1] - \\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -86,10 +86,10 @@ function import_with_overwrite_sig { # @test --- [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m 2135591162.342034946 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-anhgqrkdqnn6uzvcaj93hr7epr72v8vefv0gkrhd7ktskl6pez2cr8kwe3krrndw8lefh8a7k5dzhete4pjk72zfp4vgf8f0srpksqsy6nn8g !toml-type-v1] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr !md "wow ok" tag-1 tag-2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-3ya9fl5nlx7e77qk4vvx2ae7cez8uagywym8f2h5r6f4ern2fhslgtvqjge6fzxjwkkgfr9qjpt0kjjq6slzrm7phraq9jm4z42q2qqnnh2eu !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-3ya9fl5nlx7e77qk4vvx2ae7cez8uagywym8f2h5r6f4ern2fhslgtvqjge6fzxjwkkgfr9qjpt0kjjq6slzrm7phraq9jm4z42q2qqnnh2eu !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] EOM list="$(realpath list)" @@ -109,15 +109,15 @@ function import_with_overwrite_sig { # @test assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @$(get_type_blob_sha) .* !toml-type-v1] - \\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -151,23 +151,23 @@ function import_with_overwrite_sig_different_hash { # @test assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @sha256-.+ .* !toml-type-v1] - \\[one/dos @sha256-95mv2p9mtaxxejqycc7fsvt55d3s8c0ptgazzgzgz4z7a3kvtujqa84qe8 .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[one/uno @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[one/uno @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[alpha/hotel @sha256-95mv2p9mtaxxejqycc7fsvt55d3s8c0ptgazzgzgz4z7a3kvtujqa84qe8 .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[alpha/golf @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[alpha/golf @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc !md "wow the first" tag-3 tag-4] + [alpha/golf @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc !md "wow the first" tag-3 tag-4] EOM - run_dodder_debug show -format sig one/uno+ + run_dodder_debug show -format sig alpha/golf+ - run_dodder show -format sig-mother one/uno + run_dodder show -format sig-mother alpha/golf assert_success assert_output - <<-EOM - [one/uno @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d !md "wow ok" tag-1 tag-2] + [alpha/golf @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d !md "wow ok" tag-1 tag-2] EOM } @@ -184,10 +184,10 @@ function import_with_dupes_in_list { # @test --- [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m 2135591162.342034946 !toml-type-v1] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 !md "wow ok" tag-1 tag-2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 !md "wow the first" tag-3 tag-4] EOM list="$(realpath list)" @@ -204,26 +204,26 @@ function import_with_dupes_in_list { # @test assert_success assert_output - <<-EOM copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format inventory_list +z,e,t assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @$(get_type_blob_sha) .* !toml-type-v1] - \\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -234,10 +234,10 @@ function import_one_tai_same { # @test run_dodder_init ) - run_dodder show -format tai one/uno + run_dodder show -format tai alpha/golf tai="$output" - run_dodder export -print-time=true one/uno [tag ^tag-1 ^tag-2]:e + run_dodder export -print-time=true alpha/golf [tag ^tag-1 ^tag-2]:e assert_success echo "$output" >list @@ -250,17 +250,17 @@ function import_one_tai_same { # @test assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format tai one/uno + run_dodder show -format tai alpha/golf assert_success assert_output "$tai" } @@ -272,7 +272,7 @@ function import_twice_no_dupes_one_zettel { # @test run_dodder_init ) - run_dodder export -print-time=true one/uno+ + run_dodder export -print-time=true alpha/golf+ assert_success echo "$output" >list @@ -285,8 +285,8 @@ function import_twice_no_dupes_one_zettel { # @test "$list" assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) EOM @@ -303,7 +303,7 @@ function import_twice_no_dupes_one_zettel { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -315,7 +315,7 @@ function import_conflict { # @test run_dodder_init ) - run_dodder export -print-time=true one/uno+ + run_dodder export -print-time=true alpha/golf+ assert_success echo "$output" >list @@ -333,7 +333,7 @@ function import_conflict { # @test EOM assert_success assert_output - <<-EOM - [one/uno @blake2b256-u20x7tfr58tc74p5y76xauwfrz382g96gfeenxvsaxaq6l3fnl2sntvzd5 !md "get out of here!" scary] + [alpha/golf @blake2b256-u20x7tfr58tc74p5y76xauwfrz382g96gfeenxvsaxaq6l3fnl2sntvzd5 !md "get out of here!" scary] EOM run_dodder import \ @@ -342,8 +342,8 @@ function import_conflict { # @test "$list" assert_failure assert_output --partial - <<-EOM - conflicted [one/uno] - conflicted [one/uno] + conflicted [alpha/golf] + conflicted [alpha/golf] EOM assert_output --partial - <<-EOM @@ -373,18 +373,18 @@ function import_twice_no_dupes { # @test copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder show +z,e,t assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder import \ @@ -398,17 +398,17 @@ function import_twice_no_dupes { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show +z,e,t assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -438,8 +438,8 @@ function import_inventory_lists { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/inventory_list_json.bats b/zz-tests_bats/inventory_list_json.bats index 1cbd0e4fe..aa7a35cf8 100644 --- a/zz-tests_bats/inventory_list_json.bats +++ b/zz-tests_bats/inventory_list_json.bats @@ -43,9 +43,9 @@ function json_init_and_checkin { # @test assert_success # Create one directory and modify a file - mkdir -p one + mkdir -p alpha - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # modified with json format - test-tag @@ -56,10 +56,10 @@ function json_init_and_checkin { # @test EOM # Checkin the file - this will test signature creation with JSON format - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success # Just verify it succeeded - the actual file name might vary - assert_output --regexp '\[one/[^ ]+ @blake2b256-.+ !md "modified with json format" test-tag\]' + assert_output --regexp '\[alpha/[^ ]+ @blake2b256-.+ !md "modified with json format" test-tag\]' # Show the inventory list to verify it's still JSON run_dodder show :b @@ -147,8 +147,8 @@ function json_signature_verification { # @test assert_success # Create directory and file - mkdir -p one - cat >one/uno.zettel <<-EOM + mkdir -p alpha + cat >alpha/golf.zettel <<-EOM --- # version 1 - tag-1 @@ -158,10 +158,10 @@ function json_signature_verification { # @test body 1 EOM - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # version 2 - tag-2 @@ -171,7 +171,7 @@ function json_signature_verification { # @test body 2 EOM - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success # Verify fsck passes (includes signature verification) diff --git a/zz-tests_bats/mergetool.bats b/zz-tests_bats/mergetool.bats index 75a1efeda..62f409dba 100644 --- a/zz-tests_bats/mergetool.bats +++ b/zz-tests_bats/mergetool.bats @@ -27,13 +27,13 @@ function mergetool_none { # @test function mergetool_conflict_base { run_dodder_init_workspace - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >one/dos.zettel <<-EOM + cat - >alpha/hotel.zettel <<-EOM --- # wow ok again - get_this_shit_merged @@ -45,31 +45,31 @@ function mergetool_conflict_base { not another one, conflict time EOM - run_dodder organize -mode commit-directly one/dos <<-EOM + run_dodder organize -mode commit-directly alpha/hotel <<-EOM --- ! txt2 --- # new-etikett-for-all - - [one/dos tag-3 tag-4] wow ok again + - [alpha/hotel tag-3 tag-4] wow ok again EOM assert_success assert_output_unsorted - <<-EOM [!txt2 !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM # TODO add better conflict printing output - run_dodder status one/dos.zettel + run_dodder status alpha/hotel.zettel assert_success assert_output - <<-EOM - conflicted [one/dos.zettel] + conflicted [alpha/hotel.zettel] EOM } @@ -79,23 +79,23 @@ function mergetool_conflict_one_local { # @test export BATS_TEST_BODY=true - run cat one/dos.conflict + run cat alpha/hotel.conflict assert_output --regexp - <<-'EOM' - \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* !txt2@.* "wow ok again" new-etikett-for-all tag-3 tag-4] - \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] - \[one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* !txt2@.* "wow ok again" new-etikett-for-all tag-3 tag-4] + \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] + \[alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !txt "wow ok again" get_this_shit_merged tag-3 tag-4] EOM # TODO add `-delete` option to `merge-tool` run_dodder merge-tool -merge-tool "/bin/bash -c 'cat \"\$0\" >\"\$3\"'" . assert_success assert_output - <<-EOM - deleted [one/dos.conflict] - deleted [one/dos.zettel] - deleted [one/] + deleted [alpha/hotel.conflict] + deleted [alpha/hotel.zettel] + deleted [alpha/] EOM - run_dodder show -format blob one/dos + run_dodder show -format blob alpha/hotel assert_success assert_output - <<-EOM not another one @@ -108,7 +108,7 @@ function mergetool_conflict_one_local { # @test run_dodder last assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] [!txt2 !toml-type-v1] EOM } @@ -122,13 +122,13 @@ function mergetool_conflict_one_remote { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] - deleted [one/dos.conflict] - deleted [one/dos.zettel] - deleted [one/] + [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + deleted [alpha/hotel.conflict] + deleted [alpha/hotel.zettel] + deleted [alpha/] EOM - run_dodder show -format blob one/dos + run_dodder show -format blob alpha/hotel assert_success assert_output - <<-EOM not another one, conflict time @@ -137,14 +137,14 @@ function mergetool_conflict_one_remote { # @test # run_dodder status . # assert_success # assert_output - <<-EOM - # changed [one/dos.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + # changed [alpha/hotel.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] # EOM run_dodder last assert_success assert_output_unsorted - <<-EOM [!txt !toml-type-v1] - [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] EOM } @@ -170,13 +170,13 @@ function mergetool_conflict_one_merged { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] - deleted [one/dos.conflict] - deleted [one/dos.zettel] - deleted [one/] + [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + deleted [alpha/hotel.conflict] + deleted [alpha/hotel.zettel] + deleted [alpha/] EOM - run_dodder show -format blob one/dos + run_dodder show -format blob alpha/hotel assert_success assert_output - <<-EOM not another one, conflict time @@ -185,14 +185,14 @@ function mergetool_conflict_one_merged { # @test # run_dodder status . # assert_success # assert_output - <<-EOM - # changed [one/dos.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + # changed [alpha/hotel.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] # EOM run_dodder last assert_success assert_output_unsorted - <<-EOM [!txt !toml-type-v1] - [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] EOM } diff --git a/zz-tests_bats/migration/main.bats b/zz-tests_bats/migration/main.bats index 8eabff7b8..cda0e1a6e 100644 --- a/zz-tests_bats/migration/main.bats +++ b/zz-tests_bats/migration/main.bats @@ -22,8 +22,8 @@ function migration_validate_schwanzen { # @test run_dodder show -format log :z,e,t assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -31,9 +31,9 @@ function migration_validate_history { # @test run_dodder show -format log +z,e,t assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -48,8 +48,8 @@ function migration_reindex { # @test assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/new.bats b/zz-tests_bats/new.bats index 903a418cc..4d114bbcc 100644 --- a/zz-tests_bats/new.bats +++ b/zz-tests_bats/new.bats @@ -17,7 +17,7 @@ function new_empty_no_edit { # @test run_dodder new -edit=false assert_success assert_output - <<-EOM - [two/uno !md] + [bravo/golf !md] EOM } @@ -26,8 +26,8 @@ function new_empty_edit { # @test run_dodder new assert_success assert_output - <<-EOM - [two/uno !md] - [two/uno @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + [bravo/golf !md] + [bravo/golf @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM } @@ -47,17 +47,17 @@ function can_duplicate_zettel_content { # @test run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [two/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [bravo/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [one/tres @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [alpha/india @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM # when - run_dodder show -format text two/uno + run_dodder show -format text bravo/golf assert_success assert_output --regexp - <<-EOM --- @@ -70,7 +70,7 @@ function can_duplicate_zettel_content { # @test the body EOM - run_dodder show -format text one/tres + run_dodder show -format text alpha/india assert_success assert_output --regexp - <<-EOM --- @@ -94,7 +94,7 @@ function use_blob_digests { # @test run_dodder new -edit=false -shas blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 assert_success assert_output - <<-EOM - [two/uno @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] + [bravo/golf @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] EOM the_blob2_digest="blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg" @@ -108,13 +108,13 @@ function use_blob_digests { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [one/tres @$the_blob2_digest !txt] + [alpha/india @$the_blob2_digest !txt] EOM run_dodder_stderr_unified new -edit=false -shas "$the_blob2_digest" assert_success assert_output --partial - <<-EOM - blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["one/tres"]). Ignoring + blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["alpha/india"]). Ignoring EOM } @@ -127,7 +127,7 @@ function new_empty_no_edit_workspace { # @test run_dodder new -edit=false assert_success assert_output - <<-EOM - [two/uno !md workspace-tags] + [bravo/golf !md workspace-tags] EOM } @@ -139,15 +139,15 @@ function new_empty_edit_workspace { # @test run_dodder new assert_success assert_output - <<-EOM - [two/uno !md workspace-tags] - checked out [two/uno.zettel !md workspace-tags] - [two/uno @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + [bravo/golf !md workspace-tags] + checked out [bravo/golf.zettel !md workspace-tags] + [bravo/golf @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM run_dodder status . assert_success assert_output - <<-EOM - same [two/uno.zettel @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + same [bravo/golf.zettel @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM } @@ -164,10 +164,10 @@ function new_zettel_file { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [two/uno !md "wow" ok] + [bravo/golf !md "wow" ok] EOM - run_dodder show -format text two/uno:z + run_dodder show -format text bravo/golf:z assert_success assert_output --regexp - <<-EOM --- @@ -191,10 +191,10 @@ function new_zettel_stdin { # @test run_dodder new -edit=false - <"$to_add" assert_success assert_output - <<-EOM - [two/uno !md "wow" ok] + [bravo/golf !md "wow" ok] EOM - run_dodder show -format text two/uno:z + run_dodder show -format text bravo/golf:z assert_success assert_output --regexp - <<-EOM --- @@ -218,10 +218,10 @@ function new_zettel { # @test run_dodder new -edit=false -description wow -tags ok assert_success assert_output - <<-EOM - [two/uno !md "wow" ok] + [bravo/golf !md "wow" ok] EOM - run_dodder show -format text two/uno:z + run_dodder show -format text bravo/golf:z assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/new_no_workspace.bats b/zz-tests_bats/new_no_workspace.bats index 8e508c676..7dbc622de 100644 --- a/zz-tests_bats/new_no_workspace.bats +++ b/zz-tests_bats/new_no_workspace.bats @@ -19,7 +19,7 @@ function new_empty_no_edit { # @test run_dodder new -edit=false assert_success assert_output - <<-EOM - [two/uno !md] + [bravo/golf !md] EOM } @@ -28,8 +28,8 @@ function new_empty_edit { # @test run_dodder new assert_success assert_output - <<-EOM - [two/uno !md] - [two/uno @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + [bravo/golf !md] + [bravo/golf @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM run_dodder status . @@ -52,17 +52,17 @@ function can_duplicate_zettel_content { # @test run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [two/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [bravo/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [one/tres @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [alpha/india @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM # when - run_dodder show -format text two/uno + run_dodder show -format text bravo/golf assert_success assert_output --regexp - <<-EOM --- @@ -75,7 +75,7 @@ function can_duplicate_zettel_content { # @test the body EOM - run_dodder show -format text one/tres + run_dodder show -format text alpha/india assert_success assert_output --regexp - <<-EOM --- @@ -99,7 +99,7 @@ function use_blob_digest { # @test run_dodder new -edit=false -shas blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 assert_success assert_output - <<-EOM - [two/uno @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] + [bravo/golf @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] EOM the_blob2_digest="blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg" @@ -113,12 +113,12 @@ function use_blob_digest { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [one/tres @$the_blob2_digest !txt] + [alpha/india @$the_blob2_digest !txt] EOM run_dodder_stderr_unified new -edit=false -shas "$the_blob2_digest" assert_success assert_output --partial - <<-EOM - blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["one/tres"]). Ignoring + blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["alpha/india"]). Ignoring EOM } diff --git a/zz-tests_bats/organize.bats b/zz-tests_bats/organize.bats index f323f6707..ba1bd4b96 100644 --- a/zz-tests_bats/organize.bats +++ b/zz-tests_bats/organize.bats @@ -43,7 +43,7 @@ function organize_empty_commit { # @test assert_success assert_output - <<-EOM - [two/uno !md "test"] + [bravo/golf !md "test"] EOM } @@ -54,13 +54,13 @@ function organize_simple { # @test assert_output_unsorted - <<-EOM - [!md !toml-type-v1] - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM } function organize_simple_commit { # @test - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success run_dodder organize -mode commit-directly :z,e,t <<-EOM @@ -71,14 +71,14 @@ function organize_simple_commit { # @test - [ tag-2] - [ tag-3] - [ tag-4] - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 %virtual_etikett new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" %virtual_etikett new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" %virtual_etikett new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" %virtual_etikett new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" %virtual_etikett new-etikett-for-all tag-3 tag-4] [tag-1 %virtual_etikett new-etikett-for-all] [tag-2 %virtual_etikett new-etikett-for-all] [tag-3 %virtual_etikett new-etikett-for-all] @@ -90,8 +90,8 @@ function organize_simple_commit { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] [tag-1 new-etikett-for-all] [tag-2 new-etikett-for-all] [tag-3 new-etikett-for-all] @@ -101,10 +101,10 @@ function organize_simple_commit { # @test } function organize_simple_checkedout_matchesmutter { # @test - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder organize -mode commit-directly :z,e,t <<-EOM @@ -115,8 +115,8 @@ function organize_simple_checkedout_matchesmutter { # @test - [ -tag-2] - [ -tag-3] - [ -tag-4] - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM @@ -126,8 +126,8 @@ function organize_simple_checkedout_matchesmutter { # @test [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] [-tag new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t @@ -139,25 +139,25 @@ function organize_simple_checkedout_matchesmutter { # @test [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] [-tag new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status one/dos.zettel + run_dodder status alpha/hotel.zettel assert_success assert_output - <<-EOM - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] EOM } function organize_simple_checkedout_merge_no_conflict { # @test - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >one/dos.zettel <<-EOM + cat - >alpha/hotel.zettel <<-EOM --- # wow ok again - get_this_shit_merged @@ -172,31 +172,31 @@ function organize_simple_checkedout_merge_no_conflict { # @test run_dodder organize -mode commit-directly :z,e,t <<-EOM # new-etikett-for-all - [ !md ] - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status one/dos.zettel + run_dodder status alpha/hotel.zettel assert_success assert_output - <<-EOM - conflicted [one/dos.zettel] + conflicted [alpha/hotel.zettel] EOM # assert_output - <<-EOM - # changed [one/dos.zettel @7ac3bdeb0ac8fd96cd7f8700a4bbc7a5d777fe26c50b52c20ecd726b255ec3d0 !md "wow ok again" get_this_shit_merged new-etikett-for-all tag-3 tag-4] + # changed [alpha/hotel.zettel @7ac3bdeb0ac8fd96cd7f8700a4bbc7a5d777fe26c50b52c20ecd726b255ec3d0 !md "wow ok again" get_this_shit_merged new-etikett-for-all tag-3 tag-4] # EOM } @@ -227,13 +227,13 @@ function organize_simple_checkedout_merge_conflict { # @test [!txt @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >one/dos.zettel <<-EOM + cat - >alpha/hotel.zettel <<-EOM --- # wow ok again modified - get_this_shit_merged @@ -256,8 +256,8 @@ function organize_simple_checkedout_merge_conflict { # @test - [ -tag-2] - [ -tag-3] - [ -tag-4] - - [one/dos !txt2 tag-3 tag-4] wow ok again different - - [one/uno !txt2 tag-3 tag-4] wow the first + - [alpha/hotel !txt2 tag-3 tag-4] wow ok again different + - [alpha/golf !txt2 tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM @@ -267,8 +267,8 @@ function organize_simple_checkedout_merge_conflict { # @test [-tag-2 new-etikett-for-all] [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t @@ -280,14 +280,14 @@ function organize_simple_checkedout_merge_conflict { # @test [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] [-tag new-etikett-for-all] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status one/dos.zettel + run_dodder status alpha/hotel.zettel assert_success assert_output - <<-EOM - conflicted [one/dos.zettel] + conflicted [alpha/hotel.zettel] EOM } @@ -309,13 +309,13 @@ function organize_hides_hidden_tags_from_organize { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [two/uno !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] + [bravo/golf !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] EOM - run_dodder show two/uno + run_dodder show bravo/golf assert_success assert_output - <<-EOM - [two/uno !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] + [bravo/golf !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] EOM run_dodder organize -mode output-only project-2021-dodder:z @@ -341,8 +341,8 @@ function organize_dry_run { # @test - [ -tag-2] - [ -tag-3] - [ -tag-4] - - [one/dos ] wow ok again - - [one/uno ] wow the first + - [alpha/hotel ] wow ok again + - [alpha/golf ] wow the first EOM assert_success @@ -359,8 +359,8 @@ function organize_with_type_output { # @test ! md --- - - [one/dos tag-3 tag-4] wow ok again - - [one/uno tag-3 tag-4] wow the first + - [alpha/golf tag-3 tag-4] wow the first + - [alpha/hotel tag-3 tag-4] wow ok again EOM } @@ -370,15 +370,15 @@ function organize_with_type_commit { # @test ! txt --- - - [one/dos tag-3 tag-4] wow ok again - - [one/uno tag-3 tag-4] wow the first + - [alpha/hotel tag-3 tag-4] wow ok again + - [alpha/golf tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM [!txt !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt "wow the first" tag-3 tag-4] EOM } @@ -391,13 +391,13 @@ function modify_description { # @test - [ tag-2] - [ tag-3] - [ tag-4] - - [one/dos !md tag-3 tag-4] wow ok again was modified - - [one/uno !md tag-3 tag-4] wow the first was modified too + - [alpha/hotel !md tag-3 tag-4] wow ok again was modified + - [alpha/golf !md tag-3 tag-4] wow the first was modified too EOM assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again was modified" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first was modified too" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again was modified" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first was modified too" tag-3 tag-4] [tag] [tag-1] [tag-2] @@ -431,12 +431,12 @@ function organize_v5_outputs_organize_one_tag { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [two/uno !md "wow" ok] + [bravo/golf !md "wow" ok] EOM - run_dodder show -format object-id o/u + run_dodder show -format object-id a/g assert_success - assert_output 'one/uno' + assert_output 'alpha/golf' run_dodder organize "${cmd_def_organize[@]}" -mode output-only ok assert_success @@ -445,7 +445,7 @@ function organize_v5_outputs_organize_one_tag { # @test - ok --- - - [two/uno !md] wow + - [bravo/golf !md] wow EOM } @@ -463,7 +463,7 @@ function organize_v5_outputs_organize_two_tags { # @test run_dodder new -edit=false "$to_add" assert_success assert_output_unsorted - <<-EOM - [two/uno !md "wow" brown ok] + [bravo/golf !md "wow" brown ok] EOM run_dodder organize "${cmd_def_organize[@]}" -mode output-only ok brown @@ -474,7 +474,7 @@ function organize_v5_outputs_organize_two_tags { # @test - ok --- - - [two/uno !md] wow + - [bravo/golf !md] wow EOM run_dodder organize "${cmd_def_organize[@]}" \ @@ -482,15 +482,15 @@ function organize_v5_outputs_organize_two_tags { # @test ok brown <<-EOM # ok - - [two/uno !md] wow + - [bravo/golf !md] wow EOM assert_success assert_output - <<-EOM - [two/uno !md "wow" ok] + [bravo/golf !md "wow" ok] EOM - run_dodder show -format text two/uno + run_dodder show -format text bravo/golf assert_success assert_output --regexp - <<-EOM --- @@ -516,7 +516,7 @@ function organize_v5_outputs_organize_one_tags_group_by_one { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [two/uno !md "wow" priority-1 priority-2 task] + [bravo/golf !md "wow" priority-1 priority-2 task] EOM run_dodder organize "${cmd_def_organize[@]}" \ @@ -530,11 +530,11 @@ function organize_v5_outputs_organize_one_tags_group_by_one { # @test # priority-1 - - [two/uno !md priority-2] wow + - [bravo/golf !md priority-2] wow # priority-2 - - [two/uno !md priority-1] wow + - [bravo/golf !md priority-1] wow EOM return @@ -556,11 +556,11 @@ function organize_v5_outputs_organize_one_tags_group_by_one { # @test ## -1 - - [two/uno !md] wow + - [bravo/golf !md] wow ## -2 - - [two/uno !md] wow + - [bravo/golf !md] wow EOM } @@ -568,7 +568,7 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes to_add="$(mktemp)" { echo "---" - echo "# one/uno" + echo "# alpha/golf" echo "- task" echo "- priority-1" echo "! md" @@ -578,13 +578,13 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes run_dodder new -edit=false "$to_add" assert_success assert_output_unsorted - <<-EOM - [two/uno !md "one/uno" priority-1 task] + [bravo/golf !md "alpha/golf" priority-1 task] EOM to_add="$(mktemp)" { echo "---" - echo "# two/dos" + echo "# bravo/hotel" echo "- task" echo "- priority-2" echo "! md" @@ -594,7 +594,7 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [one/tres !md "two/dos" priority-2 task] + [alpha/india !md "bravo/hotel" priority-2 task] EOM # add prefix joints @@ -607,11 +607,11 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes # priority-1 - - [two/uno !md] one/uno + - [bravo/golf !md] alpha/golf # priority-2 - - [one/tres !md] two/dos + - [alpha/india !md] bravo/hotel EOM } @@ -619,7 +619,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test to_add="$(mktemp)" { echo "---" - echo "# one/uno" + echo "# alpha/golf" echo "- task" echo "- priority-1" echo "- w-2022-07-07" @@ -633,7 +633,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test to_add="$(mktemp)" { echo "---" - echo "# two/dos" + echo "# bravo/hotel" echo "- task" echo "- priority-1" echo "- w-2022-07-06" @@ -666,17 +666,17 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test echo echo "### w-2022-07-06" echo - echo "- [one/dos !md] two/dos" + echo "- [alpha/hotel !md] bravo/hotel" echo echo "## priority-2" echo echo "### w-2022-07-07" echo - echo "- [one/uno !md] one/uno" + echo "- [alpha/golf !md] alpha/golf" echo echo "###" echo - echo "- [two/uno !md] 3" + echo "- [bravo/golf !md] 3" } >"$expected_organize" run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly -group-by priority,w task <"$expected_organize" @@ -685,7 +685,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test to_add="$(mktemp)" { echo "---" - echo "# one/uno" + echo "# alpha/golf" echo "- priority-2" echo "- task" echo "- w-2022-07-07" @@ -693,11 +693,11 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test echo "---" } >"$to_add" - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- -# one/uno +# alpha/golf - priority-2 - task - w-2022-07-07 @@ -705,7 +705,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test --- EOM - run_dodder show -format text two/uno + run_dodder show -format text bravo/golf assert_success assert_output --regexp - <<-EOM --- @@ -721,7 +721,7 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes to_add="$(mktemp)" { echo "---" - echo "# one/uno" + echo "# alpha/golf" echo "- task" echo "- priority-1" echo "- w-2022-07-07" @@ -745,7 +745,7 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes to_add="$(mktemp)" { echo "---" - echo "# two/dos" + echo "# bravo/hotel" echo "- task" echo "- priority-1" echo "- w-2022-07-06" @@ -784,13 +784,13 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes echo "## priority-1" echo "- new zettel two" echo "### w-2022-07-06" - echo "- [one/dos !md] two/dos" + echo "- [alpha/hotel !md] bravo/hotel" echo "## priority-2" echo "### w-2022-07-07" - echo "- [one/uno !md] one/uno" + echo "- [alpha/golf !md] alpha/golf" echo "###" echo "- new zettel three" - echo "- [two/uno !md] 3" + echo "- [bravo/golf !md] 3" } >"$expected_organize" run_dodder organize \ @@ -800,11 +800,11 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes task <"$expected_organize" assert_success - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- -# one/uno +# alpha/golf - priority-2 - task - w-2022-07-07 @@ -812,7 +812,7 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes --- EOM - run_dodder show -format text two/uno + run_dodder show -format text bravo/golf assert_success assert_output --regexp - <<-EOM --- @@ -823,13 +823,13 @@ EOM --- EOM - run_dodder show -format text one/tres + run_dodder show -format text alpha/india assert_success - run_dodder show -format text two/dos + run_dodder show -format text bravo/hotel assert_success - run_dodder show -format text three/uno + run_dodder show -format text charlie/golf assert_success { @@ -849,7 +849,7 @@ function organize_v5_commits_no_changes { # @test one="$(mktemp)" { echo "---" - echo "# one/uno" + echo "# alpha/golf" echo "- priority-1" echo "- task" echo "- w-2022-07-07" @@ -860,13 +860,13 @@ function organize_v5_commits_no_changes { # @test run_dodder new -edit=false "$one" assert_success assert_output_unsorted - <<-EOM - [two/uno !md "one/uno" priority-1 task w-2022-07-07] + [bravo/golf !md "alpha/golf" priority-1 task w-2022-07-07] EOM two="$(mktemp)" { echo "---" - echo "# two/dos" + echo "# bravo/hotel" echo "- priority-1" echo "- task" echo "- w-2022-07-06" @@ -877,7 +877,7 @@ function organize_v5_commits_no_changes { # @test run_dodder new -edit=false "$two" assert_success assert_output_unsorted - <<-EOM - [one/tres !md "two/dos" priority-1 task w-2022-07-06] + [alpha/india !md "bravo/hotel" priority-1 task w-2022-07-06] EOM three="$(mktemp)" @@ -894,7 +894,7 @@ function organize_v5_commits_no_changes { # @test run_dodder new -edit=false "$three" assert_success assert_output_unsorted - <<-EOM - [two/dos !md "3" priority-1 task w-2022-07-06] + [bravo/hotel !md "3" priority-1 task w-2022-07-06] EOM # TODO add prefix joints @@ -911,12 +911,12 @@ function organize_v5_commits_no_changes { # @test ## w-2022-07-06 - - [one/tres !md] two/dos - - [two/dos !md] 3 + - [alpha/india !md] bravo/hotel + - [bravo/hotel !md] 3 ## w-2022-07-07 - - [two/uno !md] one/uno + - [bravo/golf !md] alpha/golf EOM @@ -938,19 +938,19 @@ function organize_v5_commits_no_changes { # @test ##### -06 - - [two/uno !md] one/uno + - [bravo/golf !md] alpha/golf ##### -07 - - [one/tres !md] two/dos - - [two/dos !md] 3 + - [alpha/india !md] bravo/hotel + - [bravo/hotel !md] 3 EOM assert_success assert_output_unsorted - <<-EOM - [one/tres !md "two/dos" priority-1 task w-2022-07-07] - [two/dos !md "3" priority-1 task w-2022-07-07] - [two/uno !md "one/uno" priority-1 task w-2022-07-06] + [alpha/india !md "bravo/hotel" priority-1 task w-2022-07-07] + [bravo/hotel !md "3" priority-1 task w-2022-07-07] + [bravo/golf !md "alpha/golf" priority-1 task w-2022-07-06] EOM } @@ -958,7 +958,7 @@ function organize_v5_commits_dependent_leaf { # @test one="$(mktemp)" { echo "---" - echo "# one/uno" + echo "# alpha/golf" echo "- priority-1" echo "- task" echo "- w-2022-07-07" @@ -972,7 +972,7 @@ function organize_v5_commits_dependent_leaf { # @test two="$(mktemp)" { echo "---" - echo "# two/dos" + echo "# bravo/hotel" echo "- priority-1" echo "- task" echo "- w-2022-07-06" @@ -1003,10 +1003,10 @@ function organize_v5_commits_dependent_leaf { # @test echo "## priority-2" echo "### w-2022-07" echo "#### -07" - echo "- [one/dos !md] two/dos" - echo "- [two/uno !md] 3" + echo "- [alpha/hotel !md] bravo/hotel" + echo "- [bravo/golf !md] 3" echo "#### -08" - echo "- [one/uno !md] one/uno" + echo "- [alpha/golf !md] alpha/golf" echo "###" } >"$expected_organize" @@ -1036,7 +1036,7 @@ function organize_v5_zettels_in_correct_places { # @test - inventory-pipe_shelves-atheist_shoes_box-jabra_yellow_box_2 --- - - [two/uno !md] jabra coral usb_a-to-usb_c cable + - [bravo/golf !md] jabra coral usb_a-to-usb_c cable EOM } @@ -1051,21 +1051,21 @@ function organize_v5_tags_correct { # @test assert_success assert_output - <<-EOM - [two/uno !md "zettel bez" test1-wow] + [bravo/golf !md "zettel bez" test1-wow] EOM - mkdir -p one + mkdir -p alpha { echo "---" echo "- test4" echo "! md" echo "---" - } >"one/uno.zettel" + } >"alpha/golf.zettel" - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success assert_output - <<-EOM - [one/uno !md test4] + [alpha/golf !md test4] EOM # TODO-P2 fix issue with kennung schwanzen @@ -1073,18 +1073,18 @@ function organize_v5_tags_correct { # @test # assert_output - <<-EOM # EOM - mkdir -p one + mkdir -p alpha { echo "---" echo "- test4" echo "- test1-ok" echo "! md" echo "---" - } >"one/uno.zettel" + } >"alpha/golf.zettel" - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_output - <<-EOM - [one/uno !md test1-ok test4] + [alpha/golf !md test1-ok test4] EOM } @@ -1092,8 +1092,8 @@ function organize_remove_anchored_metadata { # @test run_dodder show tag-3:z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly tag-3 <<-EOM --- @@ -1103,8 +1103,8 @@ function organize_remove_anchored_metadata { # @test assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-4] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-4] EOM run_dodder show tag-3:z @@ -1114,10 +1114,10 @@ function organize_remove_anchored_metadata { # @test } function organize_update_checkout { # @test - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly :z <<-EOM @@ -1125,43 +1125,43 @@ function organize_update_checkout { # @test - test --- - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test] EOM run_dodder status assert_success assert_output_unsorted - <<-EOM - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] EOM } function organize_update_checkout_remove_tags { # @test - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly :z <<-EOM - - [one/dos !md] wow ok again - - [one/uno !md] wow the first + - [alpha/hotel !md] wow ok again + - [alpha/golf !md] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first"] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first"] EOM run_dodder status assert_success assert_output_unsorted - <<-EOM - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] EOM } @@ -1177,8 +1177,8 @@ function create_structured_zettels { # @test assert_success assert_output_unsorted - <<-EOM [!task !toml-type-v1] - [one/tres !task "second" tag-3 test] - [two/uno !md "first" test] + [alpha/india !task "second" tag-3 test] + [bravo/golf !md "first" test] EOM } @@ -1196,19 +1196,19 @@ function description_with_literal_characters { # @test function tags_with_extended_tags_noop { # @test run_dodder organize -mode commit-directly :z <<-EOM # new-etikett-for-all - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder organize -mode output-only new:z <<-EOM # new-etikett-for-all - - [one/dos !md tag-3 tag-4] wow ok again - - [one/uno !md tag-3 tag-4] wow the first + - [alpha/hotel !md tag-3 tag-4] wow ok again + - [alpha/golf !md tag-3 tag-4] wow the first EOM assert_success assert_output - <<-EOM @@ -1216,15 +1216,15 @@ function tags_with_extended_tags_noop { # @test - new --- - - [one/dos !md new-etikett-for-all tag-3 tag-4] wow ok again - - [one/uno !md new-etikett-for-all tag-3 tag-4] wow the first + - [alpha/golf !md new-etikett-for-all tag-3 tag-4] wow the first + - [alpha/hotel !md new-etikett-for-all tag-3 tag-4] wow ok again EOM run_dodder organize -mode commit-directly new:z <<-EOM # new - - [one/dos !md new-etikett-for-all tag-3 tag-4] wow ok again - - [one/uno !md new-etikett-for-all tag-3 tag-4] wow the first + - [alpha/golf !md new-etikett-for-all tag-3 tag-4] wow the first + - [alpha/hotel !md new-etikett-for-all tag-3 tag-4] wow ok again EOM assert_success assert_output '' @@ -1263,7 +1263,7 @@ function organize_new_objects_default_tags { # @test run_dodder organize assert_success assert_output - <<-EOM - [two/uno !md "new zettel object"] + [bravo/golf !md "new zettel object"] EOM # shellcheck disable=SC2317 @@ -1274,7 +1274,7 @@ function organize_new_objects_default_tags { # @test run_dodder organize assert_success assert_output - <<-EOM - [one/tres !md "new zettel object" zz-inbox] + [alpha/india !md "new zettel object" zz-inbox] EOM } @@ -1288,7 +1288,7 @@ function object_with_newline_in_description { # @test EOM assert_success assert_output_unsorted - <<-EOM - [two/uno !md "description that has newline"] + [bravo/golf !md "description that has newline"] EOM } @@ -1297,8 +1297,8 @@ function organize_checked_out { # @test assert_success assert_output_unsorted - <<-EOM checked out [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder organize -mode output-only . @@ -1306,8 +1306,8 @@ function organize_checked_out { # @test assert_output - <<-EOM - [md.type !toml-type-v1] - - [one/dos.zettel !md tag-3 tag-4] wow ok again - - [one/uno.zettel !md tag-3 tag-4] wow the first + - [alpha/golf.zettel !md tag-3 tag-4] wow the first + - [alpha/hotel.zettel !md tag-3 tag-4] wow ok again EOM } @@ -1381,7 +1381,7 @@ function organize_default_tags_workspace { # @test EOM assert_success assert_output_unsorted - <<-EOM - [two/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "test default tags" tag-3 today zz-inbox] + [bravo/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "test default tags" tag-3 today zz-inbox] EOM actual="$(mktemp)" @@ -1394,7 +1394,7 @@ function organize_default_tags_workspace { # @test # tag-3 - - [two/uno !md zz-inbox] test default tags + - [bravo/golf !md zz-inbox] test default tags EOM } @@ -1451,8 +1451,8 @@ function organize_dot_operator_workspace_delete_files { # @test run_dodder organize . assert_success assert_output - <<-EOM - [two/uno @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "1" tag-3 tag-two] - [one/tres @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "2" tag-3 tag-one] + [bravo/golf @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "1" tag-3 tag-two] + [alpha/india @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "2" tag-3 tag-one] deleted [1.md] deleted [2.md] EOM diff --git a/zz-tests_bats/pull.bats b/zz-tests_bats/pull.bats index 19ce5d2c5..853b2ac9e 100644 --- a/zz-tests_bats/pull.bats +++ b/zz-tests_bats/pull.bats @@ -45,7 +45,7 @@ function bootstrap_content { run_dodder new -edit=false to_add assert_success assert_output - <<-EOM - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder new -edit=false - <<-EOM @@ -61,7 +61,7 @@ function bootstrap_content { assert_success assert_output - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM cat - >task.type <<-EOM @@ -88,7 +88,7 @@ function try_add_new_after_pull { assert_success assert_output - <<-EOM - [two/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [bravo/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM } @@ -117,8 +117,8 @@ function pull_history_zettel_type_tag_no_conflicts { # @test copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM @@ -148,8 +148,8 @@ function pull_history_zettel_type_tag_no_conflicts_stdio_local { # @test copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM @@ -166,18 +166,18 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test copy_from_version "$DIR" - run_dodder show one/dos+ + run_dodder show alpha/hotel+ assert_success assert_output - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder show +z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder remote-add \ @@ -195,9 +195,9 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test assert_failure assert_output_unsorted --partial - <<-EOM copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) - conflicted [one/uno] + conflicted [alpha/golf] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) - conflicted [one/dos] + conflicted [alpha/hotel] copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] import failed with conflicts, merging required @@ -213,40 +213,40 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test run_dodder status assert_success assert_output_unsorted - <<-EOM - conflicted [one/dos] - conflicted [one/uno] + conflicted [alpha/hotel] + conflicted [alpha/golf] EOM run_dodder show +z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder merge-tool -merge-tool "/bin/bash -c 'cat \"\$2\" >\"\$3\"'" . assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] - deleted [one/dos.conflict] - deleted [one/uno.conflict] - deleted [one/] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + deleted [alpha/hotel.conflict] + deleted [alpha/golf.conflict] + deleted [alpha/] EOM # TODO make sure merging includes the REMOTE in addition to the MERGED run_dodder show +z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show -format text one/dos + run_dodder show -format text alpha/hotel assert_success assert_output --regexp - <<-EOM --- @@ -259,11 +259,11 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test zettel with multiple etiketten body EOM - run_dodder show one/dos+ + run_dodder show alpha/hotel+ assert_success assert_output - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM try_add_new_after_pull @@ -286,7 +286,7 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te assert_success assert_output - <<-EOM - [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM them="them" @@ -310,9 +310,9 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te # TODO address the bandaid of two `[tag]` objects assert_output_unsorted - <<-EOM copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM @@ -321,7 +321,7 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te assert_success assert_output_unsorted '' - run_dodder show -format text one/dos + run_dodder show -format text alpha/hotel assert_success assert_output --regexp - <<-EOM --- @@ -334,11 +334,11 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te zettel with multiple etiketten body EOM - run_dodder show one/uno+ + run_dodder show alpha/golf+ assert_success assert_output - <<-EOM - [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } @@ -359,7 +359,7 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test assert_success assert_output - <<-EOM - [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM them="them" @@ -382,9 +382,9 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test assert_failure assert_output_unsorted --partial - <<-EOM - conflicted [one/uno] + conflicted [alpha/golf] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) @@ -398,18 +398,18 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test run_dodder status assert_success assert_output_unsorted - <<-EOM - conflicted [one/uno] + conflicted [alpha/golf] EOM run_dodder merge-tool -merge-tool "/bin/bash -c 'cat \"\$2\" >\"\$3\"'" . assert_success assert_output - <<-EOM - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] - deleted [one/uno.conflict] - deleted [one/] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + deleted [alpha/golf.conflict] + deleted [alpha/] EOM - run_dodder show -format text one/dos + run_dodder show -format text alpha/hotel assert_success assert_output --regexp - <<-EOM --- @@ -422,11 +422,11 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test zettel with multiple etiketten body EOM - run_dodder show one/uno+ + run_dodder show alpha/golf+ assert_success assert_output - <<-EOM - [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } @@ -455,15 +455,15 @@ function pull_history_default_no_conflict { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM - run_dodder show one/dos+ + run_dodder show alpha/hotel+ assert_success assert_output - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM run_dodder show !md:t @@ -500,17 +500,17 @@ function pull_history_zettel_one_abbr { # @test \[/them @[0-9a-z]+ !toml-repo-dotenv_xdg-v0] EOM - run_dodder pull -include-blobs=false /them o/u+ + run_dodder pull -include-blobs=false /them a/g+ assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show one/uno+ + run_dodder show alpha/golf+ assert_success assert_output - <<-EOM - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } @@ -536,17 +536,17 @@ function pull_history_zettels_no_conflict_no_blobs { # @test assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show one/dos+ + run_dodder show alpha/hotel+ assert_success assert_output - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM - run_dodder show -format blob one/dos + run_dodder show -format blob alpha/hotel assert_failure try_add_new_after_pull diff --git a/zz-tests_bats/push.bats b/zz-tests_bats/push.bats index da3bc3fee..88a25f14f 100644 --- a/zz-tests_bats/push.bats +++ b/zz-tests_bats/push.bats @@ -34,7 +34,7 @@ function bootstrap_with_content { run_dodder new -edit=false to_add assert_success assert_output - <<-EOM - [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder new -edit=false - <<-EOM @@ -50,7 +50,7 @@ function bootstrap_with_content { assert_success assert_output - <<-EOM - [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM ) } @@ -110,9 +110,9 @@ function push_history_zettel_type_tag_no_conflicts { # @test assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) @@ -124,9 +124,9 @@ function push_history_zettel_type_tag_no_conflicts { # @test assert_output_unsorted - <<-EOM [konfig @$(get_konfig_sha) !toml-config-v2] [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM ) } @@ -143,9 +143,9 @@ function push_history_zettel_type_tag_yes_conflicts { # @test assert_failure assert_output_unsorted - <<-EOM - conflicted [one/dos] - conflicted [one/uno] - conflicted [one/uno] + conflicted [alpha/hotel] + conflicted [alpha/golf] + conflicted [alpha/golf] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) @@ -158,8 +158,8 @@ function push_history_zettel_type_tag_yes_conflicts { # @test run_dodder status . assert_output_unsorted - <<-EOM - conflicted [one/dos] - conflicted [one/uno] + conflicted [alpha/hotel] + conflicted [alpha/golf] untracked [to_add @blake2b256-45lpe4rm9mjvdx8pt04kp5gh04uy77h0m0xtw2fhr0q7vl98g0vqls6hxe] EOM ) @@ -168,9 +168,9 @@ function push_history_zettel_type_tag_yes_conflicts { # @test assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -194,9 +194,9 @@ function push_history_default { # @test run_dodder show +?z,e,t assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM pushd them || exit 1 @@ -204,9 +204,9 @@ function push_history_default { # @test assert_output_unsorted - <<-EOM [konfig @$(get_konfig_sha) !toml-config-v2] [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -239,9 +239,9 @@ function push_history_default_only_blobs { # @test run_dodder show +?z,e,t assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM pushd them || exit 1 @@ -278,8 +278,8 @@ function push_default_stdio_local_once { # @test run_dodder show :zettel assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -301,16 +301,16 @@ function push_history_default_stdio_local_twice { # @test assert_output_unsorted --partial - <<-EOM copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM pushd them || exit 1 run_dodder show :zettel assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM popd || exit 1 @@ -339,8 +339,8 @@ function push_history_default_stdio_twice { # @test assert_success assert_line --regexp '\[/them @blake2b256-.+ !toml-repo-local_override_path-v0]' assert_line --regexp '\[[0-9]+\.[0-9]+ @blake2b256-.+ !inventory_list-v2]' - assert_line --partial '[one/dos @blake2b256-' - assert_line --partial '[one/uno @blake2b256-' + assert_line --partial '[alpha/hotel @blake2b256-' + assert_line --partial '[alpha/golf @blake2b256-' assert_line --regexp 'copied Blob blake2b256-.+ \(.*\)' pushd them || exit 1 @@ -354,9 +354,9 @@ function push_history_default_stdio_twice { # @test \[[0-9]+\.[0-9]+ @blake2b256-.+ !inventory_list-v2] \[[0-9]+\.[0-9]+ @blake2b256-.+ !inventory_list-v2] \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - \[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - \[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + \[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + \[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM popd || exit 1 diff --git a/zz-tests_bats/recursive_tags.bats b/zz-tests_bats/recursive_tags.bats index 8ca56e587..efc98f723 100644 --- a/zz-tests_bats/recursive_tags.bats +++ b/zz-tests_bats/recursive_tags.bats @@ -34,8 +34,8 @@ function recursive_tags_add_one { # @test assert_success assert_output_unsorted - <<-EOM [tag-3 recurse] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -74,15 +74,15 @@ function recursive_tags_add_one_super_tags { # @test assert_output_unsorted - <<-EOM [tag-3 recurse] [tag-3-sub] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format tags-path recurse:z,e assert_success assert_output_unsorted - <<-EOM - one/dos [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] - one/uno [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + alpha/hotel [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + alpha/golf [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] tag-3 [Paths: [TypeDirect:[recurse] TypeSelf:[tag-3]], All: [recurse:[TypeDirect:[recurse]] tag-3:[TypeSelf:[tag-3]]]] tag-3-sub [Paths: [TypeSuper:[tag-3 -> recurse] TypeSelf:[tag-3-sub]], All: [recurse:[TypeSuper:[tag-3 -> recurse]] tag-3:[TypeSuper:[tag-3 -> recurse]] tag-3-sub:[TypeSelf:[tag-3-sub]]]] EOM @@ -90,8 +90,8 @@ function recursive_tags_add_one_super_tags { # @test run_dodder show -format tags-path recurse:e,z assert_success assert_output_unsorted - <<-EOM - one/dos [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] - one/uno [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + alpha/hotel [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + alpha/golf [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] tag-3 [Paths: [TypeDirect:[recurse] TypeSelf:[tag-3]], All: [recurse:[TypeDirect:[recurse]] tag-3:[TypeSelf:[tag-3]]]] tag-3-sub [Paths: [TypeSuper:[tag-3 -> recurse] TypeSelf:[tag-3-sub]], All: [recurse:[TypeSuper:[tag-3 -> recurse]] tag-3:[TypeSuper:[tag-3 -> recurse]] tag-3-sub:[TypeSelf:[tag-3-sub]]]] EOM @@ -115,19 +115,19 @@ function recursive_tags_with_same_root { # @test [project-one-crit priority-0_must] EOM - run_dodder organize -mode commit-directly one/uno <<-EOM + run_dodder organize -mode commit-directly alpha/golf <<-EOM # project-one-crit, project-one-general - - [one/uno] + - [alpha/golf] EOM assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] EOM run_dodder show priority-0_must:z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] EOM } diff --git a/zz-tests_bats/reindex.bats b/zz-tests_bats/reindex.bats index 484885e03..66c5e981b 100644 --- a/zz-tests_bats/reindex.bats +++ b/zz-tests_bats/reindex.bats @@ -23,17 +23,17 @@ function reindex_simple { # @test assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder show -format tags-path :e,z,t assert_success assert_output_unsorted - <<-EOM !md [Paths: [], All: []] - one/dos [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] - one/uno [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] + alpha/hotel [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] + alpha/golf [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] EOM } @@ -42,9 +42,9 @@ function reindex_simple_twice { # @test cat - >"$expected" <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder reindex @@ -106,9 +106,9 @@ function reindex_after_changes { # @test [!md @$(get_type_blob_sha) !toml-type-v1] [!md @blake2b256-473260as3d3pd4uramcc60877srvpkxs4krlap45dkl3mfvq2npq2duvvq !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM verify diff --git a/zz-tests_bats/revert.bats b/zz-tests_bats/revert.bats index d0591a20c..75a3ff15e 100644 --- a/zz-tests_bats/revert.bats +++ b/zz-tests_bats/revert.bats @@ -14,10 +14,10 @@ teardown() { } function revert_one_zettel { # @test - run_dodder revert one/uno + run_dodder revert alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -25,7 +25,7 @@ function revert_all_zettels { # @test run_dodder revert :z assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -35,18 +35,18 @@ function revert_last { # @test run_dodder revert -last assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder last assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/show.bats b/zz-tests_bats/show.bats index 16d51c806..dc338bfe8 100644 --- a/zz-tests_bats/show.bats +++ b/zz-tests_bats/show.bats @@ -16,7 +16,7 @@ teardown() { # bats file_tags=user_story:query function show_simple_one_zettel { # @test - run_dodder show -format text one/uno + run_dodder show -format text alpha/golf assert_success assert_output --regexp - <<-EOM --- @@ -44,10 +44,10 @@ function show_simple_one_zettel_with_description_with_quotes { # @test EOM assert_success assert_output - <<-EOM - [two/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "see these \"quotes\""] + [bravo/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "see these \"quotes\""] EOM - run_dodder show -format text two/uno: + run_dodder show -format text bravo/golf: assert_success assert_output --regexp - <<-EOM --- @@ -60,7 +60,7 @@ function show_simple_one_zettel_with_description_with_quotes { # @test } function show_simple_one_zettel_with_sigil { # @test - run_dodder show -format text one/uno: + run_dodder show -format text alpha/golf: assert_success assert_output --regexp - <<-EOM --- @@ -75,7 +75,7 @@ function show_simple_one_zettel_with_sigil { # @test } function show_simple_one_zettel_with_sigil_and_genre { # @test - run_dodder show -format text one/uno:zettel + run_dodder show -format text alpha/golf:zettel assert_success assert_output --regexp - <<-EOM --- @@ -93,16 +93,16 @@ function show_simple_one_zettel_checked_out { # @test run_dodder init-workspace assert_success - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show one/uno.zettel + run_dodder show alpha/golf.zettel assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -118,14 +118,14 @@ function show_simple_one_zettel_hidden { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -137,14 +137,14 @@ function show_simple_one_zettel_hidden_past { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -165,7 +165,7 @@ function show_simple_one_zettel_binary { # @test assert_output_unsorted - <<-EOM deleted [file.bin] [!bin !toml-type-v1] - [two/uno @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + [bravo/golf @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM cat >bin.type <<-EOM @@ -183,7 +183,7 @@ function show_simple_one_zettel_binary { # @test [!bin @blake2b256-zhvux7vmpch9f44kvnua7n69f8jzgk5s7p9k2s3kuvkrcpjh07lse493jl !toml-type-v1] EOM - run_dodder show -format text two/uno + run_dodder show -format text bravo/golf assert_success assert_output - <<-EOM --- @@ -194,14 +194,14 @@ function show_simple_one_zettel_binary { # @test } function show_history_one_zettel { # @test - run_dodder show one/uno+z + run_dodder show alpha/golf+z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM - run_dodder show -format text one/uno+z + run_dodder show -format text alpha/golf+z assert_success assert_output_unsorted --regexp - <<-EOM --- @@ -227,8 +227,8 @@ function show_zettel_tag { # @test run_dodder show tag-3:z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format blob tag-3:z @@ -241,8 +241,8 @@ function show_zettel_tag { # @test run_dodder show -format sku-metadata-sans-tai tag-3:z assert_success assert_output_unsorted - <<-EOM - Zettel one/dos blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" - Zettel one/uno blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" + Zettel alpha/hotel blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" + Zettel alpha/golf blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" EOM } @@ -253,8 +253,8 @@ function show_zettels_with_tag_no_workspace_folder { # @test run_dodder show tag assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -262,13 +262,13 @@ function show_zettel_tag_complex { # @test run_dodder init-workspace assert_success - run_dodder checkout o/u + run_dodder checkout a/g assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wow the first - tag-3 @@ -283,15 +283,15 @@ function show_zettel_tag_complex { # @test # run_dodder show -verbose tag-3.z tag-5.z # assert_success # assert_output_unsorted - <<-EOM - # [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] + # [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] # EOM - run_dodder checkin -delete one/uno.zettel + run_dodder checkin -delete alpha/golf.zettel run_dodder show [tag-3 tag-5]:z assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] EOM run_dodder show -format blob [tag-3 tag-5]:z @@ -303,7 +303,7 @@ function show_zettel_tag_complex { # @test run_dodder show -format sku-metadata-sans-tai [tag-3 tag-5]:z assert_success assert_output_unsorted --partial - <<-EOM - Zettel one/uno blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-5 "wow the first" + Zettel alpha/golf blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-5 "wow the first" EOM } @@ -311,8 +311,8 @@ function show_complex_zettel_tag_negation { # @test run_dodder show ^-etikett-two:z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -321,8 +321,8 @@ function show_simple_all { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format blob :z,t @@ -338,8 +338,8 @@ function show_simple_all { # @test assert_success assert_output_unsorted - <<-EOM Type !md blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1 - Zettel one/dos blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" - Zettel one/uno blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" + Zettel alpha/hotel blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" + Zettel alpha/golf blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" EOM } @@ -438,9 +438,9 @@ function show_history_all { # @test assert_output_unsorted - <<-EOM [konfig @$(get_konfig_sha) !toml-config-v2] [!md @$(get_type_blob_sha) !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -471,8 +471,8 @@ function show_tag_toml { # @test run_dodder show true assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -503,8 +503,8 @@ function show_tag_lua_v1 { # @test run_dodder show true assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] true true EOM @@ -537,8 +537,8 @@ function show_tag_lua_v2 { # @test run_dodder show true assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] true true EOM @@ -609,12 +609,12 @@ function show_builtin_type_md { # @test # bats file_tags=user_story:workspace function show_workspace_default { # @test - run_dodder organize -mode commit-directly one/uno <<-EOM - - [one/uno !md tag-3 tag-4 tag-5] wow the first + run_dodder organize -mode commit-directly alpha/golf <<-EOM + - [alpha/golf !md tag-3 tag-4 tag-5] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] EOM run_dodder init-workspace -query tag-5 @@ -623,27 +623,27 @@ function show_workspace_default { # @test run_dodder show : assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] EOM } function show_workspace_exactly_one_zettel { # @test skip - run_dodder organize -mode commit-directly one/uno <<-EOM - - [one/uno !md tag-3 tag-4 tag-5] wow the first + run_dodder organize -mode commit-directly alpha/golf <<-EOM + - [alpha/golf !md tag-3 tag-4 tag-5] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] [tag-5] EOM run_dodder init-workspace -query tag-3 assert_success - run_dodder show one/dos + run_dodder show alpha/hotel assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] EOM } diff --git a/zz-tests_bats/show_mothers.bats b/zz-tests_bats/show_mothers.bats index 91f5dcfd3..dee1bdcd9 100644 --- a/zz-tests_bats/show_mothers.bats +++ b/zz-tests_bats/show_mothers.bats @@ -14,11 +14,11 @@ teardown() { } function format_mother_sha_one { # @test - run_dodder show -format sig-bytes-hex one/uno+ + run_dodder show -format sig-bytes-hex alpha/golf+ assert_success sig="$(echo -n "$output" | head -n1)" - run_dodder show -format sig-mother-bytes-hex one/uno + run_dodder show -format sig-mother-bytes-hex alpha/golf assert_success assert_output - <<-EOM $sig @@ -26,17 +26,17 @@ function format_mother_sha_one { # @test } function format_mother_one { # @test - run_dodder_debug show -format sig one/uno+ - mother_sig="$(run_dodder_debug show -format sig one/uno+ | head -n 1 | cut -d@ -f2)" + run_dodder_debug show -format sig alpha/golf+ + mother_sig="$(run_dodder_debug show -format sig alpha/golf+ | head -n 1 | cut -d@ -f2)" - run_dodder show -format sig-mother one/uno + run_dodder show -format sig-mother alpha/golf assert_success assert_output "dodder-object-mother-sig-v2@$mother_sig" run_dodder show "dodder-object-sig-v2@$mother_sig"+ assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -44,6 +44,6 @@ function format_mother_all { # @test run_dodder show -format mother : assert_success assert_output - <<-EOM - [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/status.bats b/zz-tests_bats/status.bats index 9581cfd23..cc96a437f 100644 --- a/zz-tests_bats/status.bats +++ b/zz-tests_bats/status.bats @@ -20,8 +20,8 @@ function checkout_everything() { assert_success assert_output_unsorted - <<-EOM checked out [md.type @$(get_type_blob_sha) !toml-type-v1] - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -39,27 +39,27 @@ function dirty_new_zettel() { assert_success assert_output --partial - <<-EOM [!txt !toml-type-v1] - [two/uno @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one] + [bravo/golf @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one] EOM } function dirty_existing_akte() { - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wildly different - etikett-one - @ one/uno.md + @ alpha/golf.md ! md --- EOM - cat >one/uno.md <<-EOM + cat >alpha/golf.md <<-EOM newest body but even newer EOM } function dirty_one_uno() { - cat >one/uno.zettel <<-EOM + cat >alpha/golf.zettel <<-EOM --- # wildly different - etikett-one @@ -71,7 +71,7 @@ function dirty_one_uno() { } function dirty_one_dos() { - cat >one/dos.zettel <<-EOM + cat >alpha/hotel.zettel <<-EOM --- # dos wildly different - etikett-two @@ -104,79 +104,79 @@ function dirty_zz_archive_tag() { function status_simple_one_zettel { # @test checkout_everything - run_dodder status one/uno.zettel + run_dodder status alpha/golf.zettel assert_success assert_output - <<-EOM - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno - run_dodder status one/uno.zettel + run_dodder status alpha/golf.zettel assert_success assert_output - <<-EOM - changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } function status_simple_one_zettel_blob_separate { # @test checkout_everything - run_dodder status one/uno.zettel + run_dodder status alpha/golf.zettel assert_success assert_output - <<-EOM - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - rm one/uno.zettel + rm alpha/golf.zettel - cat >one/uno.md <<-EOM + cat >alpha/golf.md <<-EOM newest body but even newerests EOM - run_dodder status one/uno.zettel + run_dodder status alpha/golf.zettel assert_success assert_output - <<-EOM - changed [one/uno @blake2b256-dy8ywz7cr2pr4tgf8lfjsyfhmvxpezul5p7mk7yl2x4khjr7a4ns4cnst4 !md "wow the first" tag-3 tag-4 - one/uno.md] + changed [alpha/golf @blake2b256-dy8ywz7cr2pr4tgf8lfjsyfhmvxpezul5p7mk7yl2x4khjr7a4ns4cnst4 !md "wow the first" tag-3 tag-4 + alpha/golf.md] EOM } function status_simple_one_zettel_blob_only { # @test checkout_everything - run_dodder clean one/uno.zettel + run_dodder clean alpha/golf.zettel assert_success # assert_output - <<-EOM - # deleted [one/uno.zettel] + # deleted [alpha/golf.zettel] # EOM - run_dodder checkout -mode blob one/uno + run_dodder checkout -mode blob alpha/golf # assert_output - <<-EOM - # checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - # one/uno.md] + # checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + # alpha/golf.md] # EOM - run_dodder status one/uno.zettel + run_dodder status alpha/golf.zettel assert_success # assert_output - <<-EOM - # same [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - # one/uno.md] + # same [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + # alpha/golf.md] # EOM dirty_existing_akte - run ls one + run ls alpha assert_success assert_output - <<-EOM - dos.zettel - uno.md - uno.zettel + golf.md + golf.zettel + hotel.zettel EOM - run_dodder status one/uno.zettel + run_dodder status alpha/golf.zettel assert_success assert_output - <<-EOM - changed [one/uno.zettel @blake2b256-kdw9q3458v3njrejvhc7tjfsddxnzpmg5wt8mdwq7psss20whkesyxdzx7 !md "wildly different" etikett-one - one/uno.md] + changed [alpha/golf.zettel @blake2b256-kdw9q3458v3njrejvhc7tjfsddxnzpmg5wt8mdwq7psss20whkesyxdzx7 !md "wildly different" etikett-one + alpha/golf.md] EOM } @@ -187,18 +187,18 @@ function status_zettel_blob_checkout { # @test dirty_new_zettel - run_dodder checkout -mode blob two/uno + run_dodder checkout -mode blob bravo/golf assert_success assert_output - <<-EOM - checked out [two/uno @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one - two/uno.txt] + checked out [bravo/golf @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one + bravo/golf.txt] EOM run_dodder status .z assert_success assert_output - <<-EOM - same [two/uno @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one - two/uno.txt] + same [bravo/golf @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one + bravo/golf.txt] EOM } @@ -214,22 +214,22 @@ function status_zettel_hidden { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder status .z assert_success assert_output_unsorted - <<-EOM - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder status !md.z assert_success assert_output_unsorted - <<-EOM - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM } @@ -238,8 +238,8 @@ function status_zettelen_typ { # @test run_dodder status !md.z assert_success assert_output_unsorted - <<-EOM - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno @@ -248,8 +248,8 @@ function status_zettelen_typ { # @test run_dodder status !md.z assert_success assert_output_unsorted - <<-EOM - changed [one/dos.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + changed [alpha/hotel.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -258,8 +258,8 @@ function status_complex_zettel_tag_negation { # @test run_dodder status ^-etikett-two.z assert_success assert_output_unsorted - <<-EOM - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno @@ -267,8 +267,8 @@ function status_complex_zettel_tag_negation { # @test run_dodder status ^-etikett-two.z assert_success assert_output_unsorted - <<-EOM - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -278,8 +278,8 @@ function status_simple_all { # @test assert_success assert_output_unsorted - <<-EOM same [md.type @$(get_type_blob_sha) !toml-type-v1] - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno @@ -292,8 +292,8 @@ function status_simple_all { # @test assert_success assert_output_unsorted - <<-EOM changed [md.type @blake2b256-473260as3d3pd4uramcc60877srvpkxs4krlap45dkl3mfvq2npq2duvvq !toml-type-v1] - changed [one/dos.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + changed [alpha/hotel.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] untracked [da-new.type @blake2b256-9rzlpgryfegathtl4ss3s80cwskx7e5w77usfjxgxrrg4ns80epqnzxjvs !toml-type-v1] untracked [zz-archive.tag @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM @@ -336,13 +336,13 @@ function status_simple_tag { # @test function status_conflict { # @test checkout_everything - run_dodder checkout one/dos + run_dodder checkout alpha/hotel assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >one/dos.zettel <<-EOM + cat - >alpha/hotel.zettel <<-EOM --- # wow ok again - get_this_shit_merged @@ -354,30 +354,30 @@ function status_conflict { # @test not another one, conflict time EOM - run_dodder organize -mode commit-directly one/dos <<-EOM + run_dodder organize -mode commit-directly alpha/hotel <<-EOM --- ! txt2 --- # new-etikett-for-all - - [one/dos tag-3 tag-4] wow ok again + - [alpha/hotel tag-3 tag-4] wow ok again EOM assert_success assert_output - <<-EOM [!txt2 !toml-type-v1] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t assert_success assert_output - <<-EOM - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status one/dos.zettel + run_dodder status alpha/hotel.zettel assert_success assert_output - <<-EOM - conflicted [one/dos.zettel] + conflicted [alpha/hotel.zettel] EOM } @@ -405,34 +405,34 @@ function status_added_untracked() { # @test assert_success assert_output_unsorted - <<-EOM untracked [test.md @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9] - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] same [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM } # bats test_tags=user_story:fs_blobs, user_story:recognized_blobs function status_dot_untracked_recognized_blob_only() { # @test - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf echo "$output" >test.md run_dodder status . assert_success assert_output - <<-EOM - recognized [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + recognized [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test.md] EOM } # bats test_tags=user_story:fs_blobs, user_story:recognized_blobs function status_explicit_untracked_recognized_blob_only() { # @test - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf echo "$output" >test.md run_dodder status test.md assert_success assert_output - <<-EOM - recognized [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + recognized [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test.md] EOM } @@ -440,16 +440,16 @@ function status_explicit_untracked_recognized_blob_only() { # @test # bats test_tags=user_story:fs_blobs, user_story:recognized_blobs function status_dot_untracked_recognized_blob() { # @test checkout_everything - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf echo "$output" >test.md run_dodder status . assert_success assert_output_unsorted - <<-EOM - recognized [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + recognized [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test.md] same [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } diff --git a/zz-tests_bats/test.bats b/zz-tests_bats/test.bats index 26ea9d46c..4612e70fa 100755 --- a/zz-tests_bats/test.bats +++ b/zz-tests_bats/test.bats @@ -33,12 +33,12 @@ function can_checkout_and_checkin { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [one/uno !md "wow" ok] + [alpha/golf !md "wow" ok] EOM - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success - # assert_output ' (checked out) [one/uno.zettel @9a638e2b183562da6d3c634d5a3841d64bc337c9cf79f8fffa0d0194659bc564 !md "wow"]' + # assert_output ' (checked out) [alpha/golf.zettel @9a638e2b183562da6d3c634d5a3841d64bc337c9cf79f8fffa0d0194659bc564 !md "wow"]' { echo "---" @@ -47,12 +47,12 @@ function can_checkout_and_checkin { # @test echo "---" echo echo "content" - } >"one/uno.zettel" + } >"alpha/golf.zettel" - run_dodder checkin one/uno.zettel + run_dodder checkin alpha/golf.zettel assert_success assert_output - <<-EOM - [one/uno @blake2b256-lenzq4f690e7qealpgk53cxl68ym7xcx0vxl9hj6q2kqud8v265sqehvrn "wow" ok] + [alpha/golf @blake2b256-lenzq4f690e7qealpgk53cxl68ym7xcx0vxl9hj6q2kqud8v265sqehvrn "wow" ok] EOM } @@ -74,13 +74,13 @@ function can_checkout_via_tags { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [one/uno !md "wow" ok] + [alpha/golf !md "wow" ok] EOM run_dodder checkout -- ok:z assert_success assert_output - <<-EOM - checked out [one/uno.zettel !md "wow" ok] + checked out [alpha/golf.zettel !md "wow" ok] EOM } @@ -104,7 +104,7 @@ function can_new_zettel_with_metadata { # @test run_dodder new -edit=false -description bez -tags et1,et2 assert_success assert_output_unsorted - <<-EOM - [one/uno !md "bez" et1 et2] + [alpha/golf !md "bez" et1 et2] EOM } @@ -131,7 +131,7 @@ function indexes_are_implicitly_correct { # @test run_dodder new -edit=false "$expected" assert_success assert_output_unsorted - <<-EOM - [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM { @@ -144,14 +144,14 @@ function indexes_are_implicitly_correct { # @test echo the body } >"$expected" - mkdir -p one - cp "$expected" "one/uno.zettel" - run_dodder checkin -delete "one/uno.zettel" + mkdir -p alpha + cp "$expected" "alpha/golf.zettel" + run_dodder checkin -delete "alpha/golf.zettel" assert_success assert_output - <<-EOM - [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1] - deleted [one/uno.zettel] - deleted [one/] + [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1] + deleted [alpha/golf.zettel] + deleted [alpha/] EOM # TODO-P2 fix issue with kennung schwanzen @@ -161,7 +161,7 @@ function indexes_are_implicitly_correct { # @test # EOM { - echo one/uno + echo alpha/golf } >"$expected" #TODO @@ -191,16 +191,16 @@ function checkouts_dont_overwrite { # @test run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run_dodder checkout one/uno + run_dodder checkout alpha/golf assert_success assert_output - <<-EOM - checked out [one/uno.zettel @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + checked out [alpha/golf.zettel @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run cat one/uno.zettel + run cat alpha/golf.zettel assert_success assert_output --regexp - <<-EOM --- @@ -224,15 +224,15 @@ EOM echo the body 2 } >"$expected" - cat "$expected" >"one/uno.zettel" + cat "$expected" >"alpha/golf.zettel" - run_dodder checkout one/uno:z + run_dodder checkout alpha/golf:z assert_success assert_output - <<-EOM - changed [one/uno.zettel @blake2b256-7dzz0dhlp77yccl0m2yn983azxuhd28pgsk5h3kplndhf2rg5gds8cqdyf !md "bez" et1 et2] + changed [alpha/golf.zettel @blake2b256-7dzz0dhlp77yccl0m2yn983azxuhd28pgsk5h3kplndhf2rg5gds8cqdyf !md "bez" et1 et2] EOM - run cat one/uno.zettel + run cat alpha/golf.zettel assert_success assert_output "$(cat "$expected")" } diff --git a/zz-tests_bats/workspace.bats b/zz-tests_bats/workspace.bats index 84601dfff..e350bf467 100644 --- a/zz-tests_bats/workspace.bats +++ b/zz-tests_bats/workspace.bats @@ -22,8 +22,8 @@ function workspace_show { # @test run_dodder show assert_success assert_output_unsorted - <<-eom - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] eom run_dodder show :e @@ -31,10 +31,10 @@ function workspace_show { # @test assert_output_unsorted - <<-eom eom - run_dodder show one/uno + run_dodder show alpha/golf assert_success assert_output - <<-eom - [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] eom } @@ -46,11 +46,11 @@ function workspace_edit { # @test run_dodder edit assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format blob one/uno + run_dodder show -format blob alpha/golf assert_success assert_output - <<-EOM last time @@ -68,11 +68,11 @@ function workspace_checkout { # @test run_dodder checkout : assert_success assert_output_unsorted - <<-EOM - checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format blob one/uno.zettel + run_dodder show -format blob alpha/golf.zettel assert_success assert_output - <<-EOM last time @@ -98,18 +98,18 @@ function workspace_organize { # @test - tag-3 --- - - [one/dos !md tag-4] wow ok again - - [one/uno !md tag-4] wow the first + - [alpha/golf !md tag-4] wow the first + - [alpha/hotel !md tag-4] wow ok again EOM - run_dodder organize -mode output-only one/uno + run_dodder organize -mode output-only alpha/golf assert_success assert_output - <<-EOM --- - tag-3 --- - - [one/uno !md tag-4] wow the first + - [alpha/golf !md tag-4] wow the first EOM } @@ -122,7 +122,7 @@ function workspace_add_no_organize { # @test run_dodder add -delete -tags new_tags -description "added file" todo.wow.md assert_success assert_output - <<-EOM - [two/uno @blake2b256-qdflthfeky7ak3up8qgagd4qx2a8ua5lr4kvffynjl2k4063ja0qr65g5r !md "added file" new_tags tag-3] + [bravo/golf @blake2b256-qdflthfeky7ak3up8qgagd4qx2a8ua5lr4kvffynjl2k4063ja0qr65g5r !md "added file" new_tags tag-3] deleted [todo.wow.md] EOM } @@ -155,8 +155,8 @@ function workspace_add_yes_organize { # @test run_dodder add -organize -delete ./*.md assert_success assert_output - <<-EOM - [two/uno @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "2" tag-one] - [one/tres @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] + [bravo/golf @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "2" tag-one] + [alpha/india @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] deleted [1.md] deleted [2.md] EOM @@ -186,7 +186,7 @@ function workspace_add_yes_organize_omit_one { # @test run_dodder add -organize -delete ./*.md assert_success assert_output - <<-EOM - [two/uno @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] + [bravo/golf @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] deleted [1.md] EOM } From 3d99ab4c462e6ebb9bf12a2cc491a05f7320dfd3 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 05:44:50 -0500 Subject: [PATCH 13/25] fix: use context.Must lock pattern and add missing repo lock Switch add-zettel-ids and migrate-zettel-ids to the codebase's req.Must(errors.MakeFuncContextFromFuncErr(...)) pattern for locksmith lock/unlock instead of manual error checking. Add missing repo lock to migrate-zettel-ids. Also add early return after ContextCancelWithError in readAndExtractCandidates. Co-Authored-By: Claude Opus 4.6 --- go/src/yankee/commands_dodder/add_zettel_ids_yin.go | 13 +++---------- go/src/yankee/commands_dodder/migrate_zettel_ids.go | 5 +++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go b/go/src/yankee/commands_dodder/add_zettel_ids_yin.go index 8059a04a8..2360cb2b3 100644 --- a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go +++ b/go/src/yankee/commands_dodder/add_zettel_ids_yin.go @@ -86,16 +86,8 @@ func (cmd AddZettelIds) Run(req command.Request) { lockSmith := envRepo.GetLockSmith() - if err := lockSmith.Lock(); err != nil { - errors.ContextCancelWithErrorf(req, "acquiring lock: %s", err) - return - } - - defer func() { - if err := lockSmith.Unlock(); err != nil { - errors.ContextCancelWithErrorf(req, "releasing lock: %s", err) - } - }() + req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Lock)) + defer req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Unlock)) logPath := envRepo.FileObjectIdLog() flatFilePath := path.Join(dirObjectId, cmd.flatFileName) @@ -145,6 +137,7 @@ func readAndExtractCandidates(req command.Request) []string { if err != nil && err != io.EOF { errors.ContextCancelWithError(req, err) + return nil } if len(line) > 0 { diff --git a/go/src/yankee/commands_dodder/migrate_zettel_ids.go b/go/src/yankee/commands_dodder/migrate_zettel_ids.go index a70ac3279..e50d72053 100644 --- a/go/src/yankee/commands_dodder/migrate_zettel_ids.go +++ b/go/src/yankee/commands_dodder/migrate_zettel_ids.go @@ -70,6 +70,11 @@ func (cmd MigrateZettelIds) Run(req command.Request) { return } + lockSmith := envRepo.GetLockSmith() + + req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Lock)) + defer req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Unlock)) + tai := ids.NowTai() yinEntry := &object_id_log.V1{ From f1a5af2cf2d63775882ad75426cb0cb49f5cc4a5 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 06:46:00 -0500 Subject: [PATCH 14/25] fixup! test: update all BATS tests for NATO phonetic zettel IDs fixup! test: update all BATS tests for NATO phonetic zettel IDs Revert all test changes - keep old word lists (one/two/three, uno/dos/tres). Only retain new subcommand entries in complete.bats. Co-Authored-By: Claude Opus 4.6 --- zz-tests_bats/add.bats | 48 +-- zz-tests_bats/checkin.bats | 98 ++--- zz-tests_bats/checkin_blob.bats | 20 +- zz-tests_bats/checkout.bats | 66 ++-- zz-tests_bats/clean.bats | 86 ++--- zz-tests_bats/clone.bats | 30 +- zz-tests_bats/common.bash | 30 +- zz-tests_bats/complete.bats | 8 +- zz-tests_bats/diff.bats | 8 +- zz-tests_bats/edit.bats | 30 +- zz-tests_bats/export.bats | 13 +- zz-tests_bats/fix.bats | 10 +- zz-tests_bats/format_object.bats | 12 +- zz-tests_bats/format_organize.bats | 4 +- zz-tests_bats/hide.bats | 12 +- zz-tests_bats/import.bats | 124 +++---- zz-tests_bats/init.bats | 12 +- zz-tests_bats/inventory_list_json.bats | 18 +- zz-tests_bats/mergetool.bats | 64 ++-- zz-tests_bats/migration/generate_fixture.bats | 2 +- zz-tests_bats/migration/main.bats | 16 +- .../v13/.dodder/config/config-mutable | Bin 5202 -> 5203 bytes .../v13/.dodder/local/share/config-seed | 2 +- .../v13/.dodder/local/share/index/Abbr | Bin 1199 -> 1179 bytes .../v13/.dodder/local/share/index/object_id | Bin 146 -> 146 bytes .../local/share/index/object_pointers/Page-0 | Bin 147 -> 147 bytes .../local/share/index/object_pointers/Page-1 | Bin 147 -> 147 bytes .../local/share/index/object_pointers/Page-2 | Bin 147 -> 49 bytes .../local/share/index/object_pointers/Page-3 | Bin 245 -> 196 bytes .../local/share/index/object_pointers/Page-4 | Bin 98 -> 147 bytes .../local/share/index/object_pointers/Page-6 | Bin 0 -> 49 bytes .../local/share/index/object_pointers/Page-7 | Bin 49 -> 98 bytes .../local/share/index/object_pointers/Page-8 | Bin 147 -> 196 bytes .../local/share/index/object_pointers/Page-a | Bin 147 -> 196 bytes .../local/share/index/object_pointers/Page-c | Bin 98 -> 98 bytes .../local/share/index/object_pointers/Page-d | Bin 49 -> 245 bytes .../local/share/index/object_pointers/Page-e | Bin 49 -> 49 bytes .../local/share/index/object_pointers/Page-f | Bin 98 -> 147 bytes .../.dodder/local/share/index/objects/Page-0 | Bin 367 -> 367 bytes .../.dodder/local/share/index/objects/Page-1 | Bin 364 -> 1040 bytes .../.dodder/local/share/index/objects/Page-2 | Bin 0 -> 469 bytes .../.dodder/local/share/index/objects/Page-3 | Bin 784 -> 417 bytes .../.dodder/local/share/index/objects/Page-4 | Bin 0 -> 367 bytes .../.dodder/local/share/index/objects/Page-6 | Bin 0 -> 441 bytes .../.dodder/local/share/index/objects/Page-8 | Bin 0 -> 367 bytes .../.dodder/local/share/index/objects/Page-c | Bin 420 -> 420 bytes .../.dodder/local/share/inventory_lists_log | 8 +- .../v13/.dodder/local/share/object_ids/Yang | 12 +- .../v13/.dodder/local/share/object_ids/Yin | 12 +- ...4a347a0cf3e192d168b70993d3782161f666ad6ab7 | Bin 0 -> 280 bytes ...d397d37fb025248d485041e48755f04e5c866e6c9e | Bin 0 -> 283 bytes ...b5d2276220658e5ca80ab6a75b350710df0bfce14d | Bin 0 -> 369 bytes ...7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 | Bin 0 -> 365 bytes ...8225b8fdb4f8bbc4235e20b754d27be375de0b5682 | Bin 0 -> 451 bytes ...3b60e4ed1679fdb2dc45575a473784c6893285fd3c | Bin 0 -> 282 bytes ...d8f42ee65daba036d5c646f854207f8e6e2fe2386a | Bin 0 -> 418 bytes ...551f14edadfcdc77b69e7e1208c1b7507cd2883254 | Bin 0 -> 280 bytes zz-tests_bats/new.bats | 42 +-- zz-tests_bats/new_no_workspace.bats | 20 +- zz-tests_bats/organize.bats | 336 +++++++++--------- zz-tests_bats/pull.bats | 128 +++---- zz-tests_bats/push.bats | 72 ++-- zz-tests_bats/recursive_tags.bats | 24 +- zz-tests_bats/reindex.bats | 22 +- zz-tests_bats/revert.bats | 14 +- zz-tests_bats/show.bats | 120 +++---- zz-tests_bats/show_mothers.bats | 14 +- zz-tests_bats/status.bats | 152 ++++---- zz-tests_bats/test.bats | 50 +-- zz-tests_bats/workspace.bats | 36 +- 70 files changed, 891 insertions(+), 884 deletions(-) create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-6 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-4 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-8 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/713d169713e60de958884a347a0cf3e192d168b70993d3782161f666ad6ab7 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/35/b319e3ba245cd5b88a51b5d2276220658e5ca80ab6a75b350710df0bfce14d create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 diff --git a/zz-tests_bats/add.bats b/zz-tests_bats/add.bats index 802317172..d1386407e 100644 --- a/zz-tests_bats/add.bats +++ b/zz-tests_bats/add.bats @@ -23,11 +23,11 @@ function add { # @test assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] deleted [to_add.md] EOM - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- @@ -62,10 +62,10 @@ function add_with_dupe_added { # @test assert_output_unsorted - <<-EOM deleted [to_add.md] deleted [to_add2.md] - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add to_add2" zz-inbox-2022-11-14] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add to_add2" zz-inbox-2022-11-14] EOM - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- @@ -95,14 +95,14 @@ function add_not_md { # @test assert_success assert_output - <<-EOM [!pdf !toml-type-v1] - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14] - checked out [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14 - alpha/golf.pdf] - golf.pdf + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14] + checked out [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !pdf "to_add" zz-inbox-2022-11-14 + one/uno.pdf] + uno.pdf deleted [to_add.pdf] EOM - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- @@ -130,7 +130,7 @@ function add_1 { # @test assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] deleted [to_add.md] EOM } @@ -161,8 +161,8 @@ function add_2 { # @test assert_output_unsorted - <<-EOM deleted [to_add.md] deleted [to_add2.md] - [alpha/hotel @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [one/dos @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] EOM } @@ -192,13 +192,13 @@ function add_dot { # @test assert_output_unsorted - <<-EOM deleted [to_add.md] deleted [to_add2.md] - [alpha/hotel @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] + [one/dos @blake2b256-exrtq04pdgc72mh7ufctgak45f085u6rzdfwlw0yhxrnxdfmnmqs6du6ya !md "to_add2" zz-inbox-2022-11-14] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to_add" zz-inbox-2022-11-14] EOM } #TODO-P2 add_dedupe: define expected behavior when re-adding a blob that already -# has a zettel. Current behavior: creates a new zettel (alpha/hotel) inheriting +# has a zettel. Current behavior: creates a new zettel (one/dos) inheriting # metadata from the existing zettel, but -tags flag is silently ignored. # Should -tags be merged? Should it reuse the existing zettel ID instead? @@ -225,11 +225,11 @@ function add_several_with_spaces_in_filename { # @test assert_output_unsorted - <<-EOM deleted [to add.md] deleted [to add2.md] - [alpha/hotel @blake2b256-wg3yq6ymccg8mrm3zrsdym3u9dvyq6pfdt2d463e53nw9vxypxeqttduac !md "to add2" zz-inbox-2022-11-14] - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] + [one/dos @blake2b256-wg3yq6ymccg8mrm3zrsdym3u9dvyq6pfdt2d463e53nw9vxypxeqttduac !md "to add2" zz-inbox-2022-11-14] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] EOM - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- @@ -258,10 +258,10 @@ function add_each_blob { # @test assert_success assert_output_unsorted - <<-EOM - alpha/golf.md] + one/uno.md] deleted [to add.md] - checked out [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] + checked out [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] test file EOM } @@ -293,9 +293,9 @@ function add_organize { # @test assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] - checked out [alpha/golf @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 - alpha/golf.md] + [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14] + checked out [one/uno @blake2b256-kzc0sp5p2ftddtjqgtusdwrsc33fs8h6xwdhp8shhgp0r92uln9q5mkl08 !md "to add" zz-inbox-2022-11-14 + one/uno.md] test file deleted [to add.md] EOM diff --git a/zz-tests_bats/checkin.bats b/zz-tests_bats/checkin.bats index c4a630c64..b0f49d023 100644 --- a/zz-tests_bats/checkin.bats +++ b/zz-tests_bats/checkin.bats @@ -14,18 +14,18 @@ setup() { assert_success assert_output_unsorted - <<-EOM checked out [md.type @$(get_type_blob_sha) !toml-type-v1] - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run ls assert_success assert_output_unsorted - <<-EOM md.type - alpha + one EOM - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wildly different - etikett-one @@ -35,7 +35,7 @@ setup() { newest body EOM - cat >alpha/hotel.zettel <<-EOM + cat >one/dos.zettel <<-EOM --- # dos wildly different - etikett-two @@ -62,7 +62,7 @@ teardown() { } function dirty_one_virtual() { - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wildly different - etikett-one @@ -75,10 +75,10 @@ function dirty_one_virtual() { } function checkin_simple_one_zettel { # @test - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -89,23 +89,23 @@ function checkin_two_zettel_hidden { # @test run_dodder checkin .z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] - [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] EOM } function checkin_simple_one_zettel_virtual_tag { # @test dirty_one_virtual - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" %virtual etikett-one] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" %virtual etikett-one] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -113,7 +113,7 @@ function checkin_complex_zettel_tag_negation { # @test run_dodder checkin ^etikett-two.z assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -122,8 +122,8 @@ function checkin_simple_all { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM @@ -131,8 +131,8 @@ function checkin_simple_all { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM } @@ -142,8 +142,8 @@ function checkin_simple_all_dry_run { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM @@ -151,8 +151,8 @@ function checkin_simple_all_dry_run { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -166,15 +166,15 @@ function checkin_simple_typ { # @test run_dodder update :z assert_success assert_output_unsorted - <<-'EOM' -[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] -[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] +[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] +[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder last -format box-archive assert_success assert_output_unsorted --regexp - <<-'EOM' -\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow the first" tag-3 tag-4] -\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] +\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow the first" tag-3 tag-4] +\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] EOM run_dodder show -format blob !md:t @@ -194,7 +194,7 @@ function checkin_simple_typ { # @test assert_success assert_output 'toml' - run_dodder show -format type.vim-syntax-type alpha/golf + run_dodder show -format type.vim-syntax-type one/uno assert_success assert_output 'test' } @@ -253,25 +253,25 @@ function checkin_zettel_typ_has_commit_hook { # @test EOM assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-hhew85kxn9usmuqxalnupnt2jpwwlje3m68y6v0kyr4yqj9w49vq9w79lk !typ_with_hook "test lua" on_new on_pre_commit] + [two/uno @blake2b256-hhew85kxn9usmuqxalnupnt2jpwwlje3m68y6v0kyr4yqj9w49vq9w79lk !typ_with_hook "test lua" on_new on_pre_commit] EOM } function checkin_zettel_with_komment { # @test - run_dodder checkin -print-inventory_list=true -comment "message" alpha/golf.zettel + run_dodder checkin -print-inventory_list=true -comment "message" one/uno.zettel assert_success assert_output --regexp - <<-'EOM' - \[alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one\] + \[one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one\] \[[0-9]+\.[0-9]+ @blake2b256-.* !inventory_list-v2 "message"\] EOM } function checkin_via_organize { # @test export EDITOR="true" - run_dodder checkin -organize alpha/golf.zettel + run_dodder checkin -organize one/uno.zettel assert_success assert_output - <<-'EOM' - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -285,9 +285,9 @@ function checkin_dot_untracked_fs_blob() { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] - [bravo/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] + [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [two/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM } @@ -301,7 +301,7 @@ function checkin_explicit_untracked_fs_blob() { # @test run_dodder checkin test.md assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] + [two/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] EOM } @@ -316,9 +316,9 @@ function checkin_dot_organize_exclude_untracked_fs_blob() { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-76m5lj0dp3je79ft9z2mdwpcrzrf9sddj04tvewpuk6gyqmll27sz46w72 !toml-type-v1] - [alpha/hotel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - [alpha/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] - [bravo/golf @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] + [one/dos @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + [one/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + [two/uno @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "test"] [zz-archive @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM } @@ -333,7 +333,7 @@ function checkin_explicit_organize_include_untracked_fs_blob() { # @test run_dodder checkin -organize test.md "$new_blob" - run_dodder checkin-blob -new-tags et3 alpha/golf "$new_blob" + run_dodder checkin-blob -new-tags et3 one/uno "$new_blob" assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] + [one/uno @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] EOM - run_dodder show -format text alpha/golf:z + run_dodder show -format text one/uno:z assert_success assert_output --regexp - <<-EOM --- @@ -77,10 +77,10 @@ the body EOM assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run_dodder show -format text alpha/golf:z + run_dodder show -format text one/uno:z assert_success assert_output --regexp - <<-EOM --- @@ -98,13 +98,13 @@ EOM assert_success assert_output --partial 'ok 1 - blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza' - run_dodder checkin-blob -new-tags et3 alpha/golf blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza + run_dodder checkin-blob -new-tags et3 one/uno blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] + [one/uno @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] EOM - run_dodder show -format text alpha/golf:z + run_dodder show -format text one/uno:z assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/checkout.bats b/zz-tests_bats/checkout.bats index 49fcf9279..574a4666d 100644 --- a/zz-tests_bats/checkout.bats +++ b/zz-tests_bats/checkout.bats @@ -48,8 +48,8 @@ function checkout_simple_all { # @test checked out [txt.type @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] checked out [bin.type @blake2b256-zhvux7vmpch9f44kvnua7n69f8jzgk5s7p9k2s3kuvkrcpjh07lse493jl !toml-type-v1] checked out [md.type @$(get_type_blob_sha) !toml-type-v1] - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -57,8 +57,8 @@ function checkout_simple_zettel { # @test run_dodder checkout : assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -68,7 +68,7 @@ function checkout_non_binary_simple_zettel { # @test assert_success assert_output_unsorted - <<-EOM deleted [file.txt] - [bravo/golf @blake2b256-eu5uyveldt6hg5ddd80k0qjsjvkt5d5u24gg36084ehr7yppvkws7cac7g !txt "file"] + [two/uno @blake2b256-eu5uyveldt6hg5ddd80k0qjsjvkt5d5u24gg36084ehr7yppvkws7cac7g !txt "file"] EOM run_dodder show -format text !txt:z @@ -89,16 +89,16 @@ function checkout_binary_simple_zettel { # @test assert_success assert_output_unsorted - <<-EOM deleted [file.bin] - [bravo/golf @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + [two/uno @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM run_dodder checkout !bin:z assert_success assert_output_unsorted - <<-EOM - checked out [bravo/golf.zettel @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + checked out [two/uno.zettel @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM - run cat bravo/golf.zettel + run cat two/uno.zettel assert_success assert_output --regexp - <<-EOM --- @@ -116,19 +116,19 @@ function checkout_simple_zettel_blob_only { # @test run_dodder checkout -mode blob :z assert_success assert_output_unsorted - <<-EOM - alpha/hotel.md] - alpha/golf.md] - checked out [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 - checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + one/dos.md] + one/uno.md] + checked out [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 + checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 EOM } function checkout_zettel_several { # @test - run_dodder checkout alpha/golf alpha/hotel + run_dodder checkout one/uno one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -143,33 +143,33 @@ function checkout_simple_type { # @test } function checkout_zettel_blob_then_object { # @test - run_dodder checkout -mode blob alpha/golf + run_dodder checkout -mode blob one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - alpha/golf.md] + checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + one/uno.md] EOM - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run ls alpha/ + run ls one/ assert_output_unsorted - <<-EOM - golf.zettel + uno.zettel EOM - run_dodder checkout -force alpha/golf + run_dodder checkout -force one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run ls alpha/ + run ls one/ assert_output - <<-EOM - golf.zettel + uno.zettel EOM } @@ -183,20 +183,20 @@ function mode_both { # @test EOM assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin] + [two/uno @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin] EOM - run_dodder checkout -mode both bravo/golf + run_dodder checkout -mode both two/uno assert_success assert_output - <<-EOM - checked out [bravo/golf.zettel @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin - bravo/golf.bin] + checked out [two/uno.zettel @blake2b256-jyxyyxxrgdsgt5nwezujm3e037rh3ce4f85wllrzg0y3adg7f5pqg5sw95 !bin + two/uno.bin] EOM - run ls bravo/ + run ls two/ assert_output_unsorted - <<-EOM - golf.bin - golf.zettel + uno.bin + uno.zettel EOM } diff --git a/zz-tests_bats/clean.bats b/zz-tests_bats/clean.bats index c967b7df7..27e3e1ece 100644 --- a/zz-tests_bats/clean.bats +++ b/zz-tests_bats/clean.bats @@ -19,8 +19,8 @@ function prepare_checkouts() { assert_success assert_output_unsorted - <<-EOM checked out [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -40,9 +40,9 @@ function clean_all { # @test assert_success assert_output_unsorted - <<-EOM deleted [md.type] - deleted [alpha/] - deleted [alpha/hotel.zettel] - deleted [alpha/golf.zettel] + deleted [one/] + deleted [one/dos.zettel] + deleted [one/uno.zettel] EOM run_find @@ -54,9 +54,9 @@ function clean_zettels { # @test run_dodder clean .z assert_success assert_output_unsorted - <<-EOM - deleted [alpha/hotel.zettel] - deleted [alpha/golf.zettel] - deleted [alpha/] + deleted [one/dos.zettel] + deleted [one/uno.zettel] + deleted [one/] EOM run_find @@ -69,7 +69,7 @@ function clean_zettels { # @test function clean_all_dirty_wd { # @test prepare_checkouts - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wildly different - etikett-one @@ -79,7 +79,7 @@ function clean_all_dirty_wd { # @test newest body EOM - cat >alpha/hotel.zettel <<-EOM + cat >one/dos.zettel <<-EOM --- # dos wildly different - etikett-two @@ -113,9 +113,9 @@ function clean_all_dirty_wd { # @test assert_output_unsorted - <<-EOM . ./md.type - ./alpha - ./alpha/golf.zettel - ./alpha/hotel.zettel + ./one + ./one/uno.zettel + ./one/dos.zettel ./da-new.type ./zz-archive.tag EOM @@ -123,7 +123,7 @@ function clean_all_dirty_wd { # @test function clean_all_force_dirty_wd { # @test prepare_checkouts - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wildly different - etikett-one @@ -133,7 +133,7 @@ function clean_all_force_dirty_wd { # @test newest body EOM - cat >alpha/hotel.zettel <<-EOM + cat >one/dos.zettel <<-EOM --- # dos wildly different - tag-two @@ -162,9 +162,9 @@ function clean_all_force_dirty_wd { # @test assert_output_unsorted - <<-EOM deleted [da-new.type] deleted [md.type] - deleted [alpha/hotel.zettel] - deleted [alpha/golf.zettel] - deleted [alpha/] + deleted [one/dos.zettel] + deleted [one/uno.zettel] + deleted [one/] deleted [zz-archive.tag] EOM @@ -175,17 +175,17 @@ function clean_all_force_dirty_wd { # @test function clean_hidden { # @test prepare_checkouts - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder organize -mode commit-directly :z <<-EOM - - [alpha/golf !md zz-archive tag-3 tag-4] wow the first + - [one/uno !md zz-archive tag-3 tag-4] wow the first EOM assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] EOM run_dodder dormant-add zz-archive @@ -195,74 +195,74 @@ function clean_hidden { # @test run_dodder show :z assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - run_dodder checkout -force alpha/golf + run_dodder checkout -force one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] EOM run_dodder clean !md.z assert_success assert_output_unsorted - <<-EOM - deleted [alpha/] - deleted [alpha/hotel.zettel] - deleted [alpha/golf.zettel] + deleted [one/] + deleted [one/dos.zettel] + deleted [one/uno.zettel] EOM } function clean_mode_blob_hidden { # @test prepare_checkouts run_dodder organize -mode commit-directly :z <<-EOM - - [alpha/golf !md zz-archive tag-3 tag-4] wow the first + - [one/uno !md zz-archive tag-3 tag-4] wow the first EOM assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive] EOM run_dodder dormant-add zz-archive assert_success assert_output '' - run_dodder checkout -force -mode blob alpha/golf + run_dodder checkout -force -mode blob one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive - alpha/golf.md] + checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 zz-archive + one/uno.md] EOM run_dodder clean !md.z assert_success assert_output_unsorted - <<-EOM - deleted [alpha/golf.md] - deleted [alpha/hotel.zettel] - deleted [alpha/] + deleted [one/uno.md] + deleted [one/dos.zettel] + deleted [one/] EOM } function clean_mode_blob { # @test run_dodder_init_workspace - run_dodder checkout -mode blob alpha/golf + run_dodder checkout -mode blob one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - alpha/golf.md] + checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + one/uno.md] EOM run_dodder clean . assert_success assert_output_unsorted - <<-EOM - deleted [alpha/golf.md] - deleted [alpha/] + deleted [one/uno.md] + deleted [one/] EOM } diff --git a/zz-tests_bats/clone.bats b/zz-tests_bats/clone.bats index 18facfb92..d6efda2ec 100644 --- a/zz-tests_bats/clone.bats +++ b/zz-tests_bats/clone.bats @@ -32,7 +32,7 @@ function bootstrap { run_dodder new -edit=false to_add assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder new -edit=false - <<-EOM @@ -48,7 +48,7 @@ function bootstrap { assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM ) } @@ -78,7 +78,7 @@ function try_add_new_after_clone { assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [two/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM } @@ -96,8 +96,8 @@ function clone_history_zettel_type_tag { # @test assert_output_unsorted --regexp - <<-'EOM' \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] \[konfig @blake2b256-.* !toml-config-v2] - \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - \[alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc \(5 B) copied Blob blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m \(51 B) @@ -120,8 +120,8 @@ function clone_history_zettel_type_tag_stdio_local { # @test assert_output_unsorted --regexp - <<-EOM \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] \[konfig @blake2b256-.+ !toml-config-v2] - \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - \[alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc \(5 B) copied Blob blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m \(51 B) @@ -139,13 +139,13 @@ function clone_history_one_zettel_stdio_local { # @test run_clone_default_with \ test-repo-id-us \ "$(realpath them)" \ - a/h+ + o/d+ assert_success assert_output_unsorted --regexp - <<-'EOM' copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) \[konfig @blake2b256-.* !toml-config-v2] - \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM } @@ -163,8 +163,8 @@ function clone_history_zettel_type_tag_stdio_ssh { # @test assert_output_unsorted --regexp - <<-'EOM' \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] \[konfig @blake2b256-.+ !toml-config-v2] - \[alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - \[alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + \[one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + \[one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 \(36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc \(5 B) copied Blob blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m \(51 B) @@ -188,8 +188,8 @@ function clone_history_default_allow_conflicts { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM try_add_new_after_clone @@ -218,8 +218,8 @@ function clone_history_zettel_type_tag_port { # @test assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] [konfig @b2c9398d2585afe1be26ed36a13703c051311256dc9dab03cf826b377ba237a6 !toml-config-v2] - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [this_is_the_first] [this_is_the_second] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) diff --git a/zz-tests_bats/common.bash b/zz-tests_bats/common.bash index 124f633e9..e37c13630 100644 --- a/zz-tests_bats/common.bash +++ b/zz-tests_bats/common.bash @@ -51,21 +51,21 @@ set_xdg() { DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" >/dev/null 2>&1 && pwd)" cat_yin() ( - echo "the alpha" - echo "the bravo" - echo "the charlie" - echo "the delta" - echo "an echo" - echo "the foxtrot" + echo "one" + echo "two" + echo "three" + echo "four" + echo "five" + echo "six" ) cat_yang() ( - echo "the golf" - echo "the hotel" - echo "the india" - echo "the juliet" - echo "the kilo" - echo "the lima" + echo "uno" + echo "dos" + echo "tres" + echo "quatro" + echo "cinco" + echo "seis" ) cmd_dodder_def_no_debug=( @@ -290,10 +290,10 @@ EOM assert_success - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success - cat >alpha/golf.zettel <one/uno.zettel <>alpha/golf.zettel - run_dodder diff alpha/golf.zettel + echo wowowow >>one/uno.zettel + run_dodder diff one/uno.zettel assert_success assert_output - <<-EOM - --- alpha/golf:zettel - +++ alpha/golf.zettel + --- one/uno:zettel + +++ one/uno.zettel @@ -6,3 +6,4 @@ --- diff --git a/zz-tests_bats/edit.bats b/zz-tests_bats/edit.bats index 23805c350..c7eb92676 100644 --- a/zz-tests_bats/edit.bats +++ b/zz-tests_bats/edit.bats @@ -20,14 +20,14 @@ function edit_and_change_workspace { # @test assert_success export EDITOR="/bin/bash -c 'echo \"this is the body 2\" > \"\$0\"'" - run_dodder edit alpha/golf + run_dodder edit one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] EOM - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno assert_success assert_output - <<-EOM this is the body 2 @@ -39,13 +39,13 @@ function edit_and_dont_change_workspace { # @test assert_success export EDITOR="true" - run_dodder edit alpha/golf + run_dodder edit one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno assert_success assert_output - <<-EOM last time @@ -58,13 +58,13 @@ function edit_and_dont_change_workspace { # @test function edit_and_change_no_workspace { # @test skip export EDITOR="/bin/bash -c 'echo \"this is the body 2\" > \"\$0\"'" - run_dodder edit alpha/golf + run_dodder edit one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] + [one/uno @blake2b256-5sxcr2vpy33y4m72vfn9ya49jjrzrx0wulls880dv66jxfksjsfs5p6pg7] EOM - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno assert_success assert_output - <<-EOM this is the body 2 @@ -74,12 +74,12 @@ function edit_and_change_no_workspace { # @test function edit_and_dont_change_no_workspace { # @test skip export EDITOR="true" - run_dodder edit alpha/golf + run_dodder edit one/uno assert_success assert_output - <<-EOM EOM - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno assert_success assert_output - <<-EOM last time @@ -101,13 +101,13 @@ function edit_and_format_no_workspace { # @test # shellcheck disable=SC2016 export EDITOR='bash -c "editor $0"' - run_dodder edit alpha/golf + run_dodder edit one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd] EOM - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno assert_success assert_output - <<-EOM last time diff --git a/zz-tests_bats/export.bats b/zz-tests_bats/export.bats index fed2e99f5..79ede1248 100644 --- a/zz-tests_bats/export.bats +++ b/zz-tests_bats/export.bats @@ -23,8 +23,15 @@ function basic { # @test \[konfig @blake2b256-.+ .* !toml-config-v2] \[!md @blake2b256-.+ .* !toml-type-v1] - \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* !md@.* "wow ok again" tag-3 tag-4] - \[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* !md@.* "wow the first" tag-3 tag-4] - \[alpha/golf @blake2b256-.+ .* !md@.* "wow ok" tag-1 tag-2] + EOM + + assert_output_unsorted --regexp - <<-'EOM' + \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* !md@.* "wow ok again" tag-3 tag-4] + EOM + assert_output_unsorted --regexp - <<-'EOM' + \[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* !md@.* "wow the first" tag-3 tag-4] + EOM + assert_output_unsorted --regexp - <<-'EOM' + \[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* !md@.* "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/fix.bats b/zz-tests_bats/fix.bats index 8e4be3d17..63d9079d3 100644 --- a/zz-tests_bats/fix.bats +++ b/zz-tests_bats/fix.bats @@ -30,10 +30,10 @@ function can_update_blob { # @test run_dodder new -edit=false "$expected" assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- @@ -52,10 +52,10 @@ EOM echo the body but new } >"$new_akte" - run_dodder checkin-blob -new-tags et3 alpha/golf "$new_akte" + run_dodder checkin-blob -new-tags et3 one/uno "$new_akte" assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] + [one/uno @blake2b256-2qwngrkkpcptsnphu6jcyrwmtpyxux0hmsg4pjfpsn0tr7yt732sgk5lza !md "bez" et3] EOM # then @@ -69,7 +69,7 @@ EOM echo the body but new } >"$expected" - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/format_object.bats b/zz-tests_bats/format_object.bats index e244237a2..186d64dc1 100644 --- a/zz-tests_bats/format_object.bats +++ b/zz-tests_bats/format_object.bats @@ -36,7 +36,7 @@ function format_simple { # @test deleted [md.type] EOM - run_dodder format-object -mode both alpha/golf text + run_dodder format-object -mode both one/uno text assert_success assert_output --regexp - <<-EOM --- @@ -49,9 +49,9 @@ function format_simple { # @test last time EOM - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wow the second - tag-3 @@ -62,7 +62,7 @@ function format_simple { # @test last time but new EOM - run_dodder format-object -mode both alpha/golf.zettel text + run_dodder format-object -mode both one/uno.zettel text assert_success assert_output --regexp - <<-EOM --- @@ -86,7 +86,7 @@ function show_simple_one_zettel_binary { # @test assert_output_unsorted - <<-EOM deleted [file.bin] [!bin !toml-type-v1] - [bravo/golf @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + [two/uno @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM run_dodder checkout !bin:t @@ -110,7 +110,7 @@ function show_simple_one_zettel_binary { # @test [!bin @blake2b256-zhvux7vmpch9f44kvnua7n69f8jzgk5s7p9k2s3kuvkrcpjh07lse493jl !toml-type-v1] EOM - run_dodder format-object -mode both bravo/golf + run_dodder format-object -mode both two/uno assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/format_organize.bats b/zz-tests_bats/format_organize.bats index e0c3e0bbc..aff9ea5f5 100644 --- a/zz-tests_bats/format_organize.bats +++ b/zz-tests_bats/format_organize.bats @@ -223,9 +223,9 @@ function format_organize_recognized_fs_blob_with_newlines() { # @test skip run_dodder_init_disable_age run_dodder format-organize - <<-EOM - - [alpha/golf !pdf payee-x-heloc zz-inbox + - [one/uno !pdf payee-x-heloc zz-inbox "heloc-board/CO-OP Modified Clarity Comittment - letterhead.pdf"] CO-OP Modified Clarity Comittment - letterhead - - [bravo/hotel !pdf area-money-tax + - [two/dos !pdf area-money-tax heloc-board/2022 taxes.pdf] us tax return EOM assert_success diff --git a/zz-tests_bats/hide.bats b/zz-tests_bats/hide.bats index d644a4361..cadab28ae 100644 --- a/zz-tests_bats/hide.bats +++ b/zz-tests_bats/hide.bats @@ -17,8 +17,8 @@ function mark_one_as_hidden { # @test run_dodder show :z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder dormant-add tag-3 @@ -32,8 +32,8 @@ function mark_one_as_hidden { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder dormant-remove tag-3 @@ -43,7 +43,7 @@ function mark_one_as_hidden { # @test run_dodder show :z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM } diff --git a/zz-tests_bats/import.bats b/zz-tests_bats/import.bats index 6586060e6..111293a86 100644 --- a/zz-tests_bats/import.bats +++ b/zz-tests_bats/import.bats @@ -60,15 +60,15 @@ function import { # @test assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @$(get_type_blob_sha) .* !toml-type-v1] - \\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -86,10 +86,10 @@ function import_with_overwrite_sig { # @test --- [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m 2135591162.342034946 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-anhgqrkdqnn6uzvcaj93hr7epr72v8vefv0gkrhd7ktskl6pez2cr8kwe3krrndw8lefh8a7k5dzhete4pjk72zfp4vgf8f0srpksqsy6nn8g !toml-type-v1] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr !md "wow ok" tag-1 tag-2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-3ya9fl5nlx7e77qk4vvx2ae7cez8uagywym8f2h5r6f4ern2fhslgtvqjge6fzxjwkkgfr9qjpt0kjjq6slzrm7phraq9jm4z42q2qqnnh2eu !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-sig-v1@ed25519_sig-3ya9fl5nlx7e77qk4vvx2ae7cez8uagywym8f2h5r6f4ern2fhslgtvqjge6fzxjwkkgfr9qjpt0kjjq6slzrm7phraq9jm4z42q2qqnnh2eu !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 dodder-repo-public_key-v1@ed25519_pub-vhhh5p6qfc9q5fpqm2xmjmetgnagmjpxxqlwlac4uvrhrvjvgevsv5z5q6 dodder-object-mother-sig-v1@ed25519_sig-jr7jqjh6rq0zd42n03z5vcl2grqr3eg9eqwnuwxj809h3eaxqw58mm3garf4nzenptmu9mhamhtlt9uuxsrt5wl4dshsfsnak3zvgrcelwkhr dodder-object-sig-v1@ed25519_sig-3ngs79lfywr6ewtdze0c9d3mwk824mymu8xjavzn3uc5s26fzwdy6mz487yasxhd2nqwefjuq3rtnfsj6a4p2u4dcj0wt2h4s2yl6qgm73qt6 !md "wow the first" tag-3 tag-4] EOM list="$(realpath list)" @@ -109,15 +109,15 @@ function import_with_overwrite_sig { # @test assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @$(get_type_blob_sha) .* !toml-type-v1] - \\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -151,23 +151,23 @@ function import_with_overwrite_sig_different_hash { # @test assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @sha256-.+ .* !toml-type-v1] - \\[alpha/hotel @sha256-95mv2p9mtaxxejqycc7fsvt55d3s8c0ptgazzgzgz4z7a3kvtujqa84qe8 .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[alpha/golf @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[alpha/golf @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[one/dos @sha256-95mv2p9mtaxxejqycc7fsvt55d3s8c0ptgazzgzgz4z7a3kvtujqa84qe8 .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[one/uno @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[one/uno @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc !md "wow the first" tag-3 tag-4] + [one/uno @sha256-z8suqjv408y63y3x8dt83cwlexzusepm94aqa0wu7j7suq5ghsgs7dg4qc !md "wow the first" tag-3 tag-4] EOM - run_dodder_debug show -format sig alpha/golf+ + run_dodder_debug show -format sig one/uno+ - run_dodder show -format sig-mother alpha/golf + run_dodder show -format sig-mother one/uno assert_success assert_output - <<-EOM - [alpha/golf @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d !md "wow ok" tag-1 tag-2] + [one/uno @sha256-8259ya5jn9gmqvvy5quv5zkk0ja83tnzduhr2yzzdddp0ftdl92s6huu7d !md "wow ok" tag-1 tag-2] EOM } @@ -184,10 +184,10 @@ function import_with_dupes_in_list { # @test --- [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m 2135591162.342034946 !toml-type-v1] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 !md "wow ok" tag-1 tag-2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 2135591162.520209927 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd 2135591162.606407248 !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539117 !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd 2135591162.697539118 !md "wow the first" tag-3 tag-4] EOM list="$(realpath list)" @@ -204,26 +204,26 @@ function import_with_dupes_in_list { # @test assert_success assert_output - <<-EOM copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format inventory_list +z,e,t assert_success assert_output_unsorted --regexp - <<-EOM \\[!md @$(get_type_blob_sha) .* !toml-type-v1] - \\[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] - \\[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] - \\[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] + \\[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd .* $new_pubkey .* !md@.* "wow ok again" tag-3 tag-4] + \\[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd .* $new_pubkey .* !md@.* "wow the first" tag-3 tag-4] + \\[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 .* $new_pubkey .* !md@.* "wow ok" tag-1 tag-2] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -234,10 +234,10 @@ function import_one_tai_same { # @test run_dodder_init ) - run_dodder show -format tai alpha/golf + run_dodder show -format tai one/uno tai="$output" - run_dodder export -print-time=true alpha/golf [tag ^tag-1 ^tag-2]:e + run_dodder export -print-time=true one/uno [tag ^tag-1 ^tag-2]:e assert_success echo "$output" >list @@ -250,17 +250,17 @@ function import_one_tai_same { # @test assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format tai alpha/golf + run_dodder show -format tai one/uno assert_success assert_output "$tai" } @@ -272,7 +272,7 @@ function import_twice_no_dupes_one_zettel { # @test run_dodder_init ) - run_dodder export -print-time=true alpha/golf+ + run_dodder export -print-time=true one/uno+ assert_success echo "$output" >list @@ -285,8 +285,8 @@ function import_twice_no_dupes_one_zettel { # @test "$list" assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) EOM @@ -303,7 +303,7 @@ function import_twice_no_dupes_one_zettel { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -315,7 +315,7 @@ function import_conflict { # @test run_dodder_init ) - run_dodder export -print-time=true alpha/golf+ + run_dodder export -print-time=true one/uno+ assert_success echo "$output" >list @@ -333,7 +333,7 @@ function import_conflict { # @test EOM assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-u20x7tfr58tc74p5y76xauwfrz382g96gfeenxvsaxaq6l3fnl2sntvzd5 !md "get out of here!" scary] + [one/uno @blake2b256-u20x7tfr58tc74p5y76xauwfrz382g96gfeenxvsaxaq6l3fnl2sntvzd5 !md "get out of here!" scary] EOM run_dodder import \ @@ -342,8 +342,8 @@ function import_conflict { # @test "$list" assert_failure assert_output --partial - <<-EOM - conflicted [alpha/golf] - conflicted [alpha/golf] + conflicted [one/uno] + conflicted [one/uno] EOM assert_output --partial - <<-EOM @@ -373,18 +373,18 @@ function import_twice_no_dupes { # @test copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder show +z,e,t assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder import \ @@ -398,17 +398,17 @@ function import_twice_no_dupes { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show +z,e,t assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -438,8 +438,8 @@ function import_inventory_lists { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/init.bats b/zz-tests_bats/init.bats index 01a9141e0..50f18c855 100644 --- a/zz-tests_bats/init.bats +++ b/zz-tests_bats/init.bats @@ -169,29 +169,29 @@ function init_and_init { # @test run_dodder new -edit=false to_add assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder init -lock-internal-files=false -override-xdg-with-cwd test-repo-id assert_failure assert_output --partial ': file exists' - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder show : assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } diff --git a/zz-tests_bats/inventory_list_json.bats b/zz-tests_bats/inventory_list_json.bats index aa7a35cf8..1cbd0e4fe 100644 --- a/zz-tests_bats/inventory_list_json.bats +++ b/zz-tests_bats/inventory_list_json.bats @@ -43,9 +43,9 @@ function json_init_and_checkin { # @test assert_success # Create one directory and modify a file - mkdir -p alpha + mkdir -p one - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # modified with json format - test-tag @@ -56,10 +56,10 @@ function json_init_and_checkin { # @test EOM # Checkin the file - this will test signature creation with JSON format - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success # Just verify it succeeded - the actual file name might vary - assert_output --regexp '\[alpha/[^ ]+ @blake2b256-.+ !md "modified with json format" test-tag\]' + assert_output --regexp '\[one/[^ ]+ @blake2b256-.+ !md "modified with json format" test-tag\]' # Show the inventory list to verify it's still JSON run_dodder show :b @@ -147,8 +147,8 @@ function json_signature_verification { # @test assert_success # Create directory and file - mkdir -p alpha - cat >alpha/golf.zettel <<-EOM + mkdir -p one + cat >one/uno.zettel <<-EOM --- # version 1 - tag-1 @@ -158,10 +158,10 @@ function json_signature_verification { # @test body 1 EOM - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # version 2 - tag-2 @@ -171,7 +171,7 @@ function json_signature_verification { # @test body 2 EOM - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success # Verify fsck passes (includes signature verification) diff --git a/zz-tests_bats/mergetool.bats b/zz-tests_bats/mergetool.bats index 62f409dba..75a1efeda 100644 --- a/zz-tests_bats/mergetool.bats +++ b/zz-tests_bats/mergetool.bats @@ -27,13 +27,13 @@ function mergetool_none { # @test function mergetool_conflict_base { run_dodder_init_workspace - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >alpha/hotel.zettel <<-EOM + cat - >one/dos.zettel <<-EOM --- # wow ok again - get_this_shit_merged @@ -45,31 +45,31 @@ function mergetool_conflict_base { not another one, conflict time EOM - run_dodder organize -mode commit-directly alpha/hotel <<-EOM + run_dodder organize -mode commit-directly one/dos <<-EOM --- ! txt2 --- # new-etikett-for-all - - [alpha/hotel tag-3 tag-4] wow ok again + - [one/dos tag-3 tag-4] wow ok again EOM assert_success assert_output_unsorted - <<-EOM [!txt2 !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM # TODO add better conflict printing output - run_dodder status alpha/hotel.zettel + run_dodder status one/dos.zettel assert_success assert_output - <<-EOM - conflicted [alpha/hotel.zettel] + conflicted [one/dos.zettel] EOM } @@ -79,23 +79,23 @@ function mergetool_conflict_one_local { # @test export BATS_TEST_BODY=true - run cat alpha/hotel.conflict + run cat one/dos.conflict assert_output --regexp - <<-'EOM' - \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* !txt2@.* "wow ok again" new-etikett-for-all tag-3 tag-4] - \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] - \[alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* !txt2@.* "wow ok again" new-etikett-for-all tag-3 tag-4] + \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-sig-v2@.* !md@.* "wow ok again" tag-3 tag-4] + \[one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv [0-9]+\.[0-9]+ dodder-repo-public_key-v1@.* dodder-object-mother-sig-v2@.* dodder-object-sig-v2@.* !txt "wow ok again" get_this_shit_merged tag-3 tag-4] EOM # TODO add `-delete` option to `merge-tool` run_dodder merge-tool -merge-tool "/bin/bash -c 'cat \"\$0\" >\"\$3\"'" . assert_success assert_output - <<-EOM - deleted [alpha/hotel.conflict] - deleted [alpha/hotel.zettel] - deleted [alpha/] + deleted [one/dos.conflict] + deleted [one/dos.zettel] + deleted [one/] EOM - run_dodder show -format blob alpha/hotel + run_dodder show -format blob one/dos assert_success assert_output - <<-EOM not another one @@ -108,7 +108,7 @@ function mergetool_conflict_one_local { # @test run_dodder last assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] [!txt2 !toml-type-v1] EOM } @@ -122,13 +122,13 @@ function mergetool_conflict_one_remote { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] - deleted [alpha/hotel.conflict] - deleted [alpha/hotel.zettel] - deleted [alpha/] + [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + deleted [one/dos.conflict] + deleted [one/dos.zettel] + deleted [one/] EOM - run_dodder show -format blob alpha/hotel + run_dodder show -format blob one/dos assert_success assert_output - <<-EOM not another one, conflict time @@ -137,14 +137,14 @@ function mergetool_conflict_one_remote { # @test # run_dodder status . # assert_success # assert_output - <<-EOM - # changed [alpha/hotel.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + # changed [one/dos.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] # EOM run_dodder last assert_success assert_output_unsorted - <<-EOM [!txt !toml-type-v1] - [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] EOM } @@ -170,13 +170,13 @@ function mergetool_conflict_one_merged { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] - deleted [alpha/hotel.conflict] - deleted [alpha/hotel.zettel] - deleted [alpha/] + [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + deleted [one/dos.conflict] + deleted [one/dos.zettel] + deleted [one/] EOM - run_dodder show -format blob alpha/hotel + run_dodder show -format blob one/dos assert_success assert_output - <<-EOM not another one, conflict time @@ -185,14 +185,14 @@ function mergetool_conflict_one_merged { # @test # run_dodder status . # assert_success # assert_output - <<-EOM - # changed [alpha/hotel.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + # changed [one/dos.zettel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] # EOM run_dodder last assert_success assert_output_unsorted - <<-EOM [!txt !toml-type-v1] - [alpha/hotel @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] + [one/dos @blake2b256-k680x8tenq3j3ts88ydzga2ghjyg75czkfhzr4g3xxc8f33tykjs47n7xv !txt "wow ok again" get_this_shit_merged tag-3 tag-4] EOM } diff --git a/zz-tests_bats/migration/generate_fixture.bats b/zz-tests_bats/migration/generate_fixture.bats index ddcc21db9..de1170272 100644 --- a/zz-tests_bats/migration/generate_fixture.bats +++ b/zz-tests_bats/migration/generate_fixture.bats @@ -93,7 +93,7 @@ function generate { # @test create_test_zettels - run_dodder show -format tags alpha/golf + run_dodder show -format tags one/uno assert_success assert_output "tag-3, tag-4" } diff --git a/zz-tests_bats/migration/main.bats b/zz-tests_bats/migration/main.bats index cda0e1a6e..8eabff7b8 100644 --- a/zz-tests_bats/migration/main.bats +++ b/zz-tests_bats/migration/main.bats @@ -22,8 +22,8 @@ function migration_validate_schwanzen { # @test run_dodder show -format log :z,e,t assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -31,9 +31,9 @@ function migration_validate_history { # @test run_dodder show -format log +z,e,t assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -48,8 +48,8 @@ function migration_reindex { # @test assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/migration/v13/.dodder/config/config-mutable b/zz-tests_bats/migration/v13/.dodder/config/config-mutable index b588cd52e5b5d21845206ba46ff544681e7855c3..a2f9186d3b2da5d527437ea1da2ccf97a69abf14 100644 GIT binary patch delta 65 zcmcblaam)-5_ZPjlb5oGh=>>&ni`lH8yFj!>X{fC7#olquE8dw^bZRX|3WEX&o8Cw{bnVXqS N=HuA6*+qb#1prgi5P$#x diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/config-seed b/zz-tests_bats/migration/v13/.dodder/local/share/config-seed index 20242e390..57187d4ae 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/config-seed +++ b/zz-tests_bats/migration/v13/.dodder/local/share/config-seed @@ -2,7 +2,7 @@ ! toml-config-immutable-v2 --- -private-key = 'dodder-repo-private_key-v1@ed25519_sec-5462mrzwq8r6q3286at94wrpmlgd8ljgcf7t7xzua4nkyc2c596472xva23qnty2k62eqgqqvl2ztcwy2hjpluwdd448xzdtjkw0ffqmyt4vg' +private-key = 'dodder-repo-private_key-v1@ed25519_sec-x02ej4mua4wewnzdhask02483le7udz9ufxjjla90waea7gsjqwt4rh2g0pa6d2wxdmdr3mssl5y0d2hgvyu8zhwjxt3szz5ht06qesn6vtwl' store-version = 13 id = 'test-repo-id' inventory_list-type = '!inventory_list-v2' diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/Abbr b/zz-tests_bats/migration/v13/.dodder/local/share/index/Abbr index 0ddb2c84437a4af6258e6e434d95c6fa09c7cabc..baeb0203388c139b3a2acf2da94ff0bad33874bc 100644 GIT binary patch delta 205 zcmZ3_Ih%9Ce@4dHlb9@pO_&&%85s=0q!E}jp6tVcr5G4l__RujGE-73^g_VY|1MKTMixfKd=QZbB2qzwK9FE41slSYm(P#_ lVdWQZe$Ldy=*Y(i<}>H#r80sH#V}JAWF|KKU`H@8003_we@4djlb9@p4Vf6285xYgq%oK@ne4-)U0=e;#K^$Nou8YdTT)q&s#|8r zkP8-KOkrREN-;39@M)D4Wu~N7=!Jl(|6MMOj4X_di69~eL==FC47iv+kj0b^HiS7p zCygNk%w)+gNzGw^0I<1?AagfAXDViN6JP`@VNJ{_$Vg-aS&Ct&0?1BWrh?34U;qGf CR4Q)( diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_id b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_id index 29894bbcc83d682cb07cbec9d501136f1333074d..9536476a8f6642ab82117453fc9c63912d3e9cc0 100644 GIT binary patch delta 76 zcmV~$!3Ki>007Y5Ws=NflF4L}*007Y5Ws=NflF4L}*a_l&*V1N*O*N}z*;E-IAfFLJGtc^XX7jr# zCz?K8@>+Us_KppuftM!n-{W~zSE^y~^!;|Ias~#N29AUC)y!V~;b=A7v({T<4O<0k YXf2DSov_kbigzK02k>qlmGw# literal 147 zcmZQd*m|$}sn@Z0Tc#|{5{R3c$TO*Mn$^mc&%PF`O%Pl%odE{&86hmzuxY#Hf5!9m z?l75?bmWd2i_8Y2BqqfGH`NCl_&9X!xmBS$U>exkyF714ov;*HE4H$))lJXNML#+% Yoa^q32>Y`DkMBD%_W8o6gVt*(cBHT9zoJ%$T>3OZ~$9$s&rTyq6dmz`%tGLaRSKuw~1G zr3o+R#YN3=o49`JC(EDtrZJx)ZwmjgxYzmzs+@r#2g=fko9wVjQjoPeeT~NFEtT$@ XrJYy5e9pJ!k*US5nRZt`V`u;X!q74n diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 index e8dc0ebd3677185c4ac42ddd3ae68a76f85305fc..4a6756490d166076a280d1709a81d492942cc53d 100644 GIT binary patch delta 155 zcmey$c!bf=fcM9j&80il1+I5hH_M;AUCsMnBkZ5T$Is?#PaHAY%FoCE1?Qox35H45 z!G4!5AKsF=YAR=Y>e=#!^p_U#>|2a|ni~z0-d+@*2h+lk57lGWR{9_+{HQT|K8xPJ eh>nnN#~x_U5M3TGe@XI%TkMx7Y^qQ#Fbx2^!8Bk1 delta 205 zcmX@Y_?2;@p<%s=WKUoX%XG$XJ~<@;LIqD}uM2u!{I2MMV%Mv_Cm!AG%nKPAz#tz= zn`~{lrR^*mUaGKe#nzOj+bRF=PFWzeXYQ|!g@!SYcbw!_g{WtMX)tXmT>tdI;=cht z0qMKur|Z@(x)mPBcyP`nk$9HtuFpdML)A0Db=aNIITdzbdYs?WrHpe`D(r*1cS!Kf Wvo%*alws-2tyK(l2?Ik8lm!53YeUfh diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 index 631f72970804ed1cba66c71e366f1d41dc9d16b1..fb1a6bac31c28f7069207df69fb610aa9670ba34 100644 GIT binary patch literal 147 zcmZ<|(0cW7UDDI0`BNO#Z|>#N&9M4+!=msK_pPX2lk9pX76vHDXM`}k&$~#|RVZHfW>-|tuC34F8pTUQU8>7{gq*U7p$9kwasQh)iE%fpQvR409|Z1Z2$lO delta 100 zcmX@YIGItaYspjn=lQ4gR+RV~Dsu!BXvwi(UaC{*xbcSa1mPPFQllBdy(lg9OLew*a!!%r-er)?Uk4~;IC%?IG3>aT+ bWSt=>$D{CZ>F1T2_xIh0DraEGhiU)-O-wQb diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-c b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-c index c8c264db0659344636b64cd2729c1044cbba60d3..f2bd74ebd683719721b98de39719a18f6ebfddc8 100644 GIT binary patch delta 55 zcmYdFnrLWfcq(+lg?hgymH${(gdR866uL58)7dE?Yrm8IlVH{A{6);F3=j~`2%!OB Ceh~ox delta 54 zcmYdFGCWklG?n>We$|(M{PlZ<+O0WS&$h8HO_x%Wm2TK+=5NBilaT=oZbIn^h5#*J B5KRC8 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d index 2abd5a5ec0d26c5b07084c9ab6fa0cd18c73c608..d28cb40249775992f33db5d1341af1ee0972666c 100644 GIT binary patch literal 245 zcmca$G>iB2?yvJxPiDq_S|WdHMRw-n90jdh)()?YF)zEOFfl;ERYnNoLgCdlI{l8G z(ds+%Kb%!B?tW5oWRF6vXa8S~8A|&(oj70`@}U~8Fo&i^hi4z~aG%X=;<_|g-$SRn zX#Mqy7XpoQ(tS;iv!H9Z^;~J<7q_l>rf%tCeJ0U!wR0ve>84m<_2ZpivTPrP3mj%G<@`~T<$Le(#A(5f2jp5mF~C4RBZT#vc}Y#bUsH$m zpF2%Lsmsrw5Eq_1=zz!G|d~7|%mZc4UHR1pvlZG>-rP literal 98 zcmeyR$$YkVr^2D_#S+hqY~91eWJ<&wxfIvTxW38w_FR#F+^P%^kk1IAe+xzKmf6y! kWbx&n8t=6B1od~NR!TNH4GZQ}If+IE-)3G2RS44n0E~qlkpKVy diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 index 8340a55d2387f1082e48ec32827b73d1e2454b0e..0760c2aa451b385bd9a97b882180611ec85a819e 100644 GIT binary patch delta 252 zcmVamlz0Cy5FE?k)0$~AWE7>u`uPQYdQlP=lLQy_yXLV zKK&3d+GPs!eH@N;d%)$EdOU(^tMTRk`iv?x*lR1^T#j(~#@ z000000D#Dj_>QiHo)D840XQH#Q%=)4;o2P4H6A_6=BI#X={R2pv@=YDfiPn2(G#A^ Ca%D6C delta 252 zcmV&f7OJI8DuG!=2o$_j3LhSd#oxr}8w#9~Lec2W5PR1^TN#gKy# z000000D$@Wf9u?3hB9t z0$tWn-tK&%9j}7_{jT?CoW8s-`||$)H-?n_l$6vW-J;ZjeBFZ5q@2v;`0Uh5-7-Ul z)D$CAQ$x#mpeVzxzE{qN@0$7NcaYrF^fBqClnH&@&*Uh?tb+!Ng2=B#_rsORs` zw7*Hm{JEmYtc-U;wT|Dak1Y7u^nzbxqSCR8TntWZ4CVRd3i;WttPCZI>AHqc+9*VX z;aXoqvj77KG)%a7eRBJ&k9-Uz0St<{DJV|pH+p;jNTX0$Si;@SM^||Nyve+BpM#1~ zsfm#L$(Khq4TW!b(#cQZ^E5*Z%)e7H98G>w>@=x zXZ|46vL%W4!gC8|r&Y_oEq>m;#@A)F`Y@p( zinf)IAOL67CE>(X+#$f5ar(PXze&WLGwxAkkDexeswA-O06d zS8f;7GELLEOKKmejWr{<(3fLydmJn44RXza$8mZ`sOPuEmgp5C8xG z004l1;hC`7-K`7&bP@m|X>N99Zgg*Qd0%X4b960sGIKuwWN&0-WpXWVVrpe$bS-3Q olgk4SASdC#w6x%*VCkM-TAW6aua)vS`ENB`@>$sv_&DB${AP`KV*mgE diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 new file mode 100644 index 0000000000000000000000000000000000000000..24491c3d5a4013c9a1cd9de8eb42051d4ab8131d GIT binary patch literal 469 zcmcc27|h7P=FQK*!pp*xpO?zSsL#Tbl3(no!@!V~lbD@qlw@RT#vtM%wmfEswCL>M zvro1O1xzshB5-nQZ!8P{`Y((V4y_9gaAQcxPf1BF(k)6Y$k#0>P0Gnkj?Yf5)Gae) zNKG*^H8r%12Z}Q6>U-sU_^zp+aoNS=1??}~w}v}&9`1TKak>OY$gcYf(h3t{2IVJZ zr6!l?7H6jGmKnj#0CE{*^}A}=c%v8StbZeVU?%6h^-{~!>ZZz_-kzO0&2EC5UiHP= zLn7~FxUwtl?;aCc&)`+6AiPG)Q2d|#d5_F9llYx@7|Qd@74owc64Mhi^ITaON)pp` zjiIzjhzP^AzJ_K21`uetactYXg$vj5Gn51{DCVZ1IHcd`?foN-LS>UUjs2b0szVdvoiny literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-3 index 3505e7d4ab4d5585ff6e1adbc578bdbc5d2082fe..e8add64d4ddc3085c6a4e1ad4116938871ecc462 100644 GIT binary patch delta 170 zcmV;b09F5x2B8Cxk082^>O;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|S;Bvy|y z?cc0IzfRU{fg?tBcV^^Kc3CaD&|~0bCEot9VMTX)T{yA6fmqol$%5L&jEnj=TNM7uV!(5hESA?wvd5$mpax?C> z&YO9gBadi=U7o-ZBEqol=!9kg1`uf2aOuzNm8-XNOx9#HR+v?DKiDI=Xdy#<rY@#&aLOm?#eg` zZIQgReDcIJO=A3BzyD;ST-z0U3)9GrW!KDB8EtNlU^2BR+7z3ZQx{q^U;e-5t;5-U z%P;hWsp`9Y%}?i6d2c%X-E5Nu{*Mfsk9MQ^ea4rU3m)B_%*#+B#Gsg&SC*Prl3!FA zpOaZ!qFZKEY|oIApOTVVq?@0Vm6}|lo02)%myur~$n@BTeqXNxBC*ag-}k8*yl%N% SbGfA>&tuKy9Y5CQIs*Va6v1%- diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-4 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-4 new file mode 100644 index 0000000000000000000000000000000000000000..0fc5cfcdc82eea9ee427a496d3775f9f2b3c39aa GIT binary patch literal 367 zcmd003}$3t^Oj*?lj3GFGBh2Hl0s@<%nGh;%cD)%1@3eIdFUJ9#*mVql9F1aTa;RmuUk-> zl#`hppPgE%TV}|Rnqp*XYG@e`6lK`e_saS3T~j~fvWv$H+F!VD4R_`|-1TnabP0}- zUH2EH6(+(A%1_ElO)k+b&P>-WGlH7|Y9zK|%9s%dDg~ g%$w63lQ->C;#s;yqqbMBke@BuF)k#*b&k?s0N&GvF8}}l literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 new file mode 100644 index 0000000000000000000000000000000000000000..cf5ede6e10ae2f62167881fa3f237072aa5ab373 GIT binary patch literal 441 zcmY#p2xeqp@MdCQU`!CsEEy5hJj6ro5{$~)WFQxz}V1~iBXS>$;8mW z)YQPxz{F99fgvd;F+0^L$;i}=57{RmO0@5|GF zWRVr%#*mVql9F1aTa;RmuUk->l#`hppPgE%TV}|Rnqp*XYG@e`6lK`e_saS3T~j~f zvWv$H+F!VD4R_`|-1TnabP0}-UH2EH6(+(A%1_ElO)k+b&P>-WGlH7|abJmrCsuu3Cfv%HAk=bxF64W5+utwKicv2d!?)gZ$JGwKV!D&=c}BSOYXmZu~j-E zGelsr=jKQcOAcVTTwS7k@MY=_)1^K!K zrAaxN$?@5#mAYky45=wbra)8Ufuan%`d&F7zH91dTz2tzLHi5$t>Mm`hr8ZQoG!r; zvg`hWw8BJ~LHS8psmUd}#hK~4Wkzr_fLsRNy}tP;_Fa8Yr<`$`{ea3BgBx+rJh!Jb zJMF2v(I9t7HaSMALOW^Zk=)lCc9u*yNp43SM9VzW>K7%t}=&+FkI_vXck}q zfrgITJ)btr`pL&oBE+DWnOByYSCU^;8K09`TmrPX*dEP2DVgc1U>Szuj6_h-TqwM{ iMyKD=Gg^IT{)e;b#obRzj_gsW_3ZzvF+*uTrxO4U5RJb8 literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-c b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-c index bfc9c9cc3a275b617b4ce6fa0f91dd1485c3f484..b8cc935bd25da712a8cb537b9307f4ce1317eeb8 100644 GIT binary patch delta 170 zcmV;b09F5_1Ed3xkRZB_>O;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|S+p zRpcM>&24IP39FTy^rVrnBvwFn zADx{gjq^Pk*neSikJm_m`MDq6wk~sKTT(ZtGH4b6MAJN@BUaG*DK YejWr!_SBDR-G=5G$o*j zbkaJCKm-9scl{wR_hKJ3eEY)f#2QV7NYf}0-|!b|9}tufe$ z4UP~R;2?5**#6qoAE)^8{3f=v{inMdw*$fsgZ!?z`YK?bilh){zmZ8s+{h#w{bJ!T z(1prZZ?%dl9dZBS$$tO^h#Q>~O8D5IYveTv7*IUf&G&w%vf^)F6~b7jKIkK!oxVPD ekl!v_ad^6VBQ|2ewLIsFY0CltUzFb?i68}~oq;_7 literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e new file mode 100644 index 0000000000000000000000000000000000000000..99ed59aaf26ad709137f584193ad0d6478bc0756 GIT binary patch literal 283 zcmV+$0p$KDwJ-euSd|C>29-e`P)GD&M5=yuN%2c9$I2pRCOZLb5Q)DP6sHQgPy;sr zH~=^R4CDD2F5;$mQakk;S%TYA_e0@6l;ghj!RfTs(U|n4gVa0XPaYE)7!>|1{r?L* zArVOtPjG^VX1c+4b)k$HXRV1{O45v9J+;Pty*xn(t_4Q;clQPe8SN(vO_>O;$WWg} z_Bm&8gX|76#NsP^G8~=o@u#Q8kef2$%&<$KGNfedq8AauyLwgHi zm~_U*G)(;|HDtT7N!|ef1)kC2DzmVy;lRAiC;@{*-ZxaN51EE|M)Rj7%_W<#BgTa; hx*E%#opLeZeVTM34^N{^t-Ow9syQgKuSTUCRSk!VwEoHT_RX>h22L&S-3Q8UK3JTo( zM-f^=$#N3qQJZh#2mJdR()OnyX9Eaiqg=4*5B=fdx)s;DAavS-`KLScmS^!@)~h&o z@}cw-8%vZtWQ$uB{7vU1n+%;*cmxxY>%!=900+rLmJrB9mJk9rfkj48gy={YARe@? z|CqVqk7*s^CoQdgf@jb8LRp P0|0fvPV`0jMUn_oU7E6N literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 new file mode 100644 index 0000000000000000000000000000000000000000..37303c0cce1660b8e1f192fd90137da03b6cc465 GIT binary patch literal 365 zcmV-z0h0bGwJ-euSS1Sprd(AVP)R!=;dN3B2~HlVEg4lc!|zjA2luN6Pz~E_P5@2- zN&p6Z&EZ1DDDb_*Bh*Pnv6324g>=$7s(^^IabzyjvlgqIwRC(IorfNT7(Wv7(vt3SU zQt2$VSJBDi;jw~j-}u2@beR{+kdoeuC~VETwOXnwMpm35#2EBNI0{Ok2MY?@csLPU z0u69hY>UmJ&)z^PhdR9)Kzt8Bq8O_ztNYQ%#BlptU-ZwJCodLVleWi{wMOpZ9Yy#o zs}uY+KiH!OhHX3LB%IT3ba#1kzw3;V00+p(wh#p)+d>G;1HlhmfPk?+?j_zvXGwi& zqvGGAL}Wx{O640uHr4uO(ct55^(FStc1;T8PS2OsO8hD|uOwI+53#%%T|QcL0|0fv LPV`0jM3M+n!jGtH literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 new file mode 100644 index 0000000000000000000000000000000000000000..cb7b5763c3398adc82289cf173c404f51788333c GIT binary patch literal 451 zcmV;!0X+UFwJ-euSk(;xR%B@$P)R!=I>{2@<$ulAmW-;J;rB_FkO80uPz~E_WdLCS zT>wT_oE@YvEEeG?D0LnzDD1++iQp0x!(xkrg}A`*y~88YIm#r&)PO1=gO*W+Lp*uV zt+MfOBO1P(P``b{zbKCXBsVb(S&n4fIN{bFt(0U?q~lR6bqoj2rWgu{LtO}9Js1SF zN0gTZvD!Q3T(jzu+`sUHJ>|HtZHG<5xzdg9EN|}jC11o&Uh};D8mf7e&|b)de0Cud za)BYD546w@CWeDT73u1&Rw`aJ9q-v~<*i|9D&u+iMfFc{w{HxzjGoS+>}8B8dJ)Pn zrfX2w`hkyj|2_OixmRUL-H$#ZcH7^JJ>QsV@?z0782|^VkWCY)kWCW;I^%>$KtvP# zzy$~x>EmABZFH8QwWHOP#jtGW*q%Ogn`6vUiZ3Nf3$5{PnKr+)mNjb6vpyXuR>K|xgD;jNzNr^@ zLLs%#6Nw;3cm2t?d$HJ@7GtX0s+TXn{%W?rw?xmeV1gt56O01{KTWKJhuCAm$AF_g zIzniG1E#;Nn>Bc&?KITNW|l6U?5<}OpNZ_m&qVf7UMw62 zd+mHlPVn2>rE9XLya@mWi63Pnme6Q}l0=>$0Rs*XOfg?hP&T{@u;EHY%a}PQHEI0d gVwIfYj&DI>(-~Kbj1HJGwa>?L0svo>-y?}21!W|A*8l(j literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a new file mode 100644 index 0000000000000000000000000000000000000000..33edf054121392489150275c84821d18fe5d7175 GIT binary patch literal 418 zcmV;T0bTwmwJ-euSj`Lo24P?uP)B=^SZ%3EE-0(d15p*SlaO1s0m`UM=Ryry09OE5 z0QrCsN}UG@h(3H+4_v_#cpi=n_psr6#|uCPrF51_1ByTf6-E&!;2I@ztW$;SFF8_& z(6q^Xc~!P7ewX2d;#{ECQlTr|#dK0JXhlPz4&lJsEP){4U4ep^rkU&a1?D?0Dz?9= zmc}~^>B}a|NjR)mKdwV{!*3G(jFWbMRydQHz=-rw_6a@!|CDzj3{(H?X>F*?Cf7rX|In5KlYXWHBnAU&~;_xa+U|orrYT zGH29loaNwmjpLEzhdwjypL*eM_(x9BirXkA>kMK<0;yz>Ar^#@1^_L{A^=ca;eZIU MJ<=ED2T3AG0Tuhm)&Kwi literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 new file mode 100644 index 0000000000000000000000000000000000000000..25e23d9252571d974a12bd4a2b57e6c61e1efd63 GIT binary patch literal 280 zcmV+z0q6cGwJ-euSbYcp2Gu|tP)9sSVL=6mfje42iiylbbjToq;4j6gLN3%f05||Q z0QWU@^TKlo-=$HG$D$CoMRx(&6Ln;xQ>-P_yj`@Z6?+;>MvAnk#=u~q0WpS#CBO!S zR6}e?1ObI7{2>qRS95dLdy)JaT{>rtE!k=2UqX(-FM${sOE3-${rpG?M^X)b4|8Ka zIYP+5L8=|sjaM&gKhuBB^QO3sAmsRQ|@o`4_4*&(JpRJQh_?g)@cAEqY8vNTIxKZ*awuMSTPMu_?RJEqq6_Jhq eyByyNHWn2eQEBGMPUqH}OA7)3UzFb?i68|-D0-Fv literal 0 HcmV?d00001 diff --git a/zz-tests_bats/new.bats b/zz-tests_bats/new.bats index 4d114bbcc..903a418cc 100644 --- a/zz-tests_bats/new.bats +++ b/zz-tests_bats/new.bats @@ -17,7 +17,7 @@ function new_empty_no_edit { # @test run_dodder new -edit=false assert_success assert_output - <<-EOM - [bravo/golf !md] + [two/uno !md] EOM } @@ -26,8 +26,8 @@ function new_empty_edit { # @test run_dodder new assert_success assert_output - <<-EOM - [bravo/golf !md] - [bravo/golf @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + [two/uno !md] + [two/uno @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM } @@ -47,17 +47,17 @@ function can_duplicate_zettel_content { # @test run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [two/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [alpha/india @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [one/tres @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM # when - run_dodder show -format text bravo/golf + run_dodder show -format text two/uno assert_success assert_output --regexp - <<-EOM --- @@ -70,7 +70,7 @@ function can_duplicate_zettel_content { # @test the body EOM - run_dodder show -format text alpha/india + run_dodder show -format text one/tres assert_success assert_output --regexp - <<-EOM --- @@ -94,7 +94,7 @@ function use_blob_digests { # @test run_dodder new -edit=false -shas blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] + [two/uno @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] EOM the_blob2_digest="blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg" @@ -108,13 +108,13 @@ function use_blob_digests { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [alpha/india @$the_blob2_digest !txt] + [one/tres @$the_blob2_digest !txt] EOM run_dodder_stderr_unified new -edit=false -shas "$the_blob2_digest" assert_success assert_output --partial - <<-EOM - blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["alpha/india"]). Ignoring + blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["one/tres"]). Ignoring EOM } @@ -127,7 +127,7 @@ function new_empty_no_edit_workspace { # @test run_dodder new -edit=false assert_success assert_output - <<-EOM - [bravo/golf !md workspace-tags] + [two/uno !md workspace-tags] EOM } @@ -139,15 +139,15 @@ function new_empty_edit_workspace { # @test run_dodder new assert_success assert_output - <<-EOM - [bravo/golf !md workspace-tags] - checked out [bravo/golf.zettel !md workspace-tags] - [bravo/golf @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + [two/uno !md workspace-tags] + checked out [two/uno.zettel !md workspace-tags] + [two/uno @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM run_dodder status . assert_success assert_output - <<-EOM - same [bravo/golf.zettel @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + same [two/uno.zettel @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM } @@ -164,10 +164,10 @@ function new_zettel_file { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [bravo/golf !md "wow" ok] + [two/uno !md "wow" ok] EOM - run_dodder show -format text bravo/golf:z + run_dodder show -format text two/uno:z assert_success assert_output --regexp - <<-EOM --- @@ -191,10 +191,10 @@ function new_zettel_stdin { # @test run_dodder new -edit=false - <"$to_add" assert_success assert_output - <<-EOM - [bravo/golf !md "wow" ok] + [two/uno !md "wow" ok] EOM - run_dodder show -format text bravo/golf:z + run_dodder show -format text two/uno:z assert_success assert_output --regexp - <<-EOM --- @@ -218,10 +218,10 @@ function new_zettel { # @test run_dodder new -edit=false -description wow -tags ok assert_success assert_output - <<-EOM - [bravo/golf !md "wow" ok] + [two/uno !md "wow" ok] EOM - run_dodder show -format text bravo/golf:z + run_dodder show -format text two/uno:z assert_success assert_output --regexp - <<-EOM --- diff --git a/zz-tests_bats/new_no_workspace.bats b/zz-tests_bats/new_no_workspace.bats index 7dbc622de..8e508c676 100644 --- a/zz-tests_bats/new_no_workspace.bats +++ b/zz-tests_bats/new_no_workspace.bats @@ -19,7 +19,7 @@ function new_empty_no_edit { # @test run_dodder new -edit=false assert_success assert_output - <<-EOM - [bravo/golf !md] + [two/uno !md] EOM } @@ -28,8 +28,8 @@ function new_empty_edit { # @test run_dodder new assert_success assert_output - <<-EOM - [bravo/golf !md] - [bravo/golf @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] + [two/uno !md] + [two/uno @blake2b256-w2uv3ams8736hqllgvzgf7563m34ycem40nf8sg3mkefnrd9m75s083p85] EOM run_dodder status . @@ -52,17 +52,17 @@ function can_duplicate_zettel_content { # @test run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [two/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [alpha/india @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [one/tres @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM # when - run_dodder show -format text bravo/golf + run_dodder show -format text two/uno assert_success assert_output --regexp - <<-EOM --- @@ -75,7 +75,7 @@ function can_duplicate_zettel_content { # @test the body EOM - run_dodder show -format text alpha/india + run_dodder show -format text one/tres assert_success assert_output --regexp - <<-EOM --- @@ -99,7 +99,7 @@ function use_blob_digest { # @test run_dodder new -edit=false -shas blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] + [two/uno @blake2b256-t9kaw07x3c89sft5axwjhe8z76p6d2642qr5xc62j5a4zq49pmvqypsla0 !md] EOM the_blob2_digest="blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg" @@ -113,12 +113,12 @@ function use_blob_digest { # @test assert_success assert_output - <<-EOM [!txt !toml-type-v1] - [alpha/india @$the_blob2_digest !txt] + [one/tres @$the_blob2_digest !txt] EOM run_dodder_stderr_unified new -edit=false -shas "$the_blob2_digest" assert_success assert_output --partial - <<-EOM - blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["alpha/india"]). Ignoring + blake2b256-65lys7dm4vfkag9y5j2hqhnah45qnc0kqvpdc46dw2cw63974a5q40q7xg appears in object already checked in (["one/tres"]). Ignoring EOM } diff --git a/zz-tests_bats/organize.bats b/zz-tests_bats/organize.bats index ba1bd4b96..f323f6707 100644 --- a/zz-tests_bats/organize.bats +++ b/zz-tests_bats/organize.bats @@ -43,7 +43,7 @@ function organize_empty_commit { # @test assert_success assert_output - <<-EOM - [bravo/golf !md "test"] + [two/uno !md "test"] EOM } @@ -54,13 +54,13 @@ function organize_simple { # @test assert_output_unsorted - <<-EOM - [!md !toml-type-v1] - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM } function organize_simple_commit { # @test - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success run_dodder organize -mode commit-directly :z,e,t <<-EOM @@ -71,14 +71,14 @@ function organize_simple_commit { # @test - [ tag-2] - [ tag-3] - [ tag-4] - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 %virtual_etikett new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" %virtual_etikett new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" %virtual_etikett new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" %virtual_etikett new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" %virtual_etikett new-etikett-for-all tag-3 tag-4] [tag-1 %virtual_etikett new-etikett-for-all] [tag-2 %virtual_etikett new-etikett-for-all] [tag-3 %virtual_etikett new-etikett-for-all] @@ -90,8 +90,8 @@ function organize_simple_commit { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] [tag-1 new-etikett-for-all] [tag-2 new-etikett-for-all] [tag-3 new-etikett-for-all] @@ -101,10 +101,10 @@ function organize_simple_commit { # @test } function organize_simple_checkedout_matchesmutter { # @test - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder organize -mode commit-directly :z,e,t <<-EOM @@ -115,8 +115,8 @@ function organize_simple_checkedout_matchesmutter { # @test - [ -tag-2] - [ -tag-3] - [ -tag-4] - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM @@ -126,8 +126,8 @@ function organize_simple_checkedout_matchesmutter { # @test [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] [-tag new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t @@ -139,25 +139,25 @@ function organize_simple_checkedout_matchesmutter { # @test [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] [-tag new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status alpha/hotel.zettel + run_dodder status one/dos.zettel assert_success assert_output - <<-EOM - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] EOM } function organize_simple_checkedout_merge_no_conflict { # @test - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >alpha/hotel.zettel <<-EOM + cat - >one/dos.zettel <<-EOM --- # wow ok again - get_this_shit_merged @@ -172,31 +172,31 @@ function organize_simple_checkedout_merge_no_conflict { # @test run_dodder organize -mode commit-directly :z,e,t <<-EOM # new-etikett-for-all - [ !md ] - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1 new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status alpha/hotel.zettel + run_dodder status one/dos.zettel assert_success assert_output - <<-EOM - conflicted [alpha/hotel.zettel] + conflicted [one/dos.zettel] EOM # assert_output - <<-EOM - # changed [alpha/hotel.zettel @7ac3bdeb0ac8fd96cd7f8700a4bbc7a5d777fe26c50b52c20ecd726b255ec3d0 !md "wow ok again" get_this_shit_merged new-etikett-for-all tag-3 tag-4] + # changed [one/dos.zettel @7ac3bdeb0ac8fd96cd7f8700a4bbc7a5d777fe26c50b52c20ecd726b255ec3d0 !md "wow ok again" get_this_shit_merged new-etikett-for-all tag-3 tag-4] # EOM } @@ -227,13 +227,13 @@ function organize_simple_checkedout_merge_conflict { # @test [!txt @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >alpha/hotel.zettel <<-EOM + cat - >one/dos.zettel <<-EOM --- # wow ok again modified - get_this_shit_merged @@ -256,8 +256,8 @@ function organize_simple_checkedout_merge_conflict { # @test - [ -tag-2] - [ -tag-3] - [ -tag-4] - - [alpha/hotel !txt2 tag-3 tag-4] wow ok again different - - [alpha/golf !txt2 tag-3 tag-4] wow the first + - [one/dos !txt2 tag-3 tag-4] wow ok again different + - [one/uno !txt2 tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM @@ -267,8 +267,8 @@ function organize_simple_checkedout_merge_conflict { # @test [-tag-2 new-etikett-for-all] [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t @@ -280,14 +280,14 @@ function organize_simple_checkedout_merge_conflict { # @test [-tag-3 new-etikett-for-all] [-tag-4 new-etikett-for-all] [-tag new-etikett-for-all] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again different" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt2 "wow the first" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status alpha/hotel.zettel + run_dodder status one/dos.zettel assert_success assert_output - <<-EOM - conflicted [alpha/hotel.zettel] + conflicted [one/dos.zettel] EOM } @@ -309,13 +309,13 @@ function organize_hides_hidden_tags_from_organize { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [bravo/golf !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] + [two/uno !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] EOM - run_dodder show bravo/golf + run_dodder show two/uno assert_success assert_output - <<-EOM - [bravo/golf !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] + [two/uno !md "split hinweis for usability" project-2021-dodder zz-archive-task-done] EOM run_dodder organize -mode output-only project-2021-dodder:z @@ -341,8 +341,8 @@ function organize_dry_run { # @test - [ -tag-2] - [ -tag-3] - [ -tag-4] - - [alpha/hotel ] wow ok again - - [alpha/golf ] wow the first + - [one/dos ] wow ok again + - [one/uno ] wow the first EOM assert_success @@ -359,8 +359,8 @@ function organize_with_type_output { # @test ! md --- - - [alpha/golf tag-3 tag-4] wow the first - - [alpha/hotel tag-3 tag-4] wow ok again + - [one/dos tag-3 tag-4] wow ok again + - [one/uno tag-3 tag-4] wow the first EOM } @@ -370,15 +370,15 @@ function organize_with_type_commit { # @test ! txt --- - - [alpha/hotel tag-3 tag-4] wow ok again - - [alpha/golf tag-3 tag-4] wow the first + - [one/dos tag-3 tag-4] wow ok again + - [one/uno tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM [!txt !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !txt "wow the first" tag-3 tag-4] EOM } @@ -391,13 +391,13 @@ function modify_description { # @test - [ tag-2] - [ tag-3] - [ tag-4] - - [alpha/hotel !md tag-3 tag-4] wow ok again was modified - - [alpha/golf !md tag-3 tag-4] wow the first was modified too + - [one/dos !md tag-3 tag-4] wow ok again was modified + - [one/uno !md tag-3 tag-4] wow the first was modified too EOM assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again was modified" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first was modified too" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again was modified" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first was modified too" tag-3 tag-4] [tag] [tag-1] [tag-2] @@ -431,12 +431,12 @@ function organize_v5_outputs_organize_one_tag { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [bravo/golf !md "wow" ok] + [two/uno !md "wow" ok] EOM - run_dodder show -format object-id a/g + run_dodder show -format object-id o/u assert_success - assert_output 'alpha/golf' + assert_output 'one/uno' run_dodder organize "${cmd_def_organize[@]}" -mode output-only ok assert_success @@ -445,7 +445,7 @@ function organize_v5_outputs_organize_one_tag { # @test - ok --- - - [bravo/golf !md] wow + - [two/uno !md] wow EOM } @@ -463,7 +463,7 @@ function organize_v5_outputs_organize_two_tags { # @test run_dodder new -edit=false "$to_add" assert_success assert_output_unsorted - <<-EOM - [bravo/golf !md "wow" brown ok] + [two/uno !md "wow" brown ok] EOM run_dodder organize "${cmd_def_organize[@]}" -mode output-only ok brown @@ -474,7 +474,7 @@ function organize_v5_outputs_organize_two_tags { # @test - ok --- - - [bravo/golf !md] wow + - [two/uno !md] wow EOM run_dodder organize "${cmd_def_organize[@]}" \ @@ -482,15 +482,15 @@ function organize_v5_outputs_organize_two_tags { # @test ok brown <<-EOM # ok - - [bravo/golf !md] wow + - [two/uno !md] wow EOM assert_success assert_output - <<-EOM - [bravo/golf !md "wow" ok] + [two/uno !md "wow" ok] EOM - run_dodder show -format text bravo/golf + run_dodder show -format text two/uno assert_success assert_output --regexp - <<-EOM --- @@ -516,7 +516,7 @@ function organize_v5_outputs_organize_one_tags_group_by_one { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [bravo/golf !md "wow" priority-1 priority-2 task] + [two/uno !md "wow" priority-1 priority-2 task] EOM run_dodder organize "${cmd_def_organize[@]}" \ @@ -530,11 +530,11 @@ function organize_v5_outputs_organize_one_tags_group_by_one { # @test # priority-1 - - [bravo/golf !md priority-2] wow + - [two/uno !md priority-2] wow # priority-2 - - [bravo/golf !md priority-1] wow + - [two/uno !md priority-1] wow EOM return @@ -556,11 +556,11 @@ function organize_v5_outputs_organize_one_tags_group_by_one { # @test ## -1 - - [bravo/golf !md] wow + - [two/uno !md] wow ## -2 - - [bravo/golf !md] wow + - [two/uno !md] wow EOM } @@ -568,7 +568,7 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes to_add="$(mktemp)" { echo "---" - echo "# alpha/golf" + echo "# one/uno" echo "- task" echo "- priority-1" echo "! md" @@ -578,13 +578,13 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes run_dodder new -edit=false "$to_add" assert_success assert_output_unsorted - <<-EOM - [bravo/golf !md "alpha/golf" priority-1 task] + [two/uno !md "one/uno" priority-1 task] EOM to_add="$(mktemp)" { echo "---" - echo "# bravo/hotel" + echo "# two/dos" echo "- task" echo "- priority-2" echo "! md" @@ -594,7 +594,7 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [alpha/india !md "bravo/hotel" priority-2 task] + [one/tres !md "two/dos" priority-2 task] EOM # add prefix joints @@ -607,11 +607,11 @@ function organize_v5_outputs_organize_two_zettels_one_tags_group_by_one { # @tes # priority-1 - - [bravo/golf !md] alpha/golf + - [two/uno !md] one/uno # priority-2 - - [alpha/india !md] bravo/hotel + - [one/tres !md] two/dos EOM } @@ -619,7 +619,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test to_add="$(mktemp)" { echo "---" - echo "# alpha/golf" + echo "# one/uno" echo "- task" echo "- priority-1" echo "- w-2022-07-07" @@ -633,7 +633,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test to_add="$(mktemp)" { echo "---" - echo "# bravo/hotel" + echo "# two/dos" echo "- task" echo "- priority-1" echo "- w-2022-07-06" @@ -666,17 +666,17 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test echo echo "### w-2022-07-06" echo - echo "- [alpha/hotel !md] bravo/hotel" + echo "- [one/dos !md] two/dos" echo echo "## priority-2" echo echo "### w-2022-07-07" echo - echo "- [alpha/golf !md] alpha/golf" + echo "- [one/uno !md] one/uno" echo echo "###" echo - echo "- [bravo/golf !md] 3" + echo "- [two/uno !md] 3" } >"$expected_organize" run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly -group-by priority,w task <"$expected_organize" @@ -685,7 +685,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test to_add="$(mktemp)" { echo "---" - echo "# alpha/golf" + echo "# one/uno" echo "- priority-2" echo "- task" echo "- w-2022-07-07" @@ -693,11 +693,11 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test echo "---" } >"$to_add" - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- -# alpha/golf +# one/uno - priority-2 - task - w-2022-07-07 @@ -705,7 +705,7 @@ function organize_v5_commits_organize_one_tags_group_by_two { # @test --- EOM - run_dodder show -format text bravo/golf + run_dodder show -format text two/uno assert_success assert_output --regexp - <<-EOM --- @@ -721,7 +721,7 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes to_add="$(mktemp)" { echo "---" - echo "# alpha/golf" + echo "# one/uno" echo "- task" echo "- priority-1" echo "- w-2022-07-07" @@ -745,7 +745,7 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes to_add="$(mktemp)" { echo "---" - echo "# bravo/hotel" + echo "# two/dos" echo "- task" echo "- priority-1" echo "- w-2022-07-06" @@ -784,13 +784,13 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes echo "## priority-1" echo "- new zettel two" echo "### w-2022-07-06" - echo "- [alpha/hotel !md] bravo/hotel" + echo "- [one/dos !md] two/dos" echo "## priority-2" echo "### w-2022-07-07" - echo "- [alpha/golf !md] alpha/golf" + echo "- [one/uno !md] one/uno" echo "###" echo "- new zettel three" - echo "- [bravo/golf !md] 3" + echo "- [two/uno !md] 3" } >"$expected_organize" run_dodder organize \ @@ -800,11 +800,11 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes task <"$expected_organize" assert_success - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- -# alpha/golf +# one/uno - priority-2 - task - w-2022-07-07 @@ -812,7 +812,7 @@ function organize_v5_commits_organize_one_tags_group_by_two_new_zettels { # @tes --- EOM - run_dodder show -format text bravo/golf + run_dodder show -format text two/uno assert_success assert_output --regexp - <<-EOM --- @@ -823,13 +823,13 @@ EOM --- EOM - run_dodder show -format text alpha/india + run_dodder show -format text one/tres assert_success - run_dodder show -format text bravo/hotel + run_dodder show -format text two/dos assert_success - run_dodder show -format text charlie/golf + run_dodder show -format text three/uno assert_success { @@ -849,7 +849,7 @@ function organize_v5_commits_no_changes { # @test one="$(mktemp)" { echo "---" - echo "# alpha/golf" + echo "# one/uno" echo "- priority-1" echo "- task" echo "- w-2022-07-07" @@ -860,13 +860,13 @@ function organize_v5_commits_no_changes { # @test run_dodder new -edit=false "$one" assert_success assert_output_unsorted - <<-EOM - [bravo/golf !md "alpha/golf" priority-1 task w-2022-07-07] + [two/uno !md "one/uno" priority-1 task w-2022-07-07] EOM two="$(mktemp)" { echo "---" - echo "# bravo/hotel" + echo "# two/dos" echo "- priority-1" echo "- task" echo "- w-2022-07-06" @@ -877,7 +877,7 @@ function organize_v5_commits_no_changes { # @test run_dodder new -edit=false "$two" assert_success assert_output_unsorted - <<-EOM - [alpha/india !md "bravo/hotel" priority-1 task w-2022-07-06] + [one/tres !md "two/dos" priority-1 task w-2022-07-06] EOM three="$(mktemp)" @@ -894,7 +894,7 @@ function organize_v5_commits_no_changes { # @test run_dodder new -edit=false "$three" assert_success assert_output_unsorted - <<-EOM - [bravo/hotel !md "3" priority-1 task w-2022-07-06] + [two/dos !md "3" priority-1 task w-2022-07-06] EOM # TODO add prefix joints @@ -911,12 +911,12 @@ function organize_v5_commits_no_changes { # @test ## w-2022-07-06 - - [alpha/india !md] bravo/hotel - - [bravo/hotel !md] 3 + - [one/tres !md] two/dos + - [two/dos !md] 3 ## w-2022-07-07 - - [bravo/golf !md] alpha/golf + - [two/uno !md] one/uno EOM @@ -938,19 +938,19 @@ function organize_v5_commits_no_changes { # @test ##### -06 - - [bravo/golf !md] alpha/golf + - [two/uno !md] one/uno ##### -07 - - [alpha/india !md] bravo/hotel - - [bravo/hotel !md] 3 + - [one/tres !md] two/dos + - [two/dos !md] 3 EOM assert_success assert_output_unsorted - <<-EOM - [alpha/india !md "bravo/hotel" priority-1 task w-2022-07-07] - [bravo/hotel !md "3" priority-1 task w-2022-07-07] - [bravo/golf !md "alpha/golf" priority-1 task w-2022-07-06] + [one/tres !md "two/dos" priority-1 task w-2022-07-07] + [two/dos !md "3" priority-1 task w-2022-07-07] + [two/uno !md "one/uno" priority-1 task w-2022-07-06] EOM } @@ -958,7 +958,7 @@ function organize_v5_commits_dependent_leaf { # @test one="$(mktemp)" { echo "---" - echo "# alpha/golf" + echo "# one/uno" echo "- priority-1" echo "- task" echo "- w-2022-07-07" @@ -972,7 +972,7 @@ function organize_v5_commits_dependent_leaf { # @test two="$(mktemp)" { echo "---" - echo "# bravo/hotel" + echo "# two/dos" echo "- priority-1" echo "- task" echo "- w-2022-07-06" @@ -1003,10 +1003,10 @@ function organize_v5_commits_dependent_leaf { # @test echo "## priority-2" echo "### w-2022-07" echo "#### -07" - echo "- [alpha/hotel !md] bravo/hotel" - echo "- [bravo/golf !md] 3" + echo "- [one/dos !md] two/dos" + echo "- [two/uno !md] 3" echo "#### -08" - echo "- [alpha/golf !md] alpha/golf" + echo "- [one/uno !md] one/uno" echo "###" } >"$expected_organize" @@ -1036,7 +1036,7 @@ function organize_v5_zettels_in_correct_places { # @test - inventory-pipe_shelves-atheist_shoes_box-jabra_yellow_box_2 --- - - [bravo/golf !md] jabra coral usb_a-to-usb_c cable + - [two/uno !md] jabra coral usb_a-to-usb_c cable EOM } @@ -1051,21 +1051,21 @@ function organize_v5_tags_correct { # @test assert_success assert_output - <<-EOM - [bravo/golf !md "zettel bez" test1-wow] + [two/uno !md "zettel bez" test1-wow] EOM - mkdir -p alpha + mkdir -p one { echo "---" echo "- test4" echo "! md" echo "---" - } >"alpha/golf.zettel" + } >"one/uno.zettel" - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success assert_output - <<-EOM - [alpha/golf !md test4] + [one/uno !md test4] EOM # TODO-P2 fix issue with kennung schwanzen @@ -1073,18 +1073,18 @@ function organize_v5_tags_correct { # @test # assert_output - <<-EOM # EOM - mkdir -p alpha + mkdir -p one { echo "---" echo "- test4" echo "- test1-ok" echo "! md" echo "---" - } >"alpha/golf.zettel" + } >"one/uno.zettel" - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_output - <<-EOM - [alpha/golf !md test1-ok test4] + [one/uno !md test1-ok test4] EOM } @@ -1092,8 +1092,8 @@ function organize_remove_anchored_metadata { # @test run_dodder show tag-3:z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly tag-3 <<-EOM --- @@ -1103,8 +1103,8 @@ function organize_remove_anchored_metadata { # @test assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-4] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-4] EOM run_dodder show tag-3:z @@ -1114,10 +1114,10 @@ function organize_remove_anchored_metadata { # @test } function organize_update_checkout { # @test - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly :z <<-EOM @@ -1125,43 +1125,43 @@ function organize_update_checkout { # @test - test --- - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test] EOM run_dodder status assert_success assert_output_unsorted - <<-EOM - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4 test] EOM } function organize_update_checkout_remove_tags { # @test - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder organize "${cmd_def_organize[@]}" -mode commit-directly :z <<-EOM - - [alpha/hotel !md] wow ok again - - [alpha/golf !md] wow the first + - [one/dos !md] wow ok again + - [one/uno !md] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first"] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first"] EOM run_dodder status assert_success assert_output_unsorted - <<-EOM - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again"] EOM } @@ -1177,8 +1177,8 @@ function create_structured_zettels { # @test assert_success assert_output_unsorted - <<-EOM [!task !toml-type-v1] - [alpha/india !task "second" tag-3 test] - [bravo/golf !md "first" test] + [one/tres !task "second" tag-3 test] + [two/uno !md "first" test] EOM } @@ -1196,19 +1196,19 @@ function description_with_literal_characters { # @test function tags_with_extended_tags_noop { # @test run_dodder organize -mode commit-directly :z <<-EOM # new-etikett-for-all - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" new-etikett-for-all tag-3 tag-4] EOM run_dodder organize -mode output-only new:z <<-EOM # new-etikett-for-all - - [alpha/hotel !md tag-3 tag-4] wow ok again - - [alpha/golf !md tag-3 tag-4] wow the first + - [one/dos !md tag-3 tag-4] wow ok again + - [one/uno !md tag-3 tag-4] wow the first EOM assert_success assert_output - <<-EOM @@ -1216,15 +1216,15 @@ function tags_with_extended_tags_noop { # @test - new --- - - [alpha/golf !md new-etikett-for-all tag-3 tag-4] wow the first - - [alpha/hotel !md new-etikett-for-all tag-3 tag-4] wow ok again + - [one/dos !md new-etikett-for-all tag-3 tag-4] wow ok again + - [one/uno !md new-etikett-for-all tag-3 tag-4] wow the first EOM run_dodder organize -mode commit-directly new:z <<-EOM # new - - [alpha/golf !md new-etikett-for-all tag-3 tag-4] wow the first - - [alpha/hotel !md new-etikett-for-all tag-3 tag-4] wow ok again + - [one/dos !md new-etikett-for-all tag-3 tag-4] wow ok again + - [one/uno !md new-etikett-for-all tag-3 tag-4] wow the first EOM assert_success assert_output '' @@ -1263,7 +1263,7 @@ function organize_new_objects_default_tags { # @test run_dodder organize assert_success assert_output - <<-EOM - [bravo/golf !md "new zettel object"] + [two/uno !md "new zettel object"] EOM # shellcheck disable=SC2317 @@ -1274,7 +1274,7 @@ function organize_new_objects_default_tags { # @test run_dodder organize assert_success assert_output - <<-EOM - [alpha/india !md "new zettel object" zz-inbox] + [one/tres !md "new zettel object" zz-inbox] EOM } @@ -1288,7 +1288,7 @@ function object_with_newline_in_description { # @test EOM assert_success assert_output_unsorted - <<-EOM - [bravo/golf !md "description that has newline"] + [two/uno !md "description that has newline"] EOM } @@ -1297,8 +1297,8 @@ function organize_checked_out { # @test assert_success assert_output_unsorted - <<-EOM checked out [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder organize -mode output-only . @@ -1306,8 +1306,8 @@ function organize_checked_out { # @test assert_output - <<-EOM - [md.type !toml-type-v1] - - [alpha/golf.zettel !md tag-3 tag-4] wow the first - - [alpha/hotel.zettel !md tag-3 tag-4] wow ok again + - [one/dos.zettel !md tag-3 tag-4] wow ok again + - [one/uno.zettel !md tag-3 tag-4] wow the first EOM } @@ -1381,7 +1381,7 @@ function organize_default_tags_workspace { # @test EOM assert_success assert_output_unsorted - <<-EOM - [bravo/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "test default tags" tag-3 today zz-inbox] + [two/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "test default tags" tag-3 today zz-inbox] EOM actual="$(mktemp)" @@ -1394,7 +1394,7 @@ function organize_default_tags_workspace { # @test # tag-3 - - [bravo/golf !md zz-inbox] test default tags + - [two/uno !md zz-inbox] test default tags EOM } @@ -1451,8 +1451,8 @@ function organize_dot_operator_workspace_delete_files { # @test run_dodder organize . assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "1" tag-3 tag-two] - [alpha/india @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "2" tag-3 tag-one] + [two/uno @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "1" tag-3 tag-two] + [one/tres @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "2" tag-3 tag-one] deleted [1.md] deleted [2.md] EOM diff --git a/zz-tests_bats/pull.bats b/zz-tests_bats/pull.bats index 853b2ac9e..19ce5d2c5 100644 --- a/zz-tests_bats/pull.bats +++ b/zz-tests_bats/pull.bats @@ -45,7 +45,7 @@ function bootstrap_content { run_dodder new -edit=false to_add assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder new -edit=false - <<-EOM @@ -61,7 +61,7 @@ function bootstrap_content { assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM cat - >task.type <<-EOM @@ -88,7 +88,7 @@ function try_add_new_after_pull { assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [two/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM } @@ -117,8 +117,8 @@ function pull_history_zettel_type_tag_no_conflicts { # @test copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM @@ -148,8 +148,8 @@ function pull_history_zettel_type_tag_no_conflicts_stdio_local { # @test copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM @@ -166,18 +166,18 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test copy_from_version "$DIR" - run_dodder show alpha/hotel+ + run_dodder show one/dos+ assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder show +z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder remote-add \ @@ -195,9 +195,9 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test assert_failure assert_output_unsorted --partial - <<-EOM copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) - conflicted [alpha/golf] + conflicted [one/uno] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) - conflicted [alpha/hotel] + conflicted [one/dos] copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] import failed with conflicts, merging required @@ -213,40 +213,40 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test run_dodder status assert_success assert_output_unsorted - <<-EOM - conflicted [alpha/hotel] - conflicted [alpha/golf] + conflicted [one/dos] + conflicted [one/uno] EOM run_dodder show +z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder merge-tool -merge-tool "/bin/bash -c 'cat \"\$2\" >\"\$3\"'" . assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] - deleted [alpha/hotel.conflict] - deleted [alpha/golf.conflict] - deleted [alpha/] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + deleted [one/dos.conflict] + deleted [one/uno.conflict] + deleted [one/] EOM # TODO make sure merging includes the REMOTE in addition to the MERGED run_dodder show +z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show -format text alpha/hotel + run_dodder show -format text one/dos assert_success assert_output --regexp - <<-EOM --- @@ -259,11 +259,11 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_second { # @test zettel with multiple etiketten body EOM - run_dodder show alpha/hotel+ + run_dodder show one/dos+ assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM try_add_new_after_pull @@ -286,7 +286,7 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM them="them" @@ -310,9 +310,9 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te # TODO address the bandaid of two `[tag]` objects assert_output_unsorted - <<-EOM copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM @@ -321,7 +321,7 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te assert_success assert_output_unsorted '' - run_dodder show -format text alpha/hotel + run_dodder show -format text one/dos assert_success assert_output --regexp - <<-EOM --- @@ -334,11 +334,11 @@ function pull_history_zettel_type_tag_yes_conflicts_allowed_remote_first { # @te zettel with multiple etiketten body EOM - run_dodder show alpha/golf+ + run_dodder show one/uno+ assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } @@ -359,7 +359,7 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] EOM them="them" @@ -382,9 +382,9 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test assert_failure assert_output_unsorted --partial - <<-EOM - conflicted [alpha/golf] + conflicted [one/uno] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] copied Blob blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 (36 B) copied Blob blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc (5 B) copied Blob blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e (15 B) @@ -398,18 +398,18 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test run_dodder status assert_success assert_output_unsorted - <<-EOM - conflicted [alpha/golf] + conflicted [one/uno] EOM run_dodder merge-tool -merge-tool "/bin/bash -c 'cat \"\$2\" >\"\$3\"'" . assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] - deleted [alpha/golf.conflict] - deleted [alpha/] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + deleted [one/uno.conflict] + deleted [one/] EOM - run_dodder show -format text alpha/hotel + run_dodder show -format text one/dos assert_success assert_output --regexp - <<-EOM --- @@ -422,11 +422,11 @@ function pull_history_zettel_type_tag_yes_conflicts_remote_first { # @test zettel with multiple etiketten body EOM - run_dodder show alpha/golf+ + run_dodder show one/uno+ assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-kn7w3q7c3xvfa2p78wny0h79f7hd72nxtded0gvymu33wcnr2qmscl46ar !md "zettel after clone description"] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } @@ -455,15 +455,15 @@ function pull_history_default_no_conflict { # @test assert_success assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] [!task @blake2b256-qxzg22c3axe9m42tpwqd4usnfag4elp20q7zvnkgmyea4f4rwcwsurfp5e !toml-type-v1] EOM - run_dodder show alpha/hotel+ + run_dodder show one/dos+ assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM run_dodder show !md:t @@ -500,17 +500,17 @@ function pull_history_zettel_one_abbr { # @test \[/them @[0-9a-z]+ !toml-repo-dotenv_xdg-v0] EOM - run_dodder pull -include-blobs=false /them a/g+ + run_dodder pull -include-blobs=false /them o/u+ assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show alpha/golf+ + run_dodder show one/uno+ assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM } @@ -536,17 +536,17 @@ function pull_history_zettels_no_conflict_no_blobs { # @test assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM - run_dodder show alpha/hotel+ + run_dodder show one/dos+ assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM - run_dodder show -format blob alpha/hotel + run_dodder show -format blob one/dos assert_failure try_add_new_after_pull diff --git a/zz-tests_bats/push.bats b/zz-tests_bats/push.bats index 88a25f14f..da3bc3fee 100644 --- a/zz-tests_bats/push.bats +++ b/zz-tests_bats/push.bats @@ -34,7 +34,7 @@ function bootstrap_with_content { run_dodder new -edit=false to_add assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] + [one/uno @blake2b256-gu738nunyrnsqukgqkuaau9zslu0fhwg4dgs9ltuyvnlp42wal8sdpn2hc !md "wow" tag] EOM run_dodder new -edit=false - <<-EOM @@ -50,7 +50,7 @@ function bootstrap_with_content { assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] + [one/dos @blake2b256-fm7kce7793j3npevpm29spk04r6ycxv38dvx3hjxlzl8tcm5m3qq2mml86 !md "zettel with multiple etiketten" this_is_the_first this_is_the_second] EOM ) } @@ -110,9 +110,9 @@ function push_history_zettel_type_tag_no_conflicts { # @test assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) @@ -124,9 +124,9 @@ function push_history_zettel_type_tag_no_conflicts { # @test assert_output_unsorted - <<-EOM [konfig @$(get_konfig_sha) !toml-config-v2] [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM ) } @@ -143,9 +143,9 @@ function push_history_zettel_type_tag_yes_conflicts { # @test assert_failure assert_output_unsorted - <<-EOM - conflicted [alpha/hotel] - conflicted [alpha/golf] - conflicted [alpha/golf] + conflicted [one/dos] + conflicted [one/uno] + conflicted [one/uno] copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) copied Blob blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 (27 B) @@ -158,8 +158,8 @@ function push_history_zettel_type_tag_yes_conflicts { # @test run_dodder status . assert_output_unsorted - <<-EOM - conflicted [alpha/hotel] - conflicted [alpha/golf] + conflicted [one/dos] + conflicted [one/uno] untracked [to_add @blake2b256-45lpe4rm9mjvdx8pt04kp5gh04uy77h0m0xtw2fhr0q7vl98g0vqls6hxe] EOM ) @@ -168,9 +168,9 @@ function push_history_zettel_type_tag_yes_conflicts { # @test assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -194,9 +194,9 @@ function push_history_default { # @test run_dodder show +?z,e,t assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM pushd them || exit 1 @@ -204,9 +204,9 @@ function push_history_default { # @test assert_output_unsorted - <<-EOM [konfig @$(get_konfig_sha) !toml-config-v2] [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -239,9 +239,9 @@ function push_history_default_only_blobs { # @test run_dodder show +?z,e,t assert_output_unsorted - <<-EOM [!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM pushd them || exit 1 @@ -278,8 +278,8 @@ function push_default_stdio_local_once { # @test run_dodder show :zettel assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -301,16 +301,16 @@ function push_history_default_stdio_local_twice { # @test assert_output_unsorted --partial - <<-EOM copied Blob blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd (10 B) copied Blob blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd (16 B) - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM pushd them || exit 1 run_dodder show :zettel assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM popd || exit 1 @@ -339,8 +339,8 @@ function push_history_default_stdio_twice { # @test assert_success assert_line --regexp '\[/them @blake2b256-.+ !toml-repo-local_override_path-v0]' assert_line --regexp '\[[0-9]+\.[0-9]+ @blake2b256-.+ !inventory_list-v2]' - assert_line --partial '[alpha/hotel @blake2b256-' - assert_line --partial '[alpha/golf @blake2b256-' + assert_line --partial '[one/dos @blake2b256-' + assert_line --partial '[one/uno @blake2b256-' assert_line --regexp 'copied Blob blake2b256-.+ \(.*\)' pushd them || exit 1 @@ -354,9 +354,9 @@ function push_history_default_stdio_twice { # @test \[[0-9]+\.[0-9]+ @blake2b256-.+ !inventory_list-v2] \[[0-9]+\.[0-9]+ @blake2b256-.+ !inventory_list-v2] \[!md @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - \[alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - \[alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - \[alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + \[one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + \[one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + \[one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM popd || exit 1 diff --git a/zz-tests_bats/recursive_tags.bats b/zz-tests_bats/recursive_tags.bats index efc98f723..8ca56e587 100644 --- a/zz-tests_bats/recursive_tags.bats +++ b/zz-tests_bats/recursive_tags.bats @@ -34,8 +34,8 @@ function recursive_tags_add_one { # @test assert_success assert_output_unsorted - <<-EOM [tag-3 recurse] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -74,15 +74,15 @@ function recursive_tags_add_one_super_tags { # @test assert_output_unsorted - <<-EOM [tag-3 recurse] [tag-3-sub] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format tags-path recurse:z,e assert_success assert_output_unsorted - <<-EOM - alpha/hotel [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] - alpha/golf [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + one/dos [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + one/uno [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] tag-3 [Paths: [TypeDirect:[recurse] TypeSelf:[tag-3]], All: [recurse:[TypeDirect:[recurse]] tag-3:[TypeSelf:[tag-3]]]] tag-3-sub [Paths: [TypeSuper:[tag-3 -> recurse] TypeSelf:[tag-3-sub]], All: [recurse:[TypeSuper:[tag-3 -> recurse]] tag-3:[TypeSuper:[tag-3 -> recurse]] tag-3-sub:[TypeSelf:[tag-3-sub]]]] EOM @@ -90,8 +90,8 @@ function recursive_tags_add_one_super_tags { # @test run_dodder show -format tags-path recurse:e,z assert_success assert_output_unsorted - <<-EOM - alpha/hotel [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] - alpha/golf [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + one/dos [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] + one/uno [Paths: [TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse] TypeDirect:[tag-4]], All: [recurse:[TypeIndirect:[tag-3 -> recurse]] tag-3:[TypeDirect:[tag-3] TypeIndirect:[tag-3 -> recurse]] tag-4:[TypeDirect:[tag-4]]]] tag-3 [Paths: [TypeDirect:[recurse] TypeSelf:[tag-3]], All: [recurse:[TypeDirect:[recurse]] tag-3:[TypeSelf:[tag-3]]]] tag-3-sub [Paths: [TypeSuper:[tag-3 -> recurse] TypeSelf:[tag-3-sub]], All: [recurse:[TypeSuper:[tag-3 -> recurse]] tag-3:[TypeSuper:[tag-3 -> recurse]] tag-3-sub:[TypeSelf:[tag-3-sub]]]] EOM @@ -115,19 +115,19 @@ function recursive_tags_with_same_root { # @test [project-one-crit priority-0_must] EOM - run_dodder organize -mode commit-directly alpha/golf <<-EOM + run_dodder organize -mode commit-directly one/uno <<-EOM # project-one-crit, project-one-general - - [alpha/golf] + - [one/uno] EOM assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] EOM run_dodder show priority-0_must:z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md project-one-crit project-one-general] EOM } diff --git a/zz-tests_bats/reindex.bats b/zz-tests_bats/reindex.bats index 66c5e981b..484885e03 100644 --- a/zz-tests_bats/reindex.bats +++ b/zz-tests_bats/reindex.bats @@ -23,17 +23,17 @@ function reindex_simple { # @test assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder show -format tags-path :e,z,t assert_success assert_output_unsorted - <<-EOM !md [Paths: [], All: []] - alpha/hotel [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] - alpha/golf [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] + one/dos [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] + one/uno [Paths: [TypeDirect:[tag-3] TypeDirect:[tag-4]], All: [tag-3:[TypeDirect:[tag-3]] tag-4:[TypeDirect:[tag-4]]]] EOM } @@ -42,9 +42,9 @@ function reindex_simple_twice { # @test cat - >"$expected" <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder reindex @@ -106,9 +106,9 @@ function reindex_after_changes { # @test [!md @$(get_type_blob_sha) !toml-type-v1] [!md @blake2b256-473260as3d3pd4uramcc60877srvpkxs4krlap45dkl3mfvq2npq2duvvq !toml-type-v1] [konfig @$(get_konfig_sha) !toml-config-v2] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM verify diff --git a/zz-tests_bats/revert.bats b/zz-tests_bats/revert.bats index 75a3ff15e..d0591a20c 100644 --- a/zz-tests_bats/revert.bats +++ b/zz-tests_bats/revert.bats @@ -14,10 +14,10 @@ teardown() { } function revert_one_zettel { # @test - run_dodder revert alpha/golf + run_dodder revert one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -25,7 +25,7 @@ function revert_all_zettels { # @test run_dodder revert :z assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -35,18 +35,18 @@ function revert_last { # @test run_dodder revert -last assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM run_dodder last assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/show.bats b/zz-tests_bats/show.bats index dc338bfe8..16d51c806 100644 --- a/zz-tests_bats/show.bats +++ b/zz-tests_bats/show.bats @@ -16,7 +16,7 @@ teardown() { # bats file_tags=user_story:query function show_simple_one_zettel { # @test - run_dodder show -format text alpha/golf + run_dodder show -format text one/uno assert_success assert_output --regexp - <<-EOM --- @@ -44,10 +44,10 @@ function show_simple_one_zettel_with_description_with_quotes { # @test EOM assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "see these \"quotes\""] + [two/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "see these \"quotes\""] EOM - run_dodder show -format text bravo/golf: + run_dodder show -format text two/uno: assert_success assert_output --regexp - <<-EOM --- @@ -60,7 +60,7 @@ function show_simple_one_zettel_with_description_with_quotes { # @test } function show_simple_one_zettel_with_sigil { # @test - run_dodder show -format text alpha/golf: + run_dodder show -format text one/uno: assert_success assert_output --regexp - <<-EOM --- @@ -75,7 +75,7 @@ function show_simple_one_zettel_with_sigil { # @test } function show_simple_one_zettel_with_sigil_and_genre { # @test - run_dodder show -format text alpha/golf:zettel + run_dodder show -format text one/uno:zettel assert_success assert_output --regexp - <<-EOM --- @@ -93,16 +93,16 @@ function show_simple_one_zettel_checked_out { # @test run_dodder init-workspace assert_success - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show alpha/golf.zettel + run_dodder show one/uno.zettel assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -118,14 +118,14 @@ function show_simple_one_zettel_hidden { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -137,14 +137,14 @@ function show_simple_one_zettel_hidden_past { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -165,7 +165,7 @@ function show_simple_one_zettel_binary { # @test assert_output_unsorted - <<-EOM deleted [file.bin] [!bin !toml-type-v1] - [bravo/golf @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] + [two/uno @blake2b256-w9l3z9c2w8lhr42fwekmhrxeqtmzw40s9p46vt88ydgwux4rxxuqnfqsmk !bin "file"] EOM cat >bin.type <<-EOM @@ -183,7 +183,7 @@ function show_simple_one_zettel_binary { # @test [!bin @blake2b256-zhvux7vmpch9f44kvnua7n69f8jzgk5s7p9k2s3kuvkrcpjh07lse493jl !toml-type-v1] EOM - run_dodder show -format text bravo/golf + run_dodder show -format text two/uno assert_success assert_output - <<-EOM --- @@ -194,14 +194,14 @@ function show_simple_one_zettel_binary { # @test } function show_history_one_zettel { # @test - run_dodder show alpha/golf+z + run_dodder show one/uno+z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM - run_dodder show -format text alpha/golf+z + run_dodder show -format text one/uno+z assert_success assert_output_unsorted --regexp - <<-EOM --- @@ -227,8 +227,8 @@ function show_zettel_tag { # @test run_dodder show tag-3:z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format blob tag-3:z @@ -241,8 +241,8 @@ function show_zettel_tag { # @test run_dodder show -format sku-metadata-sans-tai tag-3:z assert_success assert_output_unsorted - <<-EOM - Zettel alpha/hotel blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" - Zettel alpha/golf blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" + Zettel one/dos blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" + Zettel one/uno blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" EOM } @@ -253,8 +253,8 @@ function show_zettels_with_tag_no_workspace_folder { # @test run_dodder show tag assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -262,13 +262,13 @@ function show_zettel_tag_complex { # @test run_dodder init-workspace assert_success - run_dodder checkout a/g + run_dodder checkout o/u assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wow the first - tag-3 @@ -283,15 +283,15 @@ function show_zettel_tag_complex { # @test # run_dodder show -verbose tag-3.z tag-5.z # assert_success # assert_output_unsorted - <<-EOM - # [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] + # [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] # EOM - run_dodder checkin -delete alpha/golf.zettel + run_dodder checkin -delete one/uno.zettel run_dodder show [tag-3 tag-5]:z assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-5] EOM run_dodder show -format blob [tag-3 tag-5]:z @@ -303,7 +303,7 @@ function show_zettel_tag_complex { # @test run_dodder show -format sku-metadata-sans-tai [tag-3 tag-5]:z assert_success assert_output_unsorted --partial - <<-EOM - Zettel alpha/golf blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-5 "wow the first" + Zettel one/uno blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-5 "wow the first" EOM } @@ -311,8 +311,8 @@ function show_complex_zettel_tag_negation { # @test run_dodder show ^-etikett-two:z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -321,8 +321,8 @@ function show_simple_all { # @test assert_success assert_output_unsorted - <<-EOM [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder show -format blob :z,t @@ -338,8 +338,8 @@ function show_simple_all { # @test assert_success assert_output_unsorted - <<-EOM Type !md blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1 - Zettel alpha/hotel blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" - Zettel alpha/golf blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" + Zettel one/dos blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md tag-3 tag-4 "wow ok again" + Zettel one/uno blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md tag-3 tag-4 "wow the first" EOM } @@ -438,9 +438,9 @@ function show_history_all { # @test assert_output_unsorted - <<-EOM [konfig @$(get_konfig_sha) !toml-config-v2] [!md @$(get_type_blob_sha) !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -471,8 +471,8 @@ function show_tag_toml { # @test run_dodder show true assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -503,8 +503,8 @@ function show_tag_lua_v1 { # @test run_dodder show true assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] true true EOM @@ -537,8 +537,8 @@ function show_tag_lua_v2 { # @test run_dodder show true assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] true true EOM @@ -609,12 +609,12 @@ function show_builtin_type_md { # @test # bats file_tags=user_story:workspace function show_workspace_default { # @test - run_dodder organize -mode commit-directly alpha/golf <<-EOM - - [alpha/golf !md tag-3 tag-4 tag-5] wow the first + run_dodder organize -mode commit-directly one/uno <<-EOM + - [one/uno !md tag-3 tag-4 tag-5] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] EOM run_dodder init-workspace -query tag-5 @@ -623,27 +623,27 @@ function show_workspace_default { # @test run_dodder show : assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] EOM } function show_workspace_exactly_one_zettel { # @test skip - run_dodder organize -mode commit-directly alpha/golf <<-EOM - - [alpha/golf !md tag-3 tag-4 tag-5] wow the first + run_dodder organize -mode commit-directly one/uno <<-EOM + - [one/uno !md tag-3 tag-4 tag-5] wow the first EOM assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] [tag-5] EOM run_dodder init-workspace -query tag-3 assert_success - run_dodder show alpha/hotel + run_dodder show one/dos assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 tag-5] EOM } diff --git a/zz-tests_bats/show_mothers.bats b/zz-tests_bats/show_mothers.bats index dee1bdcd9..91f5dcfd3 100644 --- a/zz-tests_bats/show_mothers.bats +++ b/zz-tests_bats/show_mothers.bats @@ -14,11 +14,11 @@ teardown() { } function format_mother_sha_one { # @test - run_dodder show -format sig-bytes-hex alpha/golf+ + run_dodder show -format sig-bytes-hex one/uno+ assert_success sig="$(echo -n "$output" | head -n1)" - run_dodder show -format sig-mother-bytes-hex alpha/golf + run_dodder show -format sig-mother-bytes-hex one/uno assert_success assert_output - <<-EOM $sig @@ -26,17 +26,17 @@ function format_mother_sha_one { # @test } function format_mother_one { # @test - run_dodder_debug show -format sig alpha/golf+ - mother_sig="$(run_dodder_debug show -format sig alpha/golf+ | head -n 1 | cut -d@ -f2)" + run_dodder_debug show -format sig one/uno+ + mother_sig="$(run_dodder_debug show -format sig one/uno+ | head -n 1 | cut -d@ -f2)" - run_dodder show -format sig-mother alpha/golf + run_dodder show -format sig-mother one/uno assert_success assert_output "dodder-object-mother-sig-v2@$mother_sig" run_dodder show "dodder-object-sig-v2@$mother_sig"+ assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } @@ -44,6 +44,6 @@ function format_mother_all { # @test run_dodder show -format mother : assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] + [one/uno @blake2b256-c5xgv9eyuv6g49mcwqks24gd3dh39w8220l0kl60qxt60rnt60lsc8fqv0 !md "wow ok" tag-1 tag-2] EOM } diff --git a/zz-tests_bats/status.bats b/zz-tests_bats/status.bats index cc96a437f..9581cfd23 100644 --- a/zz-tests_bats/status.bats +++ b/zz-tests_bats/status.bats @@ -20,8 +20,8 @@ function checkout_everything() { assert_success assert_output_unsorted - <<-EOM checked out [md.type @$(get_type_blob_sha) !toml-type-v1] - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } @@ -39,27 +39,27 @@ function dirty_new_zettel() { assert_success assert_output --partial - <<-EOM [!txt !toml-type-v1] - [bravo/golf @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one] + [two/uno @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one] EOM } function dirty_existing_akte() { - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wildly different - etikett-one - @ alpha/golf.md + @ one/uno.md ! md --- EOM - cat >alpha/golf.md <<-EOM + cat >one/uno.md <<-EOM newest body but even newer EOM } function dirty_one_uno() { - cat >alpha/golf.zettel <<-EOM + cat >one/uno.zettel <<-EOM --- # wildly different - etikett-one @@ -71,7 +71,7 @@ function dirty_one_uno() { } function dirty_one_dos() { - cat >alpha/hotel.zettel <<-EOM + cat >one/dos.zettel <<-EOM --- # dos wildly different - etikett-two @@ -104,79 +104,79 @@ function dirty_zz_archive_tag() { function status_simple_one_zettel { # @test checkout_everything - run_dodder status alpha/golf.zettel + run_dodder status one/uno.zettel assert_success assert_output - <<-EOM - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno - run_dodder status alpha/golf.zettel + run_dodder status one/uno.zettel assert_success assert_output - <<-EOM - changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } function status_simple_one_zettel_blob_separate { # @test checkout_everything - run_dodder status alpha/golf.zettel + run_dodder status one/uno.zettel assert_success assert_output - <<-EOM - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - rm alpha/golf.zettel + rm one/uno.zettel - cat >alpha/golf.md <<-EOM + cat >one/uno.md <<-EOM newest body but even newerests EOM - run_dodder status alpha/golf.zettel + run_dodder status one/uno.zettel assert_success assert_output - <<-EOM - changed [alpha/golf @blake2b256-dy8ywz7cr2pr4tgf8lfjsyfhmvxpezul5p7mk7yl2x4khjr7a4ns4cnst4 !md "wow the first" tag-3 tag-4 - alpha/golf.md] + changed [one/uno @blake2b256-dy8ywz7cr2pr4tgf8lfjsyfhmvxpezul5p7mk7yl2x4khjr7a4ns4cnst4 !md "wow the first" tag-3 tag-4 + one/uno.md] EOM } function status_simple_one_zettel_blob_only { # @test checkout_everything - run_dodder clean alpha/golf.zettel + run_dodder clean one/uno.zettel assert_success # assert_output - <<-EOM - # deleted [alpha/golf.zettel] + # deleted [one/uno.zettel] # EOM - run_dodder checkout -mode blob alpha/golf + run_dodder checkout -mode blob one/uno # assert_output - <<-EOM - # checked out [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - # alpha/golf.md] + # checked out [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + # one/uno.md] # EOM - run_dodder status alpha/golf.zettel + run_dodder status one/uno.zettel assert_success # assert_output - <<-EOM - # same [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 - # alpha/golf.md] + # same [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + # one/uno.md] # EOM dirty_existing_akte - run ls alpha + run ls one assert_success assert_output - <<-EOM - golf.md - golf.zettel - hotel.zettel + dos.zettel + uno.md + uno.zettel EOM - run_dodder status alpha/golf.zettel + run_dodder status one/uno.zettel assert_success assert_output - <<-EOM - changed [alpha/golf.zettel @blake2b256-kdw9q3458v3njrejvhc7tjfsddxnzpmg5wt8mdwq7psss20whkesyxdzx7 !md "wildly different" etikett-one - alpha/golf.md] + changed [one/uno.zettel @blake2b256-kdw9q3458v3njrejvhc7tjfsddxnzpmg5wt8mdwq7psss20whkesyxdzx7 !md "wildly different" etikett-one + one/uno.md] EOM } @@ -187,18 +187,18 @@ function status_zettel_blob_checkout { # @test dirty_new_zettel - run_dodder checkout -mode blob bravo/golf + run_dodder checkout -mode blob two/uno assert_success assert_output - <<-EOM - checked out [bravo/golf @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one - bravo/golf.txt] + checked out [two/uno @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one + two/uno.txt] EOM run_dodder status .z assert_success assert_output - <<-EOM - same [bravo/golf @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one - bravo/golf.txt] + same [two/uno @blake2b256-x4dstl5rrxp60932zj0sgmaku39ylula4fg3scgcgyj4yyneyy3qdtnzlm !txt "the new zettel" etikett-one + two/uno.txt] EOM } @@ -214,22 +214,22 @@ function status_zettel_hidden { # @test run_dodder show :?z assert_success assert_output_unsorted - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM run_dodder status .z assert_success assert_output_unsorted - <<-EOM - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM run_dodder status !md.z assert_success assert_output_unsorted - <<-EOM - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM } @@ -238,8 +238,8 @@ function status_zettelen_typ { # @test run_dodder status !md.z assert_success assert_output_unsorted - <<-EOM - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno @@ -248,8 +248,8 @@ function status_zettelen_typ { # @test run_dodder status !md.z assert_success assert_output_unsorted - <<-EOM - changed [alpha/hotel.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + changed [one/dos.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -258,8 +258,8 @@ function status_complex_zettel_tag_negation { # @test run_dodder status ^-etikett-two.z assert_success assert_output_unsorted - <<-EOM - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno @@ -267,8 +267,8 @@ function status_complex_zettel_tag_negation { # @test run_dodder status ^-etikett-two.z assert_success assert_output_unsorted - <<-EOM - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] EOM } @@ -278,8 +278,8 @@ function status_simple_all { # @test assert_success assert_output_unsorted - <<-EOM same [md.type @$(get_type_blob_sha) !toml-type-v1] - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM dirty_one_uno @@ -292,8 +292,8 @@ function status_simple_all { # @test assert_success assert_output_unsorted - <<-EOM changed [md.type @blake2b256-473260as3d3pd4uramcc60877srvpkxs4krlap45dkl3mfvq2npq2duvvq !toml-type-v1] - changed [alpha/hotel.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] - changed [alpha/golf.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] + changed [one/dos.zettel @blake2b256-wn30f7j6g62r7lgz0jhmnapnkem09c7lkkv65k005wv3fnj44m7q6auex2 !md "dos wildly different" etikett-two] + changed [one/uno.zettel @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9 !md "wildly different" etikett-one] untracked [da-new.type @blake2b256-9rzlpgryfegathtl4ss3s80cwskx7e5w77usfjxgxrrg4ns80epqnzxjvs !toml-type-v1] untracked [zz-archive.tag @blake2b256-4nnaw9wx7vwsdlx777qf48drgxeatj762ykhlwhe6pykmmutglvsz2szgt] EOM @@ -336,13 +336,13 @@ function status_simple_tag { # @test function status_conflict { # @test checkout_everything - run_dodder checkout alpha/hotel + run_dodder checkout one/dos assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM - cat - >alpha/hotel.zettel <<-EOM + cat - >one/dos.zettel <<-EOM --- # wow ok again - get_this_shit_merged @@ -354,30 +354,30 @@ function status_conflict { # @test not another one, conflict time EOM - run_dodder organize -mode commit-directly alpha/hotel <<-EOM + run_dodder organize -mode commit-directly one/dos <<-EOM --- ! txt2 --- # new-etikett-for-all - - [alpha/hotel tag-3 tag-4] wow ok again + - [one/dos tag-3 tag-4] wow ok again EOM assert_success assert_output - <<-EOM [!txt2 !toml-type-v1] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM run_dodder show -format log new-etikett-for-all:z,e,t assert_success assert_output - <<-EOM - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !txt2 "wow ok again" new-etikett-for-all tag-3 tag-4] EOM - run_dodder status alpha/hotel.zettel + run_dodder status one/dos.zettel assert_success assert_output - <<-EOM - conflicted [alpha/hotel.zettel] + conflicted [one/dos.zettel] EOM } @@ -405,34 +405,34 @@ function status_added_untracked() { # @test assert_success assert_output_unsorted - <<-EOM untracked [test.md @blake2b256-k87yyah5da3c8h9j4ugf44edeurrqztn7zddh7ksc88pfg4zzx0smqmuf9] - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] same [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] EOM } # bats test_tags=user_story:fs_blobs, user_story:recognized_blobs function status_dot_untracked_recognized_blob_only() { # @test - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno echo "$output" >test.md run_dodder status . assert_success assert_output - <<-EOM - recognized [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + recognized [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test.md] EOM } # bats test_tags=user_story:fs_blobs, user_story:recognized_blobs function status_explicit_untracked_recognized_blob_only() { # @test - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno echo "$output" >test.md run_dodder status test.md assert_success assert_output - <<-EOM - recognized [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + recognized [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test.md] EOM } @@ -440,16 +440,16 @@ function status_explicit_untracked_recognized_blob_only() { # @test # bats test_tags=user_story:fs_blobs, user_story:recognized_blobs function status_dot_untracked_recognized_blob() { # @test checkout_everything - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno echo "$output" >test.md run_dodder status . assert_success assert_output_unsorted - <<-EOM - recognized [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 + recognized [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4 test.md] same [md.type @blake2b256-3kj7xgch6rjkq64aa36pnjtn9mdnl89k8pdhtlh33cjfpzy8ek4qnufx0m !toml-type-v1] - same [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - same [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + same [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + same [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM } diff --git a/zz-tests_bats/test.bats b/zz-tests_bats/test.bats index 4612e70fa..26ea9d46c 100755 --- a/zz-tests_bats/test.bats +++ b/zz-tests_bats/test.bats @@ -33,12 +33,12 @@ function can_checkout_and_checkin { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [alpha/golf !md "wow" ok] + [one/uno !md "wow" ok] EOM - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success - # assert_output ' (checked out) [alpha/golf.zettel @9a638e2b183562da6d3c634d5a3841d64bc337c9cf79f8fffa0d0194659bc564 !md "wow"]' + # assert_output ' (checked out) [one/uno.zettel @9a638e2b183562da6d3c634d5a3841d64bc337c9cf79f8fffa0d0194659bc564 !md "wow"]' { echo "---" @@ -47,12 +47,12 @@ function can_checkout_and_checkin { # @test echo "---" echo echo "content" - } >"alpha/golf.zettel" + } >"one/uno.zettel" - run_dodder checkin alpha/golf.zettel + run_dodder checkin one/uno.zettel assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-lenzq4f690e7qealpgk53cxl68ym7xcx0vxl9hj6q2kqud8v265sqehvrn "wow" ok] + [one/uno @blake2b256-lenzq4f690e7qealpgk53cxl68ym7xcx0vxl9hj6q2kqud8v265sqehvrn "wow" ok] EOM } @@ -74,13 +74,13 @@ function can_checkout_via_tags { # @test run_dodder new -edit=false "$to_add" assert_success assert_output - <<-EOM - [alpha/golf !md "wow" ok] + [one/uno !md "wow" ok] EOM run_dodder checkout -- ok:z assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel !md "wow" ok] + checked out [one/uno.zettel !md "wow" ok] EOM } @@ -104,7 +104,7 @@ function can_new_zettel_with_metadata { # @test run_dodder new -edit=false -description bez -tags et1,et2 assert_success assert_output_unsorted - <<-EOM - [alpha/golf !md "bez" et1 et2] + [one/uno !md "bez" et1 et2] EOM } @@ -131,7 +131,7 @@ function indexes_are_implicitly_correct { # @test run_dodder new -edit=false "$expected" assert_success assert_output_unsorted - <<-EOM - [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM { @@ -144,14 +144,14 @@ function indexes_are_implicitly_correct { # @test echo the body } >"$expected" - mkdir -p alpha - cp "$expected" "alpha/golf.zettel" - run_dodder checkin -delete "alpha/golf.zettel" + mkdir -p one + cp "$expected" "one/uno.zettel" + run_dodder checkin -delete "one/uno.zettel" assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1] - deleted [alpha/golf.zettel] - deleted [alpha/] + [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1] + deleted [one/uno.zettel] + deleted [one/] EOM # TODO-P2 fix issue with kennung schwanzen @@ -161,7 +161,7 @@ function indexes_are_implicitly_correct { # @test # EOM { - echo alpha/golf + echo one/uno } >"$expected" #TODO @@ -191,16 +191,16 @@ function checkouts_dont_overwrite { # @test run_dodder new -edit=false "$expected" assert_success assert_output - <<-EOM - [alpha/golf @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + [one/uno @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run_dodder checkout alpha/golf + run_dodder checkout one/uno assert_success assert_output - <<-EOM - checked out [alpha/golf.zettel @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] + checked out [one/uno.zettel @blake2b256-vl6ghtv2jsxppshflt86ardlx55ctn8jswx8j59tnv8r99uhs63syxsruy !md "bez" et1 et2] EOM - run cat alpha/golf.zettel + run cat one/uno.zettel assert_success assert_output --regexp - <<-EOM --- @@ -224,15 +224,15 @@ EOM echo the body 2 } >"$expected" - cat "$expected" >"alpha/golf.zettel" + cat "$expected" >"one/uno.zettel" - run_dodder checkout alpha/golf:z + run_dodder checkout one/uno:z assert_success assert_output - <<-EOM - changed [alpha/golf.zettel @blake2b256-7dzz0dhlp77yccl0m2yn983azxuhd28pgsk5h3kplndhf2rg5gds8cqdyf !md "bez" et1 et2] + changed [one/uno.zettel @blake2b256-7dzz0dhlp77yccl0m2yn983azxuhd28pgsk5h3kplndhf2rg5gds8cqdyf !md "bez" et1 et2] EOM - run cat alpha/golf.zettel + run cat one/uno.zettel assert_success assert_output "$(cat "$expected")" } diff --git a/zz-tests_bats/workspace.bats b/zz-tests_bats/workspace.bats index e350bf467..84601dfff 100644 --- a/zz-tests_bats/workspace.bats +++ b/zz-tests_bats/workspace.bats @@ -22,8 +22,8 @@ function workspace_show { # @test run_dodder show assert_success assert_output_unsorted - <<-eom - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] - [alpha/hotel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/dos @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] eom run_dodder show :e @@ -31,10 +31,10 @@ function workspace_show { # @test assert_output_unsorted - <<-eom eom - run_dodder show alpha/golf + run_dodder show one/uno assert_success assert_output - <<-eom - [alpha/golf @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + [one/uno @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] eom } @@ -46,11 +46,11 @@ function workspace_edit { # @test run_dodder edit assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format blob alpha/golf + run_dodder show -format blob one/uno assert_success assert_output - <<-EOM last time @@ -68,11 +68,11 @@ function workspace_checkout { # @test run_dodder checkout : assert_success assert_output_unsorted - <<-EOM - checked out [alpha/hotel.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] - checked out [alpha/golf.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] + checked out [one/dos.zettel @blake2b256-z3zpdf6uhqd3tx6nehjtvyjsjqelgyxfjkx46pq04l6qryxz4efs37xhkd !md "wow ok again" tag-3 tag-4] + checked out [one/uno.zettel @blake2b256-9ft3m74l5t2ppwjrvfg3wp380jqj2zfrm6zevxqx34sdethvey0s5vm9gd !md "wow the first" tag-3 tag-4] EOM - run_dodder show -format blob alpha/golf.zettel + run_dodder show -format blob one/uno.zettel assert_success assert_output - <<-EOM last time @@ -98,18 +98,18 @@ function workspace_organize { # @test - tag-3 --- - - [alpha/golf !md tag-4] wow the first - - [alpha/hotel !md tag-4] wow ok again + - [one/dos !md tag-4] wow ok again + - [one/uno !md tag-4] wow the first EOM - run_dodder organize -mode output-only alpha/golf + run_dodder organize -mode output-only one/uno assert_success assert_output - <<-EOM --- - tag-3 --- - - [alpha/golf !md tag-4] wow the first + - [one/uno !md tag-4] wow the first EOM } @@ -122,7 +122,7 @@ function workspace_add_no_organize { # @test run_dodder add -delete -tags new_tags -description "added file" todo.wow.md assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-qdflthfeky7ak3up8qgagd4qx2a8ua5lr4kvffynjl2k4063ja0qr65g5r !md "added file" new_tags tag-3] + [two/uno @blake2b256-qdflthfeky7ak3up8qgagd4qx2a8ua5lr4kvffynjl2k4063ja0qr65g5r !md "added file" new_tags tag-3] deleted [todo.wow.md] EOM } @@ -155,8 +155,8 @@ function workspace_add_yes_organize { # @test run_dodder add -organize -delete ./*.md assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "2" tag-one] - [alpha/india @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] + [two/uno @blake2b256-5hwedpxxtvucp2wnhcwafgt6y0a93qca3x0522x2j6kmlw0zzp9qvmvt2s !md "2" tag-one] + [one/tres @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] deleted [1.md] deleted [2.md] EOM @@ -186,7 +186,7 @@ function workspace_add_yes_organize_omit_one { # @test run_dodder add -organize -delete ./*.md assert_success assert_output - <<-EOM - [bravo/golf @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] + [two/uno @blake2b256-ax76uj5gxlkxj0za603p78t3fzyl23tzd977js8qkzv3j5lx8v9smrj5ch !md "1" tag-two] deleted [1.md] EOM } From c2099a91402284ccf8dc62035f0401067451344f Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 06:46:25 -0500 Subject: [PATCH 15/25] fixup! feat: update genesis to use object ID log with raw text processing fixup! feat: update genesis to use object ID log with raw text processing Remove ExtractUniqueComponents from genesis - it filters short words, breaking existing word lists. Genesis reads word-per-line files directly. ExtractUniqueComponents is only for add-zettel-ids raw text input. Revert common.bash to original word lists (one/two/three, uno/dos/tres). Add dedicated NATO word init to add_zettel_ids.bats and init.bats. Regenerate fixtures with old word lists + new object_id_log. Co-Authored-By: Claude Opus 4.6 --- go/src/juliett/env_repo/genesis.go | 37 ++--- zz-tests_bats/add_zettel_ids.bats | 148 +++++++++--------- zz-tests_bats/init.bats | 34 ++++ .../v13/.dodder/config/config-mutable | Bin 5203 -> 5203 bytes .../v13/.dodder/local/share/config-seed | 2 +- .../v13/.dodder/local/share/index/Abbr | Bin 1179 -> 1179 bytes .../v13/.dodder/local/share/index/object_id | Bin 146 -> 146 bytes .../local/share/index/object_pointers/Page-0 | Bin 147 -> 196 bytes .../local/share/index/object_pointers/Page-1 | Bin 147 -> 147 bytes .../local/share/index/object_pointers/Page-2 | Bin 49 -> 98 bytes .../local/share/index/object_pointers/Page-3 | Bin 196 -> 147 bytes .../local/share/index/object_pointers/Page-4 | Bin 147 -> 196 bytes .../local/share/index/object_pointers/Page-5 | Bin 196 -> 245 bytes .../local/share/index/object_pointers/Page-6 | Bin 49 -> 98 bytes .../local/share/index/object_pointers/Page-7 | Bin 98 -> 147 bytes .../local/share/index/object_pointers/Page-8 | Bin 196 -> 49 bytes .../local/share/index/object_pointers/Page-9 | Bin 49 -> 0 bytes .../local/share/index/object_pointers/Page-a | Bin 196 -> 49 bytes .../local/share/index/object_pointers/Page-b | Bin 98 -> 0 bytes .../local/share/index/object_pointers/Page-c | Bin 98 -> 98 bytes .../local/share/index/object_pointers/Page-d | Bin 245 -> 245 bytes .../local/share/index/object_pointers/Page-e | Bin 49 -> 49 bytes .../local/share/index/object_pointers/Page-f | Bin 147 -> 0 bytes .../.dodder/local/share/index/objects/Page-0 | Bin 367 -> 367 bytes .../.dodder/local/share/index/objects/Page-1 | Bin 1040 -> 1040 bytes .../.dodder/local/share/index/objects/Page-2 | Bin 469 -> 469 bytes .../.dodder/local/share/index/objects/Page-3 | Bin 417 -> 417 bytes .../.dodder/local/share/index/objects/Page-4 | Bin 367 -> 0 bytes .../.dodder/local/share/index/objects/Page-5 | Bin 0 -> 367 bytes .../.dodder/local/share/index/objects/Page-6 | Bin 441 -> 0 bytes .../.dodder/local/share/index/objects/Page-7 | Bin 0 -> 367 bytes .../.dodder/local/share/index/objects/Page-8 | Bin 367 -> 0 bytes .../.dodder/local/share/index/objects/Page-b | Bin 914 -> 0 bytes .../.dodder/local/share/index/objects/Page-c | Bin 420 -> 420 bytes .../.dodder/local/share/index/objects/Page-d | Bin 1046 -> 441 bytes .../.dodder/local/share/inventory_lists_log | 8 +- .../v13/.dodder/local/share/object_id_log | 8 +- ...00d16a722afc516c6cdae7a6dd1c4212b419d2a793 | Bin 456 -> 0 bytes ...4a347a0cf3e192d168b70993d3782161f666ad6ab7 | Bin 280 -> 0 bytes ...39defd8cb3ff28deaebdc821afcc2d865d397862a3 | Bin 0 -> 283 bytes ...d397d37fb025248d485041e48755f04e5c866e6c9e | Bin 283 -> 0 bytes ...5c2b0360401261a649846f74cd486a374b2a0e8baa | Bin 0 -> 281 bytes ...44252a9a476f5e28083864665125239c10a0532555 | Bin 0 -> 416 bytes ...9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b | Bin 0 -> 370 bytes ...b5d2276220658e5ca80ab6a75b350710df0bfce14d | Bin 369 -> 0 bytes ...7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 | Bin 365 -> 0 bytes ...e8e10558f54e9e7407ef510f77369359f804505822 | Bin 0 -> 280 bytes ...0d705ec9bc6df84f8749957ac11558b21b1924619a | Bin 284 -> 0 bytes ...34c13d3f0a688cef2cb7bc97f6824423be4eaf8dae | Bin 0 -> 37 bytes ...8c3ccf32066a26afaf74a51792c15810824e1ba238 | Bin 0 -> 282 bytes ...b82bf8babcff6839f24f285541894f7028a98ef6a0 | Bin 43 -> 0 bytes ...1e1e72db929ff3f882f98244e38ed2e0dd8a16ad19 | Bin 0 -> 452 bytes ...8225b8fdb4f8bbc4235e20b754d27be375de0b5682 | Bin 451 -> 0 bytes ...f22bb4a6d204cf76f618a98ff1bb41515fdfaee443 | Bin 376 -> 0 bytes ...3b60e4ed1679fdb2dc45575a473784c6893285fd3c | Bin 282 -> 0 bytes ...d8f42ee65daba036d5c646f854207f8e6e2fe2386a | Bin 418 -> 0 bytes ...1cae1745b3b532f504bbfb1eed415c43cc18383d12 | Bin 371 -> 0 bytes ...af94cc1158f28e627332697706161ffd8a06566f26 | Bin 0 -> 40 bytes ...c3240dc50ec02d67bbae42915ee49a95e70fa45290 | Bin 283 -> 0 bytes ...aa6444ea16e768a02975efa32392425a8baaa8b83e | Bin 421 -> 0 bytes ...5a9340b4fe51fd6946541c2024bce5682e10db7e8a | Bin 0 -> 368 bytes ...551f14edadfcdc77b69e7e1208c1b7507cd2883254 | Bin 280 -> 0 bytes ...8eed10e15fc75462a06f50b419bd71d812fd535ec0 | Bin 48 -> 0 bytes ...662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 | Bin 281 -> 0 bytes ...17db89aefbde460db690e716df87ed624fad3dfb52 | Bin 281 -> 0 bytes 65 files changed, 127 insertions(+), 110 deletions(-) delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-b delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-f delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-4 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-5 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-6 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-7 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-8 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-b delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/6c9e63d20add7931537d00d16a722afc516c6cdae7a6dd1c4212b419d2a793 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/713d169713e60de958884a347a0cf3e192d168b70993d3782161f666ad6ab7 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/05/5295cc744e50e1c356be39defd8cb3ff28deaebdc821afcc2d865d397862a3 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/07/492f274032bb458c29cfd397d37fb025248d485041e48755f04e5c866e6c9e create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/10/ad3c81c961aa2d82210c5c2b0360401261a649846f74cd486a374b2a0e8baa create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/18/9744d3979d225d8206b544252a9a476f5e28083864665125239c10a0532555 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/1e/9ff26261b7f2e071648b9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/35/b319e3ba245cd5b88a51b5d2276220658e5ca80ab6a75b350710df0bfce14d delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/45/4bf9c598f0df2ed71db6e8e10558f54e9e7407ef510f77369359f804505822 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/58/47285856a7198c8d143f0d705ec9bc6df84f8749957ac11558b21b1924619a create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/5a/3e06f5b75580e490382134c13d3f0a688cef2cb7bc97f6824423be4eaf8dae create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/62/e17f753623321ca7a8d38c3ccf32066a26afaf74a51792c15810824e1ba238 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/70/98ff5008183cfaa32ba0b82bf8babcff6839f24f285541894f7028a98ef6a0 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/72/3000fc64739a74c56fd11e1e72db929ff3f882f98244e38ed2e0dd8a16ad19 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/95/bb26257c264038ecd141f22bb4a6d204cf76f618a98ff1bb41515fdfaee443 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9e/a2501e277e52a54c61331cae1745b3b532f504bbfb1eed415c43cc18383d12 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/aa/e0e4ea1c5503c5cd992aaf94cc1158f28e627332697706161ffd8a06566f26 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ad/0213ef702cf625e87090c3240dc50ec02d67bbae42915ee49a95e70fa45290 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/af/2a7b05d2a0df28506c9baa6444ea16e768a02975efa32392425a8baaa8b83e create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c1/0fb305305d45c4937eae5a9340b4fe51fd6946541c2024bce5682e10db7e8a delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ca/c5c96c6384232b0e7ba28eed10e15fc75462a06f50b419bd71d812fd535ec0 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e4/4053df6e8efdd7004c89662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e6/c1db44a50102d89905d017db89aefbde460db690e716df87ed624fad3dfb52 diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index 275bbf139..d93b86d3f 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -10,7 +10,6 @@ import ( "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" "code.linenisgreat.com/dodder/go/src/alfa/errors" - "code.linenisgreat.com/dodder/go/src/alfa/unicorn" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" @@ -159,26 +158,20 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { return } - yinLines, err := readFileLines(bigBang.Yin) + yinWords, err := readAndCleanFileLines(bigBang.Yin) if err != nil { env.Cancel(err) return } - yangLines, err := readFileLines(bigBang.Yang) + yangWords, err := readAndCleanFileLines(bigBang.Yang) if err != nil { env.Cancel(err) return } - yinWords := unicorn.ExtractUniqueComponents(yinLines) - yangWords := unicorn.ExtractUniqueComponents(yangLines) - yinWords, yangWords = enforceCrossSideUniqueness(yinWords, yangWords) - yinWords = cleanWords(yinWords) - yangWords = cleanWords(yangWords) - blobStore := env.GetDefaultBlobStore() yinBlobId, err := genesisWriteWordsAsBlob(blobStore, yinWords) @@ -233,12 +226,12 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { } } -func readFileLines(path string) (lines []string, err error) { +func readAndCleanFileLines(path string) (words []string, err error) { var file *os.File if file, err = files.Open(path); err != nil { err = errors.Wrap(err) - return lines, err + return words, err } defer errors.DeferredCloser(&err, file) @@ -246,14 +239,18 @@ func readFileLines(path string) (lines []string, err error) { scanner := bufio.NewScanner(file) for scanner.Scan() { - lines = append(lines, scanner.Text()) + cleaned := object_id_provider.Clean(scanner.Text()) + + if cleaned != "" { + words = append(words, cleaned) + } } if err = scanner.Err(); err != nil { err = errors.Wrap(err) } - return lines, err + return words, err } func enforceCrossSideUniqueness(yin, yang []string) ([]string, []string) { @@ -286,20 +283,6 @@ func enforceCrossSideUniqueness(yin, yang []string) ([]string, []string) { return filteredYin, filteredYang } -func cleanWords(words []string) []string { - result := make([]string, 0, len(words)) - - for _, w := range words { - cleaned := object_id_provider.Clean(w) - - if cleaned != "" { - result = append(result, cleaned) - } - } - - return result -} - func genesisWriteWordsAsBlob( blobStore domain_interfaces.BlobStore, words []string, diff --git a/zz-tests_bats/add_zettel_ids.bats b/zz-tests_bats/add_zettel_ids.bats index fc3b37051..9e8a31a50 100644 --- a/zz-tests_bats/add_zettel_ids.bats +++ b/zz-tests_bats/add_zettel_ids.bats @@ -1,18 +1,43 @@ #! /usr/bin/env bats +cat_yin_nato() { + cat <<'EOM' +the alpha +the bravo +the charlie +the delta +an echo +the foxtrot +EOM +} + +cat_yang_nato() { + cat <<'EOM' +the golf +the hotel +the india +the juliet +the kilo +the lima +EOM +} + setup() { load "$(dirname "$BATS_TEST_FILE")/common.bash" # for shellcheck SC2154 export output - copy_from_version "$DIR" + run_dodder init \ + -yin <(cat_yin_nato) \ + -yang <(cat_yang_nato) \ + -lock-internal-files=false \ + -override-xdg-with-cwd \ + test - run_dodder_init_workspace - - # create the object id log via migration - run_dodder migrate-zettel-ids assert_success + + run_dodder_init_workspace } teardown() { @@ -20,100 +45,78 @@ teardown() { } function add_zettel_ids_yin_success { # @test - input="$(mktemp)" - { - echo "a sentence about ceroplastes" - echo "another line about midtown" - echo "something about harbor" - } >"$input" - - run_dodder add-zettel-ids-yin <"$input" + run_dodder add-zettel-ids-yin <<'EOM' +a sentence about ceroplastes +another line about midtown +something about harbor +EOM assert_success - assert_output --partial "added 3 words to Yin" - assert_output --partial "pool size: 54" + assert_output "added 3 words to Yin (pool size: 54)" } function add_zettel_ids_yin_dedup { # @test input="$(mktemp)" - { - echo "a sentence about ceroplastes" - echo "another line about midtown" - echo "something about harbor" - } >"$input" + cat >"$input" <<'EOM' +a sentence about ceroplastes +another line about midtown +something about harbor +EOM run_dodder add-zettel-ids-yin <"$input" assert_success - assert_output --partial "added 3 words" + assert_output "added 3 words to Yin (pool size: 54)" # same input again should be a no-op since words already exist run_dodder add-zettel-ids-yin <"$input" assert_success - assert_output --partial "no new words to add" + assert_output "no new words to add" } function add_zettel_ids_yin_cross_side_rejection { # @test - input="$(mktemp)" - { - echo "something about golf" - echo "another about newword" - } >"$input" - # golf is in Yang, should be rejected; newword is new - run_dodder add-zettel-ids-yin <"$input" + run_dodder add-zettel-ids-yin <<'EOM' +something about golf +another about newword +EOM assert_success - assert_output --partial "added 1 words to Yin" - assert_output --partial "pool size: 42" + assert_output "added 1 words to Yin (pool size: 42)" } function add_zettel_ids_yin_no_new_words { # @test - input="$(mktemp)" - { - echo "something about alpha" - echo "another about bravo" - } >"$input" - - run_dodder add-zettel-ids-yin <"$input" + run_dodder add-zettel-ids-yin <<'EOM' +something about alpha +another about bravo +EOM assert_success - assert_output --partial "no new words to add" + assert_output "no new words to add" } function add_zettel_ids_yang_success { # @test - input="$(mktemp)" - { - echo "a sentence about ceroplastes" - echo "another line about midtown" - echo "something about harbor" - } >"$input" - - run_dodder add-zettel-ids-yang <"$input" + run_dodder add-zettel-ids-yang <<'EOM' +a sentence about ceroplastes +another line about midtown +something about harbor +EOM assert_success - assert_output --partial "added 3 words to Yang" - assert_output --partial "pool size: 54" + assert_output "added 3 words to Yang (pool size: 54)" } function add_zettel_ids_yang_cross_side_rejection { # @test - input="$(mktemp)" - { - echo "something about alpha" - echo "another about newword" - } >"$input" - # alpha is in Yin, should be rejected; newword is new - run_dodder add-zettel-ids-yang <"$input" + run_dodder add-zettel-ids-yang <<'EOM' +something about alpha +another about newword +EOM assert_success - assert_output --partial "added 1 words to Yang" - assert_output --partial "pool size: 42" + assert_output "added 1 words to Yang (pool size: 42)" } function add_zettel_ids_peek_shows_larger_pool_after_reindex { # @test - input="$(mktemp)" - { - echo "a sentence about ceroplastes" - echo "another line about midtown" - echo "something about harbor" - } >"$input" - - run_dodder add-zettel-ids-yin <"$input" + run_dodder add-zettel-ids-yin <<'EOM' +a sentence about ceroplastes +another line about midtown +something about harbor +EOM assert_success # reindex rebuilds the zettel ID availability index from flat files @@ -130,14 +133,11 @@ function add_zettel_ids_peek_shows_larger_pool_after_reindex { # @test } function add_zettel_ids_new_still_works { # @test - input="$(mktemp)" - { - echo "a sentence about ceroplastes" - echo "another line about midtown" - echo "something about harbor" - } >"$input" - - run_dodder add-zettel-ids-yin <"$input" + run_dodder add-zettel-ids-yin <<'EOM' +a sentence about ceroplastes +another line about midtown +something about harbor +EOM assert_success run_dodder new -edit=false diff --git a/zz-tests_bats/init.bats b/zz-tests_bats/init.bats index 50f18c855..6d4f37860 100644 --- a/zz-tests_bats/init.bats +++ b/zz-tests_bats/init.bats @@ -233,6 +233,40 @@ function init_inventory_archive_with_encryption { # @test assert_output --regexp '.+' } +function init_with_custom_zettel_id_words { # @test + run_dodder init \ + -yin <(cat <<'EOM' +the alpha +the bravo +the charlie +EOM + ) \ + -yang <(cat <<'EOM' +the golf +the hotel +the india +EOM + ) \ + -lock-internal-files=false \ + -override-xdg-with-cwd \ + test-repo-id + + assert_success + + run_dodder_init_workspace + + run_dodder new -edit=false + assert_success + assert_output --regexp '\[alpha/golf .+ !md\]' + + run_dodder peek-zettel-ids 100 + assert_success + + # 3 yin x 3 yang = 9 possible, minus 1 used = 8 + peek_count="$(echo "$output" | wc -l)" + [[ "$peek_count" -eq 8 ]] +} + function init_with_json_inventory_list_type { # @test run_dodder init \ -yin <(cat_yin) \ diff --git a/zz-tests_bats/migration/v13/.dodder/config/config-mutable b/zz-tests_bats/migration/v13/.dodder/config/config-mutable index a2f9186d3b2da5d527437ea1da2ccf97a69abf14..75aff9fada0c5e9e603c5607e932426e3abcd83a 100644 GIT binary patch delta 55 zcmcbtaam)-KXw6gOLJ2bGd*Jy6LS*-3j_1bd>k1_qQ<61MnEN#`8f7%b`jub0RXe& B4jcdg delta 55 zcmcbtaam)-KXw5#V*_JDQ#}(y17iadQ)9!;d>k1FQ3DGj6BD3{$$T99HoFM$vj70A C#0}N} diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/config-seed b/zz-tests_bats/migration/v13/.dodder/local/share/config-seed index 57187d4ae..20295517e 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/config-seed +++ b/zz-tests_bats/migration/v13/.dodder/local/share/config-seed @@ -2,7 +2,7 @@ ! toml-config-immutable-v2 --- -private-key = 'dodder-repo-private_key-v1@ed25519_sec-x02ej4mua4wewnzdhask02483le7udz9ufxjjla90waea7gsjqwt4rh2g0pa6d2wxdmdr3mssl5y0d2hgvyu8zhwjxt3szz5ht06qesn6vtwl' +private-key = 'dodder-repo-private_key-v1@ed25519_sec-tsu27kphm3mjwxgjncasmts59n6d7zwtazkcwg038alusv0xvhaueljlp5xglnr9f56qmlq3ux883mjgvg68d76hw0tj5p3qyjewn0qpckhxq' store-version = 13 id = 'test-repo-id' inventory_list-type = '!inventory_list-v2' diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/Abbr b/zz-tests_bats/migration/v13/.dodder/local/share/index/Abbr index baeb0203388c139b3a2acf2da94ff0bad33874bc..9c11c8c2e56e122ceb04a2704d465591b147673b 100644 GIT binary patch delta 194 zcmbQuIh%7s3Zr%}Gb1BgNKs}=Y6au}J_bfcMwX!b{1V3h6Brm6LjLyyrCIXwQ&NEf zllvJZ87EC%$*9jbaq>+@Y3)f2jBH?q|Cna~@8e`-VqgO5XJBAt=F=(x8>t5|`G4PJ zc_t}gLna1hMg}7=X$&S!Ci^hSGxkl+VX^~~tC>82Gb1BgNKs}=Y6au}E(S(MMwX!b{1V3hJq!#CA^*F9(kyxTDXBn# z$^DFyjD3?=GU_w-PQJ+~t=-4K$OcyUk7@S*E>1=!1}30>1_nlEKCKe4k$Mo5|94H6 zXOa>&VParrWH1DiMqtu-vJaCyW7p&yCOaUxn#lu5eqpko{EgXh@>U==W^S5n&Y}bq Wjbc$??viDke2__kjR|N60|Nl37Bgo6 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_id b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_id index 9536476a8f6642ab82117453fc9c63912d3e9cc0..d3e0d6562c1c36d7d06d7ae10f9aadc595c36f25 100644 GIT binary patch literal 146 zcmW;BK?}iP9KhlKk0q@oNs^YdB<&zcjzTWGNp5m@=bc*3UPTVRf!TL{$@O_c`>ukU zx(t}o h#G}WA6&GFv%o)<6!-f${LJsuVv8Be0F?IH6ukU zu$RnpeUdhV!491A=_1*_N^*Y zj)ici&6N~PpE!S6V$Os)ky3h{e4D@Ws6ur_K{ap(h^_Cx&dht@!y&ePXH}HAUWVQ& z5WV)WFLy!TQzfQkm<0?l8+g(qs^_hkcxGb5|C!HTILuJA(=y;FI`#9<(&(PM_Ag49 KU^=csZ2$o1pgk`D literal 147 zcmZR$x37<7-LGd^b${ZP&r8qM?#%zC>a_l&*V1N*O*N}z*;E-IAfFLJGtc^XX7jr# zCz?K8@>+Us_KppuftM!n-{W~zSE^y~^!;|Ias~#N29AUC)y!V~;b=A7v({T<4O<0k YXf2DSov_kbigzK02k>qlmGw# diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-1 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-1 index 29ff19b02d21ba4711614dbbf63a77c703b8fb2c..e75c03f2aca79a130c63f125e6921b1f849dbcf3 100644 GIT binary patch delta 91 zcmbQtIGHh6IQ7G`=I57+|GnN|XRM{-{duJwL(Q_&i)}8H7|tnJJ&ln83eH1WV$Pu- nKP;%t&bxSLRmQ|S8n0yfcz!EbM6`9gYUDQ5H?cBI40Zqj#Wy4l delta 91 zcmbQtIGHh6q(bGgr7|bWkM5Fi{>JP-hgrglcIf@EsXRG7&*po^QpWR)3}E2M1ffOi pOl^)Id+9$nIygsL)^6!U#xBK0st2|Eva2PTwlF+mQ=J&>006Lj9{~UW diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-2 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-2 index d87a4776dcc928c9cb659c00578b887c935cf789..7690a5a27398eb3e37028e13202e3577afcd9345 100644 GIT binary patch delta 54 zcmXp^nqX+Cq^6r~xiR499o1v%VGrsX^0at&))g$7^MN~P%^hdaAM6ZJkk1HV001@G B5aa*= delta 4 LcmYc?oL~q518@OV diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 index 4a6756490d166076a280d1709a81d492942cc53d..4d9b1675a3f509359f6c39425c7fe79e828abc03 100644 GIT binary patch delta 106 zcmX@YIGJ&xp<$AV{L9PxlN0{hbKR?x$!n0B8Tm^6LPsV~nc{})O1oW7GBQBHc__<5 qXo-(e=#!^p_U#>|2a|ni~z0-d+@*2h+lk57lGWR{9_+{HQT|K8xPJ eh>nnN#~x_U5M3TGe@XI%TkMx7Y^qQ#Fbx2JYcu`; diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 index fb1a6bac31c28f7069207df69fb610aa9670ba34..18f81fc5e3a4bef1b2a1dca90d8dadf5240caf24 100644 GIT binary patch literal 196 zcmZ>8IXp8W=4ey#>s32N-sn}&$W7I+zW;O0)H!vVy#DU_#H-2x0r`v&+Wl=BgMd%^ zyHuszRL)H#N&9M4+!=msK_pPX2lk9pX76vHDXM`}k&$~#h0b_OWOXM`|Gko*QzQjk@-v={UW=3zAxW4$}1zp(vSl^Yrf+^axmT z6!GY7RlXX~o9(zP#GdyORG|wK#D?Ihdo-`rAI~USf95?8OhXh@0|1DDBX|G+ literal 49 wcmc~3o&K^+I=AcuZzIVt|2sMhL4Wfa&^d*NGQ{ z+i$qMc#ys<=!TZdTFXs4ayX;gF9mUIVMo_cCwC-3RlzgaPAT*K+CE0Oy8_2-S(pR%wxam{7`SU@1X(Ld8aTkfPpH6VgLYHJ`z0u literal 196 zcmZovSsFgy<9GS%&2y*DtVn28l>hcDNJT99(XY}SX-|SHm>8hoDkFr^V!`Be`tQXz zlWdMfm@et=1USx{vR4CkS&uD2=LUj@78+O*ETvd{F*n$m4AiqAautIiMgX8Rr* NaGj?fs!$bb6#!GDM!Wz3 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 deleted file mode 100644 index 4863f252000c26036f10c1e2a33c20277c8c3096..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49 wcmbPLb3fQ4xo9CneC0;5$a6sv&2?uFM_xZwI7#4X*PKHR%&H6!5Y7mp0TuEPq5uE@ diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-a b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-a index 1ea2e1d72234ea2d625ffe48b8e82d4c7a31b7be..168accad3fd9df76ba54d7d0b600d3e5f274c77a 100644 GIT binary patch literal 49 wcmZ3w*(LCnZEo2kxuPEmC&kvUe*R$6;`j$=qS;a%dpNBxvNJ$IJ|lzy05IAR(EtDd literal 196 zcmZ3a`Len7)yb^d^PRtre#`1L-QgP&qEWPr?fpld)4G;_cvKl6Ac_$}FIr_69npVR zA*gp<#b;?frgp9O&oy%_-c&4Id$Y+Gm`~Ba~*dcyc l_5JiabJb4yW!jjpPGgMRdz@kIuP?kZ53g|VgetrVr2+ZBBkceH diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-c b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-c index f2bd74ebd683719721b98de39719a18f6ebfddc8..deeb0a5574db7689929aa9b9b9de36c81fff7cbb 100644 GIT binary patch delta 53 ycmYdFnqXwGqH~SMEzyV`-?QPmYEqKst5Z(N<(C|5&YG%rGUXC0BLftihq3@0aS!?c delta 53 zcmYdFnqXuQI^jaS-;>IJtSUl}8*2((8LsK<6p*#w$^J>OYIXi1W>p3V2xo-Q04$&o A1poj5 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d index d28cb40249775992f33db5d1341af1ee0972666c..625275ff123f72663b286c3e7461fb027b84b732 100644 GIT binary patch literal 245 zcmcbh^LoPM1oyJ0BP%yaL@#5=E7<(1N@3m!E}jWTL^hZRGpjN{KsY0WzAPiZVXf!Q z6R|8J$yN(~e4C^YZqct1@HhCf|DL(t6XhAtLlrtQK{Q;~@hQ-IrMjm}I7Vjn;?;}i zod}9?RB24OQPca|QTRj^FU*E~sK$GS%$M!5xE5?&v(ke9O@H>z4D*24wAds*<)=$$ zY@4$MYAyrARj7vhCyu^h$@W~#-d4DEYTj9wiB2?yvJxPiDq_S|WdHMRw-n90jdh)()?YF)zEOFfl;ERYnNoLgCdlI{l8G z(ds+%Kb%!B?tW5oWRF6vXa8S~8A|&(oj70`@}U~8Fo&i^hi4z~aG%X=;<_|g-$SRn zX#Mqy7XpoQ(tS;iv!H9Z^;~J<7q_l>rf%tCeJ0U!wR0ve>84m<_2ZpivTPrP3mj%G<@`~T<$Le(#A(5f2jp5mF~C4RBZT#vc}Y#bUsH$m zpF2%Lsmsrw5Eq_1=zz!G|d~7|%mZc4UHR1pvlZG>-rP diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 index 0760c2aa451b385bd9a97b882180611ec85a819e..22df9310e2f342586e0ab011417fb0cf91fc0e43 100644 GIT binary patch delta 252 zcmV z0Ag%mYh^NGGBq{;axeh=WOJHy#c$Cb9&+1~pY!;F`GQ2_j?&=WiWaRIkyI%l%>G{u z43ErZO*9Ss5#f$_?nq)ZcKcUz*D3}eB(mwek)0$~%&;|zPZZJSkaBhdY|g^YJK)0N z0|H%hAGY?-Z;WXCSJWPl6GFC|8VQ8pk_h_EU_&En3t|lD?tA@G(UxxrR1^Tz!<2&% z000000D!36%hZ*+pbnE40XQIc^*bjynK&yFi06P?mD8V$)@?AIxqsO8o0r54G??O> C?`c~A delta 252 zcmVamlz0Cy5FE?k)0$~AWE7>u`uPQYdQlP=lLQy_yXLV zKK&3d+GPs!eH@N;d%)$EdOU(^tMTRk`iv?x*lR1^T#j(~#@ z000000D#Dj_>QiHo)D840XQH#Q%=)4;o2P4H6A_6=BI#X={R2pv@=YDfiPn2(G#A^ Ca%D6C diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-1 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-1 index ccdbf037b16685181af64a37756f8bc47e9dfb3b..229077f5f6dec89ac114087d8bcf4e94b6914490 100644 GIT binary patch delta 616 zcmbQhF@a-3fx?-8@w`0!XHtDlc>f4K?5lX^kz`W#JG}V17Mp^~rk8srPEe^oKTrJh zj9+Q9j?TPQ|2FPa$o*&Ud=zy$c_(8VF(G2V=b7x@vwvn7JKdO7!*fKv)1bls z>?F%Dp1wB=Psm>jR%bg`T$P&TrP$;f5V9wy)w!nPr&HY8>-B}xW_+HwTypXuCY5v~ zpKoYf-nZxIOg?mSj^F%C*NV3&}AKxY^gj@7$1pE!Y X?7wHO_eA*$4h9BBR!{^RBbX)tAe$Da delta 616 zcmbQhF@a-3fx@o7SI&p;n)(@+T|8dU{=$80xHISBu6GlsOK^njy1yW8;slj?v!_C3 z^B5a5e6R5yVhjUMGf19)JL8G3(Khypu9rNdkBC|5y3Dr7&t3I;e zW77+Mk%>yjE^;wAu`!hAmn-CFyRtHrB&O>cLTRHA5r%7h4b1`!AkZ-3;`PbxuRiiI zlmsv+=B6;DrWl!;8d}D?6lbP0^c%gsf22{UEG*&f=A$dTf8JzXxz9nxsMJKr{p8Cd z8}cJ_+XW|W&gRRjjyA9Exw39j$JWbFRq{DjEpy#H@$56k$vc>p6byKOeA!&OQ(fSC zS9P=e$=lVu|24w?DSZ5FzV^fsqpkdtcQUpS6C(D8yxX3-y)%ChYT1&+d*QhSv(u_& z-xfdbUgPVs_rbStQGp==fIxn^CliK7%Oe*O} zK0naXwd?QI83O1&r;5jYnYA4#jX_Z8nf(rGlACcOEQ~wwe&(&k0m+;WpT*9s<7W>% YvF!7M4^wVba4;}1vVtPm7{N3F09vdT1^@s6 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 index 24491c3d5a4013c9a1cd9de8eb42051d4ab8131d..e3a6e1ccf47d241f124660d7110c97c422ef7246 100644 GIT binary patch delta 255 zcmVAaDUBtUC| zp_Y+p<(dJ;uq) zlsR4FGgd03mH;0A*w{H8n9gUvp_^ z09$ITO(3e)v~b%Vb!tAN6-ex~M) zZblh>v~%iDK)U|I1CxCLA|T!|1Jgcg3ZSv9sW=bpk88PTH&9(>U1AO+<)xUmoV1g_ F0TwIqbm{;A delta 255 zcmVO;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|SfBtRW6 zihKqQTc9kj>=nS737)SSrY3%s9?Q3DWtKjWMlO5NeZmy(913fBKi$R>uK-GQAQP-A zF&F+H&q!&^k`IyeB4^f)fP)YK00000fY`>io}rAaDzBvxB$ ztW6-Q*0gZj9_0t0G{GO@}_2<=c|Cit$wEFjc!I6 zeYA7xPe8iO;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|S;Bvy|y z?cc2Hl0s@<%nGh;%cD)%1@3eIdFUJ9#*mVql9F1aTa;RmuUk-> zl#`hppPgE%TV}|Rnqp*XYG@e`6lK`e_saS3T~j~fvWv$H+F!VD4R_`|-1TnabP0}- zUH2EH6(+(A%1_ElO)k+b&P>-WGlH7|Y9zK|%9s%dDg~ g%$w63lQ->C;#s;yqqbMBke@BuF)k#*b&k?s0N&GvF8}}l diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-5 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-5 new file mode 100644 index 0000000000000000000000000000000000000000..c4b570579c0849fbf2be3e501316e9c431100966 GIT binary patch literal 367 zcmd003}$3t^Oj*?lj3GFGBhL9k%=n{F~_(BBP+P=V^wX!0o!O05^t|{FIc`BHg0Yf_&YA z(xjZs>p(&dw40Jo401w@nKZ+SN|v#Ra^WzKcIQK45jX(W|M;BH2Sk7_J`!CsEEy5hJj6ro5{$~)WFQxz}V1~iBXS>$;8mW z)YQPxz{F99fgvd;F+0^L$;i}=57{RmO0@5|GF zWRVr%#*mVql9F1aTa;RmuUk->l#`hppPgE%TV}|Rnqp*XYG@e`6lK`e_saS3T~j~f zvWv$H+F!VD4R_`|-1TnabP0}-UH2EH6(+(A%1_ElO)k+b&P>-WGlH7|abJmrCsuu3Cfv%HAk=bxF64W5+utwKicv2d!?)gZ$JGwKV!D&=c}BSOYXmZu~j-E zGelsr=jKQcOAcVTTh$qH7Ub&| zlqTh5CdX%|R_c}+GNh&$nVK3}#sfte&isq#<>^0@>TAOLNAO`^#XFBAld|98#n-ji z6jV07+*6ncGblePD>b=9w>UFhx6BA`29V3ZyjGN{Y~~_OO}h;`Q+{p#;G3Ok#N}g` zdb)hklNB1R%NI)vnNGfR^H*&1`^AQ5|C&0mthnR6dp3*G9 z00IpQrcK@Pd-rx;h7utL#mv02)Vz}XqRRN3%;FND#l`k$?n%i^PX)^`6lWxYf@bMv km%v-Lxn+;!ihd}Z6kEUg`GZM|;~$)fW=nPK;k3R80N~+_j{pDw literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-8 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-8 deleted file mode 100644 index 0d1026b8ef2a1f89bda1597917161a36c8b303ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmd003}$3t^Oj*?lj3GFGBhwS7k@MY=_)1^K!K zrAaxN$?@5#mAYky45=wbra)8Ufuan%`d&F7zH91dTz2tzLHi5$t>Mm`hr8ZQoG!r; zvg`hWw8BJ~LHS8psmUd}#hK~4Wkzr_fLsRNy}tP;_Fa8Yr<`$`{ea3BgBx+rJh!Jb zJMF2v(I9t7HaSMALOW^Zk=)lCc9u*yNp43SM9VzW>K7%t}=&+FkI_vXck}q zfrgITJ)btr`pL&oBE+DWnOByYSCU^;8K09`TmrPX*dEP2DVgc1U>Szuj6_h-TqwM{ iMyKD=Gg^IT{)e;b#obRzj_gsW_3ZzvF+*uTrxO4U5RJb8 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-b b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-b deleted file mode 100644 index b054ef8b4c3dec0374cfc7a2d59f9e199118e103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 914 zcmY#p2xeqp@MdCQU`!CsEEy5hJj6ro5{$~)WF=##KOXyiBXS>$=JZu z*uc`%!q8ENfgvd;F+0^L$;i}!k(vH3D*GuS#)wCH6dHfoAFZ#mbYMqPkbD z*kKpo#*mVql9F1aTa;RmuUk->l#`hppPgE%TV}|Rnqp*XYG@e`6lI9lIP+=|=bEl< zQzs}eq+d~ecqH_R{KvDoS;d^Ir_TAZq%aX?P<~QYYI2Egab~)1nGxI!AeVtTXw!y` z@;5K5Pu{n+XY+!K*AEv>YWa6ImRaagTZi1?nA&E)l9*;swa*TWx7OV;wcKPY`Y!5W z#$n02zjYVdIQ4*74fSc-r4SXEB_R63* zVIvSH*CBBt%)lbZ#*~;-kdes5sL#ffkzbOUgBBGcE@I1Lc1VlP4nF&2n^3?6<1Ydy zr}oCO@UQ>EIN{K`V7f-djyI1>Ot_}(QY)X&{cc~WlkI0DHCtRWOf$ZQdnSEh z@o-iAJM&&yj7nMJC!GU4Y#$HE@*JuC5O_hkdlRD*4?}r=xk7%nLSlMiW}Yi6LrG$~ zt}&E0L5-;yz3*mySiX#hp(KDoF*gMzO<0S*de5X1@OH&v87*nwQ$>d28U8s}?w3Wp zQOa)eRxMw9zerx}i^E)&S676s1$mAy`*Jhxw$7V*nybAYa o+NSd}fA-0AaD!Bv$!$ zPUxGr^3@YYwuRRYs}80AQw%~|ROCFEXr9v-kmw0pcUH5(Yxn03pFm-eox8otN5)D{ z1SSy|ME&W^Zv|8o0Mx^jgAf1!0001hn262)`{Bq5lPUoE{P7a^^<=AC2wF%0RR91 delta 170 zcmV;b09F5_1Ed3xkRZB_>O;fbHBK{j(Z_Iy=ts3zLkYu*?va-m2voY?pk|S+p zVAaq7H-?n_l*vj=$_i)x#q;v?pGoyK;r%1{u&?5sN0Ld|@9^U5T5Jj`n_ljj zoXVt<^XbQuLjAqJ4*PqzO5V{s{>kvk?D!c5R+B4um;Z9w{h;R70l#+>&QA(8^RUuq zt^E|(rny7s(XBIGX39O@ze=1qfnK|EcuKPX*mn&ZwjOUdd-NnHLx~WBVrE`hYFi)wFq literal 1046 zcmcb>7|h7P;w{9$BEZI!m{X9E$i%46%9Ng;ljf+yz>t)an4M~rWMpc_aFnM_T;;Jz z*Yt`4UDio0zPvB{^8WxghLrr2l++^KqSS(X-Gb7joXq6-?9@u# zGDC*c6eCkpL(6!eC_}u)nOBQA*K}>0IzfRU{fg?tBcV^^Kc3CaD&|~0byA!n7GMB@h8Z`$b!_W-&dpE~z@V6$g5m^g(O2)8R07_vI4q+j?R%=oP&~sw z=gR%Eh&M{vP2Q^IYws7yi+ypJ%kt`qu(cr1@nv6b#@*I=GjDU`5sk3R6F7?P(Y%?G znVwo)0`h5bMj|N0oo*G1*S*;l)w65sv$#g_5>c0G)s8+b_ulTX(qg-Z@zZ0I`M*Iv?L={AuY40xC9!Z#!%V>HDXWvfAQ%;PaiKWBGxwpEn;)? zfvzf|MKUIwh7=3J^y@$TILy9q;U4BiA*}CPWU5n_cuwL{zc7EYh@vSX;TR*BCIH1z Bll1@q diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log b/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log index 41a0395db..930b32039 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log +++ b/zz-tests_bats/migration/v13/.dodder/local/share/inventory_lists_log @@ -2,7 +2,7 @@ ! inventory_list-v2 --- -[2150630315.410550104 @blake2b256-njsg6at8z026537en0v0gthxtk46qdk4cer0s4pq078xutlz8p4qtlqvl2 dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-kf0rur9j24qtj2hf8e3lfyprd988e3w5f3ruw68y2gwsr86mg8477gn2urkl97x0nzd3tu74pyu6fhltaz63kkrf2sgfxjdnt9yrjzqcwtyd6 !inventory_list-v2] -[2150630315.538519645 @blake2b256-gs3y7llf5qlgu95aldlfet6v336x798m0ch58eqs7laut860wkvqn007jx dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-pk756m7ghm27ql3rdr9s0spy7scdshhxfxmkfq6zh3ld3qq7cgwkxhpz0q4k9xwydh4mpwphvfke9zv8nknqqga60ktvydj6p8fd2qcg4xzdv !inventory_list-v2] -[2150630315.555538524 @blake2b256-xke3nca6y3wdtwy22x6ayfmzypjcuh9gp2m2wke4qugd7zluu9xs0m0kdv dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-k388fqw0fzeperpmxxr4cfl5uyclqgghg9xpzy5j8v5jwlx2e2dppnmcztk4w3m5sfl4v3yz9rq8m8mjgga9hr3dchcz2c7e0qnf5pg675ska !inventory_list-v2] -[2150630315.584916789 @blake2b256-wsvpcr8sv0gmmc2dwxpztw8aknuth3prtcstw4xj003hthst26pqxuzrve dodder-repo-public_key-v1@ed25519_pub-h28w5s7rm565uvmk68rhpplgg764wscfcw9wayvhrqy9fwkl5pnqncglml dodder-object-sig-v2@ed25519_sig-yp9f5343xrj6w6e6qvd707fz8ruq9hyu8m73qvx6v590xlgu3e6hhs89jeareqn9hr9kumpygzfy6w07xfy20thneddn6wqxks59yqqsq7hrl !inventory_list-v2] +[2150797546.344959902 @blake2b256-rzt5f5uhn539mqsxk4zz2256gah4u2qg8pjxv5f9ywwppgzny42s0gtv3u dodder-repo-public_key-v1@ed25519_pub-enl97rgv3lxx2nf5ph7prcvw0rhysc35wma4wu7h9grzqf9jax7q2ek2k2 dodder-object-sig-v2@ed25519_sig-7tu2guf0hhavxn6ts5vactk87gc7fx6lnqcr4ymcpknl5s4mup7d4szwa6gvlyj4xeyr5tc90he9rp3fhqkw9kkv3gmz8rztlf6yyzgg90mxu !inventory_list-v2] +[2150797546.467381066 @blake2b256-cy8mxpfst4zufym74edfxs95legl662x2swzqf9uu45zuyxm069qzgq7dr dodder-repo-public_key-v1@ed25519_pub-enl97rgv3lxx2nf5ph7prcvw0rhysc35wma4wu7h9grzqf9jax7q2ek2k2 dodder-object-sig-v2@ed25519_sig-vhvdke4k976578t629a3mw7udp3lh5r7mae8af94yc8hktjw94mswzzauavu4f2xk2skppexeph9u58gj7aq766l2z4ckvh2jkn9jpceut3wu !inventory_list-v2] +[2150797546.483987348 @blake2b256-r60lycnpklewquty3w0zvpx0gagchukzcg6kjhkf57nucth0dgas8n8kh9 dodder-repo-public_key-v1@ed25519_pub-enl97rgv3lxx2nf5ph7prcvw0rhysc35wma4wu7h9grzqf9jax7q2ek2k2 dodder-object-sig-v2@ed25519_sig-qwk32qnknx3zj2f7kqkff74h7pxkk6fjpfxruewtw73wf2pgskn6xxcjxkfa9k06tkp7lge3eh7n2sqy4rwwy9egyhk7ynzeuxapcqqc6sga7 !inventory_list-v2] +[2150797546.513538273 @blake2b256-wgcqplrywwd8f3t06y0puukmj20l87yzlxpyfcuw6tsdmzsk45vska98f6 dodder-repo-public_key-v1@ed25519_pub-enl97rgv3lxx2nf5ph7prcvw0rhysc35wma4wu7h9grzqf9jax7q2ek2k2 dodder-object-sig-v2@ed25519_sig-ejcrtzj0zng7dyrjwcpkenkzeca7pshzqvp96uclkmmv7muvdr7904q73uf59d5mrgycfcyjprav6czryd4qkcsvarh8hl2j6xtx7zqnl4nhl !inventory_list-v2] diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log b/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log index de6961104..deaea0736 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log +++ b/zz-tests_bats/migration/v13/.dodder/local/share/object_id_log @@ -3,14 +3,14 @@ --- side = 0 -tai = '2150764887.302635814' -markl-id = 'blake2b256-etzujmrrss3jkrnm528w6y8ptlr4gc4qdagtgxdaw8vp9l2ntmqqaldnaj' +tai = '2150797546.342444535' +markl-id = 'blake2b256-tglqdadh2kqwfypcyy6vz0flpf5gemevk77f0a5zgs3mun403khqqys2dd' word-count = 6 --- ! object_id_log-v1 --- side = 1 -tai = '2150764887.302672344' -markl-id = 'blake2b256-wzv075qgrq704get5zuzh796hnlksw0jfu592svffacz32vw76sql980vc' +tai = '2150797546.342481443' +markl-id = 'blake2b256-4tswf6su25putnve92hefnq3tregucnnxf5hwpskrl7c5pjkdunqemva5e' word-count = 6 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/6c9e63d20add7931537d00d16a722afc516c6cdae7a6dd1c4212b419d2a793 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/01/6c9e63d20add7931537d00d16a722afc516c6cdae7a6dd1c4212b419d2a793 deleted file mode 100644 index 10c1e5be109ec1d10183b8cefdf8f39ba2851635..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmV;(0XP0AwJ-euSp5wEmZWMQFiCU+V57Zt70?ceX6VRgL@*HYCmZW5dFDew5~TuV z0AK)L08uL@7X_v!xB{gRj0Od|;4w*f2BpB%;!xu)ZiMgv3D+3m4EEYtH6z+Tc3z{B)J&doNnKBp!|OK_E7RMeDLcw+o4-^@14g=# z23*{Tw`X5w2LY7Tfs>zD%0he+75fN3!C# z7UT1kcR7@$aeE>58c&bfW;#pG>=>-13lpW-x0m~b=|(Tgq3u%H{Z3H9{i~*poPMZx z?B^O&$+S)?maBnG*N<3*?Nj?U^_s&>#h^&8*FPaUUrK1hcK`@qNFx)ekVYm1GQNg` zh)5>(VG9sPA+|i*Z9FKFH7y_4qFYYjaa1A4(GBl3atVL22FLPb=1z*xMW5$sktSi| yO@l$Sz|+@GPj0lAq&~j4L3GQ+`=ig0Zjc5LGz9>0z>bhu5^=`5VMe(~k_c#G$o*j zbkaJCKm-9scl{wR_hKJ3eEY)f#2QV7NYf}0-|!b|9}tufe$ z4UP~R;2?5**#6qoAE)^8{3f=v{inMdw*$fsgZ!?z`YK?bilh){zmZ8s+{h#w{bJ!T z(1prZZ?%dl9dZBS$$tO^h#Q>~O8D5IYveTv7*IUf&G&w%vf^)F6~b7jKIkK!oxVPD ekl!v_ad^6VBQ|2ewLIsFY0CltUzFb?i68}~oq;_7 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/05/5295cc744e50e1c356be39defd8cb3ff28deaebdc821afcc2d865d397862a3 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/05/5295cc744e50e1c356be39defd8cb3ff28deaebdc821afcc2d865d397862a3 new file mode 100644 index 0000000000000000000000000000000000000000..ab103f7df811e057e6ec0724a240ca22bb4fbc97 GIT binary patch literal 283 zcmV+$0p$KDwJ-euSd|C>29-e`Ku6^PU=(U18^j_}MaX1fRot2Vh=S_(93Y<^(ug?# zH~=>Q%aC?E&q6F;r|25Zt^JsTijKUu4w?;6p&Tz~{j)x9$%!qMC@7Jc3=9faN3jZG z2{2=M^I;K+AlX2iyb5PE^Fzk&t21>eR7KG&@bca!g(NujJR$Jfsnx`()-cM+zgu?nZ9u?cc8 zCIuyxgzE7KiA{O-FOBgV00jys$TpLpzW`B)X%jG*3^gWwwntFJqMFRXJc6y0kMZ29-e`P)GD&M5=yuN%2c9$I2pRCOZLb5Q)DP6sHQgPy;sr zH~=^R4CDD2F5;$mQakk;S%TYA_e0@6l;ghj!RfTs(U|n4gVa0XPaYE)7!>|1{r?L* zArVOtPjG^VX1c+4b)k$HXRV1{O45v9J+;Pty*xn(t_4Q;clQPe8SN(vO_>O;$WWg} z_Bm&8gX|76#NsP^G8~=o@u#Q8kef2$%&<$KGNfedq8AauyLwgHi zm~_U*G)(;|HDtT7N!|ef1)kC2DzmVy;lRAiC;@{*-ZxaN51EE|M)Rj7%_W<#BgTa; hx*E%#opLeZeVTM34^N{^t`s1>I%M8enoe9M!MJ{p=)y>a@q@H^P69(+ml%LEQJpAzRhERU=+y>mW)DR z70Q_ts(=Urxo8JjC5N}XL~h)zE~|nRX+2XDud_+tIhbm|3Q8g54HTNQ-y67O9!x!k z`tG?8K@13i$v3EhTL|XldC8Bt8de3ae_dS`4&mE(h?GOp^r=PZvpq4vs5vpgXK_zC z4Cv86WL-CfL3_B7NoN881*ka-PNu=WhK0U{CIJL*5ie)0t4%ZSK)1i#@v)urEw;so fx_s%y>GhXIJZtc^;9 literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/18/9744d3979d225d8206b544252a9a476f5e28083864665125239c10a0532555 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/18/9744d3979d225d8206b544252a9a476f5e28083864665125239c10a0532555 new file mode 100644 index 0000000000000000000000000000000000000000..a5acbd9e80c7cc822f273d4a8c62075f73090663 GIT binary patch literal 416 zcmV;R0bl+owJ-euSiKAY=HOo&U`Kicl5$B+@>tlK(&(ttTqbLRbvQaf0MZ;<09OE4 z0Qg`HAXMBV80f@*^q?7Pfn(x;pC*h!gAon(t%O=^gQN})W;YJq^@Y(PO7)dY1u2ULh-Ln-w7 zG%89%`NFTHu*bC8dLH-QC&Syyahr&SqjVw~4q~@A3x`4reI+Z;=7KrVaY@CI!z_YK zJHFHf(woLgVgzsTzM3AjTJ=7nzyq!xS|eQIoLOzq+ND1`SiAX>!5NipRo3R8=teg& zj>YQ9jRtrRv;e?hpc4=OO;mf>0fc{arB=(o*DZ6pNIgT@_WjFayo5~B(lRdvQl#z= z*WcKij{pXx6VU+gq1EK8G7&594aN+EnArY5F8aF0f)vsseqw#7=Q)=(CH$o#Eu9(Z zDH~!C;mh%Z$HCYeQgtT0k49LMs87GRSE>DpeY@B1i%L#KqJA literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/1e/9ff26261b7f2e071648b9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/1e/9ff26261b7f2e071648b9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b new file mode 100644 index 0000000000000000000000000000000000000000..256923c1aeaa0f3af2e3feeeeff4727f03e6ecb0 GIT binary patch literal 370 zcmV-&0ge7BwJ-euSWOE62Ax(MKuLQbK~bc8U0#9_rUjDnE{R#L37LKO}HE&U8_8Pnk}IDTbKQ06 zywZrQ&k@X2SrXy{I+&%7;Y91Mp@7&4B#2025WFhiXBDdfk!t#256w*2r<<9u4S%s3 z5_@bsnSEEA%m+OiWr|Pk@Cv=XP+j=`G-ebliJbp0>Ql3Jk!TDGMrZ}44vYnbZkA{f zUcwExbSTNTk7y{h3&r(yNQCz~(3VkOze|>? zHGHoA%Cu_tX>&MRgR$ee#D5}d=t|4q``HKp2gyvw31p_@gaDG@rXy@Z_{0kk%kGS| zmzRDy%?nX1BJ23?3r*-#>8L#~E2r?q>OU!ZK?jm|R(DCA)0Rvr*kDY>UJ;wrV88h7 Q5CZ^pz)ti<`9!h^QgNZJSO5S3 literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/35/b319e3ba245cd5b88a51b5d2276220658e5ca80ab6a75b350710df0bfce14d b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/35/b319e3ba245cd5b88a51b5d2276220658e5ca80ab6a75b350710df0bfce14d deleted file mode 100644 index d4abaf693921a08c9b10a82249eecbd55caed641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnDCwJ-euSVao}7F|{xKuLSh4Z4d(xxAt3gjI2ARLPBy;yZ)Ej)yThPXJE< zOaS$uV1wYNjegD{jzGz9R6-Ow9syQgKuSTUCRSk!VwEoHT_RX>h22L&S-3Q8UK3JTo( zM-f^=$#N3qQJZh#2mJdR()OnyX9Eaiqg=4*5B=fdx)s;DAavS-`KLScmS^!@)~h&o z@}cw-8%vZtWQ$uB{7vU1n+%;*cmxxY>%!=900+rLmJrB9mJk9rfkj48gy={YARe@? z|CqVqk7*s^CoQdgf@jb8LRp P0|0fvPV`0jMUn_oU7E6N diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/44/224f7fe9a03e8e169dfb7e9caf4c8c746f14fb7e2f43e410f7fbc59f4f7598 deleted file mode 100644 index 37303c0cce1660b8e1f192fd90137da03b6cc465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 365 zcmV-z0h0bGwJ-euSS1Sprd(AVP)R!=;dN3B2~HlVEg4lc!|zjA2luN6Pz~E_P5@2- zN&p6Z&EZ1DDDb_*Bh*Pnv6324g>=$7s(^^IabzyjvlgqIwRC(IorfNT7(Wv7(vt3SU zQt2$VSJBDi;jw~j-}u2@beR{+kdoeuC~VETwOXnwMpm35#2EBNI0{Ok2MY?@csLPU z0u69hY>UmJ&)z^PhdR9)Kzt8Bq8O_ztNYQ%#BlptU-ZwJCodLVleWi{wMOpZ9Yy#o zs}uY+KiH!OhHX3LB%IT3ba#1kzw3;V00+p(wh#p)+d>G;1HlhmfPk?+?j_zvXGwi& zqvGGAL}Wx{O640uHr4uO(ct55^(FStc1;T8PS2OsO8hD|uOwI+53#%%T|QcL0|0fv LPV`0jM3M+n!jGtH diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/45/4bf9c598f0df2ed71db6e8e10558f54e9e7407ef510f77369359f804505822 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/45/4bf9c598f0df2ed71db6e8e10558f54e9e7407ef510f77369359f804505822 new file mode 100644 index 0000000000000000000000000000000000000000..d80aa497ab0407a2e95a536a6e006310f257d44f GIT binary patch literal 280 zcmV+z0q6cGwJ-euSbYcpwp2hJP-pXi-9_J;w?O%ea4UQb<6d zwAdn~f)fNy$*FL*iItGCt8_)0Ai}kt1xD&(6Y=M`)W8ZU`TKzaKFv#mJIv$Klb~Nu z{r3`YP~TdRy)YFyVPrI1gBWbaH)YinXF=axSt%NG#TYB8#Uy(9aCCf-gFTG<Ma8Jcz<|(}Bhn(0 zK+&3F1+fT-AdJ778$wC0XS0fkvBp#_sHDQ&gJSU)-{;`B;0S9W7zYS{ny3_BQV)KQ z;l_M&gwOy7O5wOHxCRF((>`Q5*;lLS;tb!7VdLXtY+8;m#@C$OyNy76WTMd@ndq}$ zq=#X#HfDz@E%>|1n(t^Y0RRQ)&(=vTG}*9ie47Le>V0ez`aVQl*BD~V|0nlTZq9>| i-dd)Yu9S>1EEt3`vZvk|URsB*zySgPUzFb?i68}NNP?~a diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/5a/3e06f5b75580e490382134c13d3f0a688cef2cb7bc97f6824423be4eaf8dae b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/5a/3e06f5b75580e490382134c13d3f0a688cef2cb7bc97f6824423be4eaf8dae new file mode 100644 index 0000000000000000000000000000000000000000..afa6e78f02e5bd79ebcad2ce4392e041ae6a37c8 GIT binary patch literal 37 scmdPcs{fZE;voY=eqJh9NqIh3Nk&m>Dpy*5X%SaiW?3p%ab^V<0R5W`?EnA( literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/62/e17f753623321ca7a8d38c3ccf32066a26afaf74a51792c15810824e1ba238 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/62/e17f753623321ca7a8d38c3ccf32066a26afaf74a51792c15810824e1ba238 new file mode 100644 index 0000000000000000000000000000000000000000..ad0c5f2f88442a4827cc00a24af3c11fc7f5ed39 GIT binary patch literal 282 zcmV+#0px$|D^`nGyEgI3q$av(ImP-X_7lOaqLuQP;SG4Q=+H~BZIzH}Dk6jFr zBpfZKb11&)uchiK3=VI{-z5HPrTDU@?t>!U@xX<;wUz!0hiGOrnv gD)tJs>{HD$Lg-y?}21??|`DF6Tf literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/70/98ff5008183cfaa32ba0b82bf8babcff6839f24f285541894f7028a98ef6a0 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/70/98ff5008183cfaa32ba0b82bf8babcff6839f24f285541894f7028a98ef6a0 deleted file mode 100644 index ff4e55674a26b4a8853b4ed846c57805c9cc5f25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43 ycmdPcs{fZELXeRmJwGRnD(J2NMrDd41meCQNc{^oYvv6XsB{IqVFdk&Sxs?a`<61=dsJ`FbO6)|BSU&Mr6 z=qLHX7QDS_I2?NDJ9&L%GME<~nOr?dh)on~Tanr%zG=K9R`8zxEAjzsZyI-==>B<+ z?_NWUOgO?Yt4-Ihmgzc6IeoY>nu<nFwfOqPx)*82|^VhzKW85fM%Z@U0Ud@gygb zLn1&Z+poo1R($0$8&|D|D8j#2WI|s;MAFl8KPEAT|EX&Q*_(G()qpyu4VUWpSW7)W u(Teg|-+Zbhu5^=`5VMe({k_c$Q&e+ZX literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/74/181c0cf063d1bde14d718225b8fdb4f8bbc4235e20b754d27be375de0b5682 deleted file mode 100644 index cb7b5763c3398adc82289cf173c404f51788333c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+UFwJ-euSk(;xR%B@$P)R!=I>{2@<$ulAmW-;J;rB_FkO80uPz~E_WdLCS zT>wT_oE@YvEEeG?D0LnzDD1++iQp0x!(xkrg}A`*y~88YIm#r&)PO1=gO*W+Lp*uV zt+MfOBO1P(P``b{zbKCXBsVb(S&n4fIN{bFt(0U?q~lR6bqoj2rWgu{LtO}9Js1SF zN0gTZvD!Q3T(jzu+`sUHJ>|HtZHG<5xzdg9EN|}jC11o&Uh};D8mf7e&|b)de0Cud za)BYD546w@CWeDT73u1&Rw`aJ9q-v~<*i|9D&u+iMfFc{w{HxzjGoS+>}8B8dJ)Pn zrfX2w`hkyj|2_OixmRUL-H$#ZcH7^JJ>QsV@?z0782|^VkWCY)kWCW;I^%>$KtvP# zzy$~x>EmABZFH8xk^voOqX+%%} zPykH;wK!C_g>~l+jz~sIP$4Nba3F|chp`HXa1!bx-Nn_Tw|&Ma<115I#zpVP_{SS} z#t}MY8YlO#VT-FzdJ49X0l939p@3i^9VEF5K(z|NBubr=HaHQOxsdaA9aFLQ+@@IWH*W zV!K385*R}h4wY41Yc-nAOZ!o#I#5R33?Q_B^7H+kiLo;i||AM%YdKmYZ|ku2?^ zB-5v7#>S^E`&%M+LkeNYF7KI^Cwkb~r?x W@h~ST&p`nL0Cm7l^hNnek_b|S4Xn%n diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/99/817eea5e97cb2fd25fec3b60e4ed1679fdb2dc45575a473784c6893285fd3c deleted file mode 100644 index 53070c2f2c71e02dcbe3eb8a6a6167322337b543..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0pQwWHOP#jtGW*q%Ogn`6vUiZ3Nf3$5{PnKr+)mNjb6vpyXuR>K|xgD;jNzNr^@ zLLs%#6Nw;3cm2t?d$HJ@7GtX0s+TXn{%W?rw?xmeV1gt56O01{KTWKJhuCAm$AF_g zIzniG1E#;Nn>Bc&?KITNW|l6U?5<}OpNZ_m&qVf7UMw62 zd+mHlPVn2>rE9XLya@mWi63Pnme6Q}l0=>$0Rs*XOfg?hP&T{@u;EHY%a}PQHEI0d gVwIfYj&DI>(-~Kbj1HJGwa>?L0svo>-y?}21!W|A*8l(j diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9c/a08d756713d5aa47d99bd8f42ee65daba036d5c646f854207f8e6e2fe2386a deleted file mode 100644 index 33edf054121392489150275c84821d18fe5d7175..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTwmwJ-euSj`Lo24P?uP)B=^SZ%3EE-0(d15p*SlaO1s0m`UM=Ryry09OE5 z0QrCsN}UG@h(3H+4_v_#cpi=n_psr6#|uCPrF51_1ByTf6-E&!;2I@ztW$;SFF8_& z(6q^Xc~!P7ewX2d;#{ECQlTr|#dK0JXhlPz4&lJsEP){4U4ep^rkU&a1?D?0Dz?9= zmc}~^>B}a|NjR)mKdwV{!*3G(jFWbMRydQHz=-rw_6a@!|CDzj3{(H?X>F*?Cf7rX|In5KlYXWHBnAU&~;_xa+U|orrYT zGH29loaNwmjpLEzhdwjypL*eM_(x9BirXkA>kMK<0;yz>Ar^#@1^_L{A^=ca;eZIU MJ<=ED2T3AG0Tuhm)&Kwi diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9e/a2501e277e52a54c61331cae1745b3b532f504bbfb1eed415c43cc18383d12 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/9e/a2501e277e52a54c61331cae1745b3b532f504bbfb1eed415c43cc18383d12 deleted file mode 100644 index 368732a6b6d505efd781d4ff00230cf7df3846c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV1AwJ-euSXB!E=G;~vFiCU+;880Pkv-@qA07FO2nK}q+HYGBx+iIb*sLqo?#xnij|Je&tL6c7ihM1liZ=wT4Kw?tQVsBD`%RK$e)x`+w4zz#}- zQj-KShLw_KZ6J&5{kX2|D8o;R`665~XzjH!sh8qxmYx>WD&xYC7X+iA)IV5I&;^GR z!6i^bUILe4ny)(|-d#=Xb$c~{=sF=*UF+0lnsUv_k{( RO9}%3b-+&aMfpgQ2vRX>u8{x$ diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/aa/e0e4ea1c5503c5cd992aaf94cc1158f28e627332697706161ffd8a06566f26 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/aa/e0e4ea1c5503c5cd992aaf94cc1158f28e627332697706161ffd8a06566f26 new file mode 100644 index 0000000000000000000000000000000000000000..0429dab5297ba7d30b758896c15094c09f1f9efb GIT binary patch literal 40 vcmdPcs{fZE;wJ+`X29-e`Ku2@~BqN{2Q5D@vrI{?OiaTTR)gCD<8TssxMg%zk zH~=^R%o)}(wpH4u1u8hqF5#=KQC@pHHQcedrgZ$^l)F#0iW*BrdIi#AVDOk@O%Z7c z5YDYe42+Nn0&N=<_hHGMXJ^FUn{TpMTvBoDv)XgEH7d3(JOX1W{s4ia{z}0>Xt6C~ z>|=yKMkWs8tUB5E2+A4+)*DN8IQG%2*N2>=C&Bb^ai=$O&89pWy{hO8cnrS3VYU;+SNl;0zXAO*v+eSZJ| diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/af/2a7b05d2a0df28506c9baa6444ea16e768a02975efa32392425a8baaa8b83e b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/af/2a7b05d2a0df28506c9baa6444ea16e768a02975efa32392425a8baaa8b83e deleted file mode 100644 index 03c5e62d36885db8bc98340d87260050ef08435a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2ejwJ-euSmg`=<{)7nP)EA~1RnXL9orP;B%cSODr9evk-dIE8I|c=r~zC6 zRsdK4_23{Vb=)H$Y@$DT&le#}>jRUPa zmu~ZRlc2^)SH-gy+nAI~Q1ZH@^|sQPDClnDdlj8jYuRkb|8YA@^}6_$p_xqDFwj5R-FiCU+KrV8T;|D%MkB)ps1Oo{k&9*Is>PZ@EsbEb2 zP5?^)`yS=Od@?)^ zFB3DbIu#k;4Rk#A^$uHacsLDeC?FKO37}OB0+1(#ScJZvpo>y7HlvKntn`*fX2kH9ZK68=0TNRvi+{jk(}e z;OF)hS;dAsvit5^Wj-)GsYgThe@fOUQUd@7f1;s@!ik0^1g1hT3L`)?3vbOm+;FNT zW_C50rlC7;q)J^PhMfQKe#9WgyV|)))#3#&%8-oJg0!`7(b|GMNiE8vb=2Jf)g=i7 O0Cm7l^hNnak_b|G3!@bP literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c8/8af00d10fd85b28db076551f14edadfcdc77b69e7e1208c1b7507cd2883254 deleted file mode 100644 index 25e23d9252571d974a12bd4a2b57e6c61e1efd63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6cGwJ-euSbYcp2Gu|tP)9sSVL=6mfje42iiylbbjToq;4j6gLN3%f05||Q z0QWU@^TKlo-=$HG$D$CoMRx(&6Ln;xQ>-P_yj`@Z6?+;>MvAnk#=u~q0WpS#CBO!S zR6}e?1ObI7{2>qRS95dLdy)JaT{>rtE!k=2UqX(-FM${sOE3-${rpG?M^X)b4|8Ka zIYP+5L8=|sjaM&gKhuBB^QO3sAmsRQ|@o`4_4*&(JpRJQh_?g)@cAEqY8vNTIxKZ*awuMSTPMu_?RJEqq6_Jhq eyByyNHWn2eQEBGMPUqH}OA7)3UzFb?i68|-D0-Fv diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ca/c5c96c6384232b0e7ba28eed10e15fc75462a06f50b419bd71d812fd535ec0 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ca/c5c96c6384232b0e7ba28eed10e15fc75462a06f50b419bd71d812fd535ec0 deleted file mode 100644 index 9be79e52407f34754aafb5020a225e11e1e66f79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48 zcmdPcs{fZE!jh38F{dCSkt?Yvu`Hh}IU}(sCo`2RB{iockt;PhBcCfRzoMilzk~|_ Dj_DAO diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e4/4053df6e8efdd7004c89662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/e4/4053df6e8efdd7004c89662a86ecc4be6f7d87ee5572e05b386b5c70b4c480 deleted file mode 100644 index 89cd8e122a7f46958f8e5c7aefe9f0af58a4742e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|WFwJ-euScM1x))YY=Ku2@~BnvjwSA0rT7cyB`6?abJ7WzYB$;fAiG$J_w zH~=>QpD&>qBhmy5Sf8d&bv&cNc89AeUhLl>(NqE}&-H?AX-s*RLI?V3&|_fG3P`0S zz*=h*|GO3r~Y;I5Mx6;cw^feR(rO^9)%g)YEa4t-_v+Bw04oouI2PXL} z?&Wc));=y2DVg3yTzoSD00n5DB`4It@nNyQZ4xlx71`3|yA>>1?Vpi~Qj@Gl-13`x fQtB0AV8zXTd4-&<$c5 zc+rLLF>jFE)oh26Nf)ziL+(~+^>jNO2mkr>_FLM7|8S*vJ*w!F(*#8Y|3*>4C_5+* zW~mk4W~F3$w`B3{d|m Date: Thu, 26 Feb 2026 06:50:19 -0500 Subject: [PATCH 16/25] fixup! feat: implement object ID log reader and writer fixup! feat: implement object ID log reader and writer Restructure log.go to OO: methods on Log struct instead of package functions. Use pool.GetBufferedReader/GetStringReader for reader recycling. Update all callers. Co-Authored-By: Claude Opus 4.6 --- go/src/foxtrot/object_id_log/log.go | 33 ++++++++++--------- go/src/foxtrot/object_id_provider/factory.go | 4 +-- go/src/juliett/env_repo/genesis.go | 6 ++-- .../commands_dodder/add_zettel_ids_yin.go | 4 +-- .../commands_dodder/migrate_zettel_ids.go | 8 ++--- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/go/src/foxtrot/object_id_log/log.go b/go/src/foxtrot/object_id_log/log.go index ff605b6f0..b9f9c51cd 100644 --- a/go/src/foxtrot/object_id_log/log.go +++ b/go/src/foxtrot/object_id_log/log.go @@ -7,19 +7,21 @@ import ( "strings" "code.linenisgreat.com/dodder/go/src/alfa/errors" + pool "code.linenisgreat.com/dodder/go/src/alfa/pool" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/foxtrot/triple_hyphen_io" ) -func AppendEntry( - path string, - entry Entry, -) (err error) { +type Log struct { + Path string +} + +func (l Log) AppendEntry(entry Entry) (err error) { var file *os.File if file, err = files.OpenFile( - path, + l.Path, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o666, ); err != nil { @@ -42,12 +44,10 @@ func AppendEntry( return err } -func ReadAllEntries( - path string, -) (entries []Entry, err error) { +func (l Log) ReadAllEntries() (entries []Entry, err error) { var file *os.File - if file, err = files.Open(path); err != nil { + if file, err = files.Open(l.Path); err != nil { if errors.IsNotExist(err) { err = nil return entries, err @@ -59,7 +59,10 @@ func ReadAllEntries( defer errors.DeferredCloser(&err, file) - segments, err := segmentEntries(bufio.NewReader(file)) + bufferedReader, repoolBufferedReader := pool.GetBufferedReader(file) + defer repoolBufferedReader() + + segments, err := segmentEntries(bufferedReader) if err != nil { err = errors.Wrap(err) return entries, err @@ -68,9 +71,12 @@ func ReadAllEntries( for _, segment := range segments { var typedBlob triple_hyphen_io.TypedBlob[Entry] + stringReader, repoolStringReader := pool.GetStringReader(segment) + defer repoolStringReader() + if _, err = Coder.DecodeFrom( &typedBlob, - strings.NewReader(segment), + stringReader, ); err != nil { err = errors.Wrap(err) return entries, err @@ -115,11 +121,6 @@ func segmentEntries( if trimmed == triple_hyphen_io.Boundary { boundaryCount++ - // A new entry starts at boundary counts 1, 3, 5, ... - // (odd boundaries are the opening --- of metadata). - // The second boundary in each entry is boundary counts 2, 4, 6, ... - // A new entry starts when we see an odd boundary after the first - // entry. if boundaryCount > 2 && boundaryCount%2 == 1 { segments = append(segments, current.String()) current.Reset() diff --git a/go/src/foxtrot/object_id_provider/factory.go b/go/src/foxtrot/object_id_provider/factory.go index 36105c8e3..bbcf00518 100644 --- a/go/src/foxtrot/object_id_provider/factory.go +++ b/go/src/foxtrot/object_id_provider/factory.go @@ -54,11 +54,11 @@ func NewFromLog( directoryLayout directory_layout.RepoMutable, resolveBlob BlobResolver, ) (f *Provider, err error) { - logPath := directoryLayout.FileObjectIdLog() + log := object_id_log.Log{Path: directoryLayout.FileObjectIdLog()} var entries []object_id_log.Entry - if entries, err = object_id_log.ReadAllEntries(logPath); err != nil { + if entries, err = log.ReadAllEntries(); err != nil { err = errors.Wrap(err) return f, err } diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index d93b86d3f..5bea1fdc7 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -186,7 +186,7 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { return } - logPath := env.FileObjectIdLog() + log := object_id_log.Log{Path: env.FileObjectIdLog()} yinEntry := &object_id_log.V1{ Side: object_id_log.SideYin, @@ -195,7 +195,7 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { WordCount: len(yinWords), } - if err := object_id_log.AppendEntry(logPath, yinEntry); err != nil { + if err := log.AppendEntry(yinEntry); err != nil { env.Cancel(err) return } @@ -207,7 +207,7 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { WordCount: len(yangWords), } - if err := object_id_log.AppendEntry(logPath, yangEntry); err != nil { + if err := log.AppendEntry(yangEntry); err != nil { env.Cancel(err) return } diff --git a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go b/go/src/yankee/commands_dodder/add_zettel_ids_yin.go index 2360cb2b3..9f2f24142 100644 --- a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go +++ b/go/src/yankee/commands_dodder/add_zettel_ids_yin.go @@ -89,7 +89,7 @@ func (cmd AddZettelIds) Run(req command.Request) { req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Lock)) defer req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Unlock)) - logPath := envRepo.FileObjectIdLog() + log := object_id_log.Log{Path: envRepo.FileObjectIdLog()} flatFilePath := path.Join(dirObjectId, cmd.flatFileName) entry := &object_id_log.V1{ @@ -99,7 +99,7 @@ func (cmd AddZettelIds) Run(req command.Request) { WordCount: len(filtered), } - if err := object_id_log.AppendEntry(logPath, entry); err != nil { + if err := log.AppendEntry(entry); err != nil { errors.ContextCancelWithErrorf(req, "appending log entry: %s", err) return } diff --git a/go/src/yankee/commands_dodder/migrate_zettel_ids.go b/go/src/yankee/commands_dodder/migrate_zettel_ids.go index e50d72053..5ec12d8a1 100644 --- a/go/src/yankee/commands_dodder/migrate_zettel_ids.go +++ b/go/src/yankee/commands_dodder/migrate_zettel_ids.go @@ -38,9 +38,9 @@ func (cmd MigrateZettelIds) Run(req command.Request) { ) envRepo := localWorkingCopy.GetEnvRepo() - logPath := envRepo.FileObjectIdLog() + log := object_id_log.Log{Path: envRepo.FileObjectIdLog()} - entries, err := object_id_log.ReadAllEntries(logPath) + entries, err := log.ReadAllEntries() if err != nil { errors.ContextCancelWithErrorf(req, "reading object id log: %s", err) @@ -84,7 +84,7 @@ func (cmd MigrateZettelIds) Run(req command.Request) { WordCount: yinWordCount, } - if err := object_id_log.AppendEntry(logPath, yinEntry); err != nil { + if err := log.AppendEntry(yinEntry); err != nil { errors.ContextCancelWithErrorf(req, "appending yin log entry: %s", err) return } @@ -96,7 +96,7 @@ func (cmd MigrateZettelIds) Run(req command.Request) { WordCount: yangWordCount, } - if err := object_id_log.AppendEntry(logPath, yangEntry); err != nil { + if err := log.AppendEntry(yangEntry); err != nil { errors.ContextCancelWithErrorf(req, "appending yang log entry: %s", err) return } From e5fc042f2fa769bbbbe6618aedc196ef41f5c84c Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 06:55:59 -0500 Subject: [PATCH 17/25] fixup! feat: update genesis to use object ID log with raw text processing fixup! feat: update genesis to use object ID log with raw text processing Convert genesis helper functions to methods on *Env, use pool.GetBufferedReader instead of bufio.NewScanner, read file lines into maps instead of slices, iterate-write words individually instead of strings.Join. Co-Authored-By: Claude Opus 4.6 --- go/src/juliett/env_repo/genesis.go | 117 ++++++++++++++--------------- 1 file changed, 56 insertions(+), 61 deletions(-) diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index 5bea1fdc7..013674cbb 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -1,15 +1,14 @@ package env_repo import ( - "bufio" "encoding/gob" "io" "os" "path/filepath" "strings" - "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" "code.linenisgreat.com/dodder/go/src/alfa/errors" + pool "code.linenisgreat.com/dodder/go/src/alfa/pool" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" @@ -158,29 +157,27 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { return } - yinWords, err := readAndCleanFileLines(bigBang.Yin) + yinWords, err := env.readAndCleanFileLines(bigBang.Yin) if err != nil { env.Cancel(err) return } - yangWords, err := readAndCleanFileLines(bigBang.Yang) + yangWords, err := env.readAndCleanFileLines(bigBang.Yang) if err != nil { env.Cancel(err) return } - yinWords, yangWords = enforceCrossSideUniqueness(yinWords, yangWords) + env.enforceCrossSideUniqueness(yinWords, yangWords) - blobStore := env.GetDefaultBlobStore() - - yinBlobId, err := genesisWriteWordsAsBlob(blobStore, yinWords) + yinBlobId, err := env.genesisWriteWordsAsBlob(yinWords) if err != nil { env.Cancel(err) return } - yangBlobId, err := genesisWriteWordsAsBlob(blobStore, yangWords) + yangBlobId, err := env.genesisWriteWordsAsBlob(yangWords) if err != nil { env.Cancel(err) return @@ -215,18 +212,18 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { yinFlatPath := filepath.Join(env.DirObjectId(), object_id_provider.FilePathZettelIdYin) yangFlatPath := filepath.Join(env.DirObjectId(), object_id_provider.FilePathZettelIdYang) - if err := genesisWriteFlatFile(yinFlatPath, yinWords); err != nil { + if err := env.genesisWriteFlatFile(yinFlatPath, yinWords); err != nil { env.Cancel(err) return } - if err := genesisWriteFlatFile(yangFlatPath, yangWords); err != nil { + if err := env.genesisWriteFlatFile(yangFlatPath, yangWords); err != nil { env.Cancel(err) return } } -func readAndCleanFileLines(path string) (words []string, err error) { +func (env *Env) readAndCleanFileLines(path string) (words map[string]bool, err error) { var file *os.File if file, err = files.Open(path); err != nil { @@ -236,71 +233,64 @@ func readAndCleanFileLines(path string) (words []string, err error) { defer errors.DeferredCloser(&err, file) - scanner := bufio.NewScanner(file) - - for scanner.Scan() { - cleaned := object_id_provider.Clean(scanner.Text()) + reader, repool := pool.GetBufferedReader(file) + defer repool() - if cleaned != "" { - words = append(words, cleaned) - } - } - - if err = scanner.Err(); err != nil { - err = errors.Wrap(err) - } + words = make(map[string]bool) - return words, err -} + for { + var line string -func enforceCrossSideUniqueness(yin, yang []string) ([]string, []string) { - yinSet := make(map[string]bool, len(yin)) - for _, w := range yin { - yinSet[w] = true - } + if line, err = reader.ReadString('\n'); len(line) > 0 { + cleaned := object_id_provider.Clean(strings.TrimRight(line, "\n")) - yangSet := make(map[string]bool, len(yang)) - for _, w := range yang { - yangSet[w] = true - } + if cleaned != "" { + words[cleaned] = true + } + } - var filteredYin []string + if err != nil { + if err == io.EOF { + err = nil + break + } - for _, w := range yin { - if !yangSet[w] { - filteredYin = append(filteredYin, w) + err = errors.Wrap(err) + return words, err } } - var filteredYang []string + return words, err +} - for _, w := range yang { - if !yinSet[w] { - filteredYang = append(filteredYang, w) +func (env *Env) enforceCrossSideUniqueness(yin, yang map[string]bool) { + for w := range yin { + if yang[w] { + delete(yin, w) + delete(yang, w) } } - - return filteredYin, filteredYang } -func genesisWriteWordsAsBlob( - blobStore domain_interfaces.BlobStore, - words []string, -) (id markl.Id, err error) { - var blobWriter domain_interfaces.BlobWriter - - if blobWriter, err = blobStore.MakeBlobWriter(nil); err != nil { +func (env *Env) genesisWriteWordsAsBlob(words map[string]bool) (id markl.Id, err error) { + blobWriter, err := env.GetDefaultBlobStore().MakeBlobWriter(nil) + if err != nil { err = errors.Wrap(err) return id, err } defer errors.DeferredCloser(&err, blobWriter) - content := strings.Join(words, "\n") + "\n" + for word := range words { + if _, err = io.WriteString(blobWriter, word); err != nil { + err = errors.Wrap(err) + return id, err + } - if _, err = io.WriteString(blobWriter, content); err != nil { - err = errors.Wrap(err) - return id, err + if _, err = io.WriteString(blobWriter, "\n"); err != nil { + err = errors.Wrap(err) + return id, err + } } id.ResetWithMarklId(blobWriter.GetMarklId()) @@ -308,7 +298,7 @@ func genesisWriteWordsAsBlob( return id, err } -func genesisWriteFlatFile(path string, words []string) (err error) { +func (env *Env) genesisWriteFlatFile(path string, words map[string]bool) (err error) { var file *os.File if file, err = files.CreateExclusiveWriteOnly(path); err != nil { @@ -318,11 +308,16 @@ func genesisWriteFlatFile(path string, words []string) (err error) { defer errors.DeferredCloser(&err, file) - content := strings.Join(words, "\n") + "\n" + for word := range words { + if _, err = io.WriteString(file, word); err != nil { + err = errors.Wrap(err) + return err + } - if _, err = io.WriteString(file, content); err != nil { - err = errors.Wrap(err) - return err + if _, err = io.WriteString(file, "\n"); err != nil { + err = errors.Wrap(err) + return err + } } return err From 8e463ed5ff45ab0a0021612bb35632508d1696e4 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:16:30 -0500 Subject: [PATCH 18/25] fixup! feat: add add-zettel-ids-yin and add-zettel-ids-yang commands fixup! feat: add add-zettel-ids-yin and add-zettel-ids-yang commands Merge add_zettel_ids_yin.go and add_zettel_ids_yang.go into single add_zettel_ids.go. writeWordsAsBlob and appendWordsToFlatFile now cancel context instead of returning errors, use iterate-write instead of strings.Join. Co-Authored-By: Claude Opus 4.6 --- ...dd_zettel_ids_yin.go => add_zettel_ids.go} | 78 ++++++++++--------- .../commands_dodder/add_zettel_ids_yang.go | 13 ---- 2 files changed, 41 insertions(+), 50 deletions(-) rename go/src/yankee/commands_dodder/{add_zettel_ids_yin.go => add_zettel_ids.go} (74%) delete mode 100644 go/src/yankee/commands_dodder/add_zettel_ids_yang.go diff --git a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go b/go/src/yankee/commands_dodder/add_zettel_ids.go similarity index 74% rename from go/src/yankee/commands_dodder/add_zettel_ids_yin.go rename to go/src/yankee/commands_dodder/add_zettel_ids.go index 9f2f24142..06bf2590f 100644 --- a/go/src/yankee/commands_dodder/add_zettel_ids_yin.go +++ b/go/src/yankee/commands_dodder/add_zettel_ids.go @@ -27,6 +27,11 @@ func init() { side: object_id_log.SideYin, flatFileName: object_id_provider.FilePathZettelIdYin, }) + + utility.AddCmd("add-zettel-ids-yang", &AddZettelIds{ + side: object_id_log.SideYang, + flatFileName: object_id_provider.FilePathZettelIdYang, + }) } type AddZettelIds struct { @@ -76,13 +81,7 @@ func (cmd AddZettelIds) Run(req command.Request) { return } - blobStore := envRepo.GetDefaultBlobStore() - - blobId, err := writeWordsAsBlob(blobStore, filtered) - if err != nil { - errors.ContextCancelWithErrorf(req, "writing blob: %s", err) - return - } + blobId := writeWordsAsBlob(req, envRepo.GetDefaultBlobStore(), filtered) lockSmith := envRepo.GetLockSmith() @@ -104,10 +103,7 @@ func (cmd AddZettelIds) Run(req command.Request) { return } - if err := appendWordsToFlatFile(flatFilePath, filtered); err != nil { - errors.ContextCancelWithErrorf(req, "updating flat file cache: %s", err) - return - } + appendWordsToFlatFile(req, flatFilePath, filtered) yinCount := prov.Left().Len() yangCount := prov.Right().Len() @@ -168,50 +164,58 @@ func collectExistingWords(prov *object_id_provider.Provider) map[string]bool { } func writeWordsAsBlob( + req command.Request, blobStore domain_interfaces.BlobStore, words []string, -) (id markl.Id, err error) { - var blobWriter domain_interfaces.BlobWriter - - if blobWriter, err = blobStore.MakeBlobWriter(nil); err != nil { - err = errors.Wrap(err) - return id, err +) markl.Id { + blobWriter, err := blobStore.MakeBlobWriter(nil) + if err != nil { + errors.ContextCancelWithError(req, err) + return markl.Id{} } - defer errors.DeferredCloser(&err, blobWriter) + defer errors.ContextMustClose(req, blobWriter) - content := strings.Join(words, "\n") + "\n" + for _, word := range words { + if _, err := io.WriteString(blobWriter, word); err != nil { + errors.ContextCancelWithError(req, err) + return markl.Id{} + } - if _, err = io.WriteString(blobWriter, content); err != nil { - err = errors.Wrap(err) - return id, err + if _, err := io.WriteString(blobWriter, "\n"); err != nil { + errors.ContextCancelWithError(req, err) + return markl.Id{} + } } + var id markl.Id id.ResetWithMarklId(blobWriter.GetMarklId()) - return id, err + return id } -func appendWordsToFlatFile(flatFilePath string, words []string) (err error) { - var file *os.File - - if file, err = files.OpenFile( +func appendWordsToFlatFile(req command.Request, flatFilePath string, words []string) { + file, err := files.OpenFile( flatFilePath, os.O_WRONLY|os.O_APPEND, 0o666, - ); err != nil { - err = errors.Wrap(err) - return err + ) + if err != nil { + errors.ContextCancelWithError(req, err) + return } - defer errors.DeferredCloser(&err, file) + defer errors.ContextMustClose(req, file) - content := strings.Join(words, "\n") + "\n" + for _, word := range words { + if _, err := io.WriteString(file, word); err != nil { + errors.ContextCancelWithError(req, err) + return + } - if _, err = io.WriteString(file, content); err != nil { - err = errors.Wrap(err) - return err + if _, err := io.WriteString(file, "\n"); err != nil { + errors.ContextCancelWithError(req, err) + return + } } - - return err } diff --git a/go/src/yankee/commands_dodder/add_zettel_ids_yang.go b/go/src/yankee/commands_dodder/add_zettel_ids_yang.go deleted file mode 100644 index c62b30b8e..000000000 --- a/go/src/yankee/commands_dodder/add_zettel_ids_yang.go +++ /dev/null @@ -1,13 +0,0 @@ -package commands_dodder - -import ( - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" -) - -func init() { - utility.AddCmd("add-zettel-ids-yang", &AddZettelIds{ - side: object_id_log.SideYang, - flatFileName: object_id_provider.FilePathZettelIdYang, - }) -} From 6db4b819cab8b95d641422769ad750e5abb671e7 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:18:18 -0500 Subject: [PATCH 19/25] fixup! feat: add migrate-zettel-ids command fixup! feat: add migrate-zettel-ids command Reduce duplication: loop over yin/yang sides instead of repeated blocks, merge countLines into writeFlatFileAsBlob (seek-based single file open), cancel context instead of returning errors, use pool.GetBufferedReader. Co-Authored-By: Claude Opus 4.6 --- .../commands_dodder/migrate_zettel_ids.go | 154 ++++++++---------- 1 file changed, 64 insertions(+), 90 deletions(-) diff --git a/go/src/yankee/commands_dodder/migrate_zettel_ids.go b/go/src/yankee/commands_dodder/migrate_zettel_ids.go index 5ec12d8a1..70c80cf54 100644 --- a/go/src/yankee/commands_dodder/migrate_zettel_ids.go +++ b/go/src/yankee/commands_dodder/migrate_zettel_ids.go @@ -1,13 +1,13 @@ package commands_dodder import ( - "bufio" "io" - "os" "path" + "strings" "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" "code.linenisgreat.com/dodder/go/src/alfa/errors" + pool "code.linenisgreat.com/dodder/go/src/alfa/pool" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" @@ -41,7 +41,6 @@ func (cmd MigrateZettelIds) Run(req command.Request) { log := object_id_log.Log{Path: envRepo.FileObjectIdLog()} entries, err := log.ReadAllEntries() - if err != nil { errors.ContextCancelWithErrorf(req, "reading object id log: %s", err) return @@ -52,125 +51,100 @@ func (cmd MigrateZettelIds) Run(req command.Request) { return } - blobStore := envRepo.GetDefaultBlobStore() - dirObjectId := envRepo.DirObjectId() - - yinPath := path.Join(dirObjectId, object_id_provider.FilePathZettelIdYin) - yangPath := path.Join(dirObjectId, object_id_provider.FilePathZettelIdYang) - - yinMarklId, yinWordCount, err := writeFlatFileAsBlob(blobStore, yinPath) - if err != nil { - errors.ContextCancelWithErrorf(req, "writing yin blob: %s", err) - return - } - - yangMarklId, yangWordCount, err := writeFlatFileAsBlob(blobStore, yangPath) - if err != nil { - errors.ContextCancelWithErrorf(req, "writing yang blob: %s", err) - return - } - lockSmith := envRepo.GetLockSmith() req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Lock)) defer req.Must(errors.MakeFuncContextFromFuncErr(lockSmith.Unlock)) + blobStore := envRepo.GetDefaultBlobStore() + dirObjectId := envRepo.DirObjectId() tai := ids.NowTai() - yinEntry := &object_id_log.V1{ - Side: object_id_log.SideYin, - Tai: tai, - MarklId: yinMarklId, - WordCount: yinWordCount, + sides := []struct { + side object_id_log.Side + fileName string + }{ + {object_id_log.SideYin, object_id_provider.FilePathZettelIdYin}, + {object_id_log.SideYang, object_id_provider.FilePathZettelIdYang}, } - if err := log.AppendEntry(yinEntry); err != nil { - errors.ContextCancelWithErrorf(req, "appending yin log entry: %s", err) - return - } + for _, s := range sides { + flatPath := path.Join(dirObjectId, s.fileName) + marklId, wordCount := writeFlatFileAsBlob(req, blobStore, flatPath) - yangEntry := &object_id_log.V1{ - Side: object_id_log.SideYang, - Tai: tai, - MarklId: yangMarklId, - WordCount: yangWordCount, - } + entry := &object_id_log.V1{ + Side: s.side, + Tai: tai, + MarklId: marklId, + WordCount: wordCount, + } - if err := log.AppendEntry(yangEntry); err != nil { - errors.ContextCancelWithErrorf(req, "appending yang log entry: %s", err) - return - } + if err := log.AppendEntry(entry); err != nil { + errors.ContextCancelWithErrorf(req, "appending %s log entry: %s", s.fileName, err) + return + } - ui.Out().Printf( - "migrated zettel ids: yin (%d words, %s), yang (%d words, %s)", - yinWordCount, - yinMarklId, - yangWordCount, - yangMarklId, - ) + ui.Out().Printf("migrated %s: %d words, %s", s.fileName, wordCount, marklId) + } } func writeFlatFileAsBlob( + req command.Request, blobStore domain_interfaces.BlobStore, flatFilePath string, -) (id markl.Id, wordCount int, err error) { - var file *os.File - - if file, err = files.Open(flatFilePath); err != nil { - err = errors.Wrap(err) - return id, wordCount, err - } - - defer errors.DeferredCloser(&err, file) - - wordCount, err = countLines(flatFilePath) +) (markl.Id, int) { + file, err := files.Open(flatFilePath) if err != nil { - err = errors.Wrap(err) - return id, wordCount, err + errors.ContextCancelWithError(req, err) + return markl.Id{}, 0 } - var blobWriter domain_interfaces.BlobWriter + defer errors.ContextMustClose(req, file) - if blobWriter, err = blobStore.MakeBlobWriter(nil); err != nil { - err = errors.Wrap(err) - return id, wordCount, err - } + reader, repool := pool.GetBufferedReader(file) + defer repool() - defer errors.DeferredCloser(&err, blobWriter) + var wordCount int - if _, err = io.Copy(blobWriter, file); err != nil { - err = errors.Wrap(err) - return id, wordCount, err - } + for { + line, err := reader.ReadString('\n') - id.ResetWithMarklId(blobWriter.GetMarklId()) + if len(line) > 0 { + if strings.TrimRight(line, "\n") != "" { + wordCount++ + } + } - return id, wordCount, err -} + if err != nil { + if err == io.EOF { + break + } -func countLines(path string) (count int, err error) { - var file *os.File + errors.ContextCancelWithError(req, err) + return markl.Id{}, 0 + } + } - if file, err = files.Open(path); err != nil { - err = errors.Wrap(err) - return count, err + if _, err := file.Seek(0, io.SeekStart); err != nil { + errors.ContextCancelWithError(req, err) + return markl.Id{}, 0 } - defer errors.DeferredCloser(&err, file) + blobWriter, err := blobStore.MakeBlobWriter(nil) + if err != nil { + errors.ContextCancelWithError(req, err) + return markl.Id{}, 0 + } - scanner := bufio.NewScanner(file) + defer errors.ContextMustClose(req, blobWriter) - for scanner.Scan() { - line := scanner.Text() - if line != "" { - count++ - } + if _, err := io.Copy(blobWriter, file); err != nil { + errors.ContextCancelWithError(req, err) + return markl.Id{}, 0 } - if err = scanner.Err(); err != nil { - err = errors.Wrap(err) - return count, err - } + var id markl.Id + id.ResetWithMarklId(blobWriter.GetMarklId()) - return count, err + return id, wordCount } From e7ceef9559bd87347649587bd50160341bf05bc6 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:21:00 -0500 Subject: [PATCH 20/25] fixup! feat: support log-based provider loading with flat file fallback fixup! feat: support log-based provider loading with flat file fallback Rename object_id_provider package to zettel_id_provider. Updates directory, package declarations, import paths, and all qualified references across 10 files. Co-Authored-By: Claude Opus 4.6 --- .../CLAUDE.md | 0 .../common.go | 2 +- .../errors.go | 2 +- .../factory.go | 2 +- .../main.go | 2 +- go/src/india/zettel_id_index/v0/main.go | 8 ++++---- go/src/india/zettel_id_index/v1/main.go | 8 ++++---- go/src/juliett/env_repo/genesis.go | 8 ++++---- go/src/tango/store/mutating.go | 4 ++-- go/src/yankee/commands_dodder/add_zettel_ids.go | 12 ++++++------ go/src/yankee/commands_dodder/migrate_zettel_ids.go | 6 +++--- 11 files changed, 27 insertions(+), 27 deletions(-) rename go/src/foxtrot/{object_id_provider => zettel_id_provider}/CLAUDE.md (100%) rename go/src/foxtrot/{object_id_provider => zettel_id_provider}/common.go (88%) rename go/src/foxtrot/{object_id_provider => zettel_id_provider}/errors.go (97%) rename go/src/foxtrot/{object_id_provider => zettel_id_provider}/factory.go (98%) rename go/src/foxtrot/{object_id_provider => zettel_id_provider}/main.go (97%) diff --git a/go/src/foxtrot/object_id_provider/CLAUDE.md b/go/src/foxtrot/zettel_id_provider/CLAUDE.md similarity index 100% rename from go/src/foxtrot/object_id_provider/CLAUDE.md rename to go/src/foxtrot/zettel_id_provider/CLAUDE.md diff --git a/go/src/foxtrot/object_id_provider/common.go b/go/src/foxtrot/zettel_id_provider/common.go similarity index 88% rename from go/src/foxtrot/object_id_provider/common.go rename to go/src/foxtrot/zettel_id_provider/common.go index 989e0a175..2b8d65be2 100644 --- a/go/src/foxtrot/object_id_provider/common.go +++ b/go/src/foxtrot/zettel_id_provider/common.go @@ -1,4 +1,4 @@ -package object_id_provider +package zettel_id_provider import "strings" diff --git a/go/src/foxtrot/object_id_provider/errors.go b/go/src/foxtrot/zettel_id_provider/errors.go similarity index 97% rename from go/src/foxtrot/object_id_provider/errors.go rename to go/src/foxtrot/zettel_id_provider/errors.go index 5605e6af2..a0a4c9ea6 100644 --- a/go/src/foxtrot/object_id_provider/errors.go +++ b/go/src/foxtrot/zettel_id_provider/errors.go @@ -1,4 +1,4 @@ -package object_id_provider +package zettel_id_provider import ( "fmt" diff --git a/go/src/foxtrot/object_id_provider/factory.go b/go/src/foxtrot/zettel_id_provider/factory.go similarity index 98% rename from go/src/foxtrot/object_id_provider/factory.go rename to go/src/foxtrot/zettel_id_provider/factory.go index bbcf00518..b95d31687 100644 --- a/go/src/foxtrot/object_id_provider/factory.go +++ b/go/src/foxtrot/zettel_id_provider/factory.go @@ -1,4 +1,4 @@ -package object_id_provider +package zettel_id_provider import ( "path" diff --git a/go/src/foxtrot/object_id_provider/main.go b/go/src/foxtrot/zettel_id_provider/main.go similarity index 97% rename from go/src/foxtrot/object_id_provider/main.go rename to go/src/foxtrot/zettel_id_provider/main.go index f1dfc27d2..2f83afa5d 100644 --- a/go/src/foxtrot/object_id_provider/main.go +++ b/go/src/foxtrot/zettel_id_provider/main.go @@ -1,4 +1,4 @@ -package object_id_provider +package zettel_id_provider import ( "bufio" diff --git a/go/src/india/zettel_id_index/v0/main.go b/go/src/india/zettel_id_index/v0/main.go index dab050b3c..5a693dafd 100644 --- a/go/src/india/zettel_id_index/v0/main.go +++ b/go/src/india/zettel_id_index/v0/main.go @@ -14,7 +14,7 @@ import ( "code.linenisgreat.com/dodder/go/src/charlie/genres" "code.linenisgreat.com/dodder/go/src/echo/directory_layout" "code.linenisgreat.com/dodder/go/src/echo/ids" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/foxtrot/zettel_id_provider" "code.linenisgreat.com/dodder/go/src/foxtrot/repo_config_cli" ) @@ -30,7 +30,7 @@ type index struct { encodedIds - oldZettelIdStore *object_id_provider.Provider + oldZettelIdStore *zettel_id_provider.Provider didRead bool hasChanges bool @@ -52,7 +52,7 @@ func MakeIndex( }, } - if i.oldZettelIdStore, err = object_id_provider.New(directoryLayout); err != nil { + if i.oldZettelIdStore, err = zettel_id_provider.New(directoryLayout); err != nil { if errors.IsNotExist(err) { ui.TodoP4("determine which layer handles no-create kasten") err = nil @@ -232,7 +232,7 @@ func (index *index) CreateZettelId() (h *ids.ZettelId, err error) { } if len(index.AvailableIds) == 0 { - err = errors.Wrap(object_id_provider.ErrZettelIdsExhausted{}) + err = errors.Wrap(zettel_id_provider.ErrZettelIdsExhausted{}) return h, err } diff --git a/go/src/india/zettel_id_index/v1/main.go b/go/src/india/zettel_id_index/v1/main.go index 8f6390723..52ce4412c 100644 --- a/go/src/india/zettel_id_index/v1/main.go +++ b/go/src/india/zettel_id_index/v1/main.go @@ -15,7 +15,7 @@ import ( "code.linenisgreat.com/dodder/go/src/charlie/genres" "code.linenisgreat.com/dodder/go/src/echo/directory_layout" "code.linenisgreat.com/dodder/go/src/echo/ids" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/foxtrot/zettel_id_provider" "code.linenisgreat.com/dodder/go/src/foxtrot/repo_config_cli" ) @@ -27,7 +27,7 @@ type index struct { bitset collections.Bitset - oldHinweisenStore *object_id_provider.Provider + oldHinweisenStore *zettel_id_provider.Provider didRead bool hasChanges bool @@ -48,7 +48,7 @@ func MakeIndex( bitset: collections.MakeBitset(0), } - if i.oldHinweisenStore, err = object_id_provider.New(directoryLayout); err != nil { + if i.oldHinweisenStore, err = zettel_id_provider.New(directoryLayout); err != nil { if errors.IsNotExist(err) { ui.TodoP4("determine which layer handles no-create kasten") err = nil @@ -223,7 +223,7 @@ func (index *index) CreateZettelId() (h *ids.ZettelId, err error) { rand.Seed(time.Now().UnixNano()) if index.bitset.CountOn() == 0 { - err = errors.Wrap(object_id_provider.ErrZettelIdsExhausted{}) + err = errors.Wrap(zettel_id_provider.ErrZettelIdsExhausted{}) return h, err } diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index 013674cbb..62409f07b 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -14,7 +14,7 @@ import ( "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/echo/markl" "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/foxtrot/zettel_id_provider" "code.linenisgreat.com/dodder/go/src/foxtrot/triple_hyphen_io" "code.linenisgreat.com/dodder/go/src/hotel/genesis_configs" ) @@ -209,8 +209,8 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { return } - yinFlatPath := filepath.Join(env.DirObjectId(), object_id_provider.FilePathZettelIdYin) - yangFlatPath := filepath.Join(env.DirObjectId(), object_id_provider.FilePathZettelIdYang) + yinFlatPath := filepath.Join(env.DirObjectId(), zettel_id_provider.FilePathZettelIdYin) + yangFlatPath := filepath.Join(env.DirObjectId(), zettel_id_provider.FilePathZettelIdYang) if err := env.genesisWriteFlatFile(yinFlatPath, yinWords); err != nil { env.Cancel(err) @@ -242,7 +242,7 @@ func (env *Env) readAndCleanFileLines(path string) (words map[string]bool, err e var line string if line, err = reader.ReadString('\n'); len(line) > 0 { - cleaned := object_id_provider.Clean(strings.TrimRight(line, "\n")) + cleaned := zettel_id_provider.Clean(strings.TrimRight(line, "\n")) if cleaned != "" { words[cleaned] = true diff --git a/go/src/tango/store/mutating.go b/go/src/tango/store/mutating.go index 4fdc6bafb..dbf99dba6 100644 --- a/go/src/tango/store/mutating.go +++ b/go/src/tango/store/mutating.go @@ -9,7 +9,7 @@ import ( "code.linenisgreat.com/dodder/go/src/charlie/store_version" "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/echo/markl" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/foxtrot/zettel_id_provider" "code.linenisgreat.com/dodder/go/src/golf/objects" "code.linenisgreat.com/dodder/go/src/hotel/file_lock" "code.linenisgreat.com/dodder/go/src/juliett/sku" @@ -218,7 +218,7 @@ func (commitFacilitator commitFacilitator) commit( if daughter.GetGenre() == genres.Zettel { if err = commitFacilitator.zettelIdIndex.AddZettelId(&daughter.ObjectId); err != nil { - if errors.Is(err, object_id_provider.ErrDoesNotExist{}) { + if errors.Is(err, zettel_id_provider.ErrDoesNotExist{}) { ui.Log().Printf("object id does not contain value: %s", err) err = nil } else { diff --git a/go/src/yankee/commands_dodder/add_zettel_ids.go b/go/src/yankee/commands_dodder/add_zettel_ids.go index 06bf2590f..7f975e592 100644 --- a/go/src/yankee/commands_dodder/add_zettel_ids.go +++ b/go/src/yankee/commands_dodder/add_zettel_ids.go @@ -15,7 +15,7 @@ import ( "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/echo/markl" "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/foxtrot/zettel_id_provider" "code.linenisgreat.com/dodder/go/src/golf/env_ui" "code.linenisgreat.com/dodder/go/src/juliett/command" "code.linenisgreat.com/dodder/go/src/victor/local_working_copy" @@ -25,12 +25,12 @@ import ( func init() { utility.AddCmd("add-zettel-ids-yin", &AddZettelIds{ side: object_id_log.SideYin, - flatFileName: object_id_provider.FilePathZettelIdYin, + flatFileName: zettel_id_provider.FilePathZettelIdYin, }) utility.AddCmd("add-zettel-ids-yang", &AddZettelIds{ side: object_id_log.SideYang, - flatFileName: object_id_provider.FilePathZettelIdYang, + flatFileName: zettel_id_provider.FilePathZettelIdYang, }) } @@ -54,7 +54,7 @@ func (cmd AddZettelIds) Run(req command.Request) { envRepo := localWorkingCopy.GetEnvRepo() dirObjectId := envRepo.DirObjectId() - prov, err := object_id_provider.New(envRepo) + prov, err := zettel_id_provider.New(envRepo) if err != nil { errors.ContextCancelWithErrorf(req, "loading zettel id provider: %s", err) return @@ -65,7 +65,7 @@ func (cmd AddZettelIds) Run(req command.Request) { var filtered []string for _, word := range candidates { - cleaned := object_id_provider.Clean(word) + cleaned := zettel_id_provider.Clean(word) if cleaned == "" { continue @@ -149,7 +149,7 @@ func readAndExtractCandidates(req command.Request) []string { return unicorn.ExtractUniqueComponents(lines) } -func collectExistingWords(prov *object_id_provider.Provider) map[string]bool { +func collectExistingWords(prov *zettel_id_provider.Provider) map[string]bool { existing := make(map[string]bool) for _, word := range prov.Left() { diff --git a/go/src/yankee/commands_dodder/migrate_zettel_ids.go b/go/src/yankee/commands_dodder/migrate_zettel_ids.go index 70c80cf54..4168d41d9 100644 --- a/go/src/yankee/commands_dodder/migrate_zettel_ids.go +++ b/go/src/yankee/commands_dodder/migrate_zettel_ids.go @@ -13,7 +13,7 @@ import ( "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/echo/markl" "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_log" - "code.linenisgreat.com/dodder/go/src/foxtrot/object_id_provider" + "code.linenisgreat.com/dodder/go/src/foxtrot/zettel_id_provider" "code.linenisgreat.com/dodder/go/src/golf/env_ui" "code.linenisgreat.com/dodder/go/src/juliett/command" "code.linenisgreat.com/dodder/go/src/victor/local_working_copy" @@ -64,8 +64,8 @@ func (cmd MigrateZettelIds) Run(req command.Request) { side object_id_log.Side fileName string }{ - {object_id_log.SideYin, object_id_provider.FilePathZettelIdYin}, - {object_id_log.SideYang, object_id_provider.FilePathZettelIdYang}, + {object_id_log.SideYin, zettel_id_provider.FilePathZettelIdYin}, + {object_id_log.SideYang, zettel_id_provider.FilePathZettelIdYang}, } for _, s := range sides { From 05bb01a253d1de281df84ca6027337ffc849be0b Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:31:32 -0500 Subject: [PATCH 21/25] fixup! feat: implement object ID log reader and writer fixup! feat: implement object ID log reader and writer Extract common *bufio.Reader line-reading loop into ohio.MakeLineSeqFromReader iterator. Update segmentEntries to use iterator, removing manual EOF handling. Co-Authored-By: Claude Opus 4.6 --- go/src/bravo/ohio/buffered_reader_line_seq.go | 32 +++++++++++++++++ go/src/foxtrot/object_id_log/log.go | 36 ++++--------------- 2 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 go/src/bravo/ohio/buffered_reader_line_seq.go diff --git a/go/src/bravo/ohio/buffered_reader_line_seq.go b/go/src/bravo/ohio/buffered_reader_line_seq.go new file mode 100644 index 000000000..5be9a25ea --- /dev/null +++ b/go/src/bravo/ohio/buffered_reader_line_seq.go @@ -0,0 +1,32 @@ +package ohio + +import ( + "bufio" + + "code.linenisgreat.com/dodder/go/src/_/interfaces" + "code.linenisgreat.com/dodder/go/src/alfa/errors" +) + +func MakeLineSeqFromReader( + reader *bufio.Reader, +) interfaces.SeqError[string] { + return func(yield func(string, error) bool) { + for { + line, err := reader.ReadString('\n') + + if len(line) > 0 { + if !yield(line, nil) { + return + } + } + + if err != nil { + if !errors.IsEOF(err) { + yield("", errors.Wrap(err)) + } + + return + } + } + } +} diff --git a/go/src/foxtrot/object_id_log/log.go b/go/src/foxtrot/object_id_log/log.go index b9f9c51cd..1a5395cdc 100644 --- a/go/src/foxtrot/object_id_log/log.go +++ b/go/src/foxtrot/object_id_log/log.go @@ -2,12 +2,12 @@ package object_id_log import ( "bufio" - "io" "os" "strings" "code.linenisgreat.com/dodder/go/src/alfa/errors" pool "code.linenisgreat.com/dodder/go/src/alfa/pool" + "code.linenisgreat.com/dodder/go/src/bravo/ohio" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" "code.linenisgreat.com/dodder/go/src/foxtrot/triple_hyphen_io" @@ -94,28 +94,12 @@ func segmentEntries( var current strings.Builder boundaryCount := 0 - for { - var line string - - line, err = reader.ReadString('\n') - - if err != nil && err != io.EOF { - err = errors.Wrap(err) + for line, errIter := range ohio.MakeLineSeqFromReader(reader) { + if errIter != nil { + err = errIter return segments, err } - isEOF := errors.IsEOF(err) - - if isEOF && line == "" { - if current.Len() > 0 { - segments = append(segments, current.String()) - } - - err = nil - - break - } - trimmed := strings.TrimSuffix(line, "\n") if trimmed == triple_hyphen_io.Boundary { @@ -128,16 +112,10 @@ func segmentEntries( } current.WriteString(line) + } - if isEOF { - if current.Len() > 0 { - segments = append(segments, current.String()) - } - - err = nil - - break - } + if current.Len() > 0 { + segments = append(segments, current.String()) } return segments, err From f59aa2b6d64a07c54f2ecc7be81fc2bc259e2ceb Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:31:41 -0500 Subject: [PATCH 22/25] fixup! feat: update genesis to use object ID log with raw text processing fixup! feat: update genesis to use object ID log with raw text processing Use ohio.MakeLineSeqFromReader iterator in readAndCleanFileLines instead of manual ReadString/EOF loop. Co-Authored-By: Claude Opus 4.6 --- go/src/juliett/env_repo/genesis.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index 62409f07b..4b1dbdbae 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -9,6 +9,7 @@ import ( "code.linenisgreat.com/dodder/go/src/alfa/errors" pool "code.linenisgreat.com/dodder/go/src/alfa/pool" + "code.linenisgreat.com/dodder/go/src/bravo/ohio" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" @@ -238,25 +239,16 @@ func (env *Env) readAndCleanFileLines(path string) (words map[string]bool, err e words = make(map[string]bool) - for { - var line string - - if line, err = reader.ReadString('\n'); len(line) > 0 { - cleaned := zettel_id_provider.Clean(strings.TrimRight(line, "\n")) - - if cleaned != "" { - words[cleaned] = true - } + for line, errIter := range ohio.MakeLineSeqFromReader(reader) { + if errIter != nil { + err = errIter + return words, err } - if err != nil { - if err == io.EOF { - err = nil - break - } + cleaned := zettel_id_provider.Clean(strings.TrimRight(line, "\n")) - err = errors.Wrap(err) - return words, err + if cleaned != "" { + words[cleaned] = true } } From 79d85431e43e2cc11d615afd130b04e525d38cee Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:31:48 -0500 Subject: [PATCH 23/25] fixup! feat: add migrate-zettel-ids command fixup! feat: add migrate-zettel-ids command Use ohio.MakeLineSeqFromReader iterator in writeFlatFileAsBlob instead of manual ReadString/EOF loop. Co-Authored-By: Claude Opus 4.6 --- .../commands_dodder/migrate_zettel_ids.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/go/src/yankee/commands_dodder/migrate_zettel_ids.go b/go/src/yankee/commands_dodder/migrate_zettel_ids.go index 4168d41d9..61c7b243b 100644 --- a/go/src/yankee/commands_dodder/migrate_zettel_ids.go +++ b/go/src/yankee/commands_dodder/migrate_zettel_ids.go @@ -8,6 +8,7 @@ import ( "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" "code.linenisgreat.com/dodder/go/src/alfa/errors" pool "code.linenisgreat.com/dodder/go/src/alfa/pool" + "code.linenisgreat.com/dodder/go/src/bravo/ohio" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" @@ -106,23 +107,15 @@ func writeFlatFileAsBlob( var wordCount int - for { - line, err := reader.ReadString('\n') - - if len(line) > 0 { - if strings.TrimRight(line, "\n") != "" { - wordCount++ - } - } - + for line, err := range ohio.MakeLineSeqFromReader(reader) { if err != nil { - if err == io.EOF { - break - } - errors.ContextCancelWithError(req, err) return markl.Id{}, 0 } + + if strings.TrimRight(line, "\n") != "" { + wordCount++ + } } if _, err := file.Seek(0, io.SeekStart); err != nil { From 56f39dfbfa15a3b081306dbaf5f10d133cf4a7e2 Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 07:31:55 -0500 Subject: [PATCH 24/25] fixup! feat: add add-zettel-ids-yin and add-zettel-ids-yang commands fixup! feat: add add-zettel-ids-yin and add-zettel-ids-yang commands Use ohio.MakeLineSeqFromReader iterator in readAndExtractCandidates instead of manual ReadString/EOF loop. Co-Authored-By: Claude Opus 4.6 --- go/src/yankee/commands_dodder/add_zettel_ids.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/go/src/yankee/commands_dodder/add_zettel_ids.go b/go/src/yankee/commands_dodder/add_zettel_ids.go index 7f975e592..f287ebb7b 100644 --- a/go/src/yankee/commands_dodder/add_zettel_ids.go +++ b/go/src/yankee/commands_dodder/add_zettel_ids.go @@ -10,6 +10,7 @@ import ( "code.linenisgreat.com/dodder/go/src/alfa/domain_interfaces" "code.linenisgreat.com/dodder/go/src/alfa/errors" "code.linenisgreat.com/dodder/go/src/alfa/unicorn" + "code.linenisgreat.com/dodder/go/src/bravo/ohio" "code.linenisgreat.com/dodder/go/src/bravo/ui" "code.linenisgreat.com/dodder/go/src/charlie/files" "code.linenisgreat.com/dodder/go/src/echo/ids" @@ -128,22 +129,13 @@ func readAndExtractCandidates(req command.Request) []string { reader := bufio.NewReader(os.Stdin) var lines []string - for { - line, err := reader.ReadString('\n') - - if err != nil && err != io.EOF { + for line, err := range ohio.MakeLineSeqFromReader(reader) { + if err != nil { errors.ContextCancelWithError(req, err) return nil } - if len(line) > 0 { - line = strings.TrimRight(line, "\n") - lines = append(lines, line) - } - - if err == io.EOF { - break - } + lines = append(lines, strings.TrimRight(line, "\n")) } return unicorn.ExtractUniqueComponents(lines) From c762a8144a60fbfd45be56ffd3bf0618cc6b0f3f Mon Sep 17 00:00:00 2001 From: Sasha F Date: Thu, 26 Feb 2026 08:31:50 -0500 Subject: [PATCH 25/25] fixup! feat: update genesis to use object ID log with raw text processing fixup! feat: update genesis to use object ID log with raw text processing Use order-preserving slices instead of maps in genesis to fix non-deterministic word ordering. Change test NATO word entries from multi-word ("the alpha") to single-word ("alpha") to match provider storage format and fix cross-side rejection. Regenerate fixtures. Co-Authored-By: Claude Opus 4.6 --- go/src/juliett/env_repo/genesis.go | 48 +++++++++++++----- zz-tests_bats/add_zettel_ids.bats | 24 ++++----- zz-tests_bats/init.bats | 14 ++--- .../v13/.dodder/config/config-mutable | Bin 5203 -> 5203 bytes .../v13/.dodder/local/share/config-seed | 2 +- .../v13/.dodder/local/share/index/Abbr | Bin 1179 -> 1179 bytes .../v13/.dodder/local/share/index/object_id | Bin 146 -> 146 bytes .../local/share/index/object_pointers/Page-0 | Bin 196 -> 147 bytes .../local/share/index/object_pointers/Page-1 | Bin 147 -> 98 bytes .../local/share/index/object_pointers/Page-2 | Bin 98 -> 196 bytes .../local/share/index/object_pointers/Page-3 | Bin 147 -> 98 bytes .../local/share/index/object_pointers/Page-4 | Bin 196 -> 245 bytes .../local/share/index/object_pointers/Page-5 | Bin 245 -> 98 bytes .../local/share/index/object_pointers/Page-6 | Bin 98 -> 49 bytes .../local/share/index/object_pointers/Page-7 | Bin 147 -> 98 bytes .../local/share/index/object_pointers/Page-8 | Bin 49 -> 147 bytes .../local/share/index/object_pointers/Page-9 | Bin 0 -> 147 bytes .../local/share/index/object_pointers/Page-a | Bin 49 -> 49 bytes .../local/share/index/object_pointers/Page-c | Bin 98 -> 196 bytes .../local/share/index/object_pointers/Page-d | Bin 245 -> 49 bytes .../local/share/index/object_pointers/Page-e | Bin 49 -> 98 bytes .../local/share/index/object_pointers/Page-f | Bin 0 -> 49 bytes .../.dodder/local/share/index/objects/Page-0 | Bin 367 -> 0 bytes .../.dodder/local/share/index/objects/Page-1 | Bin 1040 -> 1040 bytes .../.dodder/local/share/index/objects/Page-2 | Bin 469 -> 836 bytes .../.dodder/local/share/index/objects/Page-3 | Bin 417 -> 417 bytes .../.dodder/local/share/index/objects/Page-4 | Bin 0 -> 367 bytes .../.dodder/local/share/index/objects/Page-5 | Bin 367 -> 441 bytes .../.dodder/local/share/index/objects/Page-7 | Bin 367 -> 0 bytes .../.dodder/local/share/index/objects/Page-c | Bin 420 -> 786 bytes .../.dodder/local/share/index/objects/Page-d | Bin 441 -> 0 bytes .../.dodder/local/share/inventory_lists_log | 8 +-- .../v13/.dodder/local/share/object_id_log | 4 +- ...39defd8cb3ff28deaebdc821afcc2d865d397862a3 | Bin 283 -> 0 bytes ...fbb58678e9f2b6428e5f9083d4efda4b1ee5778bfd | Bin 0 -> 282 bytes ...5c2b0360401261a649846f74cd486a374b2a0e8baa | Bin 281 -> 0 bytes ...44252a9a476f5e28083864665125239c10a0532555 | Bin 416 -> 0 bytes ...9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b | Bin 370 -> 0 bytes ...1912f7ce91ad2e836472217b4e96d007417bdd3f2c | Bin 0 -> 364 bytes ...e8e10558f54e9e7407ef510f77369359f804505822 | Bin 280 -> 0 bytes ...cc4c3e87cb376fc8be75063c7ec4dfed99bea0c707 | Bin 0 -> 421 bytes ...c38999c3c444d414ed9206ec0437e7330e393c6f09 | Bin 0 -> 373 bytes ...3458cfabc2cc9be55992f2cda8d156241dfc7675ab | Bin 0 -> 281 bytes ...8c3ccf32066a26afaf74a51792c15810824e1ba238 | Bin 282 -> 0 bytes ...1e1e72db929ff3f882f98244e38ed2e0dd8a16ad19 | Bin 452 -> 0 bytes ...e92586edddfce0d05261e67bc7e090bb8143417326 | Bin 0 -> 451 bytes ...5a9340b4fe51fd6946541c2024bce5682e10db7e8a | Bin 368 -> 0 bytes ...09e659f853a2c651fa84df19db9ff764bbb33ffad1 | Bin 0 -> 282 bytes ...b61d5a2a75bcfc855a1dd4dbf9ed6ed9afb717ff6d | Bin 0 -> 281 bytes 49 files changed, 60 insertions(+), 40 deletions(-) create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-f delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 create mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-4 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-7 delete mode 100644 zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-d delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/05/5295cc744e50e1c356be39defd8cb3ff28deaebdc821afcc2d865d397862a3 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/09/f93e02d158018bd5a063fbb58678e9f2b6428e5f9083d4efda4b1ee5778bfd delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/10/ad3c81c961aa2d82210c5c2b0360401261a649846f74cd486a374b2a0e8baa delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/18/9744d3979d225d8206b544252a9a476f5e28083864665125239c10a0532555 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/1e/9ff26261b7f2e071648b9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/2c/a713c58bbd9898512d461912f7ce91ad2e836472217b4e96d007417bdd3f2c delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/45/4bf9c598f0df2ed71db6e8e10558f54e9e7407ef510f77369359f804505822 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/46/d9cff892bcb309bfc51ecc4c3e87cb376fc8be75063c7ec4dfed99bea0c707 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/54/3664f7935cc5393c26b2c38999c3c444d414ed9206ec0437e7330e393c6f09 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/5a/a3595d777e03391f44e33458cfabc2cc9be55992f2cda8d156241dfc7675ab delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/62/e17f753623321ca7a8d38c3ccf32066a26afaf74a51792c15810824e1ba238 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/72/3000fc64739a74c56fd11e1e72db929ff3f882f98244e38ed2e0dd8a16ad19 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/b4/152d8abab829223f8787e92586edddfce0d05261e67bc7e090bb8143417326 delete mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/c1/0fb305305d45c4937eae5a9340b4fe51fd6946541c2024bce5682e10db7e8a create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/d3/6e717dac13da10494bbb09e659f853a2c651fa84df19db9ff764bbb33ffad1 create mode 100644 zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ee/9b3b541d58b553a23d9db61d5a2a75bcfc855a1dd4dbf9ed6ed9afb717ff6d diff --git a/go/src/juliett/env_repo/genesis.go b/go/src/juliett/env_repo/genesis.go index 4b1dbdbae..ba279b0e7 100644 --- a/go/src/juliett/env_repo/genesis.go +++ b/go/src/juliett/env_repo/genesis.go @@ -170,7 +170,7 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { return } - env.enforceCrossSideUniqueness(yinWords, yangWords) + yinWords, yangWords = env.enforceCrossSideUniqueness(yinWords, yangWords) yinBlobId, err := env.genesisWriteWordsAsBlob(yinWords) if err != nil { @@ -224,7 +224,7 @@ func (env *Env) genesisObjectIds(bigBang BigBang) { } } -func (env *Env) readAndCleanFileLines(path string) (words map[string]bool, err error) { +func (env *Env) readAndCleanFileLines(path string) (words []string, err error) { var file *os.File if file, err = files.Open(path); err != nil { @@ -237,7 +237,7 @@ func (env *Env) readAndCleanFileLines(path string) (words map[string]bool, err e reader, repool := pool.GetBufferedReader(file) defer repool() - words = make(map[string]bool) + seen := make(map[string]bool) for line, errIter := range ohio.MakeLineSeqFromReader(reader) { if errIter != nil { @@ -247,24 +247,44 @@ func (env *Env) readAndCleanFileLines(path string) (words map[string]bool, err e cleaned := zettel_id_provider.Clean(strings.TrimRight(line, "\n")) - if cleaned != "" { - words[cleaned] = true + if cleaned != "" && !seen[cleaned] { + seen[cleaned] = true + words = append(words, cleaned) } } return words, err } -func (env *Env) enforceCrossSideUniqueness(yin, yang map[string]bool) { - for w := range yin { - if yang[w] { - delete(yin, w) - delete(yang, w) +func (env *Env) enforceCrossSideUniqueness( + yin, yang []string, +) (filteredYin, filteredYang []string) { + yinSet := make(map[string]bool, len(yin)) + for _, w := range yin { + yinSet[w] = true + } + + yangSet := make(map[string]bool, len(yang)) + for _, w := range yang { + yangSet[w] = true + } + + for _, w := range yin { + if !yangSet[w] { + filteredYin = append(filteredYin, w) } } + + for _, w := range yang { + if !yinSet[w] { + filteredYang = append(filteredYang, w) + } + } + + return filteredYin, filteredYang } -func (env *Env) genesisWriteWordsAsBlob(words map[string]bool) (id markl.Id, err error) { +func (env *Env) genesisWriteWordsAsBlob(words []string) (id markl.Id, err error) { blobWriter, err := env.GetDefaultBlobStore().MakeBlobWriter(nil) if err != nil { err = errors.Wrap(err) @@ -273,7 +293,7 @@ func (env *Env) genesisWriteWordsAsBlob(words map[string]bool) (id markl.Id, err defer errors.DeferredCloser(&err, blobWriter) - for word := range words { + for _, word := range words { if _, err = io.WriteString(blobWriter, word); err != nil { err = errors.Wrap(err) return id, err @@ -290,7 +310,7 @@ func (env *Env) genesisWriteWordsAsBlob(words map[string]bool) (id markl.Id, err return id, err } -func (env *Env) genesisWriteFlatFile(path string, words map[string]bool) (err error) { +func (env *Env) genesisWriteFlatFile(path string, words []string) (err error) { var file *os.File if file, err = files.CreateExclusiveWriteOnly(path); err != nil { @@ -300,7 +320,7 @@ func (env *Env) genesisWriteFlatFile(path string, words map[string]bool) (err er defer errors.DeferredCloser(&err, file) - for word := range words { + for _, word := range words { if _, err = io.WriteString(file, word); err != nil { err = errors.Wrap(err) return err diff --git a/zz-tests_bats/add_zettel_ids.bats b/zz-tests_bats/add_zettel_ids.bats index 9e8a31a50..b7a79fef3 100644 --- a/zz-tests_bats/add_zettel_ids.bats +++ b/zz-tests_bats/add_zettel_ids.bats @@ -2,23 +2,23 @@ cat_yin_nato() { cat <<'EOM' -the alpha -the bravo -the charlie -the delta -an echo -the foxtrot +alpha +bravo +charlie +delta +echo +foxtrot EOM } cat_yang_nato() { cat <<'EOM' -the golf -the hotel -the india -the juliet -the kilo -the lima +golf +hotel +india +juliet +kilo +lima EOM } diff --git a/zz-tests_bats/init.bats b/zz-tests_bats/init.bats index 6d4f37860..53cd5377b 100644 --- a/zz-tests_bats/init.bats +++ b/zz-tests_bats/init.bats @@ -236,15 +236,15 @@ function init_inventory_archive_with_encryption { # @test function init_with_custom_zettel_id_words { # @test run_dodder init \ -yin <(cat <<'EOM' -the alpha -the bravo -the charlie +alpha +bravo +charlie EOM ) \ -yang <(cat <<'EOM' -the golf -the hotel -the india +golf +hotel +india EOM ) \ -lock-internal-files=false \ @@ -257,7 +257,7 @@ EOM run_dodder new -edit=false assert_success - assert_output --regexp '\[alpha/golf .+ !md\]' + assert_output --regexp '\[alpha/golf( .+)? !md\]' run_dodder peek-zettel-ids 100 assert_success diff --git a/zz-tests_bats/migration/v13/.dodder/config/config-mutable b/zz-tests_bats/migration/v13/.dodder/config/config-mutable index 75aff9fada0c5e9e603c5607e932426e3abcd83a..2d9a51a26040fde66e70f55a1e54f4fe188100e1 100644 GIT binary patch delta 55 zcmcbtaam)-KXw5N17j0QGd(jSa}x_=3nSyrd>k1_q9!IL7N#balleIIZFUjhX8{1R C&JGp; delta 55 zcmcbtaam)-KXw6gOLJ2bGd*Jy6LS*-3j_1bd>k1_qQ<61MnEN#`8f7%b`jub0RXe& B4jcdg diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/config-seed b/zz-tests_bats/migration/v13/.dodder/local/share/config-seed index 20295517e..ced5ef8e4 100644 --- a/zz-tests_bats/migration/v13/.dodder/local/share/config-seed +++ b/zz-tests_bats/migration/v13/.dodder/local/share/config-seed @@ -2,7 +2,7 @@ ! toml-config-immutable-v2 --- -private-key = 'dodder-repo-private_key-v1@ed25519_sec-tsu27kphm3mjwxgjncasmts59n6d7zwtazkcwg038alusv0xvhaueljlp5xglnr9f56qmlq3ux883mjgvg68d76hw0tj5p3qyjewn0qpckhxq' +private-key = 'dodder-repo-private_key-v1@ed25519_sec-fekenlufm2y59ly80quwen04j6ant2klrdpnye4mh09c2a7g4uhjt7feqzq4fzx4waq9f6n0c9vyl394cueah0k2znxxlugqjltxxxsmzu9sp' store-version = 13 id = 'test-repo-id' inventory_list-type = '!inventory_list-v2' diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/Abbr b/zz-tests_bats/migration/v13/.dodder/local/share/index/Abbr index 9c11c8c2e56e122ceb04a2704d465591b147673b..004d6ae3153d4b47e5cd60be13f14c1915b3dc1e 100644 GIT binary patch delta 212 zcmZXNJqp4=5Ju;l4S_V){ve8_0aMxu_EwV0Iw=Inf=2KPt{RIia{{rk@c=o7_Yh0h zF_soH4ByOqQwC*lOAziA;K%D_lJ4LP0r2Kp=Ws_NirqohUZ#^&0((Xag}orc$v)5t z3xZ!CzPWTJ022#O1l1VkwQ}?`J7ar1gRv`~NWXGBO28nn-q7|pWm+DR7=*_^|K!TP X)YRUk#@;|I3$L$C7q;T2|D}jN0V+B1 delta 187 zcmbQuIh%7s3Zr%}Gb1BgNKs}=Y6au}J_bfcMwX!b{1V3h6Brm6LjLyyrCIXwQ&NEf zllvJZ87EC%$*9jbaq>+@Y3)f2jBH?q|Cna~@8e`-VqgO5XJBAt=F=(x8>t5|`G4PJ zc_tsmzR5XEc0h79lhou!77=Nn4L}`0^^BP6zc3w~{EgXh@>U==XHf#`iega!lGQ8< E07la|J^%m! diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_id b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_id index d3e0d6562c1c36d7d06d7ae10f9aadc595c36f25..ab647c517063439ada5389127402105bfcb41290 100644 GIT binary patch literal 146 zcmW;BK?}iP9KhlKk0q@oNs^YdB<&zcjzTWGNp5m@=bc*3UPTVRgxME<$@O_c`>ukU zSrBkw%ZM6H0A9qs@C literal 146 zcmW;BK?}iP9KhlKk0q@oNs^YdB<&zcjzTWGNp5m@=bc*3UPTVRf!TL{$@O_c`>ukU zx(t}o h#G}WA6&GFv%o)<6!-f${LJsuVv8Be0F?IH6fJWCiEz#tDwbAOO6-hE$r zWj_}aNBF!_QK1x0TaTQQB)1wddwvP?ols>A4CkRN{#8o7c0IWnDvMS3p8Hl1u4xu# Za<;PBOOlBv!hNDm7Zb#M28OFp4FG>QD2@OC literal 196 zcmdu$RnpeUdhV!491A=_1*_N^*Y zj)ici&6N~PpE!S6V$Os)ky3h{e4D@Ws6ur_K{ap(h^_Cx&dht@!y&ePXH}HAUWVQ& z5WV)WFLy!TQzfQkm<0?l8+g(qs^_hkcxGb5|C!HTILuJA(=y;FI`#9<(&(PM_Ag49 KU^=csZ2$o1pgk`D diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-1 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-1 index e75c03f2aca79a130c63f125e6921b1f849dbcf3..4261d81cf752938869655bb0be9a7f33b7dd5139 100644 GIT binary patch delta 49 zcmbQtn4~4Gm0!QdZrkZ+lC%7t2Ybt@@BA-4h1Hk8SM8DY`<$3xObk$Pbz-yy0OY|D A!~g&Q delta 98 zcmYeA%or`4`r%pg^Gn75UT?57)>85QywZ-LX4&b*HWx|^=M=1-#>fB#=bj;+v}MgH?`B`^T*|5n(ZT@Jqr1a@Mbw)mXDjk- h*YQZHsRX&b-NX^~NOEcY{7#pRH=B828ls?<004`SHYWf8 delta 56 zcmX@Ym^9JQ&`?QDH`{V!z|T9X$JE0f)Hmd5@$RfESTg4WchH(U&Z0lq8K5Aa5yAif DVYm^h diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-3 index 4d9b1675a3f509359f6c39425c7fe79e828abc03..67d0607430f1385b50e9ce42be81595977cc5cee 100644 GIT binary patch delta 55 zcmbQtm^8uA&^C7Z>kmf_ZvOhsZ+l{0d!mu1!FNX?9VrGB9!lc!8^!*!+IE+-iopx``|Wg)c0 oN4d<+dMc;6p~RtueizlH_w!x6lNoLEXX?BR-awdohJ2_70Dz(&F8}}l diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-4 index 18f81fc5e3a4bef1b2a1dca90d8dadf5240caf24..604a15572b3dd53cff6e2129fdd0a8c5185e759d 100644 GIT binary patch literal 245 zcmZ=bulOS@=B^7w~;f@V}~kdU^owD0RV_%O*{Yq literal 196 zcmZ>8IXp8W=4ey#>s32N-sn}&$W7I+zW;O0)H!vVy#DU_#H-2x0r`v&+Wl=BgMd%^ zyHuszRL)H>lJ@^0I lKsMVMsx_xoUhhjky@5sN(wWBn8@#WsahGO+s%L;{003kjAt?X= literal 245 zcmWGATfRHX^vqO`8QRhUDQnd7ijFyLwc(i}X3qIxyF>h0b_OWOXM`|Gko*QzQjk@-v={UW=3zAxW4$}1zp(DG6*O4goAoM?9WEzc501~ABj(g0Sh6662? literal 98 zcmYdr5?toSb7QKl@IG%9(N(AK++D^$TmD$rqsn)D-w&=l#;eKz0r`v&Io-`rAI~USf95?8OhXh@0|1DDBX|G+ diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-7 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-7 index 8343ccd5211e6c5cd1d1b1cb550e88687fae7626..4d3937aa6b076d5de8cc68d27ab9fb497c57dcdd 100644 GIT binary patch literal 98 zcmbw+I=AcuZzIVt|2sMhL4Wfa&^d*NGQ{ z+i$qMc#ys<=!TZdTFXs4ayX;gF9mUIVMo_cCwC-3RlzgaPAT*K^1T;UtNGRMJgJTAQC;Bu=nU`oWfh$~b?uH*nN=AeAe<3GH~A}x y6i=C!u#tgXshK-@@@~+CE0Oy8_2-S(pR%wxam{7`SU@1X(Ld8aTkfPpH6VgLYHJ`z0u diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-9 new file mode 100644 index 0000000000000000000000000000000000000000..b481658c590e53501b1c79ad30904cb9e9a99513 GIT binary patch literal 147 zcmbP|-Eo_D#?Fp{0_T6Pd6H7Z_{L-S_bZk17KML@`3>8Lt<)Y%+Q( z6KC>ZLdwBApTDynVQEm&wLZvva;@*T74=YM3=HR?teNE<%YWLxrV{-R?Q94zRvQKE2LuOGZkH)B~Zijpfms(F*y$a delta 56 zcmX@Ym^3lT(D2lX&NUvlL?e29&xY%&NlBWoPB|r)UvjKDYpUAGluN9P3{Y?$$^rmy CO%aL! diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d b/zz-tests_bats/migration/v13/.dodder/local/share/index/object_pointers/Page-d index 625275ff123f72663b286c3e7461fb027b84b732..56df97f3493b95854631b95fec785c6b9d9e9ac8 100644 GIT binary patch literal 49 wcmcb1{+O@T0z4D*24wAds*<)=$$ zY@4$MYAyrARj7vhCyu^h$@W~#-d4DEYTj9wfq~Ea$8py%Gynj|4iMg?XSg=q$Wg3`zt8$(`P*~z#M^ma-Yrc~<5|MU00wzb8USYo62AZd literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-0 deleted file mode 100644 index 22df9310e2f342586e0ab011417fb0cf91fc0e43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmd003}$3t^Oj*?lj3GFGBhqH7Ub&| zlqTh5CdX%|R_c}+GNh&$nVK3}#sfte&isq#<>^0@>TAOLNAO`^#XFBAld|98#n-ji z6jV07+*6ncGblePD>b=9w>UFhx6BA`29V2eW`k*$zsSXB6N<{1bIu()XZ_&NBW9-9 zV)<>~&gb`J{0YAz*Dvg}ZMGC=%Y#WAzs@E&D`#;h@w|9f{Ws|1w0w>b5r!*=r!)&N zfI!2FJEyNq-L-&^p+ty5F*C0$HLoPUs4_k$v$zCkaj`v`dr~sfQ^7I}#Tkj9peg@q kt!_EfLR+Zgc|-Kn%kz7#W0S%2f}?CD2%OlCX+0E#M)8UO$Q diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-1 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-1 index 229077f5f6dec89ac114087d8bcf4e94b6914490..bc94d93005b11015a0c8aa267e795ccfd9dcc300 100644 GIT binary patch delta 617 zcmbQhF@a-3fr9E!ONPdfj;rMkA+PceM))7udffQ-zEdJ+@;@?6zm_aDae_*H+A-5< z&JT6Y%G^GszT?rah~r<@7)?Kv9DQ!)i;4RMHne)aSN!(>pZt_}0qeT+7v9pgJ8eBX zFUI`k2EN2cMMq9^Ik7R6=a(zwXS=d8lq9C>8bWEK5D|t;3#K*;Fn~Zq$L76*sghgI(Pc$gLa%^%p>*O8GN(!DIn%#}=1z&Y( ztotSOsrWt1QnMq%!rcFr&P}(GGtgt7ypyqwm=JO3`>*!MgL%gL%Pc1+o4*p;)>qnV z99qOM^WOFQCqzZFKN{Rnm2(k$6dJbA;^x|>5C1d5)K%17Lnd#xt27UJ9m_oVFq3jR zlGhg;xY%*;Z%<008Ls7Z(5k delta 617 zcmbQhF@a-3fx?-8@w`0!XHtDlc>f4K?5lX^kz`W#JG}V17Mp^~rk8srPEe^oKTrJh zj9+Q9j?TPQ|2FPa$o*&Ud=zy$c_(8VF(Klx=b7x@vwvn7JKdO7!*fKv)1bls z>?F%Dp1wB=Psm>jR%bg`T$P&TrP$;f5V9wy)w!nPr&HY8>-B}xW_+HwT#{+>VJ78t zB(HC1T;8|m=uAFzuT#b6zRcPVltv*a_{=WL$ZuHddGkapi%7E7f*;=|DTG_}YXtla YzU;qeuJ=Uw3JwMaMpjS^8zYz|0MeEgssI20 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-2 index e3a6e1ccf47d241f124660d7110c97c422ef7246..f9a654ee24b13e24c6388afd1ae7b12f363a2da8 100644 GIT binary patch delta 544 zcmcc0e1vU6fr9E!ONPdfj;rMkA+PceM))7udffQ-zEdJ+@;@?6zm_aDae|7&x(va$ zpKmw>+nHQYVszZGgZ;3O>aF|71(r8^ia6P=kZSmXuwM1$fh$0m2PPOfECQs7^u)N9w1o1wB;b?>=v1>u@zVJ2rQo4q8Ncp}^< z+H_6c&nOm>%NWeaz~(K(z$V4bWMpV+U}0cvVrkCAsK>=*Zenh1Y;Iy{#uB?IH@(gB1t2--0y*=;ogU@ E09N1PbN~PV delta 255 zcmVAaDUBtUC| zp_Y+p<(dJ;uq) zlsR4FGgd03mH;0A*w{H8n9gUvp_^ z09$ITO(3e)v~b%Vb!tAN6-ex~M) zZblh>v~%iDK)U|I1CxCLA|T!|1Jgcg3ZSv9sW=bpk88PTH&9(>U1AO+<)xUmoV1g_ F0Tvznbld;{ diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-3 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-3 index 295b4e7bf492f0e26463bc6f4a82a7ef43e0cf7e..e64d86269af7a86bd8d19e4d09a92def27b3f0a8 100644 GIT binary patch delta 170 zcmV;b09F5?1EB+uk02%aIRJrFh}CyMRO)ZRSWm>Y$1~f$$`s6R@c@_BV;YgKBvu{& zsVkV7fovaukajwiwv&CT82RTu@J4#|;|6#J%rn5PA}|$I#aO~_Wbdh8=Kw-oFdSA{ z&_`h~bJWI@iv?5^0MMY7gAf1!0001h$hrEmslKWalPLi+AVAL{_)=AaDzBvxB$ ztW6-Q*0gZj9_0t0G{GO@}_2<=c|Cit$wEFjc!I6 zeYA7xPe8iYw)L~#q%1O*lHA*rv zHDlN!s@t_|ho+K!d;3e(wzqfxJh%{)_^kT)g9*DEogItS0^Ar<@>5b$i*$=p3-Waf zN|SOjljE~fD|O2Z8B$Y>Oic|f0gT(oXB#_AI8e3Es~>iBG>LHM#u6RYRr_5r#_(rZx*O zfI!2KhVCtMSD%z(C=p^%%*-oG%`3?-s*KOcEG_|BTx^f#o|Me=RIm&~aYiC2XhO>0 jNYDL0H;~PChHA}emDl^yPj6t+xpby+{|4`?Yuu#)qhE~Z literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-5 b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-5 index c4b570579c0849fbf2be3e501316e9c431100966..f59a30a9ddad4e36d5737e42f04c075db620bc1f 100644 GIT binary patch delta 332 zcmaFQw3E4BnIV{wfx(-Jfq@}_fgwZ$NMnLrMxY`#Zy5$QDQ+esLsJ6_17j0QGbTno zE+#W03qx~DV@pd%9R`M^oW$%@qa-6!GX}St=YLGvvzc@MQMofdcI~Il^H1z6WwWU} za{ukjeG87W2e>h$>v5!3h5&TaO#x-gipmO#VlP>DQ8_ zCeBp}J09NuGH{>N0)^KJ42#3(pI0$&UXfA%W5yhG*x6Ydk$=>5S637rALqU-nNgb=Lf|X#STCTIv(PA;d-?ga8hCa$f)d delta 252 zcmVG{u z43ErZO*9Ss5#f$_?nq)ZcKcUz*D3}eB(mwek-{WaW!T$hwlB3$9ePoF9lP9UWBbs4 z-*SGWwI&aHE>10X2MAr~S<0nGvY}vyCdh7HQ0SMs4{KjgtBW$~m8Mw-R1^Tz!<2&% z000000DzF=+RdiC{0x&k0XQIj9>h>3AW36BB5CiFvLvp9ks6v3qFEd@y{V8h$qH7Ub&| zlqTh5CdX%|R_c}+GNh&$nVK3}#sfte&isq#<>^0@>TAOLNAO`^#XFBAld|98#n-ji z6jV07+*6ncGblePD>b=9w>UFhx6BA`29V3ZyjGN{Y~~_OO}h;`Q+{p#;G3Ok#N}g` zdb)hklNB1R%NI)vnNGfR^H*&1`^AQ5|C&0mthnR6dp3*G9 z00IpQrcK@Pd-rx;h7utL#mv02)Vz}XqRRN3%;FND#l`k$?n%i^PX)^`6lWxYf@bMv km%v-Lxn+;!ihd}Z6kEUg`GZM|;~$)fW=nPK;k3R80N~+_j{pDw diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-c b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-c index 814649744604520d02771fcc6ad136fff24f3b3f..8014a85bf244197c463e59c26e9e60c204a8e3b6 100644 GIT binary patch delta 458 zcmZ3&Jc(_>1O?TfmJE#{9aqa8LSE$`jPO6Q^|%<`w`fw@G%?=ELi^&P%SzIFbc@+qcf4cQ@6`VG*;!6r-Jjdu?$Z5>g54}U z?`G+K`;hRqLW46zgyF)1sm%fmAkc8*z~M7z7i|@sti@=mpu59=Mbw)mXDjk-*YQZH zsRX&b-NX^~NOEcY{7#pRH=8HdGpYvXFa|R+uz5=}ut{<=85x=ySQr?aSei32>Txoe znwc6|0!18k7#Nar60=i{l8j8v7<85kAMM^dV@9B^o21b9a}(FBlSfNC!Sp0X|E%&A>gUX+^_se|2@7){dfKD zH?wMD=<1YwRo}=LDn8{pT)V_|CUh!u1HFC;;q?PAPOaLp>IOeUi4cQgW?orpUP*pY zWqeL%afxo3QL#NkN`6X8YLRY!QdVkmiEc{fb&+ZjRmR9WvaD UOLdlReRr#5?Wx3xW|!Xr0BM)JFaQ7m delta 170 zcmV;b09F5z2BZU!kRZ(dUkwb8%wAaD!Bv$!$ zPUxGr^3@YYwuRRYs}80AQw%~|ROCFEXr9v-kmw0pcUH5(Yxn03pFm-eox8otN5)D{ z1SSy|ME&W^Zv|8o0Mx^jgAf1!0001hn262)`{Bq5lPUoE{P7a^^<=AC1qzz@&Et; diff --git a/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-d b/zz-tests_bats/migration/v13/.dodder/local/share/index/objects/Page-d deleted file mode 100644 index ae83ea07cbbfee934cbb9acf487817f098214160..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 441 zcmY#p2xeqp@MdCQU`!CsEEy5hJj6ro5{$~)WF=*+|$=Jli z($vz@z{pXDfgvd;F+0^L$;i}_;kVw>2ux~OW+a?g*`;IK$Z3shB}Bd{P? zH8jADAtgU0CACPmD77G8x1cmBCo?%dJGD}`%#a~9#mLmu&@vt<%5dgiJTFiGnN(jB z-amp5`zqdfB$<@`4llm0#ipRL>E)inM3_PONm;4MCA!6#>AGb`a5I2hhEG416zcE& zb=cp#Rq~GB@lS?NX2;Jku$o-KyZo2a?guru4*0#BaDGy#nTM4=Ywf4NHq9M6k8Yjm zGE?sH{#D|{2@IDjho>|PfP29-e`Ku6^PU=(U18^j_}MaX1fRot2Vh=S_(93Y<^(ug?# zH~=>Q%aC?E&q6F;r|25Zt^JsTijKUu4w?;6p&Tz~{j)x9$%!qMC@7Jc3=9faN3jZG z2{2=M^I;K+AlX2iyb5PE^Fzk&t21>eR7KG&@bca!g(NujJR$Jfsnx`()-cM+zgu?nZ9u?cc8 zCIuyxgzE7KiA{O-FOBgV00jys$TpLpzW`B)X%jG*3^gWwwntFJqMFRXJc6y0kMZP;}h&W2R_;~_QbF)(05YM)dR zSgjxiHYCCm1TF2#6$=TipNhE8)hX;_W&G>&Z^zR%vZJH9g+@r}9~>ZT)FCanq#n&h z%Y_VL;Css(uqcPY!2un49xu&UFWY&6aOdoA8dOW+oINl}Jnwzxs%@KEQB3l06qAg! zgY#H$gWrny?M+v^+10n500qC1&PgqFX3-XIn*?^8@8ldZj!O_Nld>- gmNQ>bd@tlyh#ZJDyu6~Sjk2_i0svo>&m)N-1*vg=-T(jq literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/10/ad3c81c961aa2d82210c5c2b0360401261a649846f74cd486a374b2a0e8baa b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/10/ad3c81c961aa2d82210c5c2b0360401261a649846f74cd486a374b2a0e8baa deleted file mode 100644 index 55b97c8c0d95145baf5db510b3e26ca12bd74664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmV+!0p|WFwJ-euScM1x1{FaaP)GD|1AsjhYksMHEE^&-5v@$hx4;X)aH^0CH8}t| z05$*-A>`s1>I%M8enoe9M!MJ{p=)y>a@q@H^P69(+ml%LEQJpAzRhERU=+y>mW)DR z70Q_ts(=Urxo8JjC5N}XL~h)zE~|nRX+2XDud_+tIhbm|3Q8g54HTNQ-y67O9!x!k z`tG?8K@13i$v3EhTL|XldC8Bt8de3ae_dS`4&mE(h?GOp^r=PZvpq4vs5vpgXK_zC z4Cv86WL-CfL3_B7NoN881*ka-PNu=WhK0U{CIJL*5ie)0t4%ZSK)1i#@v)urEw;so fx_s%y>GhXIJZtc^;9 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/18/9744d3979d225d8206b544252a9a476f5e28083864665125239c10a0532555 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/18/9744d3979d225d8206b544252a9a476f5e28083864665125239c10a0532555 deleted file mode 100644 index a5acbd9e80c7cc822f273d4a8c62075f73090663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl+owJ-euSiKAY=HOo&U`Kicl5$B+@>tlK(&(ttTqbLRbvQaf0MZ;<09OE4 z0Qg`HAXMBV80f@*^q?7Pfn(x;pC*h!gAon(t%O=^gQN})W;YJq^@Y(PO7)dY1u2ULh-Ln-w7 zG%89%`NFTHu*bC8dLH-QC&Syyahr&SqjVw~4q~@A3x`4reI+Z;=7KrVaY@CI!z_YK zJHFHf(woLgVgzsTzM3AjTJ=7nzyq!xS|eQIoLOzq+ND1`SiAX>!5NipRo3R8=teg& zj>YQ9jRtrRv;e?hpc4=OO;mf>0fc{arB=(o*DZ6pNIgT@_WjFayo5~B(lRdvQl#z= z*WcKij{pXx6VU+gq1EK8G7&594aN+EnArY5F8aF0f)vsseqw#7=Q)=(CH$o#Eu9(Z zDH~!C;mh%Z$HCYeQgtT0k49LMs87GRSE>DpeY@B1i%L#KqJA diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/1e/9ff26261b7f2e071648b9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/1e/9ff26261b7f2e071648b9e2604cf47518bf2c2c235695ec9a7a7cc2eef6a3b deleted file mode 100644 index 256923c1aeaa0f3af2e3feeeeff4727f03e6ecb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmV-&0ge7BwJ-euSWOE62Ax(MKuLQbK~bc8U0#9_rUjDnE{R#L37LKO}HE&U8_8Pnk}IDTbKQ06 zywZrQ&k@X2SrXy{I+&%7;Y91Mp@7&4B#2025WFhiXBDdfk!t#256w*2r<<9u4S%s3 z5_@bsnSEEA%m+OiWr|Pk@Cv=XP+j=`G-ebliJbp0>Ql3Jk!TDGMrZ}44vYnbZkA{f zUcwExbSTNTk7y{h3&r(yNQCz~(3VkOze|>? zHGHoA%Cu_tX>&MRgR$ee#D5}d=t|4q``HKp2gyvw31p_@gaDG@rXy@Z_{0kk%kGS| zmzRDy%?nX1BJ23?3r*-#>8L#~E2r?q>OU!ZK?jm|R(DCA)0Rvr*kDY>UJ;wrV88h7 Q5CZ^pz)ti<`9!h^QgNZJSO5S3 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/2c/a713c58bbd9898512d461912f7ce91ad2e836472217b4e96d007417bdd3f2c b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/2c/a713c58bbd9898512d461912f7ce91ad2e836472217b4e96d007417bdd3f2c new file mode 100644 index 0000000000000000000000000000000000000000..33105ef524dc497bffb40441f9013a448043527c GIT binary patch literal 364 zcmV-y0h9hHwJ-euSRD%hW}H+UKuLRo(myr%gngsxgjI2=>3(s_0TUSPco>rdO#n>* zN&vS|F3d%S?9Kv*rET^eS+h&vY$0pHfs5xhOW+cye@i=;7 z?ihs%j~}@rp<_63Hfks!6w3*qRSW_)!unV0^T4xYJLh_O5fgN=9h3$IbNp1q zulK3g)sDXY8S2zm3yr-OinyccKkUJ&op+Gu9qYw`PBfT%EQc8FS9S(FUE1~eoJn`=kse%GncoJsY^Q%HpCaFw5kiM zMawd^GZ{h4dNu#QRLZ*%n)6PHGim?_r-*G6g(9|12uy|WiWeY^@BAe3PKP9i6vtM# zsQv8Be@(DvIaJkbGSZA>dE=o5d;8mz+A}O K;KTBZB!Q)4XRitX literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/45/4bf9c598f0df2ed71db6e8e10558f54e9e7407ef510f77369359f804505822 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/45/4bf9c598f0df2ed71db6e8e10558f54e9e7407ef510f77369359f804505822 deleted file mode 100644 index d80aa497ab0407a2e95a536a6e006310f257d44f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6cGwJ-euSbYcpwp2hJP-pXi-9_J;w?O%ea4UQb<6d zwAdn~f)fNy$*FL*iItGCt8_)0Ai}kt1xD&(6Y=M`)W8ZU`TKzaKFv#mJIv$Klb~Nu z{r3`YP~TdRy)YFyVPrI1gBWbaH)YinXF=axSt%NG#TYB8#Uy(9aCCf-gFTG<sq{yh^6b_`V76=Fr2`C8rKGd*dgKH!W zWf3OoKU}>~#+&r9l#x5}FGq2=?$1S5P*wwB+-dVwG zf>?<5Uh3hFu07dxj4w7C4tt;l00slxz^iOik;4uk5DEVyEON`0RRSvn`k)f!JVyaMB}2DPYvgPl}4Ma95w3;G9-KT*LF6Ugv(j|t4Tow zyq`SP-Mw0jBrmXFDiX{gZKQbUf-tg`GL9fhpC`d5X;FScXQ7ph1z8;i04>NO08mCj Ph6uAg(ii0iNg_xA{u{b* literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/54/3664f7935cc5393c26b2c38999c3c444d414ed9206ec0437e7330e393c6f09 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/54/3664f7935cc5393c26b2c38999c3c444d414ed9206ec0437e7330e393c6f09 new file mode 100644 index 0000000000000000000000000000000000000000..917cd0552e5f9f98a255bd9b3543632e3baa0caf GIT binary patch literal 373 zcmV-*0gC=8wJ-euSY-xk^voOqX+%%} zPXJ5+)R1p+xQ{8A=iI>&C@rL*40Q|~iAn}ytO6q3jQU8wJoV_!IHSt&%aopS(Hqj| z^5t%@jL$NSlk=F_;_j24f-Ph~Zz|MKK>WcGJbN$*o}8^@=)`ZeMrH1Ls(=ZPngS+# zf!mXYgJ*XKbk{WVNbWc48l9|$I@P{}@k5t}o@!;0GX=RV(cLa>j=M1Ai;xu7Lhcn5 znqt3+&=LaEC5ow6dPdrGZCgf?(a5+OKtzh{djFX&iHuUQ!nQa&*P|6=`fvHQ-rEv` ze>~mRcA{PyI(IRya(bAydnDOTHgHYS)|v6x+&=*T2daPyCQ<D+ihO@d@uJj4$E7ututKh%1>gMsX+N4z@nAN&L34hH TUhHr(0|0fvPV`0jMUn_o>}a)| literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/5a/a3595d777e03391f44e33458cfabc2cc9be55992f2cda8d156241dfc7675ab b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/5a/a3595d777e03391f44e33458cfabc2cc9be55992f2cda8d156241dfc7675ab new file mode 100644 index 0000000000000000000000000000000000000000..95e85c68369be947b7b141c4c7c15dda275b85f2 GIT binary patch literal 281 zcmV+!0p|WFwJ-euScM1x1{FabP-pa{Wmvyd(2KCYY^^L}X0p2&wqd@lpx%r{0t`6- zH~=;P@1HzR-M=ztdz=Toz@BHLInR}C*5%Fu$}Fq=Lvk6~=unNcTMiK!7&J@EFjiUu zizTBd6pGLU0m{aQkb*1$J~XTr;zVR?s21spl#7ZP*j_P zNTT`1*K6F`WwA+HbbDC<1#MBKh-ko0qDp5aB4DumLf_N!@&-eNTg>hk;>?&nti&-Y f#r}ev(kksPF)>9$Z|R6hZp^C!0AG~fBZ(jd#Y=?j literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/62/e17f753623321ca7a8d38c3ccf32066a26afaf74a51792c15810824e1ba238 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/62/e17f753623321ca7a8d38c3ccf32066a26afaf74a51792c15810824e1ba238 deleted file mode 100644 index ad0c5f2f88442a4827cc00a24af3c11fc7f5ed39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0px$|D^`nGyEgI3q$av(ImP-X_7lOaqLuQP;SG4Q=+H~BZIzH}Dk6jFr zBpfZKb11&)uchiK3=VI{-z5HPrTDU@?t>!U@xX<;wUz!0hiGOrnv gD)tJs>{HD$Lg-y?}21??|`DF6Tf diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/72/3000fc64739a74c56fd11e1e72db929ff3f882f98244e38ed2e0dd8a16ad19 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/72/3000fc64739a74c56fd11e1e72db929ff3f882f98244e38ed2e0dd8a16ad19 deleted file mode 100644 index 54d4822ec36af8b8b7ff58c9fdb011dd456bd215..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmV;#0XzOEwJ-euSltZ(W~6BxKuLQD=}u7C$HO+L6IR8g8pd41meCQNc{^oYvv6XsB{IqVFdk&Sxs?a`<61=dsJ`FbO6)|BSU&Mr6 z=qLHX7QDS_I2?NDJ9&L%GME<~nOr?dh)on~Tanr%zG=K9R`8zxEAjzsZyI-==>B<+ z?_NWUOgO?Yt4-Ihmgzc6IeoY>nu<nFwfOqPx)*82|^VhzKW85fM%Z@U0Ud@gygb zLn1&Z+poo1R($0$8&|D|D8j#2WI|s;MAFl8KPEAT|EX&Q*_(G()qpyu4VUWpSW7)W u(Teg|-+Zbhu5^=`5VMe({k_c$Q&e+ZX diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/b4/152d8abab829223f8787e92586edddfce0d05261e67bc7e090bb8143417326 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/b4/152d8abab829223f8787e92586edddfce0d05261e67bc7e090bb8143417326 new file mode 100644 index 0000000000000000000000000000000000000000..4f430109529fbba68dd78447da03ab2e849b7784 GIT binary patch literal 451 zcmV;!0X+UFwJ-euSk(;x7UXCgP)R#rfkcQvGESg>(f*Z@!isD|w|WdL6Q zT>v-Mtt^FMTLh$#(rK=sz>CF61eP!j+ZG4waDiQGheoJEGKIoP$iPAjWDb)GhiDL? zJY};uu4vb?f&BH{eMRy6C*EidWIKY7)V`$mcE)J+n;2`QFhnbK)E|n=W#fowjOpP8OvnXx ziayXnGZzhqyKh_YHqPZjY-Y1@k0d@jtqy7Z=VK>NZ`5;Da@rD)T>?ago%_hHGK_kZ zw|1pHri1#Ady!u)!*p&X*>xmB-jY+Bnz$r|ovx`MY>V%2E|wGxv6f tPinO&8)9H;wj5R-FiCU+KrV8T;|D%MkB)ps1Oo{k&9*Is>PZ@EsbEb2 zP5?^)`yS=Od@?)^ zFB3DbIu#k;4Rk#A^$uHacsLDeC?FKO37}OB0+1(#ScJZvpo>y7HlvKntn`*fX2kH9ZK68=0TNRvi+{jk(}e z;OF)hS;dAsvit5^Wj-)GsYgThe@fOUQUd@7f1;s@!ik0^1g1hT3L`)?3vbOm+;FNT zW_C50rlC7;q)J^PhMfQKe#9WgyV|)))#3#&%8-oJg0!`7(b|GMNiE8vb=2Jf)g=i7 O0Cm7l^hNnak_b|G3!@bP diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/d3/6e717dac13da10494bbb09e659f853a2c651fa84df19db9ff764bbb33ffad1 b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/d3/6e717dac13da10494bbb09e659f853a2c651fa84df19db9ff764bbb33ffad1 new file mode 100644 index 0000000000000000000000000000000000000000..3ae52ba1edafdda2b9287b26aed60e75e7bb0a1d GIT binary patch literal 282 zcmV+#0pm!-C%LtB5HVeZ4I)jqOiNV-ut} zm>lS(O)<3nJBm%K#P$U&00jLBvP~@DdVr*R*#r#ougaXIS$1{r!N(*beD*fQ<~N7B g^B}Gb0-y?}21q>T}LI3~& literal 0 HcmV?d00001 diff --git a/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ee/9b3b541d58b553a23d9db61d5a2a75bcfc855a1dd4dbf9ed6ed9afb717ff6d b/zz-tests_bats/migration/v13/.madder/local/share/blob_stores/default/blake2b256/ee/9b3b541d58b553a23d9db61d5a2a75bcfc855a1dd4dbf9ed6ed9afb717ff6d new file mode 100644 index 0000000000000000000000000000000000000000..a59ac177c8af1bc433fabf5523683f9c3b8e25f8 GIT binary patch literal 281 zcmV+!0p|WFwJ-euScM1x_7p)LP)GD6t4I^N5i$aV8|M(2v1kp66;LlVI$@B`M=u@U=^q+5P1^S@}Bj1(&kRw1QsZlG{ccF=$|u2_i- z(oHm7YlcR613!K`0|{Pzjr+(`xXZRAPt0eXTLbt1t;q7-7*q7&tR@UC4eg7ThN8;c zQw;W-TE5*2)smEXyLbfv1$|MajT_`?sL|cn1Q6)c4i9`u4_Z%W3??2{YR4f_bG@2U f0TpYRRwiZW5CwfqW6Q>^=qnlm0AG~PBa0vfRC;%1 literal 0 HcmV?d00001