Plastic SCM external diff on Mac - plasticscm

I am attempting to set up Araxis diff as my external diff tool on Mac.
Command Line Reference:
http://www.araxis.com/merge_mac/command_line.html
I have set up a diff tool in the Diff Tool Configuration in the Preferences panel of Plastic with the following settings:
External Diff Tool ( selected )
Path: /usr/local/bin/compare -wait #sourcesfile #destinationfile
Use this tool for text files ( selected )
I have also attempted setting specific extensions and removing all other diff tools to no avail.
The internal diff tool shows up regardless of the settings.
Please advise what would be my next steps.

You have to use the priority arrows to set your new diff and merge tool in the first position. If a diff or merge tool is on top with no file type restriction that is the one that is going to be used, make sure your new Araxis merge tool is on top.
In order to configure the diff tool with more details I do recommend you to use the following configuration:
"/usr/local/bin/compare" /wait /2 /title1:"#sourcesymbolic" /title2:"#destinationsymbolic" #sourcefile #destinationfile
And for the merge tool you can use the following one:
"/usr/local/bin/compare" /wait /a3 /3 /title1:"#sourcesymbolic" /title2:"Workspace version" /title3:"#basesymbolic" #sourcefile #destinationfile #basefile #output
You will have this new tool available for the merge and file diff. The branch, changeset... will remain the built-in one.

Related

Equivalent of Notepad++ SCI_LINECOPY in Visual Studio 2019?

In Notepad++, view Settings > Shortcut Mapper > Scintilla commands. The command SCI_LINECOPY, currently assigned to Ctrl + Shift + X, copies the current line to the clipboard for pasting elsewhere. Very nice!
Does Visual Studio 2019 have something similar under Tools > Options > Environment > Keyboard? The Edit.Duplicate command, which copies the current line into the editor though not to the clipboard, is excellent but only superficially similar to SCI_LINECOPY.
For me, without any additional adjustment, this is a normal process as shown in the pictures below.
When the cursor is in the line (1), I can copy it to the clipboard without selecting the text first using Strg+C.
Followed of course by Strg+V (2) or optional by step (3).

SonarQube code coverage - exclude some classes

Is there any way to purposefully increase Code Coverage value in SonarQube by excluding some classes.
Try to use sonar.coverage.exclusions.
As sonar.coverage.exclusions is Comma-delimited list of file path patterns to be excluded from coverage calculations. Your pattern should be like this:
sonar.coverage.exclusions=com/abc/demo/presentation/beans/**/*, com/abc/demo/presentation/interfaces/**/*, com/abc/demo/presentation/validator/**/*, com/abc/utility/**/*
Note: Documentation for this option was removed in 7.3 (Google: site:docs.sonarqube.org "sonar.coverage.exclusions"). But you can still see them when you open the administration pages for the project on Sonar -> "General Settings" -> "Analysis Scope". Look for the values after "Key:"
You can exclude certain files in sonar-project.properties file:
sonar.exclusions=**/*.js,**/*.json,**/*.xml,**/*.png,**/*.sh,**/*.h,**/*.m,**/*.c,**/*.cpp,**/*.pdf,**/*.plist,Pods/**/*
sonar.swift.excludedPathsFromCoverage=.*Tests.*
Also, you can include specific files using:
sonar.test.inclusions=**/*Test*/**
sonar.test.inclusions=*.swift

Missing file from computer "opencv_core249d.dll". Resolution with eclipse Version: Mars.2 Release (4.5.2).Closed

I am facing a problem with my visual studio 2013 ultimate. i would run a open cv project but iam getting a error message like this " opencv_core249d.lib" missing from ur computer. re install the program.
Solution : It works with eclipse Version: Mars.2 Release (4.5.2).
This is a missing .dll issue, not a missing lib issue. It usually occurs when the Environment Variables have not been correctly set in your Windows environment. To take care of this problem, there are 2 methods:
1) edit Environment variables
Go to ‘My Computer’ , right-click and select ‘Properties’. A window called ‘System’ will open, containing the Windows Logo on the right. On the left margin of this window, you will find a link named ‘Advance system
settings’. Click on it.
Another window called ’System Properties’ will open. On the bottom right corner of this window, click on the button named ’Environment Variables..’.
Under the ‘System variables’ column, look for a variable by the name ‘Path’. - Select ‘Path’ and click ‘Edit..’
In the ‘variable value’ row, add the following address:
\path to\opencv\build\x86\vc12\bin;
Please Note- Ensure that the new address added by you, and the address previously written in the ‘variable value’ row, are separated by a ; DO NOT REMOVE the previous environment variable addresses.
2) Manually copy the .dll files.
In case the first approach does not work for you, go to:
\path to\opencv\build\x86\vc12\bin;
You'll find all the dll files that you're looking for. Copy those files to directory where your source code is located.

How to Auto-Alignment Shortcut Key in Keil uVision?

I want to find Auto-Alignment Shortcut Key in Keil uVision. I tried some shortcut keys but I can not find. In Visual Studio I used to: CTRL + K + D , but in keil uVision I don't know how it is work.
For example :
When you type below ( usually copied from another text file which was not tabified correctly):
Use the shortcut key Auto Alignment with this block of code can auto formatting your code as below :
Stop searching. There is no such feature.
Was able to align in uVision5 with Astyle (http://astyle.sourceforge.net/).
File must be saved so that this tool can do its work.
Instructions :
Copy the Astyle.exe file to the Keil installation directory (e.g. D:/Keil_v5/)
Then open Keil and under the Tools menu, open the Customize Tools Menu option.
Create a new Menu Content, the name can be casual .
Command selects the Astyle.exe file in the keil installation directory.
Fill in Arguments !E
You can add a shortcut key for the operation in Edit.
Cheers to this https://www.programmersought.com/article/578892324/

Compare tool with command line for mac

I am looking for command line tool to do diff between two HTML files.
I have analysed kdiff3/command line of bbedit but my problem is dont want to open any GUI.
I want to write a java program to call command line options of the diff program to compare html files and save result in a different file or probably show in a report file.
Any pointers will be very helpful
Thanks
Vishal
If you have xcode installed, you can call up opendiff, it's a (graphical) compare tool from the command line. From it's man page:
opendiff file1 file2 [-ancestor ancestorFile] [-merge mergeFile]
opendiff dir1 dir2 [-ancestor ancestorDirectory] [-merge mergeDirectory]
I thought mac had diff built in. Have you tried using diff from the mac terminal?

Resources