| author | TK Soh <teekaysoh@yahoo.com> |
| Sat, 01 Dec 2007 16:25:19 +0000 | |
| changeset 337 | 1f161ca182e3 |
| parent 211 | 2eaa4c2aa208 |
| child 361 | dfaa2d2e4705 |
| permissions | -rw-r--r-- |
|
211
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
1 |
:: |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
2 |
:: Win32 batch file to handle to merge with simplemerge for developement of TortoiseHg |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
3 |
:: |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
4 |
|
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
5 |
@echo off |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
6 |
setlocal |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
7 |
|
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
8 |
:: Look in the registry for TortoiseHg location |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
9 |
for /f "skip=2 tokens=3*" %%A in ( |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
10 |
'"reg query "HKEY_CURRENT_USER\SOFTWARE\TortoiseHg" /ve 2> nul"' ) do set TortoisePath=%%B |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
11 |
if "%TortoisePath%"=="" (goto :notfound) else (goto :merge) |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
12 |
|
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
13 |
:merge |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
14 |
python "%TortoisePath%\hgutils\simplemerge" %* |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
15 |
goto end |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
16 |
|
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
17 |
:notfound |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
18 |
echo hgproc: cannot find TortoiseHg location in the registry. |
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
19 |
|
|
2eaa4c2aa208
add support for simplemerge in py2exe package
TK Soh <teekaysoh@yahoo.com>
parents:
diff
changeset
|
20 |
:end |