extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-11-27 10:15:07 +03:00
Code Issues Projects Releases Wiki Activity
1,780 Commits 13 Branches 61 Tags 91 MiB
425e9f091c
Commit Graph

415 Commits

Author SHA1 Message Date
Christoph Rüßler
f132722272 Add filter to LogWalker 
This is the first step towards adding a file history view. The filter
itself is not related to files specifically, though. It could also be
used for different purposes.
 2021-06-14 00:18:10 +02:00
Stephan Dilly
850a930053 some cleanup and changelog 2021-06-12 22:41:10 +02:00
Christoph Rüßler
0fa3e0f5a8 Show symbol if tag is not yet pushed 
This partly addresses #742.
 2021-06-12 22:35:57 +02:00
Stephan Dilly
8032c35902 refactor better name 2021-06-07 23:04:07 +02:00
Emil Jaszczuk
b2b5a0faa0
Add undo_last_commit command (#769) 
closes #758
 2021-06-07 16:46:45 +02:00
Stephan Dilly
12b90715f9
fix openssl vendoring with new resolver (#775) 
* run otool in ci
* pin openssl-sys with 'vendored' feature
 2021-06-07 14:58:49 +02:00
Stephan Dilly
4c5fe630fc version bumps 2021-06-06 10:15:28 +02:00
Stephan Dilly
5b07c48234 nightly clippy fixes 2021-06-05 10:28:18 +02:00
Stephan Dilly
6006e7aebd use new custom logwalker 2021-06-04 09:55:19 +02:00
Stephan Dilly
e8c2dc25d4 simplify log walker 2021-06-03 23:55:30 +02:00
Stephan Dilly
3adcb4b8c8 turning time slow sorted revlog off again 2021-06-03 17:47:39 +02:00
Kieran Siek
a11c0b5eb6
Use libgit2 to get the merge commit message. (#755) 2021-06-01 17:29:24 +02:00
Stephan Dilly
53f65c8377 assert that merge msg is populated correctly 2021-06-01 16:27:37 +02:00
Stephan Dilly
3cd218de57
honor showUntrackedFiles config (#753) 2021-06-01 09:56:55 +02:00
Stephan Dilly
65524edf0b allow walking repo including all available refs 2021-05-30 12:03:03 +02:00
Stephan Dilly
680b178a37 make revlog sorted by time 2021-05-29 15:42:17 +02:00
Stephan Dilly
b7d7f0ab84 version bump gitui 2021-05-28 11:33:07 +02:00
Stephan Dilly
bfa83ae343 move async_job abstraction into asyncgit for now 2021-05-28 11:02:31 +02:00
Stephan Dilly
16f03d459e bump asyncgit version 2021-05-28 10:44:10 +02:00
Christoph Rüßler
2ed6f53dcf Add popup for tags 
This closes #483.
 2021-05-27 21:02:30 +02:00
Stephan Dilly
246ea9195d more warnings as errors 2021-05-26 09:13:24 +02:00
Stephan Dilly
7177bb223b change temporary commit msg file path 
we now use `.git/COMMIT_EDITMSG` for vim to recognise
 2021-05-24 10:37:58 +02:00
Stephan Dilly
6ace7f8eea cleanup 2021-05-24 00:35:00 +02:00
Stephan Dilly
7ac40f73eb warning as error 2021-05-23 13:47:14 +02:00
Stephan Dilly
1034dc1aaf
add syntax highlighting (#727) 2021-05-23 02:45:22 +02:00
Stephan Dilly
a31f185154 loss non-utf8 files lossily (fix #726) 2021-05-22 13:36:16 +02:00
Stephan Dilly
9ffe52634e treeview shows selectd file content 2021-05-22 00:47:06 +02:00
Stephan Dilly
0e31d57a33
New file tree (#718) 2021-05-21 14:52:05 +02:00
Stephan Dilly
5ba657cabe
file tree of a commit (#715) 2021-05-18 00:21:05 +02:00
Lee Bradley
fc5deec424 Allow unit tests to be run offline 
Currently unit tests require a remote git repository from GitHub. This
change allows unit tests to be run offline. Closes #613
 2021-05-16 14:17:53 +02:00
Stephan Dilly
8767642f93 allow pull that creates conflicts now 2021-05-12 15:24:35 +02:00
Stephan Dilly
f35ce0cbf4
support doing merge commit (#701) 2021-05-12 11:20:39 +02:00
Stephan Dilly
a073e0ac02 preserve ref name in annotated commit 2021-05-12 09:13:28 +02:00
Stephan Dilly
b5327a65c1 rename 2021-05-12 09:01:08 +02:00
Stephan Dilly
f30ec49886
show merge head ids in merge state (#697) 2021-05-11 18:26:12 +02:00
Stephan Dilly
4f6aceb3ec
merging a branch (#696) 
* merging arbitrary branch
* cleanup intermediate in-merge state
 2021-05-09 22:53:12 +02:00
Stephan Dilly
386a31067f cleanup 2021-05-07 12:00:13 +02:00
Stephan Dilly
147f65562c cleanup some TODO 2021-04-27 17:51:29 +02:00
Stephan Dilly
01678d2d4b prep release 2021-04-27 15:07:20 +02:00
Stephan Dilly
6c1d9e529b add timing 2021-04-25 14:50:44 +02:00
Wander Nauta
c42d369d60
Use git2::DiffLineType enum instead of char values (#668) 
closes #655
 2021-04-25 14:17:57 +02:00
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
82c52cec37 todo 2021-04-24 15:28:16 +02:00
Christoph Rüßler
3b1a004657 Call get_commits_info instead of get_commit_info 
This results in far fewer calls to `repo.find_commit` in almost all
cases.
 2021-04-24 15:21:12 +02:00
Stephan Dilly
95c41dbf45
limit log message to first line of commit msg (#662) 2021-04-24 14:55:26 +02:00
Stephan Dilly
97985bfe62 do not run blame on a binary file (earlier out) 2021-04-24 14:05:34 +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
Stephan Dilly
f081cbeb17 fix debug print when adding afile to ignore 2021-04-23 18:10:06 +02:00
Christoph Rüßler
b7eed4361e Add blame view 
This closes #484.
 2021-04-21 15:03:37 +02:00
Stephan Dilly
524add843d
more lints (#648) 2021-04-18 00:08:35 +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
ee5b9d9f4e
Fix exit on fetching a branch that has no upstream/remote (#638) 
* do not assume remote/upstream of a branch anymore
 2021-04-12 16:47:08 +02:00
Stephan Dilly
5eaafb0267 version bump 2021-04-11 22:52:59 +02:00
brunohgouveia
79a38a70b9 Add pop stash command on Staches tab 2021-04-11 13:17:26 +02:00
Bruno Gouveia
1d90219df9 Fix CommitMessage combine wrongly concatenating subject to body 2021-04-08 20:49:11 +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
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
70d4c5b1d5 bump versions 2021-03-14 12:48:22 +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
f84f6f458f bump version 2021-03-03 22:13:06 +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
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
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
c1565eb000 nightly clippy fixes 2021-02-27 18:16:38 +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
06622008da fix regression in async diff (introduced in 546c7f3) 2021-02-24 22:15:10 +01:00
Stephan Dilly
546c7f3072
fix some potentials for errors to bubble up (#547) 
* fix some potentials for errors to bubble up (#490)
* fix async diff failing panic
 2021-02-24 21:54:27 +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
dependabot-preview[bot]
0cbfa13ba5 Bump tempfile from 3.1.0 to 3.2.0 
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/Stebalien/tempfile/releases)
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS)
- [Commits](https://github.com/Stebalien/tempfile/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-01-26 14:01:14 +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
196fe4ab43 version bumps 2020-12-20 16:56:01 +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
dependabot-preview[bot]
6966882032 Bump serial_test from 0.5.0 to 0.5.1 
Bumps [serial_test](https://github.com/palfrey/serial_test) from 0.5.0 to 0.5.1.
- [Release notes](https://github.com/palfrey/serial_test/releases)
- [Commits](https://github.com/palfrey/serial_test/compare/v0.5.0...v0.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-08 01:17:35 +01:00
dependabot-preview[bot]
87142a1c2a Bump url from 2.1.1 to 2.2.0 
Bumps [url](https://github.com/servo/rust-url) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/servo/rust-url/releases)
- [Commits](https://github.com/servo/rust-url/compare/v2.1.1...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-12-08 01:15:07 +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
Richard Menzies
f74abfb685 Fix clippy error 2020-11-07 13:07:31 +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
dependabot-preview[bot]
acccbfa08a Bump rayon-core from 1.8.1 to 1.9.0 
Bumps [rayon-core](https://github.com/rayon-rs/rayon) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/rayon-rs/rayon/releases)
- [Changelog](https://github.com/rayon-rs/rayon/blob/master/RELEASES.md)
- [Commits](https://github.com/rayon-rs/rayon/compare/rayon-core-v1.8.1...rayon-core-v1.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-25 02:01:01 +02:00
Richard Menzies
71880f96f7
Rename branch (#334) 2020-10-17 09:00:34 +02:00
dependabot-preview[bot]
5fb144a354 Bump crossbeam-channel from 0.4.4 to 0.5.0 
Bumps [crossbeam-channel](https://github.com/crossbeam-rs/crossbeam) from 0.4.4 to 0.5.0.
- [Release notes](https://github.com/crossbeam-rs/crossbeam/releases)
- [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crossbeam-rs/crossbeam/compare/crossbeam-channel-0.4.4...crossbeam-channel-0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-10-12 09:00:53 +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
b5544af488 unpin git2-rs version now that there was a release 2020-10-10 01:56:39 +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
Stephan Dilly
92b1b4c2a8 dont allow unused imports 2020-10-09 15:31:51 +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
4b56a636ff fix crash interfering of other git processes (closes #271) 2020-09-27 19:11:03 +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
ca49bbd627
release 0.10 (#252) 2020-08-29 14:20:19 +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
59377c7a91 clippy fix and make perf warnings to errors 2020-08-26 19:18:57 +02:00
dependabot-preview[bot]
d8bd4721ef Bump rayon-core from 1.7.1 to 1.8.0 
Bumps [rayon-core](https://github.com/rayon-rs/rayon) from 1.7.1 to 1.8.0.
- [Release notes](https://github.com/rayon-rs/rayon/releases)
- [Changelog](https://github.com/rayon-rs/rayon/blob/master/RELEASES.md)
- [Commits](https://github.com/rayon-rs/rayon/compare/rayon-core-v1.7.1...rayon-core-v1.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-26 00:31:45 +02:00
dependabot-preview[bot]
64eebb5aca Bump git2 from 0.13.8 to 0.13.10 
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.13.8 to 0.13.10.
- [Release notes](https://github.com/rust-lang/git2-rs/releases)
- [Commits](https://github.com/rust-lang/git2-rs/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-26 00:09:23 +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
ddd11156c6 prep release 2020-07-29 22:37:50 +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
58a1719c98 fix problems with spawning too many async tasks underload (#196) 2020-07-18 13:57:08 +02:00