Merge branch 'compare-api' into 'master'

Compare api

Fixes #1165

2 files changed, 41 insertions, 0 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 457af52fe9d..6bad6c74bca 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -194,5 +194,30 @@ module API
     class Label < Grape::Entity
       expose :name
     end
+
+    class RepoDiff < Grape::Entity
+      expose :old_path, :new_path, :a_mode, :b_mode, :diff
+      expose :new_file, :renamed_file, :deleted_file
+    end
+
+    class Compare < Grape::Entity
+      expose :commit, using: Entities::RepoCommit do |compare, options|
+        if compare.commit
+          Commit.new compare.commit
+        end
+      end
+      expose :commits, using: Entities::RepoCommit do |compare, options|
+        Commit.decorate compare.commits
+      end
+      expose :diffs, using: Entities::RepoDiff do |compare, options|
+        compare.diffs
+      end
+
+      expose :compare_timeout do |compare, options|
+        compare.timeout
+      end
+
+      expose :same, as: :compare_same_ref
+    end
   end
 end
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 076a9ceeb74..a587d4a7bdf 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -15,6 +15,7 @@ module API
           not_found!
         end
       end
+
       # Get a project repository tags
       #
       # Parameters:
@@ -118,6 +119,21 @@ module API
           not_found!
         end
       end
+
+      # Compare two branches, tags or commits
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   from (required) - the commit sha or branch name
+      #   to (required) - the commit sha or branch name
+      # Example Request:
+      #   GET /projects/:id/repository/compare?from=master&to=feature
+      get ':id/repository/compare' do
+        authorize! :download_code, user_project
+        required_attributes! [:from, :to]
+        compare = Gitlab::Git::Compare.new(user_project.repository.raw_repository, params[:from], params[:to], MergeRequestDiff::COMMITS_SAFE_SIZE)
+        present compare, with: Entities::Compare
+      end
     end
   end
 end