upstream/mercurial-mirror Files · contrib/win32/hg.bat

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Matt Harbison - - Load All Authors

File last commit:

r47647:fc8a5c9e default


                r49415:50de0890

default

Download file

             hg.bat
        
                    21 lines
            
             | 509 B
            
                | application/x-msdownload
            
             |
                BatchLexer
            
             / contrib / win32 / hg.bat
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Paul Moore
    
Add a batch file driver for Windows

              r6513
            
      @echo off

      rem Windows Driver script for Mercurial

      setlocal

      set HG=%~f0

        Matt Harbison
    
win32: enable legacy I/O mode to fix missing pager output on Windows with py3...

              r47647
            
      set PYTHONLEGACYWINDOWSSTDIO=1

        FUJIWARA Katsunori
    
win32: use explicit path to "python.exe" only if it exists...

              r19091
            
      rem Use a full path to Python (relative to this script) if it exists,

      rem as the standard Python install does not put python.exe on the PATH...

      rem Otherwise, expect that python.exe can be found on the PATH.

        Paul Moore
    
Add a batch file driver for Windows

              r6513
            
      rem %~dp0 is the directory of this script

        FUJIWARA Katsunori
    
win32: use explicit path to "python.exe" only if it exists...

              r19091
            
      if exist "%~dp0..\python.exe" (

          "%~dp0..\python" "%~dp0hg" %*

      ) else (

          python "%~dp0hg" %*

      )

        Paul Moore
    
Add a batch file driver for Windows

              r6513
            
      endlocal

        FUJIWARA Katsunori
    
hg.bat: return exit code explicitly for indirect invocation...

              r23934
            
      exit /b %ERRORLEVEL%

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Paul Moore Add a batch file driver for Windows	r6513	@echo off
		rem Windows Driver script for Mercurial

		setlocal
		set HG=%~f0

Matt Harbison win32: enable legacy I/O mode to fix missing pager output on Windows with py3...	r47647	set PYTHONLEGACYWINDOWSSTDIO=1

FUJIWARA Katsunori win32: use explicit path to "python.exe" only if it exists...	r19091	rem Use a full path to Python (relative to this script) if it exists,
		rem as the standard Python install does not put python.exe on the PATH...
		rem Otherwise, expect that python.exe can be found on the PATH.
Paul Moore Add a batch file driver for Windows	r6513	rem %~dp0 is the directory of this script

FUJIWARA Katsunori win32: use explicit path to "python.exe" only if it exists...	r19091	if exist "%~dp0..\python.exe" (
		"%~dp0..\python" "%~dp0hg" %*
		) else (
		python "%~dp0hg" %*
		)
Paul Moore Add a batch file driver for Windows	r6513	endlocal
FUJIWARA Katsunori hg.bat: return exit code explicitly for indirect invocation...	r23934
		exit /b %ERRORLEVEL%