extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-11-23 11:42:56 +03:00
Code Issues Projects Releases Wiki Activity
1,258 Commits 12 Branches 61 Tags 91 MiB
a5b63e5936
Commit Graph

294 Commits

Author SHA1 Message Date
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