Add search bar at bottom of revlog #506

WizardOhio24 · 2021-02-04T00:19:05Z

Closes #429, Closes #449, (part of 1.0 todo list)

Adds a search bar at the bottom of the log tab which allows for searching commits. It works, but I'm not sure what keys are best for accessing this. Go to log tab then press s (suggested in #449), the search box will pop up and be in focus, type to search, the results will appear in the log where the arrow keys can scroll through them. Press esc to close the search box, then esc again to cancel the search and return to all commits.

TODO:

Within the search:

:s xxx filters only shas for xxx
:a xxx filters only authors for xxx
:m xxx filters only messages for xxx
:t xxx filters only tags for xxx
These can be combined to :sam(any order works, so :asm or :sma works as well) to search for all, which is equivalent to putting nothing at the start

Complement filtering is possible with :!, which returns anything not containing what was searched for, for example to get all commits whose messages do not contain 'fix' or 'remove':

:!m fix &&:!m remove

Case sensitive filtering is possible with :c, for example, to find messages which contain 'Fix' and do not contain 'fix':

:c Fix

This also adds support for intersection filtering using &&(i.e only if 'x' and 'y'), for example, to find commits where author name contains 'richard' and the commits message has 'fix' in it:

:a richard&&:m fix

And support for union filtering using ||(i.e or), for example to find any commits whose message contains 'fix' or 'move' or any commits which contain aabb':

:m fix ||:m move || aabb
(notice spaces at start and end are irrelevant, they are trimmed, but : must come before a space if filtering by something).

Intersection is currently always higher priority than union, for example, to find commit message which contain 'fix' and 'readme' or contain move = :m fix&&:m readme || move which is equivalent to ((:m fix&&:m readme) || move ).

And so, for a more complex query:

:m fix && :m revlog ||:a richard &&:m status ||:s aabb ||:mc Remove || :!cm bigger

For another example, show the commits which have tags where the commits contain 'pre' or ('fix' and 'CD'):

:t &&(:m pre ||(:m fix&&:m CD))

Some screenshots

WizardOhio24 · 2021-02-04T11:54:54Z

I'm thinking a good way to implement this could be: in the log tab press : to bring up the search bar then type to search. The up and down arrows should still work in the log. Then press esc to close the search.

extrawurst · 2021-02-04T12:17:21Z

@WizardOhio24 I don't see any change in the asyncgit crate which makes me assume you only filter on the local items. I would assume to filter the entire log history and not only the one we store in the application

WizardOhio24 · 2021-02-04T13:01:38Z

Could you provide an example, when you search for the first commit sha, this is the result:

The commit number at the top is incorrect, but the commit is correct.
Even just what I should search for, that the search doesn't find.

extrawurst · 2021-02-04T13:05:10Z

revlog.rs(37):

static LIMIT_COUNT: usize = 3000;

so we only ever have 3k revision in memory at once. checkout a repo that has more than that and try to find something old, then it won't be searched.

WizardOhio24 · 2021-02-04T14:09:57Z

Tried :, but now think s is better. Here's how it works:

Go to log tab
Press s (it's also a command at the bottom)
Type to search (updates dynamically)
Press esc to close the search box
Press esc again (now on log tab), to cancel search.

That seems to work reasonably well.

WizardOhio24 · 2021-02-04T14:11:22Z

And it now filters all commits (I think), which might be expensive, so it only does it once when beginning a search, if it must.

WizardOhio24 · 2021-02-04T14:26:25Z

Everything seems to work in this now, just need to stop the help message opening when typing into the text input.

src/keys.rs

extrawurst · 2021-02-24T21:16:52Z

@WizardOhio24 can you rebase this onto master?

extrawurst · 2021-04-03T11:34:40Z

Cargo.toml

@@ -40,6 +40,7 @@ serde = "1.0"
 anyhow = "1.0.38"
 unicode-width = "0.1"
 textwrap = "0.13"
+parking_lot = "0.11"


what reasoning went into using Mutex from parking_lot vs using the regular Mutex from std that we use everywhere else?

This was because I think it's faster and it's already used as a dependency in some of the crates GitUI uses, happy to use the normal mutexes instead though.

yeah lets keep it consistent

extrawurst · 2021-04-03T11:37:31Z

src/keys.rs

@@ -208,27 +210,21 @@ impl KeyConfig {
            | KeyCode::BackTab
            | KeyCode::Delete
            | KeyCode::Insert
-            | KeyCode::Esc => {


what changed here?

extrawurst · 2021-04-03T11:38:03Z

src/tabs/revlog.rs

@@ -166,6 +202,160 @@ impl Revlog {
            tags.and_then(|tags| tags.get(&commit).cloned())
        })
    }
+
+    fn get_what_to_filter_by(


this giant method could use some doc and test

extrawurst · 2021-04-03T11:39:54Z

src/components/utils/async_commit_filter.rs

+            Self::get_tags(&filter_strings, &mut self.git_tags)?;
+
+        rayon_core::spawn(move || {
+            // Only 1 thread can filter at a time


we use atomics in the other async bits to limit only one running at a time

extrawurst · 2021-04-03T11:42:14Z

src/components/utils/async_commit_filter.rs

+    ///
+    /// vec [vec![A], vec![B, C, D], vec![E]]
+    #[allow(clippy::too_many_lines)]
+    pub fn filter(


this needs unittesting

extrawurst · 2021-05-18T10:07:45Z

closing in favour of #672

c02y · 2022-04-28T12:57:18Z

I have been using tig for years, now I'm considering switching to lazygit or gitui, don't know which one is better, googled for a while, except for some benchmarks make two years ago, didn't find any useful info, so I tried to use both of them and decide by myself, just try gitui, didn't find a simple search function anywhere, it should be anywhere inside the session like tig or lazygit, so how to can find something in some tab like the list of log?

Sorry, I'm switching to lazygit, or maybe back to tig if I'm not satisfied with lazygit.

WizardOhio24 added 7 commits February 4, 2021 00:11

Add search bar at bottom of revlog

f70b92a

Add esc to escape and fix invisible commit details

2a5d9a8

Remove unused lines

5cc8e7d

Fix revlog

be0c76f

Fix vim keys test

bd5123a

Allow searching to happen live rather than press enter

3414a05

Filter commits in selected_entry

07f4ec1

WizardOhio24 added 2 commits February 4, 2021 12:15

Fix naming

e8a6db5

Remove unused command

95e3a70

extrawurst marked this pull request as draft February 4, 2021 12:17

WizardOhio24 added 2 commits February 4, 2021 12:30

Allow escaping with esc again

709b501

Auto set focus on filter commit to true

b06a716

WizardOhio24 added 8 commits February 4, 2021 13:31

If filtering log get all commits

bfbcc9a

Change set total count to update total count in commitlist

0e671b9

Change key to bring up find commit box to :

1b1c6ee

Don't show char count in find commit component

21904ea

Also filter by author

84ca7d2

Add find commit to log commands

ab8770c

esc on log tab to cancel search

41c121e

Change search back to s

56ef6be

Also update count when not filtering

e6dd94a

Fix h not working in text input

b5fdceb

extrawurst reviewed Feb 4, 2021

View reviewed changes

src/keys.rs Outdated Show resolved Hide resolved

WizardOhio24 added 10 commits February 18, 2021 18:06

Add filter_string to new revlog

6124b9b

Change back to set_total_count in commitlist

4b07b3a

Fix clippy warnings and change while to for in get_ending_bracket

d70cc4f

Fix search by trimming string

2d3cf33

Add brackets round tag filter in async_filter

7b610b3

Add search filter commits to readme

6ab22fa

Remove is_and && from filter

2a99ed5

Remove ALT down to focus on search

c777ef3

Remove comment about getting tags from start_filter

3fe9a33

Remove continue filter comment

dd158e0

WizardOhio24 added 2 commits February 25, 2021 00:42

Merge branch 'master' into find-sha

843ff3b

Fix merge problems

b0ee951

extrawurst force-pushed the master branch 2 times, most recently from 81a8849 to f84f6f4 Compare March 3, 2021 21:27

extrawurst reviewed Apr 3, 2021

View reviewed changes

WizardOhio24 mentioned this pull request Apr 16, 2021

Search commits for message or author #429

Closed

willir mentioned this pull request Apr 25, 2021

Continuation of Add search bar at bottom of revlog #506 #672

Closed

WizardOhio24 mentioned this pull request May 7, 2021

more tag support #483

Closed

WizardOhio24 mentioned this pull request May 18, 2021

Support reword in log tab & refactor external editor calls #312

Closed

extrawurst closed this May 18, 2021

extrawurst mentioned this pull request Mar 14, 2023

View log at git revision #1600

Closed

Rodrigodd mentioned this pull request Jul 9, 2023

Continuation of Continuation of Add search bar at bottom of revlog #506 #672 #1753

Closed

4 tasks

Rodrigodd mentioned this pull request Aug 11, 2023

search/filter commit(s) #1791

Closed

Uh oh!

Add search bar at bottom of revlog #506

Add search bar at bottom of revlog #506

Uh oh!

Conversation

WizardOhio24 commented Feb 4, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Some screenshots

Uh oh!

WizardOhio24 commented Feb 4, 2021

Uh oh!

extrawurst commented Feb 4, 2021

Uh oh!

WizardOhio24 commented Feb 4, 2021

Uh oh!

extrawurst commented Feb 4, 2021

Uh oh!

WizardOhio24 commented Feb 4, 2021

Uh oh!

WizardOhio24 commented Feb 4, 2021

Uh oh!

WizardOhio24 commented Feb 4, 2021

Uh oh!

Uh oh!

extrawurst commented Feb 24, 2021

Uh oh!

extrawurst Apr 3, 2021

Choose a reason for hiding this comment

Uh oh!

WizardOhio24 Apr 16, 2021

Choose a reason for hiding this comment

Uh oh!

extrawurst Apr 16, 2021

Choose a reason for hiding this comment

Uh oh!

extrawurst Apr 3, 2021

Choose a reason for hiding this comment

Uh oh!

extrawurst Apr 3, 2021

Choose a reason for hiding this comment

Uh oh!

extrawurst Apr 3, 2021

Choose a reason for hiding this comment

Uh oh!

extrawurst Apr 3, 2021

Choose a reason for hiding this comment

Uh oh!

extrawurst commented May 18, 2021

Uh oh!

c02y commented Apr 28, 2022

Uh oh!

Uh oh!

WizardOhio24 commented Feb 4, 2021 •

edited

Loading