Coding 2023-04-17
Pro: The tests pass now.
Con: They were coupled to the old design, not in the sense of "They're doing things the old way, and need to be switched to the new way.", but in the sense of "There is no new way, so I need to walk back a bunch of my changes."
Pro: I didn't have to walk them all back, and I was able to keep a bunch of the major improvements.
Con: This merge is going to suck.
Let's see how that goes...
(motr-dev) ↪ hg up 39-documentation
switching to topic 39-documentation
56 files updated, 0 files merged, 20 files removed, 0 files unresolved
maxchase at maxchase-ThinkPad-P1-Gen-5 in ~/D/s/m/motr
(motr-dev) ↪ hg merge 87-test-coverage
file 'src/motr/_api/cli_types/map_over_selection.py' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? d
merging src/motr/_api/cli_types/artifact.py
merging src/motr/_api/cli_types/command.py
merging src/motr/_api/cli_types/installer.py
merging src/motr/_api/cli_types/parametric.py
merging src/motr/_api/cli_types/parametric_command.py
warning: conflicts while merging src/motr/_api/cli_types/parametric_command.py! (edit, then use 'hg resolve --mark')
merging src/motr/_api/package.py
warning: conflicts while merging src/motr/_api/package.py! (edit, then use 'hg resolve --mark')
merging src/motr/_api/tasks/cmd.py and src/motr/_api/actions/cmd.py to src/motr/_api/tasks/cmd.py
warning: conflicts while merging src/motr/_api/tasks/cmd.py! (edit, then use 'hg resolve --mark')
merging src/motr/_api/tasks/io.py and src/motr/_api/actions/io.py to src/motr/_api/tasks/io.py
warning: conflicts while merging src/motr/_api/tasks/io.py! (edit, then use 'hg resolve --mark')
0 files updated, 4 files merged, 2 files removed, 4 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
... Well, that probably could have gone worse?
...
That wasn't so bad.
I haven't made all of the changes that I could make, but I'm going to hold off on taking it further for now. The thing to focus on after now, is to refresh my memory about what is a problem for the remaining wrapper code, because I've completely forgotten what was supposed to be problematic with this code.
I'll start on that in a few days. For now, I need to wind down.
Good night.