annotate contrib/win32/hg.bat @ 24764:4dcd55802237

histedit: allow histedit --continue when not on a descendant (BC) Previously we would not allow --continue if the current working copy parent was not a descendant of the commit produced by the previous histedit step. There's nothing really blocking us from continuing the histedit in this situation, so let's stop aborting in this case. This is technically a BC change, but it is making things more forgiving so I think it's ok. In the future we will likely add an 'exec' action to histedit, which means the user can do whatever they want during the middle of a histedit (like perhaps calling 'hg update'), which means we'll need to support this case eventually anyway.
author Durham Goode <durham@fb.com>
date Sat, 04 Apr 2015 01:00:05 -0700
parents 975c4fc4a512
children fc8a5c9ecee0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6513
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
1 @echo off
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
2 rem Windows Driver script for Mercurial
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
3
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
4 setlocal
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
5 set HG=%~f0
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
6
19091
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
7 rem Use a full path to Python (relative to this script) if it exists,
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
8 rem as the standard Python install does not put python.exe on the PATH...
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
9 rem Otherwise, expect that python.exe can be found on the PATH.
6513
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
10 rem %~dp0 is the directory of this script
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
11
19091
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
12 if exist "%~dp0..\python.exe" (
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
13 "%~dp0..\python" "%~dp0hg" %*
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
14 ) else (
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
15 python "%~dp0hg" %*
f01a351db791 win32: use explicit path to "python.exe" only if it exists
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 12653
diff changeset
16 )
6513
66e87c11447d Add a batch file driver for Windows
Paul Moore <p.f.moore@gmail.com>
parents:
diff changeset
17 endlocal
23934
975c4fc4a512 hg.bat: return exit code explicitly for indirect invocation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19091
diff changeset
18
975c4fc4a512 hg.bat: return exit code explicitly for indirect invocation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 19091
diff changeset
19 exit /b %ERRORLEVEL%