Does Aptana have a file diff tool? Given it's a fairly standard dev requirement, I'm surprised there isn't one embedded in the IDE already. Does anyone have a good solution to this?
I haven't had much experience with eclipse but seeing that Aptana is built as an Eclipse plugin, would other Eclipse plugins be compatible?
Thanks!
--- Answer: (because it won't let me answer my own question for 8 hours) ---
Annnnnnnnd wouldn't you know it, after months of ruing the lack of file diff every time the need has arisen, I've just found the functionality within Aptana.
Select 2 files in the various file lists within Aptana via CTRL+left click (i.e. the Project Explorer or Navigator panes)
right click on the highlighted file you want to appear on the left of the diff screen and chose the 'Compare With' -> 'Each Other' option.
I just updated Aptana to the newest release today so I'm not sure if it's a new addition but I'd be willing to bet that it's been there for a long time and I am just a nonce.
Ta for clicking on my question anyway. :)
Aptana does have file diff. It is under Compare With item when you right click a file in your project. Select two files and use Compare With > Each Other to see the diff between two local files. You can also compare your files with remote sources if you use synchronization or source control.
In case someone ran to the same situation as mine.
I can't seem to compare a file from the Local Filesystem folder and the project folder.
What I did is select both files under the Filesystem folder.
Related
I am using Visual studio code for angular2 application. The requirement is to merge files, so, I want to differentiate changes in two files as it happens in Netbeans IDE. Is there, any extensions available to achieve the task in visual studio code.
For e.g - Merging Two files by differentiating changes like below:-
Please suggest some solution.
abc.component.ts (located in project1)
abc <-- text for understanding purpose
def
abc.component.ts ( located in project2)
abc
I want to differentiate two component files and push changes in another like it happens in Netbeans IDE? Is there, any solution available for Visual studio code?
First using vscode natively with the git toolset
(Make sure to look on the second title as it's a better native way!)
This way may be available on older version of vscode too! Still a good thing to know! (even we should always run on the latest version! And vscode is always keeping getting better and better).
A native powerful and cool way is to use the git toolset within vscode! It still not the most fluid way! But if you are in a setup where you don't have anything else or time or resources to use anything else! Also as a requirement you need to have a git repo initiated! Here we go:
First we will use the change and diffing capability of the git tool set. And the steps go as bellow:
Commit all the current changes
once done: copy past the other file to diff on the place of the current one. And save.
Cool now in the git pallet you can see the file in changes list! Click on it and the diffing editor will show!
Bingo this is it! You can compare and make direct changment! The diffing will keep happening in real time. Note the current state is in the right. And you make changement there.
Here an illustration of direct modification for instance the part in the left is missing from the current file
And here another illustration (current have in plus)
Well to sum up! Git tool and diffing in vscode is so powerful! And all that one need! The only problem is the extra step of committing and cleaning after if desired!
Here some tips! If you want to have the commit history cleaner! Or not have a merge separate! You can remove the last commits from history as much as you need: Without hard reset and commit again a cleaner one!
git reset --soft HEAD~1
You can check
How to cancel a local git commit
Otherwise it can be ok with atomic commit and merge mention!
Also if what you need is to be able to keep a lot from the current file! You can copy the current elsewhere! past the other file to compare! commit ! and then past again the old one! You'll have the old in the right and as current (Not as described on the above) In such a scenario this work well! (Hacky a bit but you may need it).
Native way (direct open of the compare editor)
(May require the newer version of vscode)
open a file that you gonna compare
open the command pallet
CTRL + SHIFT + P
type file: compare
You can see the different possible ways! For a file we can choose compare active file with.
Then you choose the file! The file need to be within the project directory.
And then you choose a file and the compare editor will open
The above was tested on my brother computer on a new vscode installation. I wasn't sure at first if it was part of the core! And i just confirmed that it is. That too remove the need to the method above involving git! And it's the best native way to go with.
Vscode extensions
Here two extensions i suggest the first:
https://marketplace.visualstudio.com/items?itemName=jinsihou.diff-tool
Easy and simple! It add two elements to the right click menu:
In current file right click -> Select as first file for diff, select one again to view the diff results
select to compare and compare with select no more simple then that !
Another extension to check:
https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-diff
I prefer the first! As this one compare a lot to the native way. And having the control in the contextual menu is just great.
Out of vscode! Using other tools
A quick google search and you'll find a lot of tools!
https://meldmerge.org/
meld merge is cross platform and open source and nice!
in linux and debian:
sudo apt install meld
Otherwise you can check the long list here:
https://www.jotform.com/blog/25-useful-document-and-file-comparison-tools/
https://stackify.com/code-merge-tools/
There is too winMerge to mention (an open source project for windows)
https://winmerge.org/
Using RAD 8.5/ClearCase 7.x, I checked out many files. I made my changes and was able to check many of the files back in (using the GUI RAD interface). However I'm unable to check in many other files by right-clicking on them in Eclipse. When I do right-click on them, the check-in & out options are disabled but the 'Add to source control' is enabled - RAD/CC react like these files are not in source control, but they've been controlled for many years. I am able to do a 'Find checkouts' (using RAD) and it lists those files. If I start up CC Explorer and check those files in my view, they show as 'View-private file'.
I've tried deleting one of these files via CC Explorer and then try to "re-add" it via the RAD GUI but I still get a generic error at that point that doesn't tell me anything.
How do I at a minimum get these files back in a state that I can check them out?
After working w/ our inhouse CC support staff, we've gone the route of them going in and undoing the check outs of the remaining files and then creating a new view. Then delete the "bad" view from my RAD workspace (as well as from the VOB) and import the new view. Because of additional CC plugin issues, we're also uninstalling RAD, WAS, and Clearcase to reinstall them. So this current situation is now closed.
I was facing the same issue in clear case view, this may not be the proper answer as I am not doing through eclipse, but it may help others. Solution was
Go to version tree of the file, right click on the checked-out node and there check in option was enabled.
Is it possible to show files in package explorer in the order of date they were created? I am using eclipse juno and I couldn't find any customize option in view menu of the project..
Currently the package explorer shows items in alphabetic order which cause me to search through the files to find the last modified project or java file. Can someone help?
I'd comment if I could to ask for clarification but don't have enough points...
I assume you don't have a team repository or you would have enabled its label decorations, which I know is available in svn. Label decorations will show the team metadata associated with the files. It won't have them sorted but with a small set, you can scan them manually.
In order for this to be useful with a large set, the sort would have to be across all folders/packages. You could open up file explorer(assuming windows os), to the project folder, perform a search with filter of 'datemodified:'. Now you may have to remove the semi-colon and add it again, hit enter. That would sort the folders by date, then the files by date..across all folders.
Its ugly but it works (as far as I understand the question). Good luck.
So i want to format a bunch of files that i have to a certain standard. The problem is, there is A LOT of files. Is there anyway to have Eclipse open a file, hit CTRL+SHIFT+F (to format the file), save it, close it, then open the next file and repeat that process through a directory that i specify?
I don't have any experience with scripting so i have not even attempted doing something like this. I looked into plugins for Eclipse that could maybe do this but i really didn't get anywhere.
Any help is appreciated.
Thanks
You can right-click on any source folder in the Package Explorer (including the root of the project) and select Source > Format, or Source > Cleanup (which gives you even more control than a simple format)
You can right click on a folder in the Navigator or Package Explorer view and select Source -> Format. This will format all the files in the selected directory.
I have an eclipse project containing a source file. Now I have a different version of that file somewhere in the filesystem (not inside an eclipse project).
I can open the second file in eclipse, but I find no way to compare it to the first file.
How can I compare these two files?
Or use WinMerge as external programm - aslo not true way, but fast and simple.
Interesting article "Compare with" Dialog
A simple way is to make a temporary copy in your Eclipse workspace, in the same directory to make it even easier. Then compare, then delete.
Not the ideal theoretical way, but fast and simple to remember.
It's what I use, but I'm open to improving my ways :-)
Use the Remote System Explorer (RSE) plugin to find the files in the operating system.
Download the RSE plugin from the following link (Please check against the version of Eclipse that you are using) http://download.eclipse.org/dsdp/tm/downloads/
Once installed:
1. Display your local file system in a new view by navigating: Windows -> Show View -> Other -> remote Systems -> Remote Systems
Use CTRL-Click to select 2 files for comparison.
Right-click to bring up the context menu and select Compare - To each other.
All those are bad answers... rather have "there's no way" and go back to diff than very cumbersome ways...
This should be as simple as:
"mark first file-->right click-->select to compare"
then
"mark second file-->right click-->compare to xxxx" (xxxx is whatever you first marked)
Bam ! Compare is up.
Another useful option to keep in mind:
"mark second file-->right click-->" and have an option to mark this as first compare, in case you change your mind.
Simple as bread and butter.