path compare #8775
path compare #8775
Conversation
|
I've prepared a stage to preview changes. Open stage or view logs. |
|
updated #5927 now it much simpler. |
|
@skv-headless Can you attach an up to date screenshot of this feature? Thanks :) |
| @@ -7,12 +7,10 @@ def execute(current_user, source_project, source_branch, target_project, target_ | |||
| # Note: Use satellite only when need to compare between two repos | |||
| # because satellites are slower than operations on bare repo | |||
| if target_project == source_project | |||
| Gitlab::CompareResult.new( | |||
There was a problem hiding this comment.
Is it correct behaviour that you don't use Gitlab::CompareResult anymore?
--Edit Nevermind, I see that class is removed al together below
skv-headless
force-pushed
the
path_compare
branch
from
f302fa7
to
3b28049
Compare
|
on 1024px |
|
@skv-headless What happends if no path is given? Is the compare still working without it? |
|
It will work like before. |
|
@skv-headless Maybe you can add a placeholder in the text box saying: |
skv-headless
force-pushed
the
path_compare
branch
from
3b28049
to
5d58fb0
Compare
| @@ -257,7 +257,7 @@ | |||
| end | |||
|
|
|||
| get '/compare/:from...:to' => 'compare#show', :as => 'compare', | |||
| :constraints => { from: /.+/, to: /.+/ } | |||
| :constraints => { from: /.+/, to: /.+/, path: /.+/ } | |||
There was a problem hiding this comment.
@skv-headless Can you please fix this Hound issue?
|
|
|
+1 I need this feature very much in the Swiss meteorological office |
|
@randx What do you think about this overal feature? If you want this to be merged in I'll guide the rest of this PR. |
|
@jvanbaarsen I like idea of comparing certain directory or file. If it can be done in nice way (UI too) - I would like to have it |
|
@skv-headless Are you still working on this? |
|
What should I do? If I understood correct @randx don't like UI, but I don't know how to improve it. |
|
@skv-headless: please remove the whitespace after |
|
Just add a new commit to the branch used in the pull request and push the branch to GitHub. The pull request will automatically be updated with the additional commit. |
|
@randx Would the way @skv-headless implemented it now (UI-wise) be acceptable as a first pass? We can improve upon it later on. |
| {style: 'font-size: 15px;'} | ||
| %br | ||
| %br | ||
|
|
There was a problem hiding this comment.
Please remove this. We already have new mr button on this page
@jvanbaarsen my experience says it would be me 😄 . So I rather finish UI in this PR. Try to hide path text field and expand it only when needed. Same like we did for import URL on new project page |
|
@randx Well, yeah.. it would probably be you |
Ok. I like what you're proposing.
|
This merge request has been closed because a request for more information has not been reacted to for more than 2 weeks. If you respond and conform to the merge request guidelines in our contributing guidelines we will reopen this merge request. |
|
:,( |
|
@skv-headless Are you going to continue working on this task? This is very useful feature! |
|
I'm missing this feature as well |
|
Ough, this is a killer feature for me, too bad it's abandoned! I have huge PR (300+ changed files), and to get it reviewed I want to provide separate document with high level description of changes with links on some details in overall PR diff (i.e. links on diffs for specific files). |
|
We would also appreciate such feature. Is there any chance someone is working on this currently or we're waiting for a volunteer? |
|
Definitely would like this - diffing 1 file gives you a history of the file rather than a history of the full commits and is so useful! |
No description provided.