Code

Add worktrees view#2147

Code

Merged

jesseduffield merged 74 commits intojesseduffield:masterjesseduffield/lazygit:masterfrom kadaan:worktree_supportkadaan/lazygit:worktree_supportCopy head branch name to clipboardJul 30, 2023

+58,191-4,351

Commits

Commits on Jul 30, 2023

• Initial addition of support for worktrees

  

  Joel Baranick

  authored and

  jesseduffield

  committed
  f8ba899

• Support for deleting a worktree

  

  Joel Baranick

  authored and

  jesseduffield

  committed
  afc4aed

• Update status to differentiate the main vs linked worktrees

  

  Joel Baranick

  authored and

  jesseduffield

  committed
  60872c9

• Hide worktrees in the worktree panel if they point at a non-existing filesystem location.

  Show description for 9a79154
  

  Joel Baranick

  authored and

  jesseduffield

  committed
  9a79154

• Style missing worktree as red and display better error when trying to switch to them

  Show description for c679fd1
  

  Joel Baranick

  authored and

  jesseduffield

  committed
  c679fd1

• Improve worktree panel

  

  Joel Baranick

  authored and

  jesseduffield

  committed
  5470823

• Put all worktree i18n strings together

  Show description for 35e6e63
  

  Joel Baranick

  authored and

  jesseduffield

  committed
  35e6e63

• Basic support for adding a worktree

  

  Joel Baranick

  authored and

  jesseduffield

  committed
  1ce9a87

• Address PR comments

  

  Joel Baranick

  authored and

  jesseduffield

  committed
  db02c13

• Remove comment

  jesseduffield

  committed
  796945a

• Alert when attempting to enter the current worktree

  jesseduffield

  committed
  03f7260

• Update worktree model

  jesseduffield

  committed
  7682ec0

• Refactor

  jesseduffield

  committed
  e8ec41f

• Use sentence case

  jesseduffield

  committed
  d19d89e

• Improve name handling

  jesseduffield

  committed
  c713d55

• Use git lingo

  jesseduffield

  committed
  fe8adf9

• Prompt to switch to worktree when branch is checked out by other worktree

  jesseduffield

  committed
  077ae99

• Move current worktree to top of list

  jesseduffield

  committed
  53f4ccb

• Land in the same panel when switching to a worktree

  jesseduffield

  committed
  ab3052f

• Move status panel presentation logic into presentation package

  jesseduffield

  committed
  5868750

• Don't touch repo stack when switching worktrees

  Show description for 6c69549
  jesseduffield

  committed
  6c69549

• Update wording

  jesseduffield

  committed
  4b3c9f5

• Handle deleting branch attached to worktree

  jesseduffield

  committed
  6b4a638

• Log when directory is changed

  jesseduffield

  committed
  ae01936

• Fix wording

  jesseduffield

  committed
  4b2622d

• Support creating worktrees from refs

  jesseduffield

  committed
  18ea68c

• Fix filtering logic in worktrees view

  jesseduffield

  committed
  142f063

• Use 'M' for months in branches panel

  jesseduffield

  committed
  9b24995

• Checkout worktree when creating from worktree view

  jesseduffield

  committed
  9c69a5d

• Refresh work trees when discarding file changes

  Show description for 71422a8
  jesseduffield

  committed
  71422a8

• Show base ref suggestions when creating worktree

  jesseduffield

  committed
  2e68967

• Allow opening worktree in editor

  Show description for 87b2455
  jesseduffield

  committed
  87b2455

• Don't quit on error

  jesseduffield

  committed
  8944851

• i18n for worktrees

  jesseduffield

  committed
  2082fdf

• Assume that the base of a worktree can be checked out

  jesseduffield

  committed
  6f2f9f6

• Associate branches with worktrees even when mid-rebase

  jesseduffield

  committed
  ec839e9

• Hide worktree functionality on old git versions

  jesseduffield

  committed
  3cd2d6f

• Only show worktree in status panel if not the main worktree and worktrees are supported

  jesseduffield

  committed
  a06a5ca

• Better logic for knowing which repo we're in

  jesseduffield

  committed
  b73efb2

• Properly render worktrees in files panel

  jesseduffield

  committed
  7b05dac

• Support opening worktree in editor

  jesseduffield

  committed
  3a7468e

• Change directory to worktree if given as an argument

  Show description for 27ade50
  jesseduffield

  committed
  27ade50

• Move worktrees tab to files window

  jesseduffield

  committed
  0604e43

• Safer fetching of linked worktree paths

  jesseduffield

  committed
  eeec373

• Fix tests

  Show description for 7569180
  jesseduffield

  committed
  7569180

• Fix tests

  Show description for ca6f9c4
  jesseduffield

  committed
  ca6f9c4

• Support older versions of git when fetching worktrees

  Show description for 81a9133
  jesseduffield

  committed
  81a9133

• Show loader when switching worktrees

  jesseduffield

  committed
  b5ff55e

• Fix unit tests

  jesseduffield

  committed
  fb4453c

• Remove worktree version guards

  Show description for cdfad86
  jesseduffield

  committed
  cdfad86

• Update cheatsheets

  jesseduffield

  committed
  18a508b

• Add worktree integration tests

  jesseduffield

  committed
  277142f

• Add worktree tests for removing/detaching

  jesseduffield

  committed
  b93b9da

• Add more worktree tests

  jesseduffield

  committed
  a313b16

• Support fastforwarding worktree

  jesseduffield

  committed
  b306006

• Add test for retained context focus when switching worktrees

  jesseduffield

  committed
  9c15ba0

• Update repo switch logic

  Show description for ae66f72
  jesseduffield

  committed
  ae66f72

• Allow entering a worktree by pressing enter

  jesseduffield

  committed
  bc4ce26

• Allow entering a submodule by pressing space

  jesseduffield

  committed
  e356b29

• Fix test by making branches appear deterministically

  Show description for 0a41014
  jesseduffield

  committed
  0a41014

• Remove dead function

  jesseduffield

  committed
  e874f94

• Add test for opening lazygit in the worktree of a bare repo

  jesseduffield

  committed
  2b24c15

• Remove IO logic from presentation code for worktrees

  Show description for de57cfd
  jesseduffield

  committed
  de57cfd

• Centralise logic for obtaining repo paths

  Show description for 4c5b157
  jesseduffield

  committed
  4c5b157

• Use fields rather than methods on worktrees

  Show description for 06be88a
  jesseduffield

  committed
  06be88a

• Add more i18n for worktrees

  jesseduffield

  committed
  eecf07c

• Add section in integration readme about testing against old git versions

  jesseduffield

  committed
  a77d24f

• Use forward-slashes on windows

  Show description for b16bb40
  jesseduffield

  committed
  b16bb40

• Fix bug where worktree view would take over window upon switching branches

  Show description for a1fae41
  jesseduffield

  committed
  a1fae41

• Write unit tests with the help of afero

  Show description for 7b302d8
  jesseduffield

  committed
  7b302d8

• rename files

  jesseduffield

  committed
  f31e213

• Fix flakey worktree tests

  Show description for 9190933
  jesseduffield

  committed
  9190933

• Use double dash for disambuating path in editor templates

  jesseduffield

  committed
  d30eef6

• fix go mod

  jesseduffield

  committed
  2d4706e