Merge branch 'revert-support' of git://github.com/fasttracktool-dev/ruby-git into fasttracktool-dev-revert-support

robertodecurnex · robertodecurnex · commit b8f719d33b11 · 2013-08-17T01:46:03.000-03:00
Conflicts:
	lib/git/base.rb
	lib/git/lib.rb
	tests/units/test_index_ops.rb
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -280,7 +280,6 @@ def reset_hard(commitish = nil, opts = {})
       self.lib.reset(commitish, opts)
     end
 
-
     # cleans the working directory
     #
     # options:
@@ -291,6 +290,16 @@ def clean(opts = {})
       self.lib.clean(opts)
     end
 
+    # reverts the working directory to the provided commitish.
+    # Accepts a range, such as comittish..HEAD
+    #
+    # options:
+    #   :no_edit
+    #
+    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
@@ -428,6 +428,13 @@ def clean(opts = {})
       
       command('clean', arr_opts)
     end
+    
+    def revert(commitish, opts = {})
+      arr_opts = []
+      arr_opts << '--no-edit' if opts[:no_edit] || opts[:'no-edit']
+      arr_opts << commitish
+      command('revert', arr_opts)
+    end
 
     def apply(patch_file)
       arr_opts = []
diff --git a/tests/units/test_index_ops.rb b/tests/units/test_index_ops.rb
@@ -70,6 +70,28 @@ def test_clean
       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|
