contrib/win32/buildlocal.bat
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 13 Feb 2020 17:15:08 -0800
changeset 44394 5e3402a0b868
parent 13383 70ef5b610222
permissions -rw-r--r--
mergestate: determine if active without looking for state files on disk I couldn't think of a reason that we need to check state files on disk to determine if a merge is active. I could imagine them being for there for detecting broken state files that would then be cleaned up by some later command, but we always delete the entire `.hg/merge/` tree, so that doesn't seem to be it. The checks were added in 4e932dc5c113 (resolve: abort when not applicable (BC), 2014-04-18). Perhaps there were needed for that and then made obsolete by 6062593d8b06 (resolve: don't abort resolve -l even when no merge is in progress, 2014-05-23). The reason I want to delete the checks is that I think `ms = mergestate.read(repo); ms.active() and ms.local` should be a valid pattern, but it crashes when the merge state file is an empty file if we consider mere presence of the file as "active". Differential Revision: https://phab.mercurial-scm.org/D8118
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13383
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     1
@echo off
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     2
rem Double-click this file to (re)build Mercurial for Windows in place.
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     3
rem Useful for testing and development.
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     4
cd ..\..
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     5
del /Q mercurial\*.pyd
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     6
del /Q mercurial\*.pyc
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     7
rmdir /Q /S mercurial\locale
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     8
python setup.py build_py -c -d . build_ext -i build_mo
70ef5b610222 contrib: add win32/buildlocal.bat
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff changeset
     9
pause