1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Commit Graph

5626 Commits

Author SHA1 Message Date
a6174271aa Update cheat sheets and json schema 2024-01-09 14:27:33 +01:00
517e0f8248 Add command to open git difftool 2024-01-09 14:27:33 +01:00
c1cb95db6f Remove unused function 2024-01-09 14:24:14 +01:00
966e5f5337 Fix checking out a tag when there is a branch with the same name (#3179) 2024-01-09 14:23:08 +01:00
f244ec8251 Fix checking out a tag when a branch with the same name exists 2024-01-09 14:18:35 +01:00
2b97f0fb43 Add test demonstrating the problem
When there's a branch with the same name as the tag, the branch gets checked out
instead of the tag.
2024-01-09 14:18:35 +01:00
af5e25cfb5 Replace copy commit SHA with copy commit subject on the y s keybind in the commits view (#3188) 2024-01-09 14:17:05 +01:00
93cae68e94 Updated README.md 2024-01-09 09:55:08 +00:00
6e6fe6a489 Show a friendly error message when starting lazygit from a non-existent cwd (#3192)
Closes #3187

- **PR Description**

#3187 observes that lazygit crashes with a stack trace if it's run from
a non-existent current working directory. The steps to reproduce are:

```
mkdir test
cd test
rm -r ../test
lazygit
```

(Note: I can repro this on Ubuntu, but not on macOS Sonoma, where
lazygit starts regardless of whether the current working directory
exists or not.)

Here's how the repro steps look on Ubuntu with this PR applied:

```
simon@ubuntu:/Users/simon/src/3p/lazygit$ go build .
simon@ubuntu:/Users/simon/src/3p/lazygit$ mkdir deleteme
simon@ubuntu:/Users/simon/src/3p/lazygit$ cd deleteme/
simon@ubuntu:/Users/simon/src/3p/lazygit/deleteme$ rm -r ../deleteme
simon@ubuntu:/Users/simon/src/3p/lazygit/deleteme$ ../lazygit
2024/01/02 18:40:15 Error: the current working directory does not exist
```

- **Please check if the PR fulfills these requirements**

* [x] Cheatsheets are up-to-date (run `go generate ./...`)
* [x] Code has been formatted (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
* [x] Tests have been added/updated (see
[here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
for the integration test guide)
* [x] Text is internationalised (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
* [x] Docs (specifically `docs/Config.md`) have been updated if
necessary
* [x] You've read through your own file changes for silly mistakes etc

<!--
Be sure to name your PR with an imperative e.g. 'Add worktrees view'
see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for
examples
-->
2024-01-09 20:54:50 +11:00
2c2436574d Replace copy SHA with copy subject on commit 'y s' 2024-01-03 02:19:39 +03:00
0cdca9ac2c Update error message 2024-01-02 18:43:39 +00:00
4172be6bc8 Show a friendly error message when starting lazygit from a non-existent cwd
Closes 3187
2024-01-02 18:25:28 +00:00
d97b37a178 Add local branch sorting menu (#3182) 2023-12-27 15:30:25 +01:00
21334fa889 Add integration test for local branch sort order 2023-12-27 15:25:29 +01:00
36a29f225b Add a sort order menu for local branches 2023-12-27 15:25:29 +01:00
1e85c4379f Updated README.md 2023-12-27 10:24:12 +00:00
470632b97a Add age to stash entries (#3174) 2023-12-27 11:23:57 +01:00
50044dd5e0 chore: use null char as a stash entries divider during loading 2023-12-27 11:21:49 +01:00
bc330b8ff3 feat: add age on stash lines 2023-12-27 11:21:49 +01:00
7f36494eb2 Updated README.md 2023-12-22 08:16:48 +00:00
85c48ba887 Add remote branch sorting menu, saving the option to state.yml (#3171) 2023-12-22 09:16:34 +01:00
1e3935cbaf Add integration test for remote branch sort order 2023-12-22 16:30:20 +09:00
3fe491fcb2 Implement a sort order menu for remote branches 2023-12-22 16:30:20 +09:00
66b608b2f9 Updated README.md 2023-12-15 15:39:58 +00:00
4ee01d153b fix(config): add yaml:"options" struct tag to CustomCommandPrompt.[]Options (#3163) 2023-12-15 16:39:43 +01:00
79e04fad9a fix(config): add yaml struct tag to CustomCommandPrompt.[]Options
add `yaml` struct tag for fixing uppercase issue on json schema
2023-12-15 07:29:48 +03:00
6778bc04a3 Updated README.md 2023-12-10 15:07:02 +00:00
d548f857a4 Fall back to WithWaitingStatus if item is not visible (#3083) 2023-12-10 16:06:49 +01:00
f99c59b6d5 Fall back to WithWaitingStatus if item is scrolled out of view 2023-12-10 16:03:25 +01:00
0fd4983c66 Fall back to WithWaitingStatus if view showing the item is not visible 2023-12-10 15:57:51 +01:00
240948b882 Return only visible views from TopViewInWindow
Without this it's not reliably possible to ask whether a given view is visible
by asking

  windowHelper.TopViewInWindow(context.GetWindowName()) == context.GetView()

because there could be transient, invisible contexts after it in the Z order.

I guess it's a bit of a coincidence that this has never been a problem so far.
2023-12-10 15:57:51 +01:00
cf82e69bbe Updated README.md 2023-12-09 14:40:36 +00:00
653e59a3d5 Make move up/down blocking (#2966) 2023-12-09 15:40:23 +01:00
e342860ef1 Add WithWaitingStatusSync for reverting commits 2023-12-09 15:28:41 +01:00
569adae6a2 Use WithWaitingStatusSync for move commit up/down 2023-12-09 15:28:40 +01:00
79fe885dcd Add WithWaitingStatusSync 2023-12-09 15:28:40 +01:00
a46f26e148 Bump gocui 2023-12-09 15:23:40 +01:00
ca4b8b25f0 Fix bottom line alignment (#3076) 2023-12-09 11:57:06 +01:00
dad2c5fa52 Add tests for window arrangement code
The output of the GetWindowDimensions function is hard to understand just by looking at it,
so I've added a helper function in the tests to render the window layout as text, so that
in order to create a new test you just come up with some args and paste the output as the
expected output.

This has the same downsides that any snapshot-based testing has: it's more brittle than
targeted assertions. But it is much easier to make sense of these snapshots than it is
to make sense of more fine-grained assertions, and I like the fact that these tests can
serve as documentation.
2023-12-09 11:53:52 +01:00
8a08abcd35 Refactor window arrangement helper to use pure function
This will make it easier to test the file
2023-12-09 11:18:28 +01:00
b96befa250 Layout the bottom line view using spacer views
We are also removing the single-character padding on the left/right edges of the bottom
line because it's unnecessary

Unfortunately we need to create views for each spacer: it's not enough to just
layout the existing views with padding inbetween because gocui only renders
views meaning if there is no view in a given position, that position will just
render whatever was there previously (at least that's what I recall from talking
this through with Stefan: I could be way off).

Co-authored-by: Stefan Haller <stefan@haller-berlin.de>
2023-12-09 11:18:28 +01:00
8cc820668a Fix an incorrect comment
It sounds like at some point we only showed a slash as the search prompt, but I
dug a bit through the history and couldn't find a state of the code where that
was the case. (shrug)
2023-12-09 11:18:28 +01:00
ccb1ee04a5 fix: MacOS default path misspelling (#3148) 2023-12-07 10:07:52 +01:00
d00936fb4e fix: MacOS default path misspelling 2023-12-07 11:52:39 +03:00
e84d5acd23 Updated README.md 2023-12-07 07:35:43 +00:00
a8a4211d2b Add a copy-to-clipboard menu to the file view (with diff copy options) (#3104) 2023-12-07 08:35:28 +01:00
6907816af9 chore: update jsonschema 2023-12-07 08:30:03 +01:00
38db574de9 chore: update cheatsheets 2023-12-07 08:30:03 +01:00
c7012528fc feat: introduce a copy menu into the file view 2023-12-07 08:30:03 +01:00
2162e5ff64 Re-enable 'Unset upstream' option when upstream branch is missing (#3086) 2023-12-06 15:58:11 +11:00