Worktree add&remove

ofir-petrushka · ofir-petrushka · commit 2b6d38361fa4 · 2020-08-01T12:31:52.000+10:00
diff --git a/lib/git/base/factory.rb b/lib/git/base/factory.rb
@@ -14,7 +14,12 @@ def branch(branch_name = 'master')
       def branches
         Git::Branches.new(self)
       end
-      
+
+      # returns a Git::Worktree object for dir, commitish
+      def worktree(dir, commitish = nil)
+        Git::Worktree.new(self, dir, commitish)
+      end
+
       # returns a Git::worktrees object of all the Git::Worktrees
       # objects for this repo
       def worktrees
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -328,6 +328,15 @@ def worktrees_all
       arr
     end
 
+    def worktree_add(dir, commitish = nil)
+      return command('worktree', ['add', dir, commitish]) if !commitish.nil?
+      command('worktree', ['add', dir])
+    end
+
+    def worktree_remove(dir)
+      command('worktree', ['remove', dir])
+    end
+
     def list_files(ref_dir)
       dir = File.join(@git_dir, 'refs', ref_dir)
       files = []
diff --git a/lib/git/worktree.rb b/lib/git/worktree.rb
@@ -6,8 +6,9 @@ class Worktree < Path
     
     attr_accessor :full, :dir, :gcommit
     
-    def initialize(base, dir, gcommit)
-      @full = dir + ' ' + gcommit
+    def initialize(base, dir, gcommit = nil)
+      @full = dir
+      @full += ' ' + gcommit if !gcommit.nil?
       @base = base
       @dir = dir
       @gcommit = gcommit
@@ -18,6 +19,14 @@ def gcommit
       @gcommit
     end
 
+    def add
+      @base.lib.worktree_add(@dir, @gcommit)
+    end
+
+    def remove
+      @base.lib.worktree_remove(@dir)
+    end
+
     def to_a
       [@full]
     end
diff --git a/tests/units/test_worktree.rb b/tests/units/test_worktree.rb
@@ -27,4 +27,24 @@ def test_worktrees_single
     assert_equal(worktree.dir, @git.dir.to_s)
     assert_equal(worktree.gcommit, SAMPLE_LAST_COMMIT)
   end
+
+  def test_worktree_add_and_remove
+    assert_equal(@git.worktrees.size, 2)
+
+    @git.worktree('/tmp/pp1').add
+    assert_equal(@git.worktrees.size, 3)
+    @git.worktree('/tmp/pp1').remove
+    assert_equal(@git.worktrees.size, 2)
+
+    @git.worktree('/tmp/pp2', 'gitsearch1').add
+    @git.worktree('/tmp/pp2').remove
+
+    @git.worktree('/tmp/pp3', '34a566d193dc4702f03149969a2aad1443231560').add
+    @git.worktree('/tmp/pp3').remove
+
+    @git.worktree('/tmp/pp4', 'test_object').add
+    @git.worktree('/tmp/pp4').remove
+
+    assert_equal(@git.worktrees.size, 2)
+  end
 end
