Skip to content

configuration: decouple hardcoded colors into default.theme#4124

Merged
djmitche merged 9 commits into
GothenburgBitFactory:developfrom
dud-eisme:feature/decouple-default-theme
Jun 13, 2026
Merged

configuration: decouple hardcoded colors into default.theme#4124
djmitche merged 9 commits into
GothenburgBitFactory:developfrom
dud-eisme:feature/decouple-default-theme

Conversation

@dud-eisme

@dud-eisme dud-eisme commented Jun 7, 2026

Copy link
Copy Markdown
Contributor

Closes #3669 (Move color settings from taskrc to default.theme)

  • Made a separate default.theme in the doc/rc directory.
  • Added default.theme to the man page list in the taskrc.5.in file.
  • Application built completely done (100% target compilation).
  • Python integration checks and all tests passed 100% (178/178 green).

@djmitche djmitche left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this!

Comment thread doc/man/taskrc.5.in Outdated
Comment on lines +817 to +818
Note that core color configurations have been abstracted away from the main template file.
The system defaults now reference an include directive mapping directly to default.theme.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs typically should not reference changes, but should just document how things are.

Comment thread test/basetest/utils.py Outdated

# From the CMAKE value of the same name. This is substituted at configure.
CMAKE_BINARY_DIR = os.path.abspath("${CMAKE_BINARY_DIR}")
CMAKE_BINARY_DIR = os.path.abspath("/home/joe/Contributions/taskwarrior")

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem right.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake! Restored the original ${CMAKE_BINARY_DIR} template token

Comment thread test/CMakeLists.txt Outdated
hooks.on-exit.test.py
)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../doc/rc/default.theme default.theme COPYONLY)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this directive belongs here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed that code block from the CMakeLists.txt file

Comment thread src/Context.cpp Outdated
home_dir = getenv("HOME");

std::vector<std::string> searchPaths{TASK_RCDIR};
std::vector<std::string> searchPaths{TASK_RCDIR, "doc/rc", "../doc/rc"};

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These paths won't exist in a built version of Taskwarrior.

@dud-eisme dud-eisme Jun 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do the tests check the file paths?

@dud-eisme dud-eisme force-pushed the feature/decouple-default-theme branch 5 times, most recently from b33d909 to 082b6a6 Compare June 8, 2026 05:34
@dud-eisme dud-eisme force-pushed the feature/decouple-default-theme branch from 082b6a6 to e1babfb Compare June 8, 2026 05:49
@dud-eisme dud-eisme requested a review from djmitche June 8, 2026 06:24
@dud-eisme

Copy link
Copy Markdown
Contributor Author

All core theme and configuration parsing tests are passing 100%

@djmitche djmitche left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good! Thank you!

I'm not sure why tests are failing with I/O errors.

@djmitche djmitche enabled auto-merge (squash) June 13, 2026 22:23
@djmitche djmitche merged commit 76537e1 into GothenburgBitFactory:develop Jun 13, 2026
20 of 21 checks passed
@djmitche

Copy link
Copy Markdown
Collaborator

I guess it was a flake -- thank you for the contribution!

ashprice pushed a commit to ashprice/taskwarrior that referenced this pull request Jun 14, 2026
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.

Move color settings from taskrc to default.theme

2 participants