2019.2 GIT branch Compare With Current changed
已回答
Previous to 2019.2, the GIT branch Compare With Current feature would display a popup with current branch in a top pane and the selected branch in the bottom. In each pane would be a list of commits that did not exist in the other. I found this to be extremely helpful when determining merges. In 2019.2, this feature now just lists the updated files from the selected branch. Is there any way I can get the old way of comparing branches?
Thanks a bunch.
请先登录再写评论。
The old Compare dialog will be restored in the 2019.2.3 release.
We understand the new implementation brought in several Usability issues, and apologize for that, we could do better. We are restoring the dialog in 2019.2.
However, we believe improving the Compare branches feature is the right thing to do, so we plan to solve all the usability issues of the new implementation and use the fixed version in 2019.3. Several fixes and improvements are already done, but there are more to do.
The issues we plan to address include but are not limited to:
The feedback on the new features and changes is always welcome.
I was a heavy user of this feature, and I think it's one of the things that really made IntelliJ stand out amongst it's peers. The new feature is pretty weak by comparison.
Please add this back soon! Imagine a number of folks (including myself) will need to consider downgrading to 2019.1 otherwise.
Hey phpStorm devs!
Please bring back the previous branch comparison feature ASAP!
This feature in the newest version 2019.2 now pretty much unusable and unreadable.
Before, there was a clean and concise view of differences, now it's a usability disaster.
Thanks!
Good day, dear IntelliJ!
I was looking for the same issue as the topic starter after updating to 2019.2.
I have to say that I found the new feature ambiguous and misleading.
When I click "compare with current" I expect to see the actual difference between 2 branches (as it was before), but now I'm taken to VCS log which shows me only the unidirectional difference, e.g. commits that exist in the branch being compared and not in the current, but does not show commits that exist in the current branch but do not exist in the one being compared.
That makes the tool extremely clumsy for the purpose of comparing 2 branches because it makes me to perform one comparison, then switch branches and compare again.
I know about a new option `show diff with working tree` that partly covers the good old "compare with current", but still both new features are confusing for those who have experience with older versions.
>An option for reverse comparison will be added soon
Hope for that option as default for "compare with current", thanks!
The old popup dialog also contained a tab showing the actual changed files between one branch and another. Please bring back the old dialog, the new one is completely unusable.
Pleased to see other devs like the previous, more intuitive feature. I'm wondering why in the world JetBrains felt this needed to be "fixed".
Please return old version of this feature. It was very useful
I cannot understand the new feature. "Compare with current" opens the git log and shows nothing. It's not clear what this means. And it's not clear what extra steps I must perform to get what I need which is a view of the commits in A that aren't in B together with a list of the commits in B that aren't in A.
> Showing the tab was moved to the separate action - Show Diff with Working Tree, next to the Compare with Current in the Branches popup.
That is part of the issue: several extra user interactions are now needed to achieve the same result.
While your motivation to get rid of the old pop-up might be valid (some of the points are valid only from your/developers' view, not from the users' view), getting rid of it *before you provide* the means to deliver what the pop-up used to do is just careless.
I believe it would be fair to bring the pop-up dialog back, so you can work on polishing the new way of delivering your goals, so we don't have to wait several iterations for the final solution.
Wow, this is a major regression. Seeing the clear picture: 2 lists of actual commits in each branch on same page was huge part of our daily workflow.
downgrading for now
Please revert this until the new compare is doing what the old did.
The proposed option for reverse comparison does not look like a good solution.
Dmitriy Smirnov,
This seams as a great step backwards, I get this might be far faster, using fewer resources and with less steps in between GIT commands/calls and IntelliJ's UI. Also this data is shown in a more streamlined and less intrusive way, but it is extremely terrible for the UX in general regarding this particular (useful) functionality.
I wont pretend to talk on behalf of all the IntelliJ users, just for myself, though I see that I'm not the only one who dislikes this new behavior.
For me working with GIT/VCS was probably never one of the strong points of IntelliJ, since I consider:
So I used to work with IntelliJ, and GitKraken or GitAhdead when I wanted to track changes visually (mainly viewing branches or "log"), then GIT directly in bash for missing features.
But it also had some good/great features.
And experience was getting better with almost every new IDE version, to the point I uninstalled the GUI GIT manager and started working with just IntelliJ and GIT bash.
Now I reinstalled GitAhead and even installed JetBrains Toolbox so I can switch between IntelliJ 2019.1.4 and 2019.2.
I still think IntelliJ is the best IDE for my work, I'm not planning on stop using/paying IntelliJ Ultimate, but as I said, I consider this a huge step backwards on a feature I used a lot and now I have to turn to another tool to do so and that is frustrating.
I feel everything I just wrote wont make JetBrains bring this useful feature back and it will end up being more of a rant than anything else
Cheers,
Luis
Hi
Can only chime in: dearly missing the old compare view which served a specific purpose: to be able to evaluate in one second and one click the current state of a branch compared to another. That is gone and the current UI is nowhere near that, nor the announced addition.
Yes, it does other things (cherry-picking?), except those things are not needed for the purpose of the feature.
@Dmitriy Smirnov
> The reasons for the change are:
> The old dialog lacks features - it is no possible to cherry-pick, revert or merge branches from it, and this is possible with the new view. The new Log-based view allows this.
The old dialog had only one purpose and it achieved it extremely well. No additional feature was needed, at least not by removing the main feature for the action.
You added some features that were not needed - because they are already available elsewhere - and destroyed the good one in the process.
> The old dialog is slow (it takes a long time to load and executes expensive git log calls, especially on bit projects if branches diverge a lot). The new view is based on Git Log functionality and uses log index - so it is fast and cheap.
I have never seen the old dialog being slow in any measurable way.
> It opens in a separate frame. This is not very useful if you use the Compare feature to review a branch or cherry-pick something.
Never wanted to do that. Reviewing a branch is something else and so is cherry-picking. Again, you seem to be missing the point of that feature - for users.
> Its Files tab actually shows the difference with the working tree and not the branch tip, while the action name states otherwise
Maybe that was something you could have improved instead of removing the entire feature?
>it's an old code that requires effort to support and add new features to it, while there is a better engine at the moment.
Please be very, very careful when you use such argument. If the code is old, rewrite it. That's your job. We are paying customers, not participating in an open-source project with everyone contributing.
My usage of this feature was for reviewing code. My workflow was to switch to the branch I want to review, then from the branch picker do compare with master. This allowed me easily to see the commits that the other branch didn't have, and I could either review the changes commit by commit, or multi-select and review them all.
I want to be on the branch I'm reviewing so I can see gutter warnings etc. Now my workflow is to manually edit the branch selector thing which is a pain, and I can't easily see if the branch needs rebasing.
I did find the fact that it used to open a new frame slightly annoying, as occasionally I used to close it by accident with Esc. On balance though I prefer the old method, although if "compare with branch" showed me the commits on the branch I'm on (or there was an easy way to do a "reverse comparison" I could probably get used to it...
I can't cope. Downgraded to 2019.1
Updated to 2019.2.3, and Compare with Current is back! Nice work.
Me and my colleagues spent a good deal of time exploring the new UI and searching for documentation and new ways to do our everyday work. After this can say
For example, I'm on branch A and I want to see the differences with branch B in terms of commits and diffs
Now I can see the commits in A that aren't in B.
That was really hard to learn (it's hardly intuitive) and even now that I have done it a few times it's hard to do. It's really not easier than using git command line utility.
So I wonder why the old feature was removed? Does it break anything to leave it in?
Another issue with this change is when you have multiple repositories in your project the log lists commits from all repositories that have branches with the same name, which makes it totally unusable.
Manually changing the the path filter is also very cumbersome, most notably there is no option to 'deselect all'.
Please bring back the old functionality for comparing all files between two different branches! I need that!
Alan
I thought I changed some setting that I didn't see the popup appearing when comparing a branch, but now I read here that this feature has been removed. I liked the very practical view to see what's in one branch and not in the other branch and vice versa. I really miss this user friendly feature. I downgraded to 2019.1 for now. At least give the option or setting to have this popup view back.
Please return old version of this feature. It was very useful
Wonderful! Old compare with current is back!
I'll be reverting to 2019.1 for the same reason.
Also, the reverse comparison option is not the same as seeing both at the same time.
This makes me nervous about what other 'improvements' are in the works that are going to mess up my workflow.
Please restore the old UI. Introducing new work flows when the old one is still maintainable and simpler for the average user is terrible UX, in my opinion. IntelliJ is a premium product and charges a premium price, as such, I do not think it is unreasonable to expect the niceties in life. Your competitors are, on average, far cheaper and this was one of your differentiators.
I just found "compare with current" works different with 2019.1 which is so uncomfortable ,I can't get the difference between two branches clearly .Can you make it back ? Cause it's so useful ;
Please revert old dialog! New feature is useless and inconvenient!
As others already said: please bring back the previous and way more usable functionality of 2-way branch comparison.
I have to sum myself to this. I was quite unpleased with this change. I am not a git expert and one of my favorite things from PhpStorm is the incredible git support it has, and the old "compare branches" was great because of how intuitive it was. This new feature is not intuitive at all. Please return the old "compare branches" or make something more usable and intuitive.
THE OLD COMPARE IS BACK!!!... thank goodness.
>Since 2019.2 IntelliJ supports double-dot log filter
I checked this video after upgrading: https://youtu.be/33SZL9lIlg0?t=683
but unfortunately, it tells nothing about all these critical (IMO) vcs related features.
It's worth describing, I would never guess how to use it.
I'd appreciate if IntelliJ update this video.
Thanks for your reply and for caring about users.