I just moved to IntelliJ IDEA after spending years working in Eclipse. Eclipse has "Quick Diff" option that allows me to choose color for each type of modification (new line added, line deleted and line modified). It compares my local changes and Git / SVN / CVS code, depending on what you choose. Does IntelliJ has this option or some plugin that does the same thing?
I'm sorry if this question has already been asked before. I tried to find it on IntelliJ's page, on Google and Stack-overflow.
IntelliJ will by default diff with the VCS that's set up for the project/module, but you can also diff two files by right-clicking on one of them and selecting Compare With....
To change the colors go to Settings > Editor > Color Scheme > Diff & Merge. The important color is the highlighting of the line in the diff view, the Error stripe mark color is the color shown in the gutter.
Related
I use Eclipse with egit plugin. When I click Team -> Show Annotations, it shows up nothing. But I could view annotations by going to the history and then right clicking on the desired change set.
Shouldn't the first way show annotations from the latest version of that file I am working on?
I found eclipse bug 394161 that says the show annotations functionality won't work unless you set your EGit preferences to ignore whitespace changes. You can do that by going to Window -> Preferences -> Team -> Git and checking the box that says "Ignore whitespace changes". That fixed the problem for me.
I was having the same problem and this worked for me (in two different computers):
Make sure annotations are well set up, for example, if you want to see errors on the vertical ruler, you must have that option activated. Preferences > General > Editors > Text Editors > Annotations > Errors > Show in > Vertical ruler
Make sure your project is marked as a PyDev project. Right-click on your project > PyDev > Set as PyDev Project (if you see Remove PyDev Project config it is already marked as one)
Lastly, make sure your source folder is correctly identified. Right-click on your source folder > PyDev > Set as source folder (add to PYTHONPATH)
In the last step, if you see Set as non-source folder (remove from PYTHONPATH) it is already marked as one and, in that case, this solution shouldn't work for you, but you can try to undo and redo steps 2 and 3.
I'm using Eclipse Kepler, PyDev 3.2 and EGit 3.2.
I banged my head on this for a bit today. Right-clicking a file in Project Explorer or Package Explorer, then selecting "Team" > "Show Annotations" does not work (at least in version 4.5.1). So don't do that. I found the easiest way to show annotations is just click on the vertical ruler then select "Show Annotations" from there.
By the way, the ignore whitespace bug that #Derek mentions has been fixed. From the bug ticket,
After updating to the 3.4.0.201405071430 showing the annotations worked also without setting the property "Ignore whitespace changes"
So the bug seems to be fixed.
I verified that I am not impacted by the bug in 4.5.1
Plugins like vim-signify for Vim show the diff status of the file being edited, if the file belongs to a Mercurial or Git repository. It displays this information by showing indicators for the lines which have changed since last commit, along the left gutter of the editor window.
Is there any similar plugin for Eclipse which works with Mercurial? That is, while editing a file which belongs to a Mercurial repository, the lines which have changed are highlighted or indicated by some means.
The one and only one worth it :) : https://bitbucket.org/mercurialeclipse/main/wiki/Home
I often switch from Eclipse to Netbeans and back. There is a feature in Netbeans that allows you to see changed lines in code due to repository.
Example:
Is there something similar in Eclipse?
Yes, right click the file Team -> Show Annotation... When you hover over the colored line numbers you see the committing user and the commit message. If it is a local change it is just white.
I use the SpringSourceToolSuite (v2.9.2.201205071000-RELEASE) version of Eclipse along with Subclipse (v1.8.13). When checking in code I use Tortoise and then return to eclipse where I run a full project clean, which resets the subversion decorations (i.e asterisk, cross, question mark etc) to their correct status.
This is usually all I need to do, but lately the decorations do not get reset even though I have (say) just checked in the file and comparing with the repository shows no differences.
I can edit a file by adding and deleting a space and then the decorations reset correctly. This is proving to be a pain, and now I have a package which is decorated with a + sign and I can't get rid of it.
Anybody else getting this problem or managed to resolve it? Thanks.
Please try: right click on project, Team-> Refresh/Cleanup
I had to change {label_decoration} to {resource_url} in Preferences / Team / SVN / Label Decorations / Text Decorations / Project.
So my Project entry is: {outgoing_flag} {name} {revision} [{resource_url}{root_prefix}: {first_branchOrTag_child}]
Previously I've used command line SVN without any wrappers.
Few days ago I switched to Eclipse with Subversive and have problems with diffs.
Team Sync perspective with Compare view is OK, but it displays whole file, not just changes.
Where I can find something similar to "svn diff" output? I need only changes.
Eclipse Compare views show the entire file which makes sense, as its a GUI. In the Compare view, there are buttons in the top right that enable you to skip from diff to diff (down and up), and the right-hand margin shows locations. So, while its not exactly the same as the command-line, its just as functional. Also, it gives you context for the changes, not just the changed line.
If you need to output a report, that's a little different. You might be able to just click int the top pane, type Ctl-A to select all, Ctl-C to copy, and then paste into a text editor. That might give you just the changes.