Always re-render prompt while navigating history

[alexey-milovidov]

See AmokHuginnsson#130

PS.

milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git checkout master
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 13 and 107 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git fetch
From https://github.com/ClickHouse-Extras/replxx
 + 68410ac...f97765d master     -> origin/master  (forced update)
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git reset --hard origin/master
HEAD is now at f97765d Merge pull request #17 from azat-archive/replxx-incremental_history_search-fix-upstream
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git checkout master-old 
Switched to branch 'master-old'
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git reset --hard origin/master
HEAD is now at f97765d Merge pull request #17 from azat-archive/replxx-incremental_history_search-fix-upstream
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git push origin-ssh
Total 0 (delta 0), reused 0 (delta 0)
remote: 
remote: Create a pull request for 'master-old' on GitHub by visiting:
remote:      https://github.com/ClickHouse-Extras/replxx/pull/new/master-old
remote: 
To github.com:ClickHouse-Extras/replxx.git
 * [new branch]      master-old -> master-old
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git fetch [email protected]:AmokHuginnsson/replxx.git master
From github.com:AmokHuginnsson/replxx
 * branch            master     -> FETCH_HEAD
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git reset --hard FETCH_HEAD
HEAD is now at 68410ac Add history_move_{next/prevoius}
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git push --force origin-ssh
Total 0 (delta 0), reused 0 (delta 0)
To github.com:ClickHouse-Extras/replxx.git
 + f97765d...68410ac master -> master (forced update)
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git checkout -b amosbird-rerenderprompt
Switched to a new branch 'amosbird-rerenderprompt'
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git pull [email protected]:amosbird/replxx.git rerenderprompt
remote: Enumerating objects: 9, done.
remote: Counting objects: 100% (9/9), done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 5 (delta 4), reused 5 (delta 4), pack-reused 0
Unpacking objects: 100% (5/5), 1009 bytes | 252.00 KiB/s, done.
From github.com:amosbird/replxx
 * branch            rerenderprompt -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Add history_move_{next/prevoius}
milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git push origin-ssh
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 32 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (16/16), 2.77 KiB | 2.77 MiB/s, done.
Total 16 (delta 13), reused 6 (delta 5)
remote: Resolving deltas: 100% (13/13), completed with 9 local objects.
remote: 
remote: Create a pull request for 'amosbird-rerenderprompt' on GitHub by visiting:
remote:      https://github.com/ClickHouse-Extras/replxx/pull/new/amosbird-rerenderprompt
remote: 
To github.com:ClickHouse-Extras/replxx.git
 * [new branch]      amosbird-rerenderprompt -> amosbird-rerenderprompt

[azat]

milovidov@milovidov-desktop:~/work/ClickHouse/contrib/replxx$ git pull [email protected]:amosbird/replxx.git rerenderprompt
...
From github.com:amosbird/replxx
 * branch            rerenderprompt -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Add history_move_{next/prevoius}

It seems that you have pull.rebase=true and so now history looks a bit odd:

$ git oneline ch/master -4
f019cba (ch/master) Merge pull request #18 from ClickHouse-Extras/amosbird-rerenderprompt
7de81e3 (ch/amosbird-rerenderprompt) Add history_move_{next/prevoius}
453bd9a Always re-render prompt while navigating history
68410ac (HEAD, origin/master, origin/HEAD, master) Add history_move_{next/prevoius}

So 7de81e3 is identical to the original commit 68410ac

[Felixoid]

*   f019cba (HEAD, origin/master, origin/HEAD) Merge pull request #18 from ClickHouse-Extras/amosbird-rerenderprompt
|\  
| * 7de81e3 (origin/amosbird-rerenderprompt) Add history_move_{next/prevoius}
| * 453bd9a Always re-render prompt while navigating history
* | 68410ac Add history_move_{next/prevoius}
|/  
* f1bf1a5 ReplxxImpl: Enable raw mode in `input()` under lock.```

Looks a bit strange, but still does the job.

Not sure though that it's `pull.rebase=true`. I have it too, but I feel like it does the trick in another way around

[alexey-milovidov]

Yes, I did not want rebase, but it's ok nevertheless.