kent/consciousness
1
0
Fork 1
Code Issues 1 Pull requests 5 Projects Releases Packages Wiki Activity Actions

IRC: split on word if possible, + flush #1

Open
spqrz wants to merge 0 commits from spqrz/consciousness:master into master
pull from: spqrz/consciousness:master
merge into: kent:master
Conversation 2 Commits - Files changed -
spqrz commented 2026-04-11 21:41:10 +00:00
First-time contributor
Copy link

First-time contributor who's not used to writing in Rust, please check I didn't mess up. Thanks

First-time contributor who's not used to writing in Rust, please check I didn't mess up. Thanks
spqrz added 1 commit 2026-04-11 21:41:10 +00:00
spqrz added 1 commit 2026-04-12 07:43:12 +00:00
spqrz commented 2026-04-12 07:50:23 +00:00
Author
First-time contributor
Copy link

Added one more tweak: we don't want split_at to be 0 under any circumstances, so stop searching for space at 1. Stops an extremely unlikely loop when we're sending a message that starts with a space (such as indented code) and target is unrealistically long. (Low priority because a target.len() big enough for this to cause an actual problem is extremely unlikely to ever occur, but the pedantic purist in me wants to put this in anyway.)

As the PR was already merged I meant to make it a separate PR but Forgejo made it the same PR without me asking. I probably have to delete and re-create the fork or create a new branch for a new PR. Meanwhile I guess it can be re-merged?

Added one more tweak: we don't want split_at to be 0 under any circumstances, so stop searching for space at 1. Stops an extremely unlikely loop when we're sending a message that starts with a space (such as indented code) and `target` is unrealistically long. (Low priority because a `target.len()` big enough for this to cause an actual problem is _extremely_ unlikely to _ever_ occur, but the pedantic purist in me wants to put this in anyway.) As the PR was already merged I meant to make it a separate PR but Forgejo made it the same PR without me asking. I probably have to delete and re-create the fork or create a new branch for a new PR. Meanwhile I guess it can be re-merged?
spqrz commented 2026-04-12 07:53:44 +00:00
Author
First-time contributor
Copy link

Just noticed Forgejo is giving us a warning on the command-line instructions: "The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards." I wonder if that's why Forgejo counted it as "still open" this morning if commit ed896d4e83 was a manual merge that didn't auto-close the PR

Just noticed Forgejo is giving us a warning on the command-line instructions: "The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards." I wonder if that's why Forgejo counted it as "still open" this morning if commit ed896d4e83e090bc05a0cffe71e2eadc245965cf was a manual merge that didn't auto-close the PR
spqrz added 1 commit 2026-04-15 10:27:15 +00:00
This branch is already included in the target branch. There is nothing to merge.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u master:spqrz-master
git checkout spqrz-master

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff spqrz-master
git checkout spqrz-master
git rebase master
git checkout master
git merge --ff-only spqrz-master
git checkout spqrz-master
git rebase master
git checkout master
git merge --no-ff spqrz-master
git checkout master
git merge --squash spqrz-master
git checkout master
git merge --ff-only spqrz-master
git checkout master
git merge spqrz-master
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: kent/consciousness#1
No description provided.
Delete branch "spqrz/consciousness:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?