Skip to content

Allow changing directory with lua command #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
totalolage wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow changing directory with lua command #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
803c610
Allow changing directory with lua command
totalolage Oct 28, 2024
ec7e590
fix(chdir): typo in error message
totalolage Oct 28, 2024
cca4203
fix(delete): change directory to root if deleting current worktree
totalolage Oct 28, 2024
95698b9
fix(telescope): apply PP#124
totalolage Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions lua/git-worktree/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,23 @@ local function emit_on_change(op, metadata)
end
end

local function change_dirs_internal(path)
local cmd = string.format("%s '%s'", M._config.change_directory_command, path)
status:log().debug("Changing to directory " .. path)
vim.cmd(cmd)
end

local function change_dirs(path)
local worktree_path = M.get_worktree_path(path)

local previous_worktree = current_worktree_path

-- vim.loop.chdir(worktree_path)
if Path:new(worktree_path):exists() then
local cmd = string.format("%s %s", M._config.change_directory_command, worktree_path)
status:log().debug("Changing to directory " .. worktree_path)
vim.cmd(cmd)
change_dirs_internal(worktree_path)
current_worktree_path = worktree_path
else
status:error('Could not chang to directory: ' ..worktree_path)
status:error('Could not change to directory: ' ..worktree_path)
end

if M._config.clearjumps_on_change then
Expand Down Expand Up @@ -450,6 +454,11 @@ M.delete_worktree = function(path, force, opts)
if opts.on_success then
opts.on_success()
end
if vim.fn.getcwd() == path then
status:next_status("you deleted the current worktree, you will be switched to repo root")
change_dirs_internal(git_worktree_root)
current_worktree_path = nil
end
end))

delete:after_failure(function(e)
Expand Down
3 changes: 2 additions & 1 deletion lua/telescope/_extensions/git_worktree.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,10 @@ local telescope_git_worktree = function(opts)
}

local make_display = function(entry)
local path, _ = utils.transform_path(opts, entry.path)
return displayer {
{ entry.branch, "TelescopeResultsIdentifier" },
{ utils.transform_path(opts, entry.path) },
{ path },
{ entry.sha },
}
end
Expand Down