search

leibler / dokuwiki-plugin-todo

DokuWiki ToDo Plugin
39 stars 30 forks source link

Extend syntax with setting [priority] of task #157

Closed greeneng closed 5 months ago

greeneng commented 1 year ago

I extended syntax of Todo plugin for my project (but probably from older version). Features: add 1, 2 or 3 exclamation marks (!) into tag to set priority. When rendered this option just adds a class to Example 1: <todo !>low priority task Example 2: <todo !!!>high priority task

Re-made from scratch (was PR #133)

einhirn commented 1 year ago

@runout-at what's your take on the lines I commented on? And if it's just the commit history and the tabs of this PR, I could manually merge it, adjusting it accordingly. Don't want to be too hard on a first time contributor 😁

greeneng commented 1 year ago

Don't want to be too hard on a first time contributor

You can be, I need too learn ;-)

einhirn commented 1 year ago

Don't want to be too hard on a first time contributor

You can be, I need too learn ;-)

ok, so what environment are you using to work on the code? All those "add file via upload" commit messages look like you're not using git on your own system? Otherwise you'd group discrete changes to commits with meaningful commit messages.

Just saw your latest commit message: That's more like it.

Also with "rebasing" there's a way to reduce the number of commits, so the commit history of this repo doesn't get cluttered with all those "added file via upload"-messages. I gave some pointers in your previous PR, but it probably requires you to clone the repo to your computer and use git on that clone - maybe with some kind of GUI, or maybe just using CLI. I'm usually doing the latter, because "it's good enough for me"™, but I know there are some editors like "vsCode" or something with useful Git integrations, if you want to go through setting that up...

BTW: I'm actually using Git and vim (editor) inside a WSL Ubuntu22 on top of my Win10, maybe a little old school, but works for me.

greeneng commented 1 year ago

Early commits were copying files from prod :)

einhirn commented 9 months ago

So sorry, but there are some conflicts now - please rebase.

greeneng commented 8 months ago

Updated. Sorry for plenty of commit messages. They were created during rebase and merge-conflict resolutions.

einhirn commented 7 months ago

Updated. Sorry for plenty of commit messages. They were created during rebase and merge-conflict resolutions.

Hmm. Now your Pull Request contains lots of stuff that's already there in the current version - now I can't really see what you changed any more. Please look at the "files changed" tab of this pull request to see what I mean.

It seems that something went wrong with your rebase and/or merging. Instead of putting "our" new stuff below your changes, you put "our" new stuff on top of your changes - if that image helps.

I hope you'll be able to fix your git repo and this pull request, but I guess that'll take some work: You'll probably need to remove at least the last three commits after carefully looking at them. git log -p will show you diffs of what changed in the commits. If there is no work of yours in there, you can do git reset --hard HEAD~3 - but be careful: Any changes of yours in those three latest commits will be deleted. Skip the --hard to keep all the changes as uncommitted, but that will be a convoluted mess to be cleaned up with git restore etc. anyway.

After that's done, please also don't commit your changes to .gitignore into this PR. You can drop that commit during an 'Interactive rebase' git rebase -i upstream/main (hoping you added upstream as a remote...) by deleting the corresponding line. Also please 'squash' or 'fixup' the many commits while you're at it. If there's a conflict while rebasing, just fix it, add the fixed file and git rebase --continue as instructed by git. This may happen multiple times during the process, even in the same place, since you'll probably not fix it to match the next patch that will be applied in that place...

I also found that creating a branch with my changes helps me to keep the "main" branch up to date with the upstream one and then rebase my changes onto the local main branch.

RobertWeinmeister commented 7 months ago

I think you could also merge the current main branch into your branch and resolve any conflicts. This might be easier to do.

einhirn commented 5 months ago

I went ahead and cleaned this up into a single commit with just the needed changes.