Jesse Duffield
a82d952f48
Merge pull request #2495 from jesseduffield/feature/remove-altreturn
2023-03-20 20:11:35 +11:00
Stefan Haller
549ce09f71
Fix deprecated rand.Seed
2023-03-19 10:00:19 +01:00
Jesse Duffield
60f902f026
rename patch manager to patch builder
2023-03-19 16:35:57 +11:00
Jesse Duffield
73c7dc9c5d
refactor patch code
2023-03-19 16:30:39 +11:00
Jesse Duffield
e6274af015
appease golangci-lint ( #2512 )
2023-03-19 11:20:29 +11:00
Jens Kutilek
5c8bc790ff
Make arrows consistent ( #2501 )
2023-03-18 11:32:44 +11:00
yk-kd
b5d612e6d6
Add border config ( #2344 )
...
Co-authored-by: yk-kd <yosuke.komada@gmail.com>
2023-03-18 11:23:31 +11:00
Luka Markušić
f314cb3763
Remove alternative confirmation and return keymappings
2023-03-09 10:32:00 +01:00
Stefan Haller
4bd1322941
Rename WillBeAppliedReverse to Reverse
...
This is the only "reverse"-related option that is left, so use a less clumsy
name for it.
2023-03-07 13:40:07 +01:00
Stefan Haller
45cf993982
Remove the PatchOptions.Reverse option
...
All callers pass false now (except for the tests, which we simply remove), so we
don't need the option any more.
2023-03-07 13:39:45 +01:00
Stefan Haller
e4659145e8
Use WillBeAppliedReverse (and git apply --reverse) in the staging panel too
...
It's simpler to have only one way of reversing a patch.
2023-03-07 13:38:19 +01:00
Stefan Haller
6bd1c1d068
Remove parameters that are no longer needed
...
All callers in this file now use reverseOnGenerate=false and
keepOriginalHeader=true, so hard-code that in the call to ModifiedPatchForLines
and get rid of the parameters.
2023-03-07 09:49:34 +01:00
Stefan Haller
9cc33c479b
Use forward patches and --reverse flag for partial patches too
...
There's no reason to have two different ways of applying patches for whole-file
patches and partial patches; use --reverse for both. Not only does this simplify
the code a bit, but it fixes an actual problem: when reverseOnGenerate and
keepOriginalHeader are both true, the generated patch header is broken (the two
blobs in the line `index 6d1959b..6dc5f84 100644` are swapped). Git fails to do
a proper three-way merge in that case, as it expects the first of the two blobs
to be the common ancestor.
It would be possible to fix this by extending ModifiedPatchForLines to swap the
two blobs in this case; but this would prevent us from concatenating all patches
and apply them in one go, which we are going to do later in the branch.
2023-03-07 09:49:34 +01:00
Stefan Haller
f76cc27956
Bundle the reverse and keepOriginalHeader flags into a PatchOptions struct
...
We are going to add one more flag in the next commit.
Note that we are not using the struct inside patch_manager.go; we keep passing
the individual flags there. The reason for this will become more obvious later
in this branch.
2023-03-07 09:49:34 +01:00
Jesse Duffield
c36333af3d
Merge pull request #2433 from Ryooooooga/subcommits-limit
2023-03-06 18:22:57 +11:00
Stefan Haller
723504a290
Keep side context in context stack when pushing a main context
...
This fixes accordion mode for the commit files panel. When entering a file, the
commit files panel should stay expanded.
2023-03-04 15:07:48 +01:00
Stefan Haller
de3e4838ad
Store WorkingTreeState in model
...
This is the working tree state at the time the model commits were loaded. This
avoids a visual glitch with the "You Are Here" label appearing at times when it
is not supposed to.
2023-03-01 09:12:00 +01:00
Stefan Haller
6af8f278d0
Don't put "<--- YOU ARE HERE" in the commit model's name
...
Instead, derive it from context at display time (if we're rebasing, it's the
first non-todo commit). This fixes the problem that unfolding the current
commit's files in the local commits panel would show junk in the frame's title.
Along the way we make sure to only display the "<--- YOU ARE HERE" string in the
local commits panel; previously it would show for the top commit of a branch or
tag if mid-rebase.
2023-03-01 09:12:00 +01:00
Jesse Duffield
af7c71d1ee
Merge pull request #2476 from pereBohigas/feature/add_kotlin_icon
2023-02-28 10:11:47 +11:00
Ryooooooga
a624e0457f
feat(subcommits): load unlimited sub-commits
2023-02-27 15:29:00 +09:00
Pere Bohigas
adef3bd4ca
Add icon for Kotlin script files
2023-02-25 15:14:26 +01:00
Jesse Duffield
dd1bf629b8
migrate patch building tests
2023-02-25 21:37:16 +11:00
Pere Bohigas
c80a94aa7a
Add icon for Kotlin files
2023-02-25 10:51:43 +01:00
Jesse Duffield
037e957282
fix PullMergeConflict integration test
2023-02-25 11:39:24 +11:00
Jesse Duffield
db011d8e34
Improve staging panel integration tests
2023-02-25 11:35:41 +11:00
Jesse Duffield
78f3a7a478
migrate interactive rebase integration tests
2023-02-22 19:36:31 +11:00
Jesse Duffield
56424eb1aa
remove x keybinding for opening menu so we now only use '?'
2023-02-20 19:28:45 +11:00
Jesse Duffield
38c7030b0f
mention path in tooltips
2023-02-20 19:28:45 +11:00
Luka Markušić
31b8524fe6
Add tooltips for discarding
2023-02-20 19:28:45 +11:00
Luka Markušić
0ae34aeeb7
Make discarding items less error prone
...
The menu is opened by `d` so this makes it harder to mess things up by
accidentally pressing `dd`.
2023-02-20 19:28:45 +11:00
Jesse Duffield
e1c376ef54
Merge pull request #2453 from stefanhaller/allow-rebasing-to-first-commit
2023-02-20 19:21:37 +11:00
Jesse Duffield
0b55eaca1d
add create tag from commit test
2023-02-20 19:01:08 +11:00
Jesse Duffield
39c56553b3
show tag message
2023-02-20 19:01:08 +11:00
Stefan Haller
c5cd217a65
Allow squashing fixups above the first commit of a repo
...
This includes amending changes into a given commit, since that's implemented in
terms of the former.
2023-02-20 08:29:43 +01:00
Jesse Duffield
9e1e20fef2
Merge pull request #2421 from Ryooooooga/tag-on-branch
2023-02-20 18:20:16 +11:00
Stefan Haller
dd61c49a15
Better error message for trying to squash or fixup the first commit
...
It's not so much the total number of commits that matters here, it's just
whether we are on the first one. (This includes the other condition.)
This allows us to get rid of the condition in rebase.go.
2023-02-20 07:40:04 +01:00
Ryooooooga
67b08ac239
feat: support to create tag on branch
2023-02-19 23:31:46 +09:00
Stefan Haller
67b8ef449c
Edit by breaking after current commit
...
Instead of rebasing from the commit below the current one and then setting the
current one to "edit", we rebase from the current one and insert a "break" after
it. In most cases the behavior is exactly the same as before, except that the
new method also works if the current commit is a merge commit. This is useful if
you want to create a new commit at the very beginning of your branch (by editing
the last commit before your branch).
2023-02-19 10:21:01 +01:00
Jesse Duffield
65bd0ab431
migrate undo test
2023-02-19 15:48:09 +11:00
Jesse Duffield
a51f64814c
show snapshot of lazygit when test fails for easier investigation
2023-02-19 15:48:09 +11:00
Jesse Duffield
bff076c70a
rename key to Pull
2023-02-19 11:42:00 +11:00
stk
4d39668743
Undo a change made in #2444 that we didn't end up needing
2023-02-18 09:53:31 +01:00
Jesse Duffield
c517d1e0a2
update view cursor when selecting new line in patch explorer view
2023-02-18 10:19:34 +11:00
stk
8cad8cda8f
Don't bother setting view cursor pos for staging/stagingSecondary views
...
Now that the cursor highlight is never shown (see previous commit), there's no
reason to update the cursor position any more.
2023-02-15 21:32:21 +01:00
stk
6b81e6adca
Turn highlighting off in staging/stagingSecondary views
...
There are two reasons for doing this:
1. The view cursor position is often out of sync with the selected line; see
first commit of this branch.
2. The highlighting is already turned off when the view loses focus, and never
turned back on thereafter. So just turn it off from the start then.
2023-02-15 21:29:38 +01:00
stk
b499eba1a8
Select next stageable line correctly after staging a range of lines
...
We already have this very convenient behavior of jumping to the next stageable
line after staging something. However, while this worked well for staging
single lines or hunks, it didn't work correctly when staging a range of lines;
in this case we want to start searching from the first line of the range.
2023-02-15 21:29:00 +01:00
stk
ff2a799200
Make SelectedLine/SelectedLineIdx work in staging/stagingSecondary views
...
While we try to keep the view's cursor position in sync with the context state's
selectedLineIdx (at least when pressing up or down), there are enough situations
where the two run out of sync; for example when initially opening the view, or
after staging a hunk, or when scrolling the view using the wheel. While it would
be possible to fix these situations to keep them always in sync, it doesn't seem
worth it, because the view's cursor position isn't really used for anything
else. So we rather special-case the SelectedLine/SelectedLineIdx functions of
ViewDriver to query the context state's selectedLineIdx directly if it is a
patch explorer context.
2023-02-15 21:22:11 +01:00
Ryooooooga
39c20bc634
chore: change to work return-alt1
on all views
2023-02-11 21:19:47 +09:00
Jesse Duffield
823d95a8c6
Merge pull request #2418 from jesseduffield/feature/copy-remote-branch-to-clipboard
2023-02-11 10:53:31 +11:00
Jesse Duffield
225cd3cc60
Merge pull request #2412 from Ryooooooga/disable-help-on-suggestions
2023-02-11 10:52:49 +11:00
Ryooooooga
984eb95cb7
chore: remove UNKNOWN_VIEW_ERROR_MSG
2023-02-10 21:26:51 +09:00
Ryooooooga
1be6c522d8
fix: disable menu key binding while displaying popup
2023-02-09 20:13:41 +09:00
Luka Markušić
8af59c3e6e
Copy remote branch name to clipboard
2023-02-09 11:56:12 +01:00
Jesse Duffield
4f7324bad0
Merge pull request #2413 from stefanhaller/allow-ignore-whitespace-everywhere
2023-02-09 21:55:12 +11:00
Jesse Duffield
5e2254395a
fix linting issue
2023-02-09 21:45:14 +11:00
stk
5bb6198219
Allow ignoring whitespace in diff in commits panel
2023-02-07 12:14:29 +01:00
stk
bbaeab68e1
Better redrawing after toggling "ignore whitespace"
...
There's no need for refreshing anything; all that's needed is to re-focus the
selected list item. This way it will also work in other panels, which we are
about to add in the next commit.
2023-02-07 12:09:17 +01:00
stk
d838965a41
Make "Toggle whitespace in diff view" a global key binding
...
Since it is going to affect a number of views later in the branch, it's easier
to make it global than to find all views that are affected.
2023-02-07 09:25:38 +01:00
Ryooooooga
7bd0c779c7
fix: fix default
color to be white
2023-02-03 23:36:59 +09:00
Jesse Duffield
c0e805718d
Merge pull request #2358 from phanithinks/#2319_default_screen_mode
2023-02-01 21:52:09 +11:00
Jesse Duffield
368d6437b8
Merge pull request #2373 from phanithinks/clipboard_patch_option_2357
2023-01-31 17:02:46 +11:00
Phanindra Kumar Paladi
01f0efb997
Merge branch 'master' into #2319_default_screen_mode
2023-01-29 10:25:14 +05:30
Phanindra kumar Paladi
df58c75ca4
Fixed breaking integrtion tests(old)
2023-01-29 10:03:59 +05:30
stk
67fb28e2b8
Add user config gui.skipRewordInEditorWarning
2023-01-26 09:01:22 +01:00
stk
b8d33b8f7b
Extract helper function doRewordEditor
...
No behavior change, just a preparation for the next commit.
2023-01-22 15:59:32 +01:00
Phanindra kumar Paladi
946b8b5670
Fixed the lable in the custom_patch_options_panel.go
2023-01-18 21:13:31 +05:30
Phanindra kumar Paladi
265cdde7bc
Fixed typo
2023-01-18 10:14:48 +05:30
Phanindra kumar Paladi
e87fc4a229
Change key of clipboard copy
2023-01-18 05:50:47 +05:30
Phanindra kumar Paladi
f6f82091bc
Added copy to clipboard option to the patch options
2023-01-17 09:07:07 +05:30
Phanindra kumar Paladi
a11e91e651
replaced 'screenMode' to 'windowSize' in config
2023-01-16 20:07:21 +05:30
Phanindra kumar Paladi
f4ccb68464
Added screenMode configuration to gui configuration
2023-01-11 16:51:46 +05:30
Ryooooooga
00b922604a
fix: fix goroutine leaks
2023-01-06 10:51:09 +09:00
Jesse Duffield
5c42e1a5dc
defend against possible nil function
2022-12-30 22:49:08 +11:00
Ryooooooga
cd9111837e
feat: add GitVersion
struct
2022-12-30 20:01:14 +09:00
Ryooooooga
41222f07ed
chore(gui): remove unused gitConfig
2022-12-30 20:01:14 +09:00
Jesse Duffield
1da0427e3a
appease linter
2022-12-30 12:18:59 +11:00
Jesse Duffield
af5b3be286
integrate snake game into lazygit
2022-12-30 12:18:59 +11:00
Jesse Duffield
f3fa9ec2d1
Merge pull request #2311 from wakaka6/add_return_alt1
2022-12-28 11:54:16 +11:00
Jesse Duffield
ed93e0a2b0
remove dependency on model
2022-12-27 22:52:20 +11:00
Jesse Duffield
fb15a2f4f8
Merge pull request #2326 from Ryooooooga/fix-scroll
...
fix https://github.com/jesseduffield/lazygit/issues/2309
2022-12-24 19:20:23 +11:00
Jesse Duffield
fa97b0c76e
move background code into its own file
2022-12-24 19:14:52 +11:00
Jesse Duffield
5c11b1ecb7
discard changes integration test
2022-12-24 19:05:46 +11:00
Jesse Duffield
57a1817deb
don't kill long-running sandbox sessions
2022-12-21 22:51:39 +11:00
Ryooooooga
7bdba1abe4
fix( #2309 ): fix diff scroll
2022-12-20 22:25:49 +09:00
Jesse Duffield
dde70486a1
apply user config changes in sandbox mode
2022-12-20 23:07:43 +11:00
Jesse Duffield
5679efe174
Merge pull request #2239 from bdach/u2f-key-prompts
...
close https://github.com/jesseduffield/lazygit/issues/2230
2022-12-20 21:44:29 +11:00
wakaka6
6386a03805
add return alt1
2022-12-11 15:44:25 +08:00
Arnaud PERALTA
0af63daf18
workingtree controller fixed with new references for commit in staged menu
2022-12-01 09:12:18 +11:00
Arnaud PERALTA
8b894d7bf5
wip: commit logic in helper and reported in files/staging controllers
2022-12-01 09:12:18 +11:00
Jesse Duffield
65d6d7fb2d
fix ignore file keybinding
2022-11-30 19:36:35 +11:00
Bartłomiej Dach
1a1f042f49
Add credential prompts for U2F-backed SSH keys
...
The 8.2 release of OpenSSH added support for FIDO/U2F hardware
authenticators, which manifests in being able to create new types of SSH
key, named `ecdsa-sk` nad `ed25519-sk`. This is relevant to lazygit,
as those SSH keys can be used to authorise git operations over SSH, as
well as signing git commits. Actual code changes are required for
correct support, as the authentication process for these types of keys
is different than the process for types supported previously.
When an operation requiring credentials is initialised with a U2F
authenticator-backed key, the first prompt is:
Enter PIN for ${key_type} key ${path_to_key}:
at which point the user is supposed to enter a numeric (and secret) PIN,
specific to the particular FIDO/U2F authenticator using which the SSH
keypair was generated. Upon entering the correct key, the user is
supposed to physically interact with the authenticator to confirm
presence. Sometimes this is accompanied by the following text prompt:
Confirm user presence for key ${key_type} ${key_fingerprint}
This second prompt does not always occur and it is presumed that the
user will know to perform this step even if not prompted specifically.
At this stage some authenticator devices may also begin to blink a LED
to indicate that they're waiting for input.
To facilitate lazygit's interoperability with these types of keys, add
support for the first PIN prompt, which allows "fetch", "pull", and
"push" git operations to complete.
2022-11-30 13:34:32 +11:00
Luka Markušić
b3d086bdc1
Resolve the prompt just before using it
...
In case a later command depends on a prompt input from a previous one we
need to evaluate it only after the previous prompt has been confirmed.
2022-11-25 22:46:36 +01:00
Jesse Duffield
de22238589
Merge pull request #2224 from Ryooooooga/ambiguous-branch
2022-11-14 19:09:37 +11:00
Ryooooooga
52a2e4c1dc
fix: fix ambiguous branch name
...
test: add an integration test for checkout branch by name
fix: fix full ref name of detached head
refactor: refactor current branch loader
chore: use field name explicitly
2022-11-14 19:05:07 +11:00
Jesse Duffield
e953659ebf
Merge pull request #2273 from artvi/fix/show_loading_state_when_bottomline_disabled
2022-11-14 19:01:26 +11:00
Jesse Duffield
b33ec5a050
Merge pull request #1980 from ajhynes7/stash-untracked-changes
2022-11-14 18:46:53 +11:00
sudoburt
3e73dacce3
Merge loaders package into git_commands package
2022-11-14 18:11:45 +11:00
Andrew Hynes
684d1e955e
lint: try deleting blank line
2022-11-13 19:51:30 -03:30
Art V
c53752a5f9
[ #2258 ] hide options panel when showBottom line is disabled
2022-11-14 01:04:56 +03:00
Art V
dc163bfc4d
[ #2258 ] show bottom line when having status
2022-11-14 00:53:55 +03:00
Andrew Hynes
3c436b3457
lint: delete unused argument from handleStashSave
2022-11-13 11:02:06 -03:30
Jesse Duffield
a905a28e41
better hiding of underscores
2022-11-13 14:46:13 +11:00
Jesse Duffield
5964472ec1
hide underscores more
2022-11-13 14:41:43 +11:00
Jesse Duffield
d26350502c
stop switching focus to commits view when resetting
2022-11-13 03:26:50 +00:00
Jesse Duffield
863a65cf94
disable underscores in vscode while we wait for underscore glitch to be fixed
2022-11-13 13:41:49 +11:00
Jesse Duffield
91f83c6be7
use better colour defaults
2022-11-12 18:09:16 -03:30
Jesse Duffield
97ced9e14f
fix could-not-access error
2022-11-12 18:09:15 -03:30
Jesse Duffield
1ac3ae1ad1
use better colour defaults
2022-11-12 14:59:15 +11:00
Jesse Duffield
e8b97c9fe2
fix could-not-access error
2022-11-11 12:30:14 +11:00
Andrew Hynes
a47e72892a
Merge branch 'master' into stash-untracked-changes
2022-11-01 16:08:34 -02:30
Ryooooooga
14ec0cd92e
feat: allow null
in keybindings
2022-10-18 22:20:03 +09:00
Ryooooooga
3103398e31
chore: refactor rename stash
2022-10-16 09:30:04 +09:00
Ryooooooga
eceb3a5aa6
chore: refactor rename stash
2022-10-16 09:12:43 +09:00
Ryooooooga
11316b7a48
feat: add rename stash
2022-10-16 09:12:42 +09:00
Ryooooooga
0c3eab4059
fix: fix initial origin of commit message panel
2022-10-15 20:09:23 +09:00
Ryooooooga
d90fedfbf8
feat: add stash icon
2022-10-14 21:58:58 +09:00
Jesse Duffield
dba0edb998
use boxlayout from lazycore
2022-10-09 08:31:14 -07:00
Andrew Hynes
8c46a0110d
Merge branch 'master' into stash-untracked-changes
2022-10-06 22:59:06 -02:30
Ryooooooga
e436922eb6
feat(editors.go): move by words
2022-10-05 22:29:55 +09:00
Jesse Duffield
ed98b60078
use thread safe map
2022-10-02 20:57:44 -07:00
Jesse Duffield
e76fa5a6cb
fix glitchy render of stale data when flicking through files and directories
2022-10-02 20:41:24 -07:00
Jesse Duffield
c953871ec7
use lowercase 'quote' for consistency with existing custom command template functions
2022-10-02 18:43:25 -07:00
Ryooooooga
19df238b77
feat: allow OSCommand.Quote
to be invoked within a custom command
2022-09-30 21:16:45 +09:00
Jesse Duffield
90feb4bae6
Merge pull request #1636 from kawaemon/partially-fix-1629
2022-09-24 10:15:23 -07:00
Jesse Duffield
1d40bd1707
Merge pull request #2104 from LiamKearn/feat-emacs-char-nav
2022-09-24 10:08:13 -07:00
kawaemon
17df42e517
fix: scan to buffer to empty character input in stdin
2022-09-23 23:42:45 -07:00
Jesse Duffield
fd66499c8f
Merge pull request #2167 from xiaoliwang/remove_deprecated
2022-09-23 23:01:40 -07:00
Ryooooooga
212e19f598
feat: add support for emacs keybindings
2022-09-24 00:00:30 +09:00
jiepeng
bc8050d8ac
typo
2022-09-17 15:10:41 -07:00
jiepeng
b8900baf1a
remove deprecated calls
2022-09-17 15:10:41 -07:00
Mihai22125
7e9dffe1b9
Add Key field to CustomCommandPrompt struct
...
Add Form field to CustomCommandObjects struct
Write user prompts responses to Form field
Ensure that map keys exists
Add form prompts integration test
Remove redundant index
2022-09-17 14:58:44 -07:00
Jesse Duffield
a92f0f7c89
increase recording leeway
2022-09-17 10:50:04 -07:00
Jesse Duffield
74acb3e86a
add integration tests for cherry picking
2022-09-16 22:15:16 -07:00
Jesse Duffield
7af7af27c6
various changes to improve integration tests
2022-09-16 08:42:39 -07:00
Andrew Hynes
e189546acb
refactor: move checks for clean working tree
2022-09-15 21:48:49 -02:30
Andrew Hynes
c7733aa5e5
refactor: rename method to StashIncludeUntrackedChanges
2022-09-15 21:48:49 -02:30
Andrew Hynes
50cf7ac5bc
refactor: change command order
2022-09-15 21:48:49 -02:30
Andrew Hynes
c7fd218308
fix: add condition to if statement
2022-09-15 21:48:49 -02:30
Andrew Hynes
7ddb80a13e
feat: add stash option to include untracked changes
2022-09-15 21:48:48 -02:30
Jesse Duffield
010f430d1f
add bisect integration test
2022-09-09 20:55:47 -07:00
Ryooooooga
eb9fbb0a33
fix(confirmation_panel.go): fix initial origin of editor box
2022-09-01 19:44:17 +09:00
Jesse Duffield
448ff80d7d
Merge pull request #2123 from Ryooooooga/feature/edit-initial-scroll
2022-08-31 22:43:06 -07:00
Ryooooooga
3ada4dde12
fix: fix initial scroll position of edit box
2022-08-18 23:39:15 +09:00
nullishamy
21a4522a51
Merge branch 'master' into feat/detect-bare-repo
2022-08-15 14:00:34 +01:00
nullishamy
154bd975a6
Apply refactoring suggestions
2022-08-15 13:59:34 +01:00
Jesse Duffield
53979f7cec
a more complex custom command test
2022-08-14 20:49:20 +10:00
Jesse Duffield
39e9266089
Merge pull request #2110 from mark2185/fix-ignore-or-exclude-file-menu
2022-08-14 17:35:35 +10:00
Jesse Duffield
304d74370e
refactor to ensure code doesn't depend on integration code
2022-08-13 13:56:50 +10:00
Jesse Duffield
faed509bfd
fix CI
2022-08-13 13:56:50 +10:00
Jesse Duffield
ba96baee32
move code from main into app package to allow test to be injected
2022-08-13 13:55:08 +10:00
Jesse Duffield
d890238c7b
move input and assert into integration tests package
2022-08-13 13:52:13 +10:00
Jesse Duffield
46ae55f91e
introduce gui adapter
2022-08-13 13:51:56 +10:00
Luka Markušić
0ff5b74d80
IgnoreOrExclude should be a menu
2022-08-11 14:23:02 +02:00
Jesse Duffield
225c563c63
another integration test
2022-08-11 21:24:16 +10:00
Jesse Duffield
77881a9c7d
add new integration test pattern
2022-08-11 21:24:15 +10:00
lkearn
6422b399e7
Feat: Add emacs character navigation, because I'm weird like that :)
2022-08-09 17:58:43 +10:00
Jesse Duffield
e4e04cfa8f
fix hidden suggestions
2022-08-07 19:20:02 +10:00
Jesse Duffield
d73a236d7c
allow rendering to main panels from anywhere
2022-08-07 12:05:51 +10:00
Jesse Duffield
755ae0ef84
add deadlock mutex package
...
write to deadlock stderr after closing gocui
more deadlock checking
2022-08-07 11:16:14 +10:00
Jesse Duffield
7410acd1aa
move merge conflicts code into controller
2022-08-07 11:16:03 +10:00
Jesse Duffield
445a625b56
rename merging context to mergeConflicts
2022-08-06 18:05:00 +10:00
Jesse Duffield
54fb73080a
use ptmx map so that we can have multiple ptmx's stored for resizing
2022-08-06 13:49:11 +10:00
Jesse Duffield
524bf83a4a
refactor to only have one context per view
2022-08-06 13:49:11 +10:00
Jesse Duffield
c1c6e2fac2
make exception for searching from menu
2022-08-02 09:16:01 +10:00
Jesse Duffield
3ee2ad511e
prevent crash when opening recent repos panel if no recent repos are present
2022-08-01 22:10:08 +10:00
Jesse Duffield
debc58b6c5
fix popup focus issue
2022-08-01 22:09:48 +10:00
Jesse Duffield
fab2e14b55
fix issue caused by opening a menu over a prompt
2022-08-01 21:38:57 +10:00
Jesse Duffield
95426c5e46
handle nil properly with file nodes
2022-08-01 20:32:01 +10:00
Jesse Duffield
682be18507
refactor to use generics for file nodes
...
use less generic names
2022-07-31 19:43:14 +10:00
Jesse Duffield
2ca2acaca5
Merge pull request #2072 from jesseduffield/optimistic-file-rendering
2022-07-31 19:31:23 +10:00
Jesse Duffield
5f4c29d7b5
Merge pull request #2005 from mark2185/feature/recent-repos-path
...
Show active branch for recent repo
2022-07-31 19:30:30 +10:00
Luka Markušić
44de380c2b
Add i18n for unknown branch
2022-07-31 08:57:57 +02:00
Luka Markušić
37bdbd9a21
Display short SHA when in detached HEAD
state
2022-07-31 08:51:27 +02:00
Luka Markušić
767ef31661
Use filepath.Join instead of manual concat
2022-07-31 08:43:31 +02:00
Jesse Duffield
c81c046615
Merge pull request #2059 from sportshead/master
2022-07-31 16:19:59 +10:00
Jesse Duffield
7077ea428f
add optimistic rendering for staging and unstaging files
2022-07-31 14:34:57 +10:00
sportshead
f2880ecb46
Add empty output message and refreshing to showOutput
2022-07-31 12:04:40 +08:00
Luka Markušić
966733240c
Refactor a bit, enable worktrees
2022-07-30 19:02:19 +02:00
Luka Markušić
25ddac0d8f
Gotta go fast
2022-07-30 17:42:15 +02:00
Luka Markušić
7c09ce3871
Parallelize fetching current branch
2022-07-30 17:05:17 +02:00
Luka Markušić
e6e4513f45
Show active branch for recent repo
...
Split recent repo menu into three columns
2022-07-30 17:05:17 +02:00
Luka Markušić
9c6239df3d
Worktrees should not be filtered out
...
But non-git directories should
2022-07-30 17:03:30 +02:00
Jesse Duffield
ab5a8091f5
add better support for OpensMenu option when creating a menu
2022-07-30 20:27:51 +10:00
Jesse Duffield
95678b1b43
Merge pull request #2065 from jesseduffield/fix-rewording-merge-commit-with-editor
...
Fix rewording a merge commit with editor
2022-07-30 19:51:59 +10:00
Luka Markušić
cc377b5c49
Fix rewording a merge commit with editor
2022-07-30 08:43:42 +02:00
Luka Markušić
1f482e585e
Fix github linter errors
2022-07-30 08:10:29 +02:00
sportshead
e1f41b653c
Add showOutput option to custom commands ( #1163 )
2022-07-28 18:40:30 +08:00
Jesse Duffield
c087dca60a
Merge pull request #2027 from jesseduffield/gozes-jesse
...
Attempt at fixing CI
2022-07-05 19:37:09 +10:00
Juan Sanchez Montalvo
11d766053e
Allow adding a file to the .git/info/exclude file
2022-07-05 19:33:44 +10:00
Michael Mead
9d304098bb
feat: add confirm prompt for custom keybindings
...
- Supports configuring a custom confirmation prompt via `config.yml` for
custom keybindings. A new `CustomCommandPrompt.Body` field is
used to store the immutable body text of the confirmation popup.
- Adds a sample 'confirm' prompt to the example `config.yml`.
- Updates the `Prompts` section of the documentation to include
'confirm' prompt type and also describe which fields pertain to it
(i.e. `initialValue`).
Closes: https://github.com/jesseduffield/lazygit/issues/1858
Signed-off-by: Michael Mead <mmead.developer@gmail.com>
2022-07-04 11:36:13 -07:00
Jesse Duffield
02c5559704
run integration tests in parallel and properly cache windows build
2022-06-11 13:06:29 +10:00
Jesse Duffield
32c0b39dbd
Merge pull request #1950 from HiromasaNojima/add_subcommand_into_specific_layout_directly
2022-06-11 11:51:14 +10:00
Jesse Duffield
b1e4968d0b
allow opening lazygit to a specific panel
2022-06-11 11:23:56 +10:00
Luka Markušić
a955dbcfd7
Validate recent repo before blindly opening it
2022-06-11 09:42:51 +10:00
Jesse Duffield
de3114edc3
Merge pull request #1972 from lei4519/feature/display-whole-graph-by-default
2022-06-09 20:17:25 +10:00
Jesse Duffield
cdec70cc06
Merge pull request #1975 from mark2185/fix-unmatching-remote-branch-name
2022-06-09 20:12:56 +10:00
Jesse Duffield
9591cc381a
support setting the author of a commit
...
update copy
2022-06-09 19:12:20 +10:00
Luka Markušić
55a941d5dc
Fetch the correct remote branch
2022-06-01 20:35:09 +02:00
Lay
684ea284af
fix: lint error
2022-05-30 23:19:48 +08:00
Lay
666180cfd0
Add config param that displays the whole git graph by default
2022-05-30 13:52:39 +08:00