Commit graph

376 commits

Author SHA1 Message Date
ZingyAwesome
ef6abbba0f
Fix typo in commit.rs (#2150) 2024-03-24 15:14:07 -07:00
Hendrik Maus
5b3e2c9ae3
Support git commit signing using OpenPGP (#1544)
* Support git commit signing using OpenPGP
* workaround for amending signed commits
* workaround for rewording signed commits
* support signing initial commit
* return both signature and signature_field value from sign

---------

Co-authored-by: Utkarsh Gupta <utkarshgupta137@gmail.com>
2024-03-24 13:08:28 -07:00
extrawurst
540a95c160 fix failing to commit since b15c864
(if it would not find core.commitComment config)
2024-03-24 12:54:00 -07:00
Concelare
b15c8643c8
Git Config Commit Comments (#2145)
Closes #2136
2024-03-22 15:12:08 -07:00
Juan
43af49bab4
Remove unused clippy warning suppression (missing_const_for_fn) (#2115) 2024-03-07 20:08:28 +01:00
Anas
c629070ea5
fix: fix typos (#2092) 2024-02-21 21:27:33 +01:00
extrawurst
2bbaa6f3a1 fix a bunch more typos 2024-02-20 19:51:05 +01:00
extrawurst
762b889b48
better theme file handling (#2077)
* better theme file handling
* print all possible err of loading theme

closes #2007
2024-02-20 18:52:35 +01:00
extrawurst
acf4661c1e fix nighty and raise msrv 2024-02-19 11:36:38 +01:00
Joshix-1
7335cd1c5d
fix sorting of commits in diff view (#1747) 2024-02-12 20:33:46 +01:00
extrawurst
673edd8f2d
cargo updates (#1856)
closes #1781
2024-02-12 11:53:22 +01:00
extrawurst
e7c61ffc89
Support prepare commit hook (#1978) 2023-12-16 00:07:54 +01:00
extrawurst
521ab91309
git2-hooks: allows customizing what places to look for hooks (#1975)
* allows customizing what places to look for hooks
2023-12-08 14:33:22 +01:00
extrawurst
d4dd58f6ca
move git hooks support into separate crate (#1971)
* unique error type name
* git2 dependency future 
* return hook out/err separately
2023-12-07 16:28:52 +01:00
extrawurst
83df6ddbc8 test that proved hook has access to PATH (#1967) 2023-12-02 13:21:33 +01:00
extrawurst
c39eb93736 fix ci 2023-11-28 09:24:58 +01:00
extrawurst
bcf9bac934 simplify implementation 2023-11-27 16:21:04 +01:00
extrawurst
253a18f62a search message body/summary separately
closes #1875
2023-09-04 22:24:20 +02:00
extrawurst
ecb793206d seems useless, lets remove 2023-09-04 09:46:08 +02:00
extrawurst
0c591dfea4
Fix branch switch with slash (#1857) 2023-08-29 16:39:58 +02:00
extrawurst
15e9222f51
refactoring commit filter (#1843) 2023-08-27 16:38:20 +02:00
extrawurst
9a7c2199a7
make commit filtering an async job (#1842) 2023-08-27 15:14:10 +02:00
Ammar Abou Zor
c68fa3e87b
Jump to commit via sha (#1818) 2023-08-27 09:46:41 +02:00
extrawurst
0fdec134c5
Fix: search in log (#1838) 2023-08-26 20:34:37 +02:00
extrawurst
11c65f633f fix new fmt check 2023-08-26 13:52:47 +02:00
extrawurst
cde1c7f883
Search commits by author (#1822) 2023-08-21 12:11:53 +02:00
extrawurst
3c5131ad27
commit log filtering (#1800) 2023-08-18 17:19:18 +02:00
lightsnowball
514e8f0175
Modify checkout implementation making branch switching more similar to CLI git behaviour (#1809) 2023-08-18 14:31:51 +02:00
extrawurst
9eb8d470a4 optimize logfilter to not check stashes
logfilter using `get_commit_diff` on each entry lead to a lot of unneeded calls to `get_stashes` and `is_stash_commit` which should be not even needed for file history log entries. this is not happening now anymore
2023-08-11 11:38:21 +02:00
extrawurst
7400d5bc68 more logging/diagnostics when repo cant be opened 2023-08-10 15:39:39 +02:00
extrawurst
53988ba4e0
fix hunk edits with non standard diff options (#1803) 2023-08-10 14:48:36 +02:00
extrawurst
b935df59a1 fix nightly build 2023-07-18 09:45:05 +02:00
pm100
d6f33532bb bump msrv to 1.65 2023-05-14 13:59:48 -06:00
Christoph Rüßler
2554f04ace Don’t show upstream if commit is local branch head 2023-04-12 11:53:08 +02:00
Christoph Rüßler
3af256c75a Show remote branches in revlog 2023-04-12 11:53:08 +02:00
extrawurst
9d83ce358e
Reword commit (#1553)
* reuse commit popup for reword
* switch to status after reword
* show command
* prepopulate with old msg
* changelog

Closes #829
2023-02-18 20:47:24 +00:00
extrawurst
8ab62244ce
support reset from log view (#1534) 2023-02-04 16:15:26 +01:00
Andrey Krupskiy
57a5322fa7
Checkout commit (#1499)
* Add keybind to checkout commit in log view
* Extract commit checkout into method
* add quckbar hint for checkout commit
* add a smoke test
* update changelog
* show an error in popup

---------

Co-authored-by: Omnikar <omnikar5@gmail.com>
Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2023-02-04 07:00:19 +01:00
hamflx
5411397f9a
Fix commit hooks error and "no such file" error on Windows with wsl2 installed. (#1532)
* use git bash instead of wsl bash
* add unittest for some simple shell commands.
* fix incompatible unitest with macOS
2023-02-02 10:33:57 +01:00
extrawurst
c6dec379f2 clippy nightly fixes 2022-12-30 09:42:50 +01:00
extrawurst
289eddd9be fix nightly clippy 2022-12-10 11:27:59 +01:00
extrawurst
8d2de65868 fix clippy nightly 2022-11-23 15:14:12 +01:00
Alexandru Macovei
6b5745f6c2
Fix Clippy Lints (#1390)
* apply latest nigtly clippy lints
* temporarily disable const fn lints due to nigh false positive count on nightly
2022-10-19 13:45:12 +02:00
extrawurst
16a537c102
Persist all options (#1342)
closes #1340
2022-09-20 08:23:04 +02:00
extrawurst
4249a278b6 nightly clippy fixes 2022-09-02 09:09:29 +02:00
extrawurst
4e0da37230
Support updating submodules (#1305) 2022-08-31 11:40:52 +02:00
extrawurst
986d34a5ac
support opening submodule (#1298) 2022-08-31 10:51:08 +02:00
extrawurst
ef3ece552d
PoC list submodules (#1090) 2022-08-27 17:55:06 +02:00
extrawurst
0e2262882b fix some clippy workarounds 2022-08-20 11:52:13 +02:00
extrawurst
1985fd2dbc clippy nighytly fix 2022-07-04 10:43:30 +02:00
extrawurst
c1cb868c4b fix nightly clippy 2022-07-02 08:17:15 +02:00
extrawurst
cce49a34b7 Revert "Change diff renamed files (#1040)"
This reverts commit 5f466ff983.
2022-04-24 22:30:40 +02:00
Gleb Davydov
5f466ff983
Change diff renamed files (#1040) 2022-04-24 19:25:50 +02:00
Stephan D
2a578889f3
switch focus to index after staging last file (#1170) 2022-03-10 00:50:37 +01:00
Stephan Dilly
4f3ecfcd7c
fix left arrow closing popup (#1121)
* fix left arrow closing popup
* fix pageup/down being borked
* adhere to global diff options
* fix build for rust 1.50
* show revision count in header
* allow blaming any specific file revision
* show blame command
* allow opening history from blame
2022-01-31 20:56:59 +01:00
Stephan Dilly
f2b09d39c6 clippy nightly fixes 2022-01-30 19:28:45 +01:00
Christoph Rüßler
b622ceef94
Add popup for file history (#841) 2022-01-30 18:50:50 +01:00
Stephan Dilly
53e855e488 use auto proxy option 2022-01-26 09:54:48 +01:00
Stephan Dilly
317b245ba0
fix credential.helper config usage inside repo (#1091) 2022-01-24 00:36:58 +01:00
Stephan Dilly
9653545c81 debug print sideband progress 2022-01-22 18:53:59 +01:00
Stephan Dilly
614040b854 add note 2022-01-22 18:50:51 +01:00
Stephan Dilly
166826f5ea allow inspecting tag annotation 2022-01-22 01:21:15 +01:00
Stephan Dilly
435de9cda3
support hookspath (#1054) 2022-01-17 15:06:54 +01:00
Stephan Dilly
13b6b2fdc6
support deleting tag on remote (#1079) 2022-01-16 22:56:39 +01:00
Stephan Dilly
132559ea7f
support annotated tags (#1073) 2022-01-12 12:44:34 +01:00
Stephan Dilly
d5d36de01e
implement reverting commit from revlog (#1057) 2021-12-29 16:40:22 +01:00
Stephan Dilly
d790b48f5d fix nightly clippy 2021-12-19 21:05:05 +01:00
Stephan Dilly
10b4704662
run hooks in correct pwd (#1049)
see #1046
2021-12-17 00:46:08 +01:00
Stephan Dilly
55b9877e93 use .git path instead of workdir finding hooks
fixes #1046
2021-12-15 15:33:09 +01:00
Martin Kühl
5550415e3c
cred: check pushurl before checking url (#967)
* cred: check pushurl before checking url

if a remote has both a pushurl and a url, need_username_password should check the pushurl before checking the url since we might not need credentials for the former
2021-12-09 22:47:27 +01:00
Stephan Dilly
6249491484
keep commit msg on hook-fail (#1036)
fixes #1035
2021-12-09 21:12:31 +01:00
Stephan Dilly
eddc703fb8 fix windows build 2021-12-08 22:24:56 +01:00
Stephan Dilly
a947ce35e7
fix status fetch hanging on bare repos w/o worktree (#1032)
closes #1029
2021-12-08 22:00:55 +01:00
Stephan Dilly
006cdd6373
support bare repos (#1028) 2021-12-05 00:35:45 +01:00
Stephan Dilly
f4ee24055b Add debug log 2021-11-29 23:28:36 +01:00
Stephan Dilly
74c3d6f21c fetch all branches fetches tags aswell 2021-11-28 16:54:37 +01:00
Stephan Dilly
9038b1d07d pull gets tags on current branch (closes #1013) 2021-11-28 13:37:36 +01:00
Stephan Dilly
33ac72c8e7
fetch/prune branches (#1000) 2021-11-23 22:14:37 +01:00
Stephan Dilly
a55dcf62a3
blame: fixup windows paths (#984)
closes #981
2021-11-12 15:52:29 +01:00
Stephan Dilly
3c8eb7e049
improve files in diff speed (#979)
closes #976
2021-11-11 13:36:17 +01:00
Stephan Dilly
389bd75d46 honor options in stage_all command (see #933) 2021-10-23 15:34:49 +02:00
R0nd
153c79a828
support pull from remote (#945)
closes #920
2021-10-13 15:34:58 +02:00
Stephan Dilly
c6abbaf4d4
fix hirarchical branch names (#931) 2021-10-06 10:50:57 +02:00
Stephan Dilly
e4c7867564
allow rebase with conflicts (#897) 2021-09-29 18:55:47 +02:00
Stephan Dilly
9f8fc6b907 cleanup 2021-09-29 17:38:26 +02:00
Stephan Dilly
23516f1a41 docs 2021-09-29 17:35:47 +02:00
Stephan Dilly
f8bad7d541 cleanup 2021-09-29 17:07:59 +02:00
Stephan Dilly
d2bdec43a1 cleanup 2021-09-26 10:40:55 +02:00
Stephan Dilly
f27227af41
Conflict free rebase (#896)
* unittest for rebasing with conflicts
* hide branchlist after rebase
2021-09-07 00:04:54 +02:00
Stephan Dilly
cfea72d709 rebase returns generated commit + unittest 2021-09-06 21:20:45 +02:00
Stephan Dilly
9c7ac0f84d some more immutable string optimizations
and precompute diff line trimming (newlines)
2021-08-27 09:40:45 +02:00
Stephan Dilly
8353dfdd36 use less memory per hunk (immutable string) 2021-08-27 09:31:31 +02:00
Stephan Dilly
a8654329ec allow rebase of a branch (#816) 2021-08-26 20:31:37 +02:00
Stephan Dilly
81924fb9f8 show subject line of commits compared 2021-08-21 16:11:33 +02:00
Stephan Dilly
5672cfd033
compare two commits (#860) 2021-08-21 15:49:39 +02:00
jedel1043
13a0f4e9e2
Display mark for remote branches with tracking branches (#861) 2021-08-20 13:03:02 +02:00
Stephan Dilly
7cc19f673a
support options for the way we calculate the status (#849) 2021-08-19 02:19:36 +02:00
Stephan Dilly
dad8e8d43d cargo fmt: use hardtabs
since it does not support hard-whitespaces its the only way to make whitespaces consisitent and checked
2021-08-17 14:24:25 +02:00
zcorniere
56502ad3fd
ability to delete remote branch (#838)
* added ability to delete remote branch (closes #622)
2021-08-15 17:44:55 +02:00
Stephan Dilly
d42b00389c
check branch name validity while typing (#842)
closes #559
2021-08-15 15:14:35 +02:00