Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge TaskChampion repo into Taskwarrior #2783

Merged
merged 713 commits into from
May 20, 2022

Conversation

djmitche
Copy link
Collaborator

@djmitche djmitche commented May 8, 2022

Description

This is the first of many steps for #2770. It merges the TaskChampion repository, including its history, into this repository, with everything under rust/. It then moves a few things to the top level (GitHub workflows, dependabot, etc. -- see the commits).

Obviously there's a lot more to do here, but I want to get this "first step" landed since GitHub is going to show it as a huge mess of commits. With this landed, subsequent commits can be reviewed as usual. I also want to check that the workflows work.

When this lands, I'll archive the old taskchampion repo (and org) and indicate that development is occurring over here.

* improve linking
* parallel construction for storage and servers
* clarify rationale for Task/TaskMut
This was added to test the 'Formatting' action.  It works :)
This refactors the storage API pretty substantially, and represents a
breaking change to the schema used by the sqlite storage
The docs refer to this as the "nil version ID" so let's do the same.

This started out more ambitiously, to change this to `VersionId::NIL`,
but that required making VersionId a newtype and all of the implicit
conversions from VersionId to Uuid would have to be explicit.  That
didn't seem wortht the trouble.
This avoids the need for the messy cache-control-header macro.
Otherwise, it has no effect.
…refactor

factor taskdb into multiple modules
…-config

add server-side config --snapshot-{days,versions}
@djmitche djmitche marked this pull request as draft May 8, 2022 19:36
@djmitche
Copy link
Collaborator Author

djmitche commented May 8, 2022

Converted to a draft while I rearrange things a bit -- the GitHub actions don't support working directories, but I think I can work around that with Cargo workspaces.

@djmitche djmitche force-pushed the issue2770-crates branch 2 times, most recently from ff7aa50 to 2e1b6f8 Compare May 8, 2022 19:56
djmitche added 4 commits May 8, 2022 20:06
This moves the workspace Cargo.toml to the root of the repository, so
that the "actions-rs/cargo" action can find it.
@djmitche djmitche force-pushed the issue2770-crates branch from 2e1b6f8 to 1ed483e Compare May 8, 2022 20:06
@djmitche djmitche marked this pull request as ready for review May 8, 2022 20:16
@djmitche
Copy link
Collaborator Author

djmitche commented May 8, 2022

Hey, all green!

@djmitche
Copy link
Collaborator Author

djmitche commented May 9, 2022

btw I think this will require an admin to merge (only "Rebase and Merge" is enabled, and this can't be rebased)

@tbabej
Copy link
Member

tbabej commented May 20, 2022

I love that this preserves the commit history. I'll work on merging this in.

@tbabej tbabej merged commit b15732e into GothenburgBitFactory:develop May 20, 2022
@ryneeverett
Copy link
Collaborator

When this lands, I'll archive the old taskchampion repo (and org) and indicate that development is occurring over here.

@djmitche Looks like you archived taskchampion without indicating that it was merged into taskwarrior.

@tbabej
Copy link
Member

tbabej commented Aug 6, 2022

There is a reference in the discussions section of the repo.

@djmitche
Copy link
Collaborator Author

djmitche commented Aug 7, 2022

That's a good point, though -- I added a note to the README.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants