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

319 Commits

Author SHA1 Message Date
Stephan Dilly
23944dc608
error if force push was rejected (#810) 
* error if force push was rejected
 2021-07-10 14:11:01 +02:00
Stephan Dilly
3a1bcb74a2 try fix ci 2021-07-05 11:18:22 +02:00
Stephan Dilly
c2e6f9ff7e filetree paniced on non utf8 files/paths 2021-07-05 00:26:32 +02:00
Christoph Rüßler
bce652ecca Add filter to AsyncLog 
This is a small change that makes it possible to reuse the logic in
`AsyncLog` for the file history view. `AsyncLog` passes the filter to
`FileLogWalker` unchanged.
 2021-06-26 13:07:03 +02:00
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