# HG changeset patch # User mpm@selenic.com # Date 1127407294 25200 # Node ID c9cf171f30dddd83e79d917cfc4e643b5be3105a # Parent 3b717f27ffea3fda40c708695ecbc935b050d5e0# Parent db8bebb08f8fe3455373c5975dc960d7b31691d4 Merge with TAH diff -r db8bebb08f8f -r c9cf171f30dd contrib/win32/ReadMe.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/win32/ReadMe.html Thu Sep 22 09:41:34 2005 -0700 @@ -0,0 +1,123 @@ + + +
+Welcome to Mercurial for Windows!
+ +Mercurial is a command-line application. You must run it from + the Windows command prompt (or if you're hard core, a MinGW shell).
+ +For documentation, please visit the Mercurial web + site.
+ +By default, Mercurial installs to C:\Mercurial. The + Mercurial command is called hg.exe. To run this + command, the install directory must be in your search path.
+ +To set your search path temporarily, type the following into a + command prompt window:
+ ++set PATH=C:\Mercurial;%PATH% ++ +
To set your search path permanently, perform the following + steps. These instructions are for Windows NT, 2000 and XP.
+ +The easiest way to check that Mercurial is installed properly is to + just type the following at the command prompt:
+ ++hg ++ +
This command should print a useful help message. If it does, + other Mercurial commands should work fine for you.
+ +Before you report any problems, please consult the Mercurial web site and + see if your question is already in our list of Frequently + Answered Questions (the "FAQ"). + +
If you cannot find an answer to your question, please feel + free to send mail to the Mercurial mailing list, at mercurial@selenic.com. + Remember, the more useful information you include in your + report, the easier it will be for us to help you!
+ +If you are IRC-savvy, that's usually the fastest way to get + help. Go to #mercurial on + irc.freenode.net.
+ +Mercurial was written by Matt + Mackall, and is maintained by Matt and a team of + volunteers.
+ +The Windows installer was written by Bryan + O'Sullivan.
+ +Mercurial is Copyright 2005 Matt Mackall and others. See the + Contributors.txt file for a list of contributors.
+ +Mercurial is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version.
+ +Mercurial is distributed in the hope that it will be useful, + but without any warranty; without even the implied + warranty of merchantability or fitness for a + particular purpose. See the GNU General Public License for + more details.
+ + diff -r db8bebb08f8f -r c9cf171f30dd contrib/win32/mercurial.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/win32/mercurial.ini Thu Sep 22 09:41:34 2005 -0700 @@ -0,0 +1,36 @@ +; System-wide Mercurial config file. To override these settings on a +; per-user basis, please edit the following file instead, where +; USERNAME is your Windows user name: +; C:\Documents and Settings\USERNAME\Mercurial.ini + +; By default, we try to encode and decode all files that do not +; contain ASCII NUL characters. What this means is that we try to set +; line endings to Windows style on update, and to Unix style on +; commit. This lets us cooperate with Linux and Unix users, so +; everybody sees files with their native line endings. + +[extensions] +; The win32text extension is available and installed by default. It +; provides built-in Python hooks to perform line ending conversions. +; This is normally much faster than running an external program. +hgext.win32text = + + +[encode] +; Encode files that don't contain NUL characters. +** = cleverencode: + +; Alternatively, you can explicitly specify each file extension that +; you want encoded (any you omit will be left untouched), like this: + +; *.txt = dumbencode: + + +[decode] +; Decode files that don't contain NUL characters. +** = cleverdecode: + +; Alternatively, you can explicitly specify each file extension that +; you want decoded (any you omit will be left untouched), like this: + +; **.txt = dumbdecode: diff -r db8bebb08f8f -r c9cf171f30dd contrib/win32/mercurial.iss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/win32/mercurial.iss Thu Sep 22 09:41:34 2005 -0700 @@ -0,0 +1,58 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +AppCopyright=Copyright 2005 Matt Mackall and others +AppName=Mercurial +AppVerName=Mercurial version 0.7 +InfoAfterFile=contrib/win32/postinstall.txt +LicenseFile=COPYING +ShowLanguageDialog=yes +AppPublisher=Matt Mackall and others +AppPublisherURL=http://www.selenic.com/mercurial +AppSupportURL=http://www.selenic.com/mercurial +AppUpdatesURL=http://www.selenic.com/mercurial +AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} +AppContact=mercurial@selenic.com +OutputBaseFilename=Mercurial-0.7 +DefaultDirName={sd}\Mercurial +SourceDir=C:\hg\hg-release +VersionInfoVersion=0.7 +VersionInfoDescription=Mercurial distributed SCM +VersionInfoCopyright=Copyright 2005 Matt Mackall and others +VersionInfoCompany=Matt Mackall and others +InternalCompressLevel=max +SolidCompression=true +SetupIconFile=contrib\favicon.ico +AllowNoIcons=true +DefaultGroupName=Mercurial + +[Files] +Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs +Source: contrib\mercurial.el; DestDir: {app}/Contrib +Source: contrib\patchbomb; DestDir: {app}/Contrib +Source: dist\w9xpopen.exe; DestDir: {app} +Source: dist\hg.exe; DestDir: {app} +Source: dist\msvcr71.dll; DestDir: {sys}; Flags: sharedfile uninsnosharedfileprompt +Source: dist\library.zip; DestDir: {app} +Source: doc\*.txt; DestDir: {app}\Docs +Source: dist\mfc71.dll; DestDir: {sys}; Flags: sharedfile uninsnosharedfileprompt +Source: COPYING; DestDir: {app}; DestName: Copying.txt +Source: comparison.txt; DestDir: {app}\Docs; DestName: Comparison.txt +Source: notes.txt; DestDir: {app}\Docs; DestName: DesignNotes.txt +Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt +Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme +Source: ..\..\msys\1.0\bin\patch.exe; DestDir: {app} +Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Flags: confirmoverwrite +Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt + +[INI] +Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/ + +[UninstallDelete] +Type: files; Name: {app}\Mercurial.url + +[Icons] +Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} +Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.txt +Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url diff -r db8bebb08f8f -r c9cf171f30dd contrib/win32/postinstall.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/win32/postinstall.txt Thu Sep 22 09:41:34 2005 -0700 @@ -0,0 +1,38 @@ +Welcome to Mercurial for Windows! +--------------------------------- + +For configuration and usage directions, please read the ReadMe.html +file that comes with this package. + + +Release Notes +------------- + +2005-09-21 v0.7 with modifications + +* New INI files have been added to control Mercurial's behaviour: + + System-wide - C:\Mercurial\Mercurial.ini + Per-user - C:\Documents and Settings\USERNAME\Mercurial.ini + + A default version of the system-wide INI file is installed with + Mercurial. No per-user INI file is installed, but it will be + honoured if you create one. + +* Windows line endings are now handled automatically and correctly by + the update and commit commands. See the INI file for how to + customise this behaviour. + +* NOTE: Much of the rest of the Mercurial code does not handle Windows + line endings properly. Accordingly, the output of the diff command, + for example, will appear huge until I fix this. + +* Packaged text files now have correct Windows line endings. + + +2005-09-21 v0.7 with modifications + +* This is the first standalone release of Mercurial for Windows. + +* I believe it to be mostly functional, with one exception: there is + no support yet for DOS <-> Unix line ending conversion. diff -r db8bebb08f8f -r c9cf171f30dd contrib/win32/win32-build.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/win32/win32-build.txt Thu Sep 22 09:41:34 2005 -0700 @@ -0,0 +1,43 @@ +The standalone Windows installer for Mercurial is built in a somewhat +jury-rigged fashion. + +It has the following prerequisites, at least as I build it: + + Python for Windows + http://www.python.org/ftp/python/2.4.1/python-2.4.1.msi + + MinGW + http://www.mingw.org/ + + Python for Windows Extensions + http://sourceforge.net/projects/pywin32/ + + mfc71.dll (just download, don't install) + http://starship.python.net/crew/mhammond/win32/ + + The py2exe distutils extension + http://sourceforge.net/projects/py2exe/ + + Inno Setup + http://www.jrsoftware.org/isinfo.php + + ISTool + http://www.istool.org/default.aspx/ + +And, of course, Mercurial itself. + +Once you have all this installed and built, clone a copy of the +Mercurial repository you want to package, and name the repo +C:\hg\hg-release. + +In a shell, build a standalone copy of the hg.exe program: + + python setup.py build -c mingw32 py2exe -b 1 + +Copy mfc71.dll into the dist directory that just got created. + +Run ISTool, and open the C:\hg\hg-release\contrib\win32\mercurial.iss +file. + +In ISTool, type Ctrl-F9 to compile the installer file. The actual +installer will be in the C:\hg\hg-release\Output directory. diff -r db8bebb08f8f -r c9cf171f30dd doc/hgrc.5.txt --- a/doc/hgrc.5.txt Wed Sep 21 09:02:41 2005 +0200 +++ b/doc/hgrc.5.txt Thu Sep 22 09:41:34 2005 -0700 @@ -15,18 +15,22 @@ FILES ----- -Mercurial reads configuration data from three files: +Mercurial reads configuration data from up to three files, if they +exist. The names of these files depend on the system on which +Mercurial is installed. -/etc/mercurial/hgrc:: +(Unix) /etc/mercurial/hgrc:: +(Windows) C:\Mercurial\Mercurial.ini:: Options in this global configuration file apply to all Mercurial commands executed by any user in any directory. -$HOME/.hgrc:: +(Unix) $HOME/.hgrc:: +(Windows) C:\Documents and Settings\USERNAME\Mercurial.ini Per-user configuration options that apply to all Mercurial commands, no matter from which directory they are run. Values in this file override global settings. -