Commit graph

73 commits

Author SHA1 Message Date
Johannes Agricola
89f73d2ec2
Disable dotted range commit yanking (#2577)
The algorithm for computing marked_consecutive assumes that commits are
consecutive in the commit graph if they are consecutive in the
linearized log used in` commitlist.rs`. That is not universally correct,
as siblings may also be displayed consecutively in this list.

For now, this just removes generating commit lists in dotted range
notation.

Co-authored-by: Naseschwarz <naseschwarz@0x53a.de>
2025-04-04 15:27:50 +02:00
Robin
d4f9400e04
Remotes popup (#2350)
Co-authored-by: extrawurst <mail@rusticorn.com>
Co-authored-by: extrawurst <776816+extrawurst@users.noreply.github.com>
2024-09-18 16:31:21 +02:00
extrawurst
9c8c802b20 fix nightly clippy 2024-03-24 12:50:56 -07:00
extrawurst
e22cc70a7d
moving popups in its own module (#2066) 2024-02-19 17:18:30 +01:00
Sainath Singineedi
0e2b3db1d9
Add confirmation dialog for undo commit (#1909) 2023-10-17 07:59:59 +02:00
extrawurst
5be397b335
stash list does not update after pop/drop (#1865)
* move to stashlist after stashing
* move to status after stash popping
2023-08-31 10:41:52 +02:00
extrawurst
3c5131ad27
commit log filtering (#1800) 2023-08-18 17:19:18 +02:00
UG
e90e8dc536
FuzzyFindPopup for general use (#1672)
* replace BranchFindPopup with FuzzyFindPopup
* replace FileFindPopup with FuzzyFindPopup
2023-06-20 12:57:36 +02:00
UG
3a6f292bf5
add fuzzy finder in branch list (#1658)
* add branch_find_popup
* capital F for fetch in branchlist, f for find
* add command info of return

closes #1350
2023-04-21 23:03:35 +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
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
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 Dilly
284c57fb72
generic popup stacking solution (#1124)
* generic popup stacking solution
* allow going back to file-revision popup
* do not select diff in coming back to files-revlog
* handle filetree popup via stacking
* allow going back to inspect commit
* allow coming back to compare/inspect commit
2022-02-06 22:13:05 +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
Christoph Rüßler
b622ceef94
Add popup for file history (#841) 2022-01-30 18:50:50 +01:00
Stephan Dilly
166826f5ea allow inspecting tag annotation 2022-01-22 01:21:15 +01:00
Stephan Dilly
13b6b2fdc6
support deleting tag on remote (#1079) 2022-01-16 22:56:39 +01:00
Stephan Dilly
d5d36de01e
implement reverting commit from revlog (#1057) 2021-12-29 16:40:22 +01:00
Stephan Dilly
33ac72c8e7
fetch/prune branches (#1000) 2021-11-23 22:14:37 +01:00
Stephan Dilly
d6a2af89ee branch deletion better distinguish local vs remote 2021-10-13 11:55:21 +02:00
Stephan Dilly
e4c7867564
allow rebase with conflicts (#897) 2021-09-29 18:55:47 +02:00
Stephan Dilly
fb2b990072
find files via fuzzy finder (#890) 2021-09-04 10:50:03 +02:00
Stephan Dilly
5672cfd033
compare two commits (#860) 2021-08-21 15:49:39 +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
2b85b81a3e
drop multiple stashes (#855) 2021-08-18 01:41:33 +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
7058ab14d3 abstract queue into custom type 2021-06-07 22:57:27 +02:00
Christoph Rüßler
2ed6f53dcf Add popup for tags
This closes #483.
2021-05-27 21:02:30 +02:00
Stephan Dilly
5ba657cabe
file tree of a commit (#715) 2021-05-18 00:21:05 +02:00
Stephan Dilly
8ddb3cdac5 move focus after last file staged 2021-05-16 22:05:22 +02:00
Stephan Dilly
3643cea44d
update branchlist after creating a branch (#702) 2021-05-12 11:37:08 +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
Christoph Rüßler
b7eed4361e Add blame view
This closes #484.
2021-04-21 15:03:37 +02:00
brunohgouveia
79a38a70b9 Add pop stash command on Staches tab 2021-04-11 13:17:26 +02:00
Stephan Dilly
bfa240115c
support rebase merge (conflict free only) (#567) 2021-03-11 11:49:04 +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
97f88a2f2f rename 2021-02-28 19:34:45 +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
Richard Menzies
6c974ee1d3
Support force push (#421) 2021-02-23 11:02:16 +01:00
Richard Menzies
71880f96f7
Rename branch (#334) 2020-10-17 09:00:34 +02:00
Stephan Dilly
bb1abb22c0 cleanup 2020-10-11 14:36:08 +02:00
Richard Menzies
b6c932d0af
Delete branch (#332) 2020-10-11 14:30:44 +02:00
Richard Menzies
94bbf3c9fb
Branch popup (#303)
closes #91
2020-10-10 01:27:13 +02:00
Stephan Dilly
17de5a900c
Test push progress (#272) 2020-09-04 09:08:29 +02:00