Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-24 09:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1179 commits 22 branches 69 tags 87 MiB
Commit graph

527 commits

Author SHA1 Message Date
Stephan Dilly
a3f7d189e5
Fix 663 msg scroll (#669) 
* fix line skipping and added unittest
 2021-04-25 14:09:53 +02:00
Christoph Rüßler
26fbc8650f Add async wrapper to blame 
- Rename `self.path` to `self.file_path`.
- Take into account that `draw_scrollbar` subtracts the area’s height
  before calculating the scrollbar’s position.
- Show in title if blame is pending.
 2021-04-25 13:35:34 +02:00
Stephan Dilly
ea1415461f add todo 2021-04-24 15:52:21 +02:00
Stephan Dilly
d50e17b353 give blame a more apropriate place in command list 2021-04-24 15:40:16 +02:00
Christoph Rüßler
e7b703b922 Improve blame view 
- Set default shortcut to `B` instead of `b` because the latter would
  shadow `[b]ranches`.
- Add scrollbar.
- Show resolved commit id in title instead of `HEAD`.
- Make commit id bold if it is the commit id the file is blamed at.
- Don’t run blame on a binary file.
- Add shortcut for inspecting a commit in blame view.
 2021-04-24 14:02:51 +02:00
Christoph Rüßler
8030022303 Address minor issues in blame view 2021-04-22 09:17:42 +02:00
Christoph Rüßler
b7eed4361e Add blame view 
This closes #484.
 2021-04-21 15:03:37 +02:00
Stephan Dilly
f0a367c3f5
more linting (#647) 2021-04-17 23:17:19 +02:00
Stephan Dilly
53b2c79877
even more clippy restrtictions (#646) 
* even more clippy restrtictions
 2021-04-17 18:55:59 +02:00
Stephan Dilly
f7a17fa3bb fix empty branch list enter key still accepted and panics 2021-04-14 22:08:36 +02:00
Stephan Dilly
b0b37a84e4 cleanup cargo deplyment 2021-04-11 23:06:39 +02:00
Stephan Dilly
6274777eed
simplify toggling remote/local via tabs (and tab key) (#635) 
* simplify toggling remote/local via tabs (and tab key)
 2021-04-11 22:45:10 +02:00
Stephan Dilly
b546900e8f
Fix 623 head remote (#631) 2021-04-11 18:08:12 +02:00
Stephan Dilly
50d863aa1c update changelog 2021-04-11 13:21:24 +02:00
brunohgouveia
79a38a70b9 Add pop stash command on Staches tab 2021-04-11 13:17:26 +02:00
Stephan Dilly
0a608ae65e
Fix 624 pull offline (#625) 
* fix pull being blocked if it fails
* update changelog
 2021-04-07 10:57:03 +02:00
Stephan Dilly
6f722b4806 fix branchname width misalignment 2021-04-06 18:51:24 +02:00
Stephan Dilly
b5f1e76455
Remote branches (#618) 
* allow checking out remote branch
* set tracking branch on checking out remote
* fix unittests by making branch list stable sorted by name
 2021-04-06 18:16:08 +02:00
Stephan Dilly
2e5b344c04
branchlist was ignoring unicode boundaries on truncating strings (#603) 
* branchlist was ignoring unicode boundaries on truncating strings (fixes #602)
 2021-03-24 11:16:01 +01:00
Benedikt Terhechte
656561e3eb
Add g to toggle between staging and workdir (workarea) (#595) 
closes #594
 2021-03-21 18:37:53 +01:00
Stephan Dilly
a2ca58a3f6
use branches upstream remote if it is already tracked (#598) 
closes #597
 2021-03-20 18:47:53 +01:00
Stephan Dilly
f69ab5e719 fix nightly clippy 2021-03-15 11:11:20 +01:00
Stephan Dilly
37415259b1 cleanup commands in status/diff (closes #572) 2021-03-14 12:33:55 +01:00
Stephan Dilly
7d4b79606c
smarter config loading giving more diagnostics to the user about whats going wrong (#589) 2021-03-14 00:25:30 +01:00
Stephan Dilly
52bf018515 rename new key 2021-03-13 20:36:48 +01:00
Stephan Dilly
39442ba6c2
Fix 586 deadlock pull creds (#587) 
* fix deadlock when closing credentials input without completing
* fix same deadlock in push/push-tags
 2021-03-13 20:31:32 +01:00
Stephan Dilly
7937b80483
Fix 583 fix diff line selection (#585) 
Preserve line selection after staging/unstaging/discard (closes #583)
 2021-03-12 23:57:31 +01:00
Stephan Dilly
bfa240115c
support rebase merge (conflict free only) (#567) 2021-03-11 11:49:04 +01:00
Stephan Dilly
b5ef9b10f1
Stage/unstage lines (#575) 2021-03-10 22:27:02 +01:00
Stephan Dilly
c79b3d74fa
Fix 576 stash apply conflicts (#578) 
* unittest that applying with conflicts errors out and prepare for stash apply to allow creating conflicts for later
* mark conflicting items
 2021-03-09 14:14:16 +01:00
Stephan Dilly
6e5db96c19
support discard selected lines (#571) 2021-03-08 18:00:30 +01:00
Stephan Dilly
dcfdc42003 cleanup 2021-03-08 01:51:55 +01:00
Stephan Dilly
f1fcd341c6
add support for pushing tags (#569) 2021-03-05 17:49:40 +01:00
Stephan Dilly
0d9a973e79 fix pull popup not closing after nothing arrived 2021-03-04 16:08:23 +01:00
Stephan Dilly
51c9085d7c
user confirm merge (#565) 2021-03-03 22:06:41 +01:00
Stephan Dilly
36c124f9e3
refresh compare state at the right time (#564) 2021-03-03 18:40:00 +01:00
Stephan Dilly
1714fbad49
support conflict-free merge-commit (#561) 
* support conflict-free merge-commit
 2021-03-02 12:49:12 +01:00
Stephan Dilly
bead96db08 workaround for rust nightly clippy bug 2021-03-02 09:23:34 +01:00
Stephan Dilly
7de5265d5d clippy fixes 2021-03-02 00:21:16 +01:00
Stephan Dilly
4126de0ec7 rename 2021-03-01 14:36:09 +01:00
Stephan Dilly
26d63a37a0 show progress in spinner when push/pull is ongoing 2021-03-01 14:35:37 +01:00
Stephan Dilly
ee9ae4b2fd
changelog update (#556) 
+ small renaming
 2021-03-01 14:20:47 +01:00
Stephan Dilly
4d4761ed21
fix fetch notifications (#555) 
* fix fetch notifications
* actually show fetch transfer progress
* reduce sleep because it significantly slows down fetching
 2021-03-01 12:32:39 +01:00
Stephan Dilly
dfa4d7789d
only even try to ff merge when there is something incoming (#554) 
* Update pull.rs
 2021-03-01 11:10:25 +01:00
Stephan Dilly
102b0b31fb file rename 2021-03-01 09:51:15 +01:00
Stephan Dilly
a8690e6e24 rename 2021-03-01 09:49:17 +01:00
Stephan Dilly
67f3a13716
only show non-clean repo states (#553) 
* only show repo state if not clean
 2021-03-01 00:12:09 +01:00
Stephan Dilly
97f88a2f2f rename 2021-02-28 19:34:45 +01:00
Stephan Dilly
bd54b47d19 rename fetch to pull 2021-02-28 19:25:16 +01:00
Stephan Dilly
39fb65b396
Async fetch (#552) 
* async fetch
* reuse remote progress for fetch
* prvent push/fetch popup from closing too soon
 2021-02-28 19:24:05 +01:00