Skip to content

Instantly share code, notes, and snippets.

@malys
Last active June 6, 2018 08:20
Show Gist options
  • Save malys/0c17edff2c6733e8a6b78403bc432556 to your computer and use it in GitHub Desktop.
Save malys/0c17edff2c6733e8a6b78403bc432556 to your computer and use it in GitHub Desktop.
[Kdiff3 smart] #kdiff3 #diff
@ECHO OFF
rem ECHO filedrive=%%~di
rem ECHO filepath=%%~pi
rem ECHO filename=%%~ni
rem ECHO fileextension=%%~xi
set from=%1
set from1=%2
set diff=false
set xml=false
set XML_EXE="D:\util\Vagrant\embedded\mingw64\bin\xmllint.exe "
SETLOCAL
FOR %%i IN ("%1") DO (
rem cp %from% h:\tmp%%~ni%%~xi
rem "c:\PROGRA~2\JetBrains\IntelliJ IDEA Community Edition 2017.1\bin\format.bat" h:\tmp%%~ni%%~xi'
set file1=%TMP%\from_%%~ni%%~xi
set ext=%%~xi
)
FOR %%i IN ("%2") DO (
set file=%TMP%\to_%%~ni%%~xi
rem cp %from1% h:\tmp%%~ni%%~xi
rem "c:\PROGRA~2\JetBrains\IntelliJ IDEA Community Edition 2017.1\bin\format.bat" h:\tmp%%~ni%%~xi
)
rem "c:\PROGRA~2\JetBrains\IntelliJ IDEA Community Edition 2017.1\bin\idea.bat" format "%file1%"
rem "c:\PROGRA~2\JetBrains\IntelliJ IDEA Community Edition 2017.1\bin\idea.bat" format "%file%"
if "%ext%"==".java" ( set diff=true)
if "%ext%"==".js" ( set diff=true)
if "%ext%"==".xml" ( set xml=true)
rem echo %ext% %xml%
if "%diff%"=="true" (
echo "Language"
rem echo 1 %diff% > h:\m.txt
D:\prog\LLVM\bin\clang-format.exe %1 > %file1% && D:\prog\LLVM\bin\clang-format.exe %2 > %file%
"C:\Program Files\KDiff3\kdiff3.exe" "%file1%" "%file%"
del /S/Q "%file1%" "%file%"
)
if "%xml%"=="true" (
echo "XML"
%XML_EXE% --c14n %1 > %file1% && %XML_EXE% --c14n %2 > %file%
"C:\Program Files\KDiff3\kdiff3.exe" "%file1%" "%file%"
del /S/Q "%file1%" "%file%"
)
if "%xml%"=="false" (
if "%diff%"=="false" (
rem echo %diff% > h:\m.txt
"C:\Program Files\KDiff3\kdiff3.exe" "%1" "%2"
)
)
exit
@ECHO OFF
SETLOCAL
set EXE="D:\util\Box Sync\dotfiles\scripts\git\diffFormat.cmd"
set P="C:\Program Files (x86)\GitExtensions\PuTTY\plink.exe"
set file=%4
FOR %%i IN ("%file%") DO (
set ext=%%~xi
)
%P% -load igvita-desert -ssh %1@%2 cat %4 > h:\%2%ext%
%P% -load igvita-desert -ssh %1@%3 cat %4 > h:\%3%ext%
%EXE% h:\%2%ext% h:\%3%ext%
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment