Mercurial > hg
annotate contrib/win32/hg.bat @ 36974:435b8b05affd
uncommit: simplify condition for keeping commit
We used to keep the commit if it would have become empty and --keep
was not passed. Since we just changed it so we also keep it if any
patterns were passed on the command line, the only remaining case
where we prune the commit is when no arguments were passed and --keep
was not passed either, we can simplify the "not files and not
allowempty" to just "not allowempty". Let's also rename "allowempty"
to "keepcommit" since it's no longer about allowing an empty commit.
Differential Revision: https://phab.mercurial-scm.org/D2891
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sat, 17 Mar 2018 09:33:17 -0700 |
parents | 975c4fc4a512 |
children | fc8a5c9ecee0 |
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% |