Oswaldo Ferreira
c6273ec50c
Avoid re-fetching merge-base SHA from Gitaly unnecessarily
2018-03-07 22:46:29 -03:00
Sean McGivern
3c6a4d6363
Ensure MRs always use branch refs for comparison
...
If a merge request was created with a branch name that also matched a tag name,
we'd generate a comparison to or from the tag respectively, rather than the
branch. Merging would still use the branch, of course.
To avoid this, ensure that when we get the branch heads, we prepend the
reference prefix for branches, which will ensure that we generate the correct
comparison.
2017-11-28 17:01:38 +00:00
Jacob Vosmaer
8ad690b0d4
Prepare GitOperationService for move to Gitlab::Git
2017-08-31 15:35:59 +02:00
Douwe Maan
3a5d375e49
Fix Diff::Position#diff_file for positions on straight diffs
2017-06-06 14:48:05 -05:00
Lin Jen-Shin
ccc73c455b
Rename from base to start because base could mean merge base
2017-01-06 23:29:13 +08:00
Lin Jen-Shin
a4b97b2cb6
Rename source to base to avoid confusion from MR
2017-01-06 22:05:30 +08:00
Lin Jen-Shin
99ac093527
Introduce Repository#with_repo_branch_commit
...
We merge repository checks inside it so we don't have to
check it on the call site, and we could also load the commit
for the caller. This greatly reduce code duplication.
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_20572919
2017-01-05 01:52:21 +08:00
Lin Jen-Shin
3e01385bca
Should pass branch name, not commit object!
2016-12-10 01:23:49 +08:00
Lin Jen-Shin
e7599eb0b7
Should pass repository rather than project
2016-12-08 19:49:20 +08:00
Lin Jen-Shin
07b9b80a88
Fix tests to use the new API
2016-12-08 19:11:52 +08:00
Lin Jen-Shin
8384d0d8d5
Introduce Repository#with_tmp_ref which we need
...
commits from the other repository. We'll cleanup
the tmp ref after we're done with our business.
2016-12-08 17:57:52 +08:00
Dmitriy Zaporozhets
b48c4b2662
Refactor straight compare diff code
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12 16:32:57 +03:00
Dmitriy Zaporozhets
ac4db38094
Use straight diff approach when compare merge request versions
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12 16:32:57 +03:00
Paco Guzman
c86c1905b5
switch from diff_file_collection to diffs
...
So we have raw_diffs too
2016-08-03 07:00:20 +02:00
Paco Guzman
1d0c7b7492
Introduce Compare model in the codebase.
...
This object will manage Gitlab::Git::Compare instances
2016-08-03 07:00:20 +02:00
Sean McGivern
6a46926f88
Remove unused argument to CompareService#execute
2016-07-08 13:53:17 +01:00
Jacob Vosmaer
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
Minsik Yoon
3d0efa8e0a
Add ignore white space option in merge request diff
...
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393 ).
Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Stan Hu
de8497ca56
Fix Error 500 when comparing non-existing branches
...
Closes #2593
2015-09-18 12:02:01 -07:00
Dmitriy Zaporozhets
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c8
, reversing
changes made to 2f706fbd23
.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f41
, reversing
changes made to 6b9dbe9f5a
.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets
26f5d6047d
Refactor compare and fetch logic
2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets
2a6f522cac
Implement merge from forks without satellites
2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets
a87989fb7d
Remove satellites
2015-07-15 15:45:57 +02:00
Ciro Santilli
af7b19003c
Comment typo.
2014-08-29 20:11:57 +02:00
Ciro Santilli
5317c26cf7
Comment typo.
2014-08-29 19:35:04 +02:00
Dmitriy Zaporozhets
2f780af246
Git::Compare does not have limit param any more
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 14:29:59 +03:00
Dmitriy Zaporozhets
bf9ce1f4cf
Refactor compare logic for MR. Use satellites only for forks for better performance
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 12:11:16 +03:00