Skip to content
New issue

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

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

Already on GitHub? # to your account

Improve grep search #30843

Merged
merged 2 commits into from
May 3, 2024
Merged

Improve grep search #30843

merged 2 commits into from
May 3, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented May 3, 2024

Reduce the context line number to 1, make "git grep" search respect the include/exclude patter, and fix #30785

image

@wxiaoguang wxiaoguang added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels May 3, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 3, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 3, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 3, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 3, 2024
@lunny lunny added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label May 3, 2024
@wxiaoguang wxiaoguang marked this pull request as draft May 3, 2024 03:30
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 3, 2024
@wxiaoguang wxiaoguang marked this pull request as ready for review May 3, 2024 03:49
@wxiaoguang wxiaoguang changed the title Fix grep search Improve grep search May 3, 2024
Copy link
Member

@KN4CK3R KN4CK3R left a comment

Choose a reason for hiding this comment

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

Why the line number reduction?

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 3, 2024
@wxiaoguang
Copy link
Contributor Author

Why the line number reduction?

During my daily usage, I found showing 3 lines (one before, one hit, one after) is better.

Showing too many lines makes it more difficult to find the hit result.

@wxiaoguang wxiaoguang enabled auto-merge (squash) May 3, 2024 08:50
@wxiaoguang wxiaoguang merged commit 0f3e717 into go-gitea:main May 3, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 3, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 3, 2024
Reduce the context line number to 1, make "git grep" search respect the
include/exclude patter, and fix go-gitea#30785
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 3, 2024
wxiaoguang added a commit that referenced this pull request May 3, 2024
Backport #30843 by wxiaoguang

Reduce the context line number to 1, make "git grep" search respect the
include/exclude patter, and fix #30785

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang wxiaoguang deleted the fix-grep-search branch May 3, 2024 09:59
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 3, 2024
* giteaofficial/main: (30 commits)
  Improve grep search (go-gitea#30843)
  Don't only list code-enabled repositories when using repository API (go-gitea#30817)
  Fix no edit history after editing issue's title and content (go-gitea#30814)
  Ignore useless error message "broken pipe" (go-gitea#30801)
  Fix JS error on pull request page (go-gitea#30838)
  Fix body margin shifting with modals, fix error on project column edit (go-gitea#30831)
  Improve repo button row layout (go-gitea#30668)
  refactor: merge ListActionTasks func to action.go file (go-gitea#30811)
  Prevent automatic OAuth grants for public clients (go-gitea#30790)
  Catch and handle unallowed file type errors in issue attachment API (go-gitea#30791)
  Fix incorrect message id for releaes email (go-gitea#30825)
  Add hover outline to heatmap squares (go-gitea#30828)
  Remove external API calls in `TestPassword` (go-gitea#30716)
  Upgrade chi-binding (go-gitea#30826)
  Improve context popup rendering (go-gitea#30824)
  Fix activity heat map padding & locale (go-gitea#30823)
  Fix issue card layout (go-gitea#30800)
  Fix branch selector UI (go-gitea#30803)
  Fix rounded border for segment followed by pagination (go-gitea#30809)
  Skip gzip for some well-known compressed file types (go-gitea#30796)
  ...
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/L Denotes a PR that changes 100-499 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git grep search error
4 participants