Add git revert --no-edit support.

joemoore · joemoore · commit dcb44d27cc87 · 2013-04-29T11:21:32.000-04:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -264,6 +264,13 @@ def reset_hard(commitish = nil, opts = {})
       self.lib.reset(commitish, opts)
     end
 
+    # reverts the working directory to the provided commitish.
+    # Accepts a range, such as comittish..HEAD
+    # Note: automatically adds --no-edit flag.
+    def revert(commitish = nil, opts = {})
+      self.lib.revert(commitish, opts)
+    end
+
     # commits all pending changes in the index file to the git repository
     # 
     # options:
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -429,7 +429,13 @@ def reset(commit, opts = {})
       arr_opts << commit if commit
       command('reset', arr_opts)
     end
-    
+
+    def revert(commit_or_range, opts = {})
+      arr_opts = ["--no-edit"]
+      arr_opts << commit_or_range if commit_or_range
+      command('revert', arr_opts)
+    end
+
     def apply(patch_file)
       arr_opts = []
       arr_opts << '--' << patch_file if patch_file
diff --git a/tests/units/test_index_ops.rb b/tests/units/test_index_ops.rb
@@ -37,7 +37,29 @@ def test_add
       end
     end
   end
-  
+
+  def test_revert
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'new')
+      Dir.chdir('new') do
+        new_file('test-file', 'blahblahbal')
+        g.add
+        g.commit("first commit")
+        first_commit = g.gcommit('HEAD')
+
+        new_file('test-file2', 'blablahbla')
+        g.add
+        g.commit("second-commit")
+        second_commit = g.gcommit('HEAD')
+
+        commits = g.log(1e4).count
+        g.revert(first_commit.sha)
+        assert_equal(commits + 1, g.log(1e4).count)
+        assert(!File.exists?('test-file2'))
+      end
+    end
+  end
+
   def test_add_array
     in_temp_dir do |path|
       g = Git.clone(@wbare, 'new')
