refactor: add back in telescope

polarmutex · Jan 4, 2024 · 6494af8 · 6494af8
1 parent 3a1eacf
commit 6494af8
Show file tree

Hide file tree

Showing 6 changed files with 291 additions and 357 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,6 +9,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    neovim = {
+      url = "github:neovim/neovim?dir=contrib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     neodev-nvim = {
       url = "github:folke/neodev.nvim";
       flake = false;
@@ -55,6 +59,9 @@
         _module.args.pkgs = import inputs.nixpkgs {
           inherit system;
           overlays = [
+            (final: _: {
+              neovim-nightly = inputs.neovim.packages.${final.system}.neovim;
+            })
           ];
         };
         devShells = {
@@ -81,12 +88,6 @@
           name = "telescope.nvim";
           src = inputs.telescope-nvim;
         };
-        packages.neorocks-test-stable = pkgs.callPackage ./nix/neorocks-test.nix {
-          name = "git-worktree-stable";
-          inherit self;
-          nvim = pkgs.neovim-unwrapped;
-          inherit (config.packages) plenary-plugin;
-        };
 
         checks = {
           inherit pre-commit-check;

diff --git a/lua/git-worktree/git.lua b/lua/git-worktree/git.lua
@@ -57,54 +57,6 @@ function M.has_worktree(path_str, cb)
     job:start()
 end
 
--- --- @return boolean
--- function M.is_bare_repo()
---     local inside_worktree_job = Job:new({
---         "git",
---         "rev-parse",
---         "--is-bare-repository",
---         cwd = vim.loop.cwd(),
---     })
---
---     local stdout, code = inside_worktree_job:sync()
---     if code ~= 0 then
---         status:log().error("Error in determining if we are in a worktree")
---         return false
---     end
---
---     stdout = table.concat(stdout, "")
---
---     if stdout == "true" then
---         return true
---     else
---         return false
---     end
--- end
---
--- --- @return boolean
--- function M.is_worktree()
---     local inside_worktree_job = Job:new({
---         "git",
---         "rev-parse",
---         "--is-inside-work-tree",
---         cwd = vim.loop.cwd(),
---     })
---
---     local stdout, code = inside_worktree_job:sync()
---     if code ~= 0 then
---         status:log().error("Error in determining if we are in a worktree")
---         return false
---     end
---
---     stdout = table.concat(stdout, "")
---
---     if stdout == "true" then
---         return true
---     else
---         return false
---     end
--- end
-
 --- @return string|nil
 function M.gitroot_dir()
     local job = Job:new {
@@ -113,20 +65,20 @@ function M.gitroot_dir()
         '--path-format=absolute',
         '--git-common-dir',
         cwd = vim.loop.cwd(),
-        -- on_stderr = function(_, data)
-        --     status:log().info('ERROR: ' .. data)
-        -- end,
+        on_stderr = function(_, data)
+            Log.error('ERROR: ' .. data)
+        end,
     }
 
     local stdout, code = job:sync()
     if code ~= 0 then
-        -- status:log().error(
-        --     'Error in determining the git root dir: code:'
-        --         .. tostring(code)
-        --         .. ' out: '
-        --         .. table.concat(stdout, '')
-        --         .. '.'
-        -- )
+        Log.error(
+            'Error in determining the git root dir: code:'
+                .. tostring(code)
+                .. ' out: '
+                .. table.concat(stdout, '')
+                .. '.'
+        )
         return nil
     end
 
@@ -141,20 +93,20 @@ function M.toplevel_dir()
         '--path-format=absolute',
         '--show-toplevel',
         cwd = vim.loop.cwd(),
-        -- on_stderr = function(_, data)
-        --     status:log().info('ERROR: ' .. data)
-        -- end,
+        on_stderr = function(_, data)
+            Log.error('ERROR: ' .. data)
+        end,
     }
 
     local stdout, code = job:sync()
     if code ~= 0 then
-        -- status:log().error(
-        --     'Error in determining the git root dir: code:'
-        --         .. tostring(code)
-        --         .. ' out: '
-        --         .. table.concat(stdout, '')
-        --         .. '.'
-        -- )
+        Log.error(
+            'Error in determining the git root dir: code:'
+                .. tostring(code)
+                .. ' out: '
+                .. table.concat(stdout, '')
+                .. '.'
+        )
         return nil
     end
 
@@ -180,27 +132,6 @@ function M.has_branch(branch, cb)
         cb(found)
     end):start()
 end
---
--- function M.has_origin()
---     local found = false
---     local job = Job:new({
---         "git",
---         "remote",
---         "show",
---         on_stdout = function(_, data)
---             data = vim.trim(data)
---             found = found or data == "origin"
---         end,
---         cwd = vim.loop.cwd(),
---     })
---
---     -- TODO: I really don't want status's spread everywhere... seems bad
---     job:after(function()
---         status:status("found origin: " .. tostring(found))
---     end):sync()
---
---     return found
--- end
 
 --- @param path string
 --- @param branch string

diff --git a/lua/git-worktree/git_spec.lua b/lua/git-worktree/git_spec.lua
@@ -1,8 +1,5 @@
 local git_harness = require('git-worktree.test.git_util')
 local gwt_git = require('git-worktree.git')
-local Status = require('git-worktree.status')
-
-local status = Status:new()
 
 -- local wait_for_result = function(job, result)
 --     if type(result) == 'string' then
@@ -20,7 +17,6 @@ describe('git-worktree git operations', function()
     describe('in normal repo', function()
         before_each(function()
             working_dir, master_dir = git_harness.prepare_repo()
-            status:reset(0)
         end)
         after_each(function()
             vim.api.nvim_command('cd ' .. cwd)
@@ -99,7 +95,6 @@ describe('git-worktree git operations', function()
     describe('in bare repo', function()
         before_each(function()
             working_dir = git_harness.prepare_repo_bare()
-            status:reset(0)
         end)
         after_each(function()
             vim.api.nvim_command('cd ' .. cwd)
@@ -177,7 +172,6 @@ describe('git-worktree git operations', function()
     describe('in worktree repo', function()
         before_each(function()
             working_dir, master_dir = git_harness.prepare_repo_bare_worktree(1)
-            status:reset(0)
         end)
         after_each(function()
             vim.api.nvim_command('cd ' .. cwd)

diff --git a/lua/git-worktree/hooks.lua b/lua/git-worktree/hooks.lua
@@ -1,7 +1,3 @@
--- local Enum = require("git-worktree.enum")
--- local Status = require("git-worktree.status")
--- local status = Status:new()
-
 --- @class GitWorkTreeHook
 --- @field SWITCH? fun(...): nil
 
@@ -47,29 +43,4 @@ M.hook_event_names = {
     SWITCH = 'SWITCH',
 }
 
--- function M.on_tree_change_handler(op, metadata)
---     if M._config.update_on_change then
---         if op == Enum.Operations.Switch then
---             local changed = M.update_current_buffer(metadata["prev_path"])
---             if not changed then
---                 status
---                     :log()
---                     .debug("Could not change to the file in the new worktree,
---                          running the `update_on_change_command`")
---                 vim.cmd(M._config.update_on_change_command)
---             end
---         end
---     end
--- end
-
--- function M.emit_on_change(op, metadata)
---     -- TODO: We don't have a way to async update what is running
---     status:next_status(string.format("Running post %s callbacks", op))
---     print(metadata)
---     -- on_tree_change_handler(op, metadata)
---     -- for idx = 1, #on_change_callbacks do
---     --     on_change_callbacks[idx](op, metadata)
---     -- end
--- end
-
 return M