Update app code to use Gitlab::Git::Diff

Dmitriy Zaporozhets
1 parent 6a4a17f3
Showing 3 changed files with 19 additions and 4 deletions Show diff stats
app/models/note.rb
lib/gitlab/git/commit.rb
lib/gitlab/git/repository.rb
@@ -68,8 +68,8 @@ class Note &lt; ActiveRecord::Base
   def diff
     if noteable.diffs.present?
       noteable.diffs.select do |d|
-        if d.b_path
-          Digest::SHA1.hexdigest(d.b_path) == diff_file_index
+        if d.new_path
+          Digest::SHA1.hexdigest(d.new_path) == diff_file_index
         end
       end.first
     end
@@ -80,7 +80,7 @@ class Note &lt; ActiveRecord::Base
   end
  
   def diff_file_name
-    diff.b_path
+    diff.new_path
   end
  
   def diff_new_line
@@ -9,7 +9,7 @@ module Gitlab
         :author_name, :author_email, :parent_ids,
         :committer_name, :committer_email
  
-      delegate :parents, :diffs, :tree, :stats, :to_patch,
+      delegate :parents, :tree, :stats, :to_patch,
         to: :raw_commit
  
       def initialize(raw_commit, head = nil)
@@ -96,6 +96,10 @@ module Gitlab
         committed_date
       end
  
+      def diffs
+        raw_commit.diffs.map { |diff| Gitlab::Git::Diff.new(diff) }
+      end
+
       private
  
       def init_from_grit(grit)
@@ -191,6 +191,17 @@ module Gitlab
         "#{type}:#{path_with_namespace}"
       end
  
+      def diffs_between(source_branch, target_branch)
+        # Only show what is new in the source branch compared to the target branch, not the other way around.
+        # The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
+        # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
+        common_commit = repo.git.native(:merge_base, {}, [target_branch, source_branch]).strip
+        repo.diff(common_commit, source_branch).map { |diff| Gitlab::Git::Diff.new(diff) }
+
+      rescue Grit::Git::GitTimeout
+        [Gitlab::Git::Diff::BROKEN_DIFF]
+      end
+
       protected
  
       def decorate_commit(commit, ref = nil)
...	...	@@ -68,8 +68,8 @@ class Note < ActiveRecord::Base
68	68	def diff
69	69	if noteable.diffs.present?
70	70	noteable.diffs.select do \|d\|
71		- if d.b_path
72		- Digest::SHA1.hexdigest(d.b_path) == diff_file_index
	71	+ if d.new_path
	72	+ Digest::SHA1.hexdigest(d.new_path) == diff_file_index
73	73	end
74	74	end.first
75	75	end
...	...	@@ -80,7 +80,7 @@ class Note < ActiveRecord::Base
80	80	end
81	81
82	82	def diff_file_name
83		- diff.b_path
	83	+ diff.new_path
84	84	end
85	85
86	86	def diff_new_line
...	...
...	...	@@ -9,7 +9,7 @@ module Gitlab
9	9	:author_name, :author_email, :parent_ids,
10	10	:committer_name, :committer_email
11	11
12		- delegate :parents, :diffs, :tree, :stats, :to_patch,
	12	+ delegate :parents, :tree, :stats, :to_patch,
13	13	to: :raw_commit
14	14
15	15	def initialize(raw_commit, head = nil)
...	...	@@ -96,6 +96,10 @@ module Gitlab
96	96	committed_date
97	97	end
98	98
	99	+ def diffs
	100	+ raw_commit.diffs.map { \|diff\| Gitlab::Git::Diff.new(diff) }
	101	+ end
	102	+
99	103	private
100	104
101	105	def init_from_grit(grit)
...	...
...	...	@@ -191,6 +191,17 @@ module Gitlab
191	191	"#{type}:#{path_with_namespace}"
192	192	end
193	193
	194	+ def diffs_between(source_branch, target_branch)
	195	+ # Only show what is new in the source branch compared to the target branch, not the other way around.
	196	+ # The linex below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
	197	+ # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
	198	+ common_commit = repo.git.native(:merge_base, {}, [target_branch, source_branch]).strip
	199	+ repo.diff(common_commit, source_branch).map { \|diff\| Gitlab::Git::Diff.new(diff) }
	200	+
	201	+ rescue Grit::Git::GitTimeout
	202	+ [Gitlab::Git::Diff::BROKEN_DIFF]
	203	+ end
	204	+
194	205	protected
195	206
196	207	def decorate_commit(commit, ref = nil)
...	...