1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-03-19 21:28:28 +02:00
Jesse Duffield d84dfc23e7 Rely on model rather than view to focus a point
Currently when we want to focus a point on a view (i.e. highlight a
line and ensure it's within the bounds of a view's box, we use the
LinesHeight method on the view to work out how many lines in total
there are.

This is bad because for example if we come back from editing a file,
the view will have no contents so LinesHeight == 0, but we might
be trying to select line 10 because there are actual ten things we
expect to be rendered already. This causes a crash when e.g. 10 is
greater than the height of the view.

So we need to pass in to our FocusPoint method the actual number of
items we want to render, rather than having the method rely on the
LinesHeight, so that the method knows to scroll a bit before setting
the cursor's y position.

Unfortunately this makes for some awkward code with our current setup.
We don't have a good interface type on these state objects so we now
need to explicitly obtain the len() of whatever array we're rendering.

In the case of the menu panel this is even more awkward because the items
list is just an interface{} and it's not easy to get the list of that, so
now when we instantiate a menu we need to pass in the count of items
as well.

The better solution would be to define an interface with a getItems
and getLength method and have all these item arrays become structs
implementing the interface, but I am too lazy to do this right now :)
2019-03-23 11:54:25 +11:00
2019-03-22 21:28:25 +11:00
2019-03-22 20:20:06 +11:00
2019-03-22 20:20:06 +11:00
2019-03-05 21:56:23 +11:00
2018-12-11 22:02:12 +11:00
2018-08-25 17:32:34 +10:00
2019-03-05 21:56:23 +11:00
2018-12-18 22:18:48 +11:00
2018-08-05 12:32:37 +10:00
2019-02-18 21:29:43 +11:00
2019-03-22 20:20:06 +11:00

lazygit CircleCI codecov Go Report Card GolangCI GoDoc GitHub tag

A simple terminal UI for git commands, written in Go with the gocui library.

Are YOU tired of typing every git command directly into the terminal, but you're too stubborn to use Sourcetree because you'll never forgive Atlassian for making Jira? This is the app for you!

Gif

Installation

Homebrew

brew tap jesseduffield/lazygit
brew install lazygit

Ubuntu

Packages for Ubuntu 16.04, 18.04 and 18.10 are available via Launchpad PPA.

Release builds

Built from git tags. Supposed to be more stable.

sudo add-apt-repository ppa:lazygit-team/release
sudo apt-get update
sudo apt-get install lazygit

Daily builds

Built from master branch once in 24 hours (or more sometimes).

sudo add-apt-repository ppa:lazygit-team/daily
sudo apt-get update
sudo apt-get install lazygit

Void Linux

Packages for Void Linux are available in the distro repo

They follow upstream latest releases

sudo xbps-install -S lazygit

Arch Linux

Packages for Arch Linux are available via AUR (Arch User Repository).

There are two packages. The stable one which is built with the latest release and the git version which builds from the most recent commit.

Instruction of how to install AUR content can be found here: https://wiki.archlinux.org/index.php/Arch_User_Repository

Conda

Released versions are available for different platforms, see https://anaconda.org/conda-forge/lazygit

conda install -c conda-forge lazygit

Binary Release (Windows/Linux/OSX)

You can download a binary release here.

Go

go get github.com/jesseduffield/lazygit

Please note: If you get an error claiming that lazygit cannot be found or is not defined, you may need to add ~/go/bin to your $PATH (MacOS/Linux), or %HOME%\go\bin (Windows). Not to be mistaked for C:\Go\bin (which is for Go's own binaries, not apps like Lazygit).

Usage

Call lazygit in your terminal inside a git repository. If you want, you can also add an alias for this with echo "alias lg='lazygit'" >> ~/.zshrc (or whichever rc file you're using).

  • Basic video tutorial here.
  • List of keybindings here.

Cool features

  • Adding files easily
  • Resolving merge conflicts
  • Easily check out recent branches
  • Scroll through logs/diffs of branches/commits/stash
  • Quick pushing/pulling
  • Squash down and rename commits

Resolving merge conflicts

Gif

Interactive Rebasing

Interactive Rebasing

Contributing

We love your input! Please check out the contributing guide. For contributor discussion about things not better discussed here in the repo, join the slack channel

Slack

Donate

If you would like to support the development of lazygit, please donate

Donate

Work in progress

This is still a work in progress so there's still bugs to iron out and as this is my first project in Go the code could no doubt use an increase in quality, but I'll be improving on it whenever I find the time. If you have any feedback feel free to raise an issue/submit a PR.

Social

If you want to see what I (Jesse) am up to in terms of development, follow me on twitter or watch me program on twitch.

Alternatives

If you find that lazygit doesn't quite satisfy your requirements, these may be a better fit:

Description
simple terminal UI for git commands
Readme MIT 219 MiB
Languages
Go 99.7%
Shell 0.2%