[Search git status] preview changed files #237

NextAlone · 2022-05-10T09:48:04Z

Add a preview for the changed file

PatrickF1 · 2022-05-10T18:08:27Z

Haven't tried out your code yet but there's already been two PRs for this that I didn't accept (yet) because I want something very specific for it. #138

I want the preview to show both the staged and non-staged changes.

NextAlone · 2022-05-10T18:27:24Z

Haven't tried out your code yet but there's already been two PRs for this that I didn't accept (yet) because I want something very specific for it. #138

I want the preview to show both the staged and non-staged changes.

Just noticed that there were PRs here.

PatrickF1 · 2022-05-10T19:21:16Z

Don't let the fact the other two PRs didn't get merged discourage you. It was more because the authors lost interest than this feature being impossible to work on (I hope).
If you can make the preview show both the staged and working directory diffs against HEAD, then I am happy to merge.
Two potential solutions:

run git diff and git diff —index separately and append them to a single file, then cat it
https://stackoverflow.com/questions/67150991/show-both-worktree-and-index-changes-for-a-single-path-in-git
use git status vv

NextAlone · 2022-05-10T19:30:06Z

Don't let the fact the other two PRs didn't get merged discourage you. It was more because the authors lost interest than this feature being impossible to work on (I hope).
If you can make the preview show both the staged and working directory diffs against HEAD, then I am happy to merge.
Two potential solutions:

run git diff and git diff —index separately and append them to a single file, then cat it
https://stackoverflow.com/questions/67150991/show-both-worktree-and-index-changes-for-a-single-path-in-git

use git status vv

Ok, i will check these two.

NextAlone · 2022-05-11T07:57:04Z

Don't let the fact the other two PRs didn't get merged discourage you. It was more because the authors lost interest than this feature being impossible to work on (I hope). If you can make the preview show both the staged and working directory diffs against HEAD, then I am happy to merge. Two potential solutions:

run git diff and git diff —index separately and append them to a single file, then cat it
https://stackoverflow.com/questions/67150991/show-both-worktree-and-index-changes-for-a-single-path-in-git

use git status vv

Are you talking about being displayed together or separately?

NextAlone · 2022-05-11T08:52:24Z

How about this?

It preview untracked files/dirs as ordinary files/dirs, and diff new file with /dev/null, the others diff with HEAD.

if string match -r '\?\?' {1} > /dev/null
    _fzf_preview_file {2..}
else if string match -r 'A' {1} > /dev/null
    git diff --color=always -- /dev/null {2..}
else
    git diff --color=always HEAD -- {2..}
end

Or split cached and uncached changes.

...
else 
    echo 'Unstaged'
    git diff --color=always HEAD -- {2..}
    echo -e '\nStaged'
    git diff --color=always --cached HEAD -- {2..}
end

PatrickF1 · 2022-05-11T16:05:57Z

Are you talking about being displayed together or separately?

If there are both staged and working tree changes, I want the preview to show both.

Yeah the second one is along the lines of what I'm thinking. I guess you don't need the intermediate file to store them huh?

NextAlone · 2022-05-11T16:45:34Z

Are you talking about being displayed together or separately?

If there are both staged and working tree changes, I want the preview to show both.

Yeah the second one is along the lines of what I'm thinking. I guess you don't need the intermediate file to store them huh?

Yes, no intermediate file, and add check with status (just simply string match, don't know other convenient way)?

if string match -r '\?\?' {1} > /dev/null
    _fzf_preview_file {2..}
else if string match -r 'A' {1} > /dev/null
    git diff --color=always -- /dev/null {2..}
else 
    if string match -r '\S\s\S' > /dev/null
        echo -e (set_color red)Unstaged
        echo
        git diff --color=always HEAD -- {2..}
        echo
    end
    if string match -r '\s\s|\S\S\s' > /dev/null
        echo (set_color green)Staged
        echo
        git diff --color=always --cached HEAD -- {2..}
    end
end

NextAlone · 2022-05-11T16:53:11Z

 X          Y     Meaning
 -------------------------------------------------
          [AMD]   not updated
 M        [ MTD]  updated in index
 T        [ MTD]  type changed in index
 A        [ MTD]  added to index
 D                deleted from index
 R        [ MTD]  renamed in index
 C        [ MTD]  copied in index
 [MTARC]          index and work tree matches
 [ MTARC]    M    work tree changed since index
 [ MTARC]    T    type changed in work tree since index
 [ MTARC]    D    deleted in work tree
             R    renamed in work tree
             C    copied in work tree
 -------------------------------------------------
 D           D    unmerged, both deleted
 A           U    unmerged, added by us
 U           D    unmerged, deleted by them
 U           A    unmerged, added by them
 D           U    unmerged, deleted by us
 A           A    unmerged, both added
 U           U    unmerged, both modified
 -------------------------------------------------
 ?           ?    untracked
 !           !    ignored
 -------------------------------------------------

Not works with R(renamed), C(copied), T(type changed), and unmerged status. i will find out the way.

NextAlone · 2022-05-13T19:37:29Z

Are you talking about being displayed together or separately?

If there are both staged and working tree changes, I want the preview to show both.
Yeah the second one is along the lines of what I'm thinking. I guess you don't need the intermediate file to store them huh?

Yes, no intermediate file, and add check with status (just simply string match, don't know other convenient way)?
if string match -r '\?\?' {1} > /dev/null
    _fzf_preview_file {2..}
else if string match -r 'A' {1} > /dev/null
    git diff --color=always -- /dev/null {2..}
else 
    if string match -r '\S\s\S' > /dev/null
        echo -e (set_color red)Unstaged
        echo
        git diff --color=always HEAD -- {2..}
        echo
    end
    if string match -r '\s\s|\S\S\s' > /dev/null
        echo (set_color green)Staged
        echo
        git diff --color=always --cached HEAD -- {2..}
    end
end

maybe this is enough to preview

functions/_fzf_search_git_status.fish

PatrickF1

thanks for the great work so far!

functions/_fzf_preview_status.fish

functions/_fzf_preview_changed_file.fish

PatrickF1 · 2022-05-15T05:26:29Z

functions/_fzf_preview_changed_file.fish

+            git diff --color=always -- $path
+            echo
+        end
+        if string match -r '\S\s\s\S|\S\S\s\S' $argv >/dev/null


sorry I know you tried to explain what you were doing but I'm still confused about this regex and the one above

Maybe ^\S also works.

NextAlone · 2022-05-15T08:43:47Z

No need to split ^A, it works with staged file

PatrickF1 · 2022-05-17T16:54:18Z

Thanks for the updates. This week is really busy so it'll be a while before I can come back to review but just letting you know I won't forget about this

NextAlone · 2022-05-17T22:29:10Z

Thanks for the updates. This week is really busy so it'll be a while before I can come back to review but just letting you know I won't forget about this

It doesn't matter, I will always be here.

NextAlone · 2022-05-17T22:29:11Z

Thanks for the updates. This week is really busy so it'll be a while before I can come back to review but just letting you know I won't forget about this

It doesn't matter, I will always be here.

PatrickF1 · 2022-06-01T17:31:45Z

Don't worry I haven't forgotten about this, just thinking through what is the best way to make this feature simple and easy to use!

PatrickF1 · 2022-06-06T03:36:33Z

functions/_fzf_preview_changed_file.fish

@@ -0,0 +1,20 @@
+function _fzf_preview_changed_file
+    set -l path (string split ' ' $argv)[-1]
+    if string match -r '^\?\?' $argv --quiet


Hi, I'm back! I've found a great way to extract the symbols without using regex--you can use git status --porcelain. Can you update the code to use that instead? Afterwards, we'll be very close to merging

I didn't quite understand it and didn't find its use effect

Try using version 1 porcelain and qualifying the file path. The status it displays is much easier to parse because it's at the very beginning of the line. Then you can use substring instead of playing with unreadable regexes.

but it still needs to regex with prefix to detect file status

What I'd strongly prefer to see is something like this pattern

set file_status (command to grab the two letters of the file status) if test file_status[0] = "A"

I think this'll be much more readable. Right now I still don't exactly know what your regexes are matching.

What I'd strongly prefer to see is something like this pattern

set file_status (command to grab the two letters of the file status) if test file_status[0] = "A"

I think this'll be much more readable. Right now I still don't exactly know what your regexes are matching.

--porcelain no diff to -s

What I'd strongly prefer to see is something like this pattern

set file_status (command to grab the two letters of the file status) if test file_status[0] = "A"

I think this'll be much more readable. Right now I still don't exactly know what your regexes are matching.

git status shows with two character, when first not null, it means staged changes, while second, the unstaged.

So, \S\s\S means unstaged and ^\S means staged

Got it, I get it now, thanks! I am fine with the logic as it is then.

NextAlone · 2022-06-13T01:57:39Z

And if there any other changes request？

PatrickF1 · 2022-06-13T04:57:43Z

Nope, I'll take it from here and merge soon :)

PatrickF1 · 2022-06-13T05:03:46Z

Thanks for working on this and especially our patience @NextAlone! Really appreciate it. You are the third person to try to PR this change in and it seems third time's the charm. Sorry I've been so busy.

NextAlone · 2022-06-13T05:05:52Z

Thanks for working on this and especially our patience @NextAlone! Really appreciate it. You are the third person to try to PR this change in and it seems third time's the charm. Sorry I've been so busy.

Also thanks for your work, this is such a wonderful plugin.

NextAlone · 2022-06-13T05:05:53Z

Thanks for working on this and especially our patience @NextAlone! Really appreciate it. You are the third person to try to PR this change in and it seems third time's the charm. Sorry I've been so busy.

Also thanks for your work, this is such a wonderful plugin.

davidnanry · 2022-06-13T18:46:59Z

Thank you both! This is an excellent addition to an excellent plugin

NextAlone · 2022-06-13T18:52:36Z

@PatrickF1 And it is time to update Modified paths section in Readme.

PatrickF1 · 2022-06-13T19:00:31Z

I did update it. I'll add a gif later. Or did you mean something else?

NextAlone · 2022-06-13T19:01:38Z

I did update it. I'll add a gif later. Or did you mean something else?

Just the gif，thanks for your work.

NextAlone added 2 commits May 10, 2022 17:47

feat: add git status preview

8554f80

fix: multi state of changes

395f2da

PatrickF1 reviewed May 13, 2022

View reviewed changes

functions/_fzf_search_git_status.fish Outdated Show resolved Hide resolved

fix: extract _fzf_preview_status

189a465

NextAlone requested a review from PatrickF1 May 13, 2022 21:44

NextAlone added 2 commits May 14, 2022 05:46

fix: regex

71554d8

fix: indent

57927e9

PatrickF1 reviewed May 13, 2022

View reviewed changes

functions/_fzf_preview_status.fish Outdated Show resolved Hide resolved

functions/_fzf_preview_status.fish Outdated Show resolved Hide resolved

refactor: rename to _fzf_preview_changed_file

1b10b77

PatrickF1 reviewed May 15, 2022

View reviewed changes

functions/_fzf_preview_changed_file.fish Show resolved Hide resolved

PatrickF1 reviewed May 15, 2022

View reviewed changes

functions/_fzf_preview_changed_file.fish Outdated Show resolved Hide resolved

PatrickF1 reviewed May 15, 2022

View reviewed changes

functions/_fzf_preview_changed_file.fish Outdated Show resolved Hide resolved

PatrickF1 reviewed May 15, 2022

View reviewed changes

NextAlone added 2 commits May 15, 2022 16:35

fix: use --quiet

228ce90

refactor: simplify regex

204a821

fix: change helper desc

d1bc38e

PatrickF1 changed the title ~~feat: add git status preview~~ [Search git status] preview changed files May 22, 2022

PatrickF1 reviewed Jun 6, 2022

View reviewed changes

PatrickF1 added 2 commits June 12, 2022 19:05

update readme, make markers more readable, add comments

2c2fc22

remove extra echo

98f19ec

grammar

81de478

PatrickF1 merged commit 6d8e962 into PatrickF1:main Jun 13, 2022

This was referenced Jun 13, 2022

Add git diff preview to Modified paths function #138

Closed

Show diff or file content in fzf_search_git_status #124

Closed

[Search git status] preview changed files #237

[Search git status] preview changed files #237

Conversation

NextAlone commented May 10, 2022 • edited by PatrickF1 Loading

PatrickF1 commented May 10, 2022

NextAlone commented May 10, 2022

PatrickF1 commented May 10, 2022

NextAlone commented May 10, 2022

NextAlone commented May 11, 2022

NextAlone commented May 11, 2022 • edited Loading

PatrickF1 commented May 11, 2022

NextAlone commented May 11, 2022

NextAlone commented May 11, 2022

NextAlone commented May 13, 2022

PatrickF1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NextAlone commented May 15, 2022

PatrickF1 commented May 17, 2022

NextAlone commented May 17, 2022

NextAlone commented May 17, 2022

PatrickF1 commented Jun 1, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PatrickF1 Jun 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NextAlone commented Jun 13, 2022

PatrickF1 commented Jun 13, 2022

PatrickF1 commented Jun 13, 2022

NextAlone commented Jun 13, 2022

NextAlone commented Jun 13, 2022

davidnanry commented Jun 13, 2022

NextAlone commented Jun 13, 2022

PatrickF1 commented Jun 13, 2022

NextAlone commented Jun 13, 2022

NextAlone commented May 10, 2022 •

edited by PatrickF1

Loading

NextAlone commented May 11, 2022 •

edited

Loading

PatrickF1 Jun 7, 2022 •

edited

Loading