Skip to content

Commit 0f7f796

Browse files
committed
chore: move libgit2 modules to core
1 parent ee57ed8 commit 0f7f796

18 files changed

+23
-24
lines changed

lua/fugit2/core/blame.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- Helper module to parse git blame porcelain information
22

33
local diff_utils = require "fugit2.diff"
4-
local git2 = require "fugit2.git2"
4+
local git2 = require "fugit2.core.git2"
55
local pendulum = require "fugit2.core.pendulum"
66
local utils = require "fugit2.utils"
77

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
local ffi = require "ffi"
2-
local libgit2 = require "fugit2.libgit2"
2+
local libgit2 = require "fugit2.core.libgit2"
33
local stat = require "fugit2.core.stat"
44
local table_new = require "table.new"
55
local uv = vim.uv or vim.loop
@@ -4151,7 +4151,7 @@ function Repository:blame_file_async(path, opts, callback)
41514151
end
41524152

41534153
local work_fn = function(lib, repo_ptr, p, opts_ptr)
4154-
local lg2 = require "fugit2.libgit2"
4154+
local lg2 = require "fugit2.core.libgit2"
41554155
lg2.setup_lib(lib)
41564156
local ffi_ = require "ffi"
41574157

@@ -4194,7 +4194,7 @@ function Repository:status_async(callback)
41944194
---@return integer?
41954195
---@return GIT_ERROR
41964196
local function new_git_status_list(lib, repo_ptr, flags)
4197-
local lg2 = require "fugit2.libgit2"
4197+
local lg2 = require "fugit2.core.libgit2"
41984198
lg2.setup_lib(lib)
41994199
local ffi_ = require "ffi"
42004200

lua/fugit2/core/git_gpg.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
local uv = vim.uv or vim.loop
44
local PlenaryJob = require "plenary.job"
55

6-
local git2 = require "fugit2.git2"
76
local gpgme = require "fugit2.core.gpgme"
87
local utils = require "fugit2.utils"
98

lua/fugit2/core/git_rebase_helper.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
---SQUASH AND FIXUP
44

55
local DynamicArray = require "fugit2.util.dynamic_array"
6-
local git2 = require "fugit2.git2"
7-
local libgit2 = require "fugit2.libgit2"
6+
local git2 = require "fugit2.core.git2"
7+
local libgit2 = require "fugit2.core.libgit2"
88

99
---@module "fugit2.core.git_rebase"
1010
local M = {}

lua/fugit2/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ M.setup = function(args)
2020
local cfg = config.merge(args)
2121

2222
-- setup C Library
23-
require("fugit2.libgit2").setup_lib(cfg.libgit2_path)
23+
require("fugit2.core.libgit2").setup_lib(cfg.libgit2_path)
2424
require("fugit2.core.gpgme").setup_lib(cfg.gpgme_path)
2525

2626
require("fugit2.view.colors").set_hl(0, cfg.colorscheme)
@@ -43,7 +43,7 @@ local function open_repository(dir)
4343
local repo = repos[cwd]
4444

4545
if not repo then
46-
local git2 = require "fugit2.git2"
46+
local git2 = require "fugit2.core.git2"
4747

4848
local err
4949
repo, err = git2.Repository.open(cwd, true)

lua/fugit2/view/components/branch_tree_view.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local NuiText = require "nui.text"
66
local NuiTree = require "nui.tree"
77
local Object = require "nui.object"
88

9-
local git2 = require "fugit2.git2"
9+
local git2 = require "fugit2.core.git2"
1010
local utils = require "fugit2.utils"
1111

1212
-- ===============

lua/fugit2/view/components/commit_log_view.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ local NuiText = require "nui.text"
66
local Object = require "nui.object"
77
local string_utils = require "plenary.strings"
88

9-
local git2 = require "fugit2.git2"
9+
local git2 = require "fugit2.core.git2"
1010
local pendulum = require "fugit2.core.pendulum"
1111
local utils = require "fugit2.utils"
1212

lua/fugit2/view/components/diff_view.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
local NuiPopup = require "nui.popup"
44
local Object = require "nui.object"
55
local event = require("nui.utils.autocmd").event
6-
local utils = require "lua.fugit2.utils"
6+
local utils = require "fugit2.utils"
77

88
---@class Fugit2DiffView Diff view panel, used in git status
99
---@field ns_id integer namespace id

lua/fugit2/view/components/file_tree_view.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ local plenary_filetype = require "plenary.filetype"
1111
local strings = require "plenary.strings"
1212

1313
local TreeBase = require "fugit2.view.components.base_tree_view"
14-
local git2 = require "fugit2.git2"
14+
local git2 = require "fugit2.core.git2"
1515
local notifier = require "fugit2.notifier"
1616
local utils = require "fugit2.utils"
1717

0 commit comments

Comments
 (0)