Mercurial > hg > easyhg
view easyhg-merge.bat @ 571:012ba1b83328
Show cancel button with progress bar only when running an operation that it makes sense to cancel (we don't really want people cancelling e.g. initial folder scan because it would leave things in an inconsistent state)
author | Chris Cannam |
---|---|
date | Thu, 01 Mar 2012 22:53:54 +0000 |
parents | d2e4bf428cfc |
children |
line wrap: on
line source
@echo off setlocal enableextensions setlocal enabledelayedexpansion set mypath=%~dp0 set kdiff=kdiff3.exe set found= set SEARCH=%mypath%;%PATH% :loop for /F "delims=; tokens=1*" %%e in ("%SEARCH%") do ( if exist "%%e\%kdiff%" ( set found=%%e\%kdiff% goto done; ) set SEARCH=%%f ) if not "%SEARCH%"=="" goto loop; :done if "%found%"=="" ( echo. "Failed to find kdiff.exe in path" ) else ( "%found%" "%~2" "%~1" "%~3" -o "%~1" --auto -L1 "%~1 (Common ancestor)" -L2 "%~1 (Your current version)" -L3 "%~1 (Version being merged)" )