Differences between revisions 100 and 101
Revision 100 as of 2013-07-19 10:31:45
Size: 13343
Editor: rcl
Comment: fix incorrect capitalization
Revision 101 as of 2013-07-19 10:49:44
Size: 13517
Editor: rcl
Comment: fix missing fixed-pitch sections
Deletions are marked like this. Additions are marked like this.
Line 6: Line 6:
<<TableOfContents>>

= Compile and install =
<<TableOfContents()>>

== Compile and install ==
Line 19: Line 19:
== "Standard" procedure for building optimized version == === "Standard" procedure for building optimized version ===
Line 24: Line 24:
4. Add {{{C:\MinGW\bin}}} to PATH env. It should looks like 4. Add {{{C:\MinGW\bin}}} to PATH env. It should look like

{{{
Line 27: Line 28:
}}}
Line 32: Line 34:
python setup.py build --force -c mingw32 python setup.py install --force --skip-build

== Building pure Python alternative ==
{{{
python setup.py build --force -c mingw32
python setup.py install --force --skip-build
}}}

=
== Building pure Python alternative ===
Line 37: Line 42:
C:\Python26\python.exe setup.py --pure build_py -c -d . build_ext -i build_mo --force C:\Python26\python.exe setup.py --pure install --force

= Setup environment =
{{{
C:\Python26\python.exe setup.py --pure build_py -c -d . build_ext -i build_mo --force
C:\Python26\python.exe setup.py --pure install --force
}}}

=
= Setup environment ==
Line 46: Line 54:
Notepad "C:\Documents and Settings\[your_name]\Mercurial.ini" `notepad "C:\Documents and Settings\[your_name]\Mercurial.ini"`
Line 50: Line 58:
Notepad "C:\Users\[your_name]\Mercurial.ini" `notepad "C:\Users\[your_name]\Mercurial.ini"`
Line 54: Line 62:
[ui] editor = Notepad username = your_name <your_email_address>  [merge-tools] kdiff3.priority=-1 kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output kdiff3.regkey=Software\KDiff3 kdiff3.regappend=\kdiff3.exe kdiff3.fixeol=True kdiff3.gui=True {{{
[ui]
editor = Notepad
username = your_name <your_email_address>

[merge-tools]
kdiff3.priority=-1
kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
kdiff3.gui=True
}}}
Line 58: Line 78:
= Various tips and references =
== Overview ==
== Various tips and references ==
=== Overview ===
Line 63: Line 83:
Line 76: Line 95:
python setup.py install --force {{{
python setup.py install --force`
}}}
Line 90: Line 111:
python setup.py build -f -c mingw32 install -f {{{
python setup.py build -f -c mingw32 install -f`
}}}
Line 94: Line 117:
msys.exe msysDTK.exe {{{
msys.exe
msysDTK.exe`
}}}
Line 98: Line 124:
MinGW.exe `MinGW.exe`
Line 104: Line 130:
set PATH=%PATH%;c:\python24;c:\msys\1.0\mingw\bin {{{
set PATH=%PATH%;c:\python24;c:\msys\1.0\mingw\bin`
}}}
Line 109: Line 137:
pexports C:\WINDOWS\system32\python24.dll > python24.def dlltool --dllname C:\WINDOWS\system32\python24.dll --def python24.def --output-lib C:\Python24\libs\libpython24.a
}}}
pexports C:\WINDOWS\system32\python24.dll > python24.def
dlltool --dllname C:\WINDOWS\system32\python24.dll --def python24.def --output-lib C:\Python24\libs\libpython24.a
}}}
Line 116: Line 146:
set PATH=%PATH%;c:\python24;c:\cygwin\bin python setup.py build --force -c mingw32 python setup.py install --force --skip-build {{{
set PATH=%PATH%;c:\python24;c:\cygwin\bin
python setup.py build --force -c mingw32
python setup.py install --force --skip-build
}}}
Line 130: Line 164:
(Note: If you take care of backing out 7de68012f86e and related changes (b6d0fa8c7685 and 835a51e63c5b), then building Mercurial with a different compiler would still work using the DISTUTILS_USE_SDK=1 trick. Refer to a previous version of this wiki page if you really need to build Mercurial this way.) (Note: If you take care of backing out 7de68012f86e and related changes (b6d0fa8c7685 and 835a51e63c5b), then building Mercurial with a different compiler would still work using the `DISTUTILS_USE_SDK=1` trick. Refer to a previous version of this wiki page if you really need to build Mercurial this way.)
Line 140: Line 174:
@echo off shift python <path-to-Scripts-folder>\hg %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 {{{
@echo off
shift python<path-to-Scripts-folder>\hg %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
}}}
Line 144: Line 181:
@echo off shift python c:\python\hg %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 {{{
@echo off
shift python c:\python\hg %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
}}}
Line 148: Line 188:
@python <path-to-Scripts-folder>\hg %* `@python <path-to-Scripts-folder>\hg %*`
Line 152: Line 192:
@python c:\python\Scripts\hg %* `@python c:\python\Scripts\hg %*`
Line 156: Line 196:
@echo off for /f %%i in ("hg") DO set HGSCRIPT="%%~$PATH:i" if %HGSCRIPT% == "" (      echo Cannot find hg on PATH      exit /b 1 ) python %HGSCRIPT% %* {{{
@echo off
for /f %%i in ("hg") DO set HGSCRIPT="%%~$PATH:i"
if %HGSCRIPT% == "" (
echo Cannot find hg on PATH
exit /b 1
)
python %HGSCRIPT% %*
}}}
Line 186: Line 234:
... File "C:\projects\hg\mercurial\demandload.py", line 54, in module return object.__getattribute__(self, 'importer').module()   File "C:\projects\hg\mercurial\demandload.py", line 30, in module self.fromlist)   File "C:\projects\hg\mercurial\mdiff.py", line 9, in ? import struct, bdiff, util, mpatch ImportError: No module named bdiff {{{
File "C:\projects\hg\mercurial\demandload.py", line 54, in module
return object.__getattribute__(self, 'importer').module()
File "C:\projects\hg\mercurial\demandload.py", line 30, in module
self.fromlist)
File "C:\projects\hg\mercurial\mdiff.py", line 9, in ?
import struct, bdiff, util, mpatch
ImportError: No module named bdiff
}}}
Line 197: Line 253:
The default editor for commit messages is {{{vi}}}. The Windows installer creates a {{{Mercurial.ini}}} file that sets it to notepad. You can set the EDITOR (or HGEDITOR) environment variable to specify your preference, or set it in {{{Mercurial.ini:}}}

{{{
[ui] editor = whatever
The default editor for commit messages is {{{vi}}}. The Windows installer creates a `''Mercurial.ini''` file that sets it to notepad. You can set the EDITOR (or HGEDITOR) environment variable to specify your preference, or set it in `''mercurial.ini''`:

{{{
[ui]
editor = whatever

Windows Install

/!\ You probably want the prepackaged Windows version from here.

In this web page firstly you will find a 'standard' procedure to install and config Mercurial from sources under Windows. It should satisfy you generally. If not, you could continue reading for various tips and references provided by various contributors in history. Some of them are valuable although some of them are a bit out of date.

1. Compile and install

When installing Mercurial from source, you have two choices: Compile optimized version with C extensions for increased performance, or use the pure Python method. The latter doesn't require a C compiler to be present on Windows system (which it usually isn't).

You'll need Python and Mercurial source in either case.

1. Download Python binary such as python-2.6.2.msi from http://www.python.org/download/. Install it to somewhere you can find later - C:\Python26 as default.

2. Download Mercurial source such as mercurial-1.3.tar.gz from http://www.selenic.com/mercurial/release/?M=D. Unpack it to C:\Mercurial_src.

Caution: Check to make sure you didn't unpack it to C:\Mercurial_src\mercurial-1.3 or similar.

1.1. "Standard" procedure for building optimized version

Caution: Don't use Active Python in http://www.activestate.com/activepython/, or you will probably fail to build Mercurial from source.

3. Download the MinGW binary (such as MinGW-5.1.4.exe) from http://sourceforge.net/project/showfiles.php?group_id=2435&package_id=240780. Download it to a writable directory. Install it to C:\MinGW as default, with other default opinions ("Current", and then "min").

4. Add C:\MinGW\bin to PATH env. It should look like

C:\Python26;bla bla bla;C:\MinGW\bin

Caution: The order is important. Keep it or you will probably fail to build.

5. In Windows command prompt, change dir to C:\Mercurial_src. Then run following commands:

python setup.py build --force -c mingw32
python setup.py install --force --skip-build

1.2. Building pure Python alternative

3. Change dir to C:\Mercurial_src and run following commands:

C:\Python26\python.exe setup.py --pure build_py -c -d . build_ext -i build_mo --force
C:\Python26\python.exe setup.py --pure install --force

2. Setup environment

6. Download KDiff3 such as KDiff3Setup_0.9.95.exe from http://sourceforge.net/project/showfiles.php?group_id=58666. Install it into C:\Program Files\KDiff3 as default.

7. Add C:\Program Files\KDiff3 to PATH env.

8. Create Mercurial config file:

notepad "C:\Documents and Settings\[your_name]\Mercurial.ini"

Or:

notepad "C:\Users\[your_name]\Mercurial.ini"

Fill in content below into the config file:

[ui]
editor = Notepad
username = your_name <your_email_address>

[merge-tools]
kdiff3.priority=-1
kdiff3.args=--L1 base --L2 local --L3 other $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
kdiff3.gui=True

9. (Nice to have) Copy from C:\Python26\Scripts\hg to C:\Python26\hg.py. As C:\Python26 is in your PATH env already, you could call hg.py to run Mercurial at any location. As you may installed or will install binary Mercurial or TortoiseHG, you could always call hg.py to run this script version of Mercurial, or call hg which will lead you to the binary version.

3. Various tips and references

3.1. Overview

To install Mercurial from sources under Windows, you need

  • a Python interpreter (such as the one from python.org, or ActivePython)

  • a C compiler (this is needed to compile some extensions used by Mercurial, so it's needed at setup-time only and not to run Mercurial itself)
  • Mercurial's own sources, of course
  • a three-way merge program

If you are using python.org's Python, you will find that the win32 API extensions make a huge performance difference when you use the clone command (but see the caveats below about hardlinks on Windows). If you are using Python 2.4, you will also need mfc71.dll. (These extensions are already shipped as part of ActivePython, but ActivePython is not completely open source software.)

See BuildingWindowsInstaller for instructions to build a Mercurial installer. BuildingOnWindows has some hints about how to build Mercurial on Windows.

This pages describes some issues you may meet when trying to install Mercurial, and how to solve them.

Ideally, you would only need to run

python setup.py install --force`

in the directory where you unpacked the sources, and everything would "just work". The use of -f/--force switch makes sure that any old installation is overwritten.

4. Build tips

4.1. MingW32

4.1.1. Using MingW32

By default, Python and ActivePython will look for Microsoft Visual C to compile the extensions, so you have to tell setup.py to use the MingW32 compiler instead. You can do this by running:

python setup.py build --force -c mingw32 python setup.py install --force --skip-build

or more briefly:

python setup.py build -f -c mingw32 install -f`

If you are not familiar with mingw32, you will first need to download and install the following packages, in the order given:

msys.exe
msysDTK.exe`

Afterwards, download and install the following package, installing it in the directory where you installed the msys package (i.e. c:\msys\1.0\)

MinGW.exe

You can find them at http://www.mingw.org

Then add the Python and mingw directories to your PATH, and run your build from the command prompt:

set PATH=%PATH%;c:\python24;c:\msys\1.0\mingw\bin`

If you encounter a compiler error in Mercurial versions 0.9.2 and up, you may need libpython24.a in PYTHONPATH\libs. If that's the case, run this command:

pexports C:\WINDOWS\system32\python24.dll > python24.def
dlltool --dllname C:\WINDOWS\system32\python24.dll --def python24.def --output-lib C:\Python24\libs\libpython24.a

The above setup.py script should then run properly.

4.1.2. Easier MingW32 based build via Cygwin

It is easier to install MinGW32 via Cygwin as it has a single graphical installer. After installing, mingw32 via Cygwin installer (setup.exe), add cygwin bin directory to the path and follow the mingw32 build instructions. e.g.

set PATH=%PATH%;c:\python24;c:\cygwin\bin
python setup.py build --force -c mingw32
python setup.py install --force --skip-build

4.2. MS Visual Studio

If you are going to use MS Visual C++, you need to use the same version of the compiler as the one which was used to build the Python interpreter. For example:

  • ActivePython 2.3.5 was built with VC6

  • ActivePython 2.4.1 was built with VC7.1

  • Python 2.4.4 win32 from python.org was built with VC7.1 (Visual Studio 2003)
  • Python 2.5.4 win32 from python.org was built with VC7.1 (Visual Studio 2003)
  • Python 2.5.2 amd64 from python.org was built with VC8 (Visual Studio 2005)
  • Python 2.6.1 (win32/amd64) from python.org were built with VC9 (Visual Studio 2008)

It is possible to force Python to use the compiler that you currently have, even if it's not strictly matching, but since Mercurial 1.3 (more precisely since 7de68012f86e and the introduction of posixfile in the osutil.c extension), the resulting Mercurial installation will crash, probably due to mismatches in the runtime.

(Note: If you take care of backing out 7de68012f86e and related changes (b6d0fa8c7685 and 835a51e63c5b), then building Mercurial with a different compiler would still work using the DISTUTILS_USE_SDK=1 trick. Refer to a previous version of this wiki page if you really need to build Mercurial this way.)

5. Install tips

5.1. Where is my Mercurial?

By default, Mercurial (the executable) gets installed in a Scripts folder under your Python installation folder.

You can create a small batch file in a folder which is present in your path (e.g. your Windows installation folder) to help you launch Mercurial.

If you are running a Windows version of the 9x series (Windows 95, 98, or ME), create a file called hg.bat with the following content:

@echo off
shift python<path-to-Scripts-folder>\hg %0 %1 %2 %3 %4 %5 %6 %7 %8 %9

For example, if you installed Python in c:\Python, the content of the file would be

@echo off
shift python c:\python\hg %0 %1 %2 %3 %4 %5 %6 %7 %8 %9

Under Windows NT, create a file called hg.cmd with the following content:

@python <path-to-Scripts-folder>\hg %*

For example, if you installed Python in c:\python, the content of the file would be

@python c:\python\Scripts\hg %*

An alternative scheme that works better for some is to search for hg on the PATH. If you are using hg.exe it should work fine. For the Python version of hg you should be able to simply rename 'hg' to 'hg.py' and assuming you have the .py extension configured it will be invoked. It is invoked, but there is a long standing redirection bug in Windows, and on XP there are sometimes problems with exit statuses being lost with this form of execution. So the following batch file is a solution -- place it in your PATH and it will find 'hg' without a .py extension in you PATH and invoke it properly: (name the file hg.cmd)

@echo off
for /f %%i in ("hg") DO set HGSCRIPT="%%~$PATH:i"
if %HGSCRIPT% == "" (
    echo Cannot find hg on PATH
    exit /b 1
)
python %HGSCRIPT% %*

An alternative is to add .py to the PATHEXT environment variable. Provided you have .py files set-up to run automatically when invoked, this allows you to run Python scripts from the command line without the ending .py. This option also works if you are using UTF-8 in the Windows console (i.e code page 65001) which causes BAT and CMD files to stop working.

5.2. Where should I put my initialization/configuration files?

Refer to this manual page for an overview.

Note: For installations of 32-bit Python on 64-bit Windows, the HKLM key should actually be under HKLM/SOFTWARE/Wow6432Node/Mercurial. Put the path to your INI file in the (Default) value that is created when you create the Mercurial key.

5.3. Other miscellaneous issues

WinZip7 does not seem to create empty files when extracting from .tar files. But WinZip9 is fine.

Earlier versions of mercurial had trouble handling tildes in glob patterns on windows. Upgrade if you encounter this problem.

5.3.1. Using the SSH protocol

Three solutions:

  1. Install PuTTY and follow the instructions here: Accessing SSH Repositories From Windows

  2. Install cygwin and OpenSSH, then use the cygwin shell where ssh will be automatically in the PATH.
  3. Install cygwin and OpenSSH, and modify Mercurial.ini to call the cygwin-installed ssh executable.
  4. Install git, which has has ssh binaries, or download and unzip this file someplace in your PATH.

Edit the Mercurial.ini file to have the following entry:

[ui] ssh = C:\cygwin\bin\ssh.exe

5.4. Fix the PATH problem on Windows

If you try to use hg inside a directory that has a "mercurial" subdirectory (such as when working on the Mercurial sources), Python may not be able to load the binary modules needed by Mercurial, and you may get a stack trace error similar to:

File "C:\projects\hg\mercurial\demandload.py", line 54, in module
     return object.__getattribute__(self, 'importer').module()
File "C:\projects\hg\mercurial\demandload.py", line 30, in module
     self.fromlist)
File "C:\projects\hg\mercurial\mdiff.py", line 9, in ?
     import struct, bdiff, util, mpatch
ImportError: No module named bdiff

See the mail list thread "Fix the path problem on Windows..." but essentially Python on Windows ends up with the current directory automatically added to the Python search path before the site libraries. So if you run hg in its own repository Python gets confused, and can't find the extensions needed. There is a candidate patch that removes the current directory, but there is an arguably better workaround from K.Thananchayan. Simply add a registry entry (replacing 2.4 with the version of Python)

HKLM/SOFTWARE/Python/PythonCore/2.4/PythonPath/XXX    (Default) REG_SZ "YYY"

see HardlinkedClones

5.6. Default editor

The default editor for commit messages is vi. The Windows installer creates a ''Mercurial.ini'' file that sets it to notepad. You can set the EDITOR (or HGEDITOR) environment variable to specify your preference, or set it in ''mercurial.ini'':

[ui]
editor = whatever


CategoryWindows

WindowsInstall (last edited 2013-07-19 10:57:21 by rcl)