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
2609 commits 22 branches 69 tags 87 MiB
Commit graph

376 commits

Author SHA1 Message Date
Stephan Dilly
2596c8b1e3 fix panic on staging lines involving missing newline eof 2021-04-03 13:19:01 +02:00
Stephan Dilly
0e85896552 fix nightly 2021-03-29 13:08:20 +02:00
Stephan Dilly
dcc01fb80e migrate some more to unicode-truncate crate 2021-03-25 09:43:35 +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
e9b296ac62 add remote name per branch 2021-03-20 17:58:03 +01:00
Stephan Dilly
ae57cf3985 add unittest for inconclusive default remote (#492) 2021-03-20 15:57:48 +01:00
Stephan Dilly
e08f357f57 nightly clippy fix 2021-03-12 13:37:05 +01:00
Stephan Dilly
18c31dc6e0 unittest to make sure rebase merge multiple commits also works 2021-03-12 12:12:14 +01:00
Stephan Dilly
6430484a97 fix detached head after rebase merge 2021-03-12 12:04:37 +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
25198101f2 cleanup 2021-03-10 15:44:42 +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
f1fcd341c6
add support for pushing tags (#569) 2021-03-05 17:49:40 +01:00
Stephan Dilly
51c9085d7c
user confirm merge (#565) 2021-03-03 22:06:41 +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
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
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
Stephan Dilly
c96feb0fe6
branch merge from upstream (#384) 
* better structure of all branch functions
* support and unittest fast forward merge
 2021-02-28 01:55:35 +01:00
Stephan Dilly
8d4c1ca26e
don't close branchlist every time (#550) 
* do not close branchlist after branch rename 
* do not close branchlist after deleting a branch
* closes #543
 2021-02-25 15:54:18 +01:00
Stephan Dilly
59acccc484 split up stuff into new remote mod 2021-02-24 11:32:38 +01:00
Stephan Dilly
a53ec16161
prefer 'origin' as default remote if it exists (#544) 
closes #494
 2021-02-24 11:04:01 +01:00
Stephan Dilly
5cf9986df9
actually commit the temp files for flaky/failing unittest (#535) 
* actually commit the temp files (#534)
* make check for commit id more explicit
* fix last assert checking against wrong id
 2021-02-23 15:04:40 +01:00
Stephan Dilly
5f9f87746e ignore flaky randomly failing test 2021-02-23 12:12:55 +01:00
Richard Menzies
6c974ee1d3
Support force push (#421) 2021-02-23 11:02:16 +01:00
Richard Menzies
301a3a1b87
Fix build (#525) 2021-02-23 10:59:10 +01:00
Stephan Dilly
be3a33e862 fix formating for rust 1.50 2021-02-11 17:56:04 +01:00
Christoph Rüßler
fe0c2f558c
Use get_entry instead of get_str (#269) 2021-02-04 19:22:08 +01:00
Stephan Dilly
02990204e1 fix crash when no remote called 'origin' present (#486) 2021-01-12 16:17:14 +01:00
Stephan Dilly
b63063271d cleanup nightly clippy warnings 2021-01-08 11:55:50 +01:00
Stephan Dilly
2b7d7f467b
Set tracking branch on push (#452) 
set upstream on each push (if not already defined). closes #275
 2020-12-20 16:48:47 +01:00
Stephan Dilly
44ba5a83c9
show branch ahead/behind only if upstream is set (#451) 
closes #385
 2020-12-20 16:01:04 +01:00
Stephan Dilly
7174817777 clippy nightly complaint 2020-12-08 00:51:41 +01:00
pm100
a6bce24d72
fix core-editor ignored (#414) (#419) 2020-12-08 00:18:51 +01:00
Richard Menzies
ac2c0624db Change he and his to they and their 2020-11-14 01:11:23 +01:00
Stephan Dilly
88813381da indicate if branch has an upstream and some cleanup 2020-11-01 19:43:19 +01:00
Stephan Dilly
c4fdbf7aba make sync part of lib expect safe 2020-11-01 12:49:11 +01:00
Stephan Dilly
00073cbdd7 fix hook panicking (#393) 2020-11-01 12:46:59 +01:00
Stephan Dilly
6e6832da21 cleanup one more expect 2020-11-01 12:37:07 +01:00
Stephan Dilly
2dab9de273 cleanup some more expects 2020-11-01 12:16:40 +01:00
Stephan Dilly
632f255548 cleanup some more expects 2020-11-01 02:11:55 +01:00
pm100
99c3277e94
adding pre-commit hook (#386) 
see #313
 2020-11-01 01:06:48 +01:00
Stephan Dilly
4ee4432f16
visualize outgoing/incoming changes (#364) 2020-10-25 17:35:54 +01:00
Stephan Dilly
a2b26c30dc little cleanups 2020-10-25 15:43:13 +01:00
Arnaud
9439114e5f
feat: support https push (#353) 2020-10-25 10:50:20 +01:00
Richard Menzies
71880f96f7
Rename branch (#334) 2020-10-17 09:00:34 +02:00
Richard Menzies
b6c932d0af
Delete branch (#332) 2020-10-11 14:30:44 +02:00
Stephan Dilly
1f55c18945 add unittests for checkout 2020-10-11 13:22:45 +02:00
Stephan Dilly
7e33047232 more idiomatic way 2020-10-11 13:22:45 +02:00
Stephan Dilly
5966c05690 add unittests for get_branches_to_display 2020-10-11 13:22:45 +02:00
Stephan Dilly
06aeca59d2
Branchlist fixes (#320) 
* changelog and some cleanup
 2020-10-10 01:43:57 +02:00
Richard Menzies
94bbf3c9fb
Branch popup (#303) 
closes #91
 2020-10-10 01:27:13 +02:00
Eduardo Flores
2434af55bd Handled crash when git2 failed to obtain username from URL 
Fixed formatting errors
 2020-10-05 10:05:17 +02:00
Stephan Dilly
a8eb68357b more logging 2020-09-07 22:15:26 +02:00
Stephan Dilly
d9e20c802d support more remote callbacks 2020-09-07 22:08:36 +02:00
Stephan Dilly
ad7490c4fe more logging 2020-09-07 21:44:42 +02:00
Stephan Dilly
26565e9021 test fetch 2020-09-07 21:44:42 +02:00
Stephan Dilly
de80601bf4
Push progress 
closes #267
 2020-09-06 17:48:14 +02:00
Stephan Dilly
17de5a900c
Test push progress (#272) 2020-09-04 09:08:29 +02:00
Stephan Dilly
7d1e3643b1
support push to origin (#266) 
* use  vendored ssl
 2020-09-02 02:08:41 +02:00
Stephan Dilly
4907e8b727
new 'create branch' popup (#254) 
closes #253
 2020-08-29 14:15:06 +02:00
Stephan Dilly
726928b7ba fix logging 2020-08-28 23:54:45 +02:00
Stephan Dilly
2401293b66
Rust1.46 and nightly ci (#246) 2020-08-28 10:52:24 +02:00
Stephan Dilly
80da95b6f5 cleanup commit message line encodings to fix rendering commit msg (closes #245) 2020-08-27 01:10:38 +02:00
Stephan Dilly
4f2e20ea1b changelog update 2020-08-18 21:48:59 +02:00
dr-BEat
ce8d79855d Fix Command::new behaviour on windows 2020-08-18 21:28:55 +02:00
Christoph Rüßler
1a90fd365f Add scrolling to commit message in details 
- Manually wrap commit message using `textwrap`

Closes #181
 2020-08-08 19:42:02 +02:00
Stephan Dilly
f83228548b use new tag_foreach api 2020-07-22 01:54:22 +02:00
Stephan Dilly
6c798df40a fix different way of internal git represenation of tags to work (closes #206) 2020-07-20 23:40:02 +02:00
Stephan Dilly
0dd50b402e upgrade to rust 1.45 and fix new clippy warnings 2020-07-17 11:54:12 +02:00
Christoph Rüßler
70423c5b83 Add command for tagging commit 2020-07-15 23:22:03 +02:00
Stephan Dilly
1afa91b144 show tags in commit details popup (closes #193) 2020-07-12 14:38:38 +02:00
Stephan Dilly
315cf615e0
Async tag fetching (#195) 2020-07-12 13:21:34 +02:00
Stephan Dilly
a84ae0950c add_to_ignore failed on files without a newline at EOF (closes #191) 2020-07-10 11:25:00 +02:00
Stephan Dilly
cbd75110b7 add error handling on potential error in ignore (#191) 2020-07-10 09:08:36 +02:00
Stephan Dilly
fc142b4604 fix crashes in revlog with utf8 commit messages (closes #188) 2020-07-10 08:55:43 +02:00
Stephan Dilly
4f731f6acc fix opening relative paths in external edtiro (closes #184) 2020-07-09 17:47:38 +02:00
Stephan Dilly
0f13ecc54e inline 2020-07-09 09:20:59 +02:00
Stephan Dilly
cb3b968e3a fix cutting commit msg in between utf8 clusters (#188) 2020-07-09 08:51:31 +02:00
Stephan Dilly
26f734c57d fixed bin file size diff on untracked files (closes #171) 2020-07-07 09:42:34 +02:00
Stephan Dilly
02bd22d3b3 fix crash diffing stash created on cmd line (closes #178) 2020-07-07 09:10:10 +02:00
Stephan Dilly
a33db8d3de cache branchname lookup (closes #159) 2020-07-04 18:12:54 +02:00
Stephan Dilly
a34bab22fa show untracked files in stash commit details (closes #130) 2020-07-02 12:55:17 +02:00
Stephan Dilly
e803cb3afe unneeded clones 2020-07-02 12:24:02 +02:00
Mehran Kordi
ea244b8cfa fixed issue with utracked files. 2020-07-02 11:58:11 +02:00
Stephan Dilly
fb6cdb92ea fix whitespace at commit-msg start breaking revlog alignment (closes #158) 2020-06-29 19:48:39 +02:00
Stephan Dilly
18c4d872d3 more debug logging 2020-06-29 16:03:35 +02:00
Stephan
738cf3fab4 try speeding up status (see #156) 2020-06-29 14:11:23 +02:00
Stephan
4a442f3829 cleanup use 2020-06-29 12:30:10 +02:00
Stephan Dilly
80f98d6b6d move commit into its own mod 
# Conflicts:
#	asyncgit/src/sync/utils.rs
 2020-06-29 09:47:54 +02:00
Stephan Dilly
c856c23aef remove outdated commit method 2020-06-29 09:46:38 +02:00
Stephan Dilly
97560564c9 run hooks from workdir and not from current dir (closes #151) 2020-06-25 08:14:43 +02:00
Stephan Dilly
b66d385a8f sort order 2020-06-25 07:47:10 +02:00
Stephan Dilly
1028a51652 fix invalid utf8 in commit msg also for commit details (see #150) 2020-06-24 16:08:46 +02:00
Stephan Dilly
fab5b6ea47 display lossy commit msg when containing invalid utf8 (closes #150) 2020-06-24 10:11:27 +02:00
Stephan Dilly
b01f716677 fix diff of commit not returning binary size 2020-06-22 22:03:45 +02:00
Stephan Dilly
76e52cc7a2 show file size diff for binary files (#141) 2020-06-22 20:01:04 +02:00
Stephan Dilly
19db19b010 add test for untracked files in stash bug (#130) 2020-06-15 23:40:09 +02:00
Stephan Dilly
d67a240bc7 fix reset hunk in untracked file 2020-06-14 23:34:54 +02:00
Stephan Dilly
dfe284a45b some cleanup 2020-06-14 11:27:23 +02:00
Stephan Dilly
24da2f200e
Reset individual hunks (#125) 
closes #11
 2020-06-14 10:46:25 +02:00
Stephan Dilly
5185f1c4d4 support commit amend (#89) 2020-06-13 01:50:39 +02:00
Stephan Dilly
63e449fca9 indicate what branch we are on (closes #115) 2020-06-12 22:37:53 +02:00
Stephan Dilly
43905cfa6b cleanup TODO 2020-06-12 15:04:52 +02:00
Stephan Dilly
6ebe717fb1 remove some duplication in reset 2020-06-12 14:41:37 +02:00
Stephan Dilly
fdd84a8692 add test for (#118) 2020-06-12 13:17:06 +02:00
Stephan Dilly
9301574624 fix reset file when running gitui in subfolder (closes #118) 2020-06-12 11:46:45 +02:00
Stephan Dilly
702415c40d
full commit detail popup (#113) 
see #80
 2020-06-09 13:30:17 +02:00
Stephan Dilly
5bfdb40a14
commit details in log (#107) 2020-06-06 19:24:48 +02:00
Stephan Dilly
bec1fb939a show error instead of app close when staging fails (#108) 
update changelog
 2020-06-04 00:02:32 +02:00
Stephan Dilly
dbd7dd33ea support Stage all/Unstage all (closes #82) 2020-06-02 16:01:54 +02:00
Stephan Dilly
14a93cbefd support adding file/folder to gitignore (closes #44) 2020-06-01 23:32:11 +02:00
Stephan Dilly
8643844913 expressive error msg when run in bare repo (closes #100) 2020-05-30 13:05:11 +02:00
Stephan Dilly
732690da1d improve performance on diffing giant files (#96) 2020-05-29 09:44:11 +02:00
Stephan Dilly
63d3bf5661 Support stash-apply,stash-drop 2020-05-25 16:16:49 +02:00
Stephan Dilly
38413d069e consistent log:: usage 2020-05-23 23:31:15 +02:00
Stephan Dilly
ad092823ff deny panics 2020-05-23 17:17:39 +02:00
Stephan Dilly
e271defc63 cleanup 2020-05-22 14:45:24 +02:00
Stephan Dilly
3c5e86eee9
stashing support (#70) 2020-05-21 15:46:38 +02:00
Stephan Dilly
1c03458de7 merge uses 2020-05-19 23:11:28 +02:00
Stephan Dilly
8b096fb9e1
support multiple tags per commit (#62) 
* support multiple tags per commit
* update changelog
* make sure clippy works in CI
 2020-05-16 20:14:27 +02:00
Mehran Kordi
19a0cb2db6
Implement git hook support on windows 
closes #14
 2020-05-16 19:08:44 +02:00
Stephan Dilly
a5d5b3b916 allow longer messages in log view 2020-05-15 18:55:18 +02:00
Stephan Dilly
f8294dcb7b cleanup some result return types 2020-05-15 18:23:07 +02:00
Mehran Kordi
03505b9eb6
Replace unwrap calls in asyncgit with error handling - closes #53 2020-05-15 15:15:26 +02:00
Stephan Dilly
16aa6f7c50 support showing tags in log, speed up log by cloning less (#47) 2020-05-10 14:23:24 +02:00
Stephan Dilly
f3a67e878f dont show weird 'no text file' when diffing binary 
cleanup
 2020-05-07 17:00:17 +02:00
Stephan Dilly
871f2cf2c3 commit error handling 2020-05-05 13:54:43 +02:00
Stephan Dilly
1db1f00302
Log view (#41) 2020-05-05 13:47:21 +02:00
Stephan Dilly
4df7704ef5 clippy fixes 2020-05-02 16:58:13 +02:00
Stephan Dilly
7407d46557 fix diff binary file once more 2020-05-02 14:13:01 +02:00
Stephan Dilly
c0b48b8a51 fix "file not found" diff on binary files 2020-05-02 13:13:16 +02:00
Stephan Dilly
d48fdd2774 fix folder indenting when a file starting exactly like the folder exists next to it 2020-04-28 17:55:08 +02:00
Stephan Dilly
513486af9c cleanup tests 2020-04-28 15:43:11 +02:00
Stephan Dilly
1ca04496cb Add folder actions unstage/stage/reset 2020-04-28 15:43:11 +02:00
Stephan Dilly
b0fdf5049c
Switch to a tree view for changed files list (#37) 2020-04-28 11:15:05 +02:00
Stephan Dilly
53e4533c74 fix diff of newfile when cwd in subdir (fixes #25) 2020-04-18 18:53:15 +02:00
Stephan Dilly
73c650174f fix staging removed files (fixes #24) 2020-04-18 11:25:03 +02:00
Stephan Dilly
6fa620eccd more docs 2020-04-17 23:11:48 +02:00
Stephan Dilly
75b729cca9 improve stage_add performance by simplification 2020-04-17 15:53:13 +02:00
Stephan Dilly
90f29a0b60 added tests 2020-04-17 15:43:42 +02:00
Stephan Dilly
d2d69063e3 cleanup 2020-04-09 12:05:42 +02:00
Stephan Dilly
b9ac1865db support altering commit-msg on ok hook 2020-04-09 11:13:02 +02:00
Stephan Dilly
f144d97e0c fix debug state ment leftover 2020-04-09 09:36:10 +02:00
Stephan Dilly
36ff0be9d1
support hooks: post-commit,commit-msg (#15) 
* support hooks: post-commit and commit-msg
* some unittests
* exclude tests on windows for now
 2020-04-09 09:23:59 +02:00
Stephan Dilly
387b8748b1 better naming 2020-04-08 00:21:08 +02:00
Stephan Dilly
b71f39fbb3 Support stage/unstage hunk 2020-04-08 00:21:08 +02:00
Stephan Dilly
f74d41a445 fix committing in empty repo 2020-04-05 19:50:11 +02:00
Stephan Dilly
b4f10c06ac fix crash when unstaging file in empty repo 2020-04-05 19:30:59 +02:00
Stephan Dilly
6392778c09 fix one crash on empty repo (diffing) 2020-04-05 18:43:52 +02:00
Stephan Dilly
0657da58db unittest for commiting 2020-04-05 15:39:02 +02:00
Stephan Dilly
e51609ed91 fix crash running outside of git repo 2020-04-03 23:32:17 +02:00
Stephan Dilly
73e9029df4
simplify reset_workdir (#6) 2020-03-30 19:25:52 +02:00
Stephan Dilly
8d1cc3eec6 test resetting workdir part of untracked stages file 2020-03-29 16:03:35 +02:00
Stephan Dilly
9cfc4a549a remove dbg 2020-03-28 21:03:54 +01:00
Stephan Dilly
aea8725d1a reset: simply delete files if they are new/untracked 2020-03-28 21:03:32 +01:00
Stephan Dilly
99fc7a7b32 fix test 2020-03-28 19:47:25 +01:00
Stephan Dilly
6ca1eb05e8 fix crash on broken symlinks 2020-03-28 19:23:48 +01:00
Stephan Dilly
41a52cfc8c more clean solution that does not need git cli 
* make test run in parallel again
* better test structure
 2020-03-28 13:45:19 +01:00
Stephan Dilly
96b739c977 remove debug statement 2020-03-27 23:16:17 +01:00
Stephan Dilly
16d0ae4b8f fix path quotation marks 2020-03-27 23:09:07 +01:00
Stephan Dilly
edce2dec12 fix clippy 2020-03-27 23:01:00 +01:00
Stephan Dilly
4fa90bfc40 diagnose win test error 2020-03-27 22:46:25 +01:00
Stephan Dilly
c455f3e316 fix working dir checkout (revert) 2020-03-27 22:10:56 +01:00
Stephan Dilly
b1f8914cba clamp scroll position to valid range 2020-03-27 09:49:57 +01:00
Stephan Dilly
8e7d2eb4a1 fix more clippy 2020-03-27 01:11:15 +01:00
Stephan Dilly
37da79233a fix tons of clippy warnings 2020-03-26 23:45:52 +01:00
Stephan Dilly
a60c3b2eb0 fetch file diff based on hunks 2020-03-25 23:47:39 +01:00
Stephan Dilly
96b2b30052 forbid unsafe/undoc'd 2020-03-24 22:21:53 +01:00
Stephan Dilly
79284469e3 fix diff of untracked file in sub dir 2020-03-24 18:02:58 +01:00
Stephan Dilly
cf4c4721dc suport resetting untracked files 2020-03-24 09:55:51 +01:00
Stephan Dilly
b380d0964a cleanup 2020-03-23 13:56:54 +01:00
Stephan Dilly
4730a8f498 show diff of new untracked files 2020-03-23 13:55:59 +01:00
Stephan Dilly
4fdf09fc56 make git status fetching async 2020-03-23 11:42:50 +01:00
Stephan Dilly
b0b9fb570d better asyncgit crate structure 2020-03-23 00:50:55 +01:00