We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 9 files · Browse files at 1697b9288e3e Showing diff from parent 26bab06c4fb5 8f26a4aa2ff5 Diff from another changeset...
-
.hgignore
-
contrib/wix/COPYING.rtf
-
contrib/wix/WixUIBannerBmp.bmp
-
contrib/wix/WixUIDialogBmp.bmp
-
contrib/wix/sdk_build_extensions.cmd
-
contrib/wix/tortoisehg.wxs
-
doc/source/figures/init.png
size changed from 892x691 to 419x150
mode changed from RGB to RGBA -
doc/source/quick.txt
-
tortoisehg/hgtk/hgthread.py
|
@@ -34,3 +34,4 @@ glob:*~
glob:tortoisehg/util/__version__.py
glob:win32/shellext/parentid.h
+glob:*.wixobj
|
||
|
|
|
|
|
|
|
|
@@ -0,0 +1,25 @@ + :: %1 - TortoiseHg Version first level
+:: %2 - second level
+:: %3 - third level
+:: %4 - platform (x86 or x64)
+:: %5 - msi product id (GUID)
+
+set _SDKBIN_=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.0\Bin
+if exist "%_SDKBIN_%" goto :ok
+set _SDKBIN_=%ProgramW6432%\Microsoft SDKs\Windows\v7.0\Bin
+if exist "%_SDKBIN_%" goto :ok
+echo Microsoft Windows SDK 7 SP1 not installed
+pause
+exit 1
+:ok
+
+cd win32\shellext
+
+call "%_SDKBIN_%\SetEnv.cmd" /xp /%4 /release
+set DEBUG=1
+set THG_EXTRA_CPPFLAGS=/DTHG_MSI_INSTALL /DTHG_PRODUCT_ID=%5
+set THG_EXTRA_RCFLAGS=/dTHG_VERSION_FIRST=%1 /dTHG_VERSION_SECOND=%2 /dTHG_VERSION_THIRD=%3 /dTHG_PRODUCT_ID="%5"
+nmake /f Makefile.nmake clean
+nmake /f Makefile.nmake
+move ThgShell.dll ..\ThgShell%4.dll
+move terminate.exe ..\terminate-%4.exe
|
|
|
@@ -77,7 +77,7 @@ Name='TortoiseHgRpcServer' Value='[INSTALLDIR]thgtaskbar.exe' />
</Component>
<Component Id='thgshellx86dll' Guid='1126CF42-3994-428B-A746-464E1BC680F3'>
- <File Id='thgshellx86dll' Name='ThgShellx86.dll' DiskId='1' Source='..\misc\ThgShellx86.dll' KeyPath='yes'/>
+ <File Id='thgshellx86dll' Name='ThgShellx86.dll' DiskId='1' Source='win32\ThgShellx86.dll' KeyPath='yes'/>
<RegistryValue Root='HKMU' Key='Software\TortoiseHg' Type='string' Value='[INSTALLDIR]' />
<RegistryValue Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll' />
@@ -186,7 +186,7 @@ <Directory Id="CommonFiles64Folder" Name="Programs64" >
<Directory Id="Common64" Name="TortoiseHg" >
<Component Id='thgshellx64dll' Guid='59FD2A49-BA62-40CC-B155-D11DB11EE611' Win64='yes'>
- <File Id='thgshellx64dll' Name='ThgShellx64.dll' DiskId='1' Source='..\misc\ThgShellx64.dll' KeyPath='yes' />
+ <File Id='thgshellx64dll' Name='ThgShellx64.dll' DiskId='1' Source='win32\ThgShellx64.dll' KeyPath='yes' />
<RegistryValue Root='HKMU' Key='Software\TortoiseHg' Type='string' Value='[INSTALLDIR]' />
<RegistryValue Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32'
Type='string' Value='[Common64]ThgShellx64.dll' />
@@ -290,9 +290,9 @@ the command pipe. Windows installer sometimes fails to shutdown thgtaskbar.exe, which
occasionally leads to a crash of thgtaskbar.exe during install, which in turn pops up
an ugly crash report dialog pointing to faulting module PYTHON26.DLL. -->
- <Binary Id='TerminateEXE' SourceFile='..\misc\terminate.exe' />
+ <Binary Id='TerminateEXE' SourceFile='win32\terminate-x86.exe' />
<CustomAction Id='CallTerminate' BinaryKey='TerminateEXE' ExeCommand='' Return='ignore' />
-
+
<CustomAction Id='StartThgtaskbarEXE' FileKey='thgtaskbarEXE' ExeCommand='' Return='asyncNoWait' />
<InstallExecuteSequence>
@@ -315,9 +315,9 @@ <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT"
Value="NOTE: Logoff/logon or restarting explorer may be needed to start the overlay icons" />
- <WixVariable Id="WixUILicenseRtf" Value="..\misc\COPYING.rtf" />
- <WixVariable Id="WixUIBannerBmp" Value="..\misc\WixUIBannerBmp.bmp" />
- <WixVariable Id="WixUIDialogBmp" Value="..\misc\WixUIDialogBmp.bmp" />
+ <WixVariable Id="WixUILicenseRtf" Value="contrib\wix\COPYING.rtf" />
+ <WixVariable Id="WixUIBannerBmp" Value="contrib\wix\WixUIBannerBmp.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="contrib\wix\WixUIDialogBmp.bmp" />
<Icon Id="thgIcon.ico" SourceFile="icons\thg_logo.ico" />
<Icon Id="hgIcon.ico" SourceFile="icons\hg.ico" />
|
||
|
doc/source/figures/init.png
size changed from 892x691 to 419x150
mode changed from RGB to RGBA |
||
|---|---|---|
|
|
|
@@ -1,10 +1,93 @@ - ******************************
-A quick tour for the impatient
-******************************
+*********************************
+A Quick Start Guide to TortoiseHg
+*********************************
.. module:: tour
:synopsis: A Gentle Introduction to Using TortoiseHg on Windows
+Welcome to TortoiseHg and the Mercurial! TortoiseHg is a Windows
+Explorer shell extension and a set of graphical applications that serve
+as a friendly front-end to the Mercurial distributed version control
+system (DVCS). All TortoiseHg functionality is reachable from Explorer
+context menus as well as from a command line application named
+:command:`hgtk`. Mercurial commands are also available from the
+standard :command:`hg` command line application.
+
+
+Configuring TortoiseHg
+======================
+
+Your first step should be to make sure that you are correctly identified
+to TortoiseHg. You do this by opening the global settings dialog.
+Right click on the desktop background and select
+:menuselection:`TortoiseHg --> Global Settings`.
+
+.. figure:: figures/cmenu-global-settings.jpg
+ :alt: Desktop Context Menu
+
+ Open "Global Settings" from the desktop
+
+This opens the TortoiseHg settings dialog, editing your global (user)
+configuration. If you are using the command line, the global settings
+dialog can be opened by :command:`hgtk userconfig`.
+
+.. figure:: figures/settings.png
+ :alt: Settings Dialog
+
+ TortoiseHg Settings Dialog
+
+First select the :guilabel:`Commit` page and enter a name in the
+:guilabel:`Username` field.
+
+.. note::
+ If you neglect to configure a username TortoiseHg will ask you to
+ enter one when you try to *commit*, which is the first time a
+ username is actually required.
+
+.. note::
+ There are no hard fast rules on how to format your username, the
+ field is free form, but the following convention is commonly used::
+
+ FullName <email>
+
+ for example ::
+
+ Donald Duck <donaldduck@example.net>
+
+ The email address is stripped when viewing history in the changelog
+ viewer, and the built-in web server obfuscates email addresses to
+ prevent SPAM.
+
+
+Next, select the :guilabel:`TortoiseHg` page and select the
+:guilabel:`Three-way Merge Tool` entry. In the drop down list you will
+find all of the merge tools detected on your computer (kdiff3 is
+provided by the Windows installer) and a number of internal merge
+behaviors. Select your preferred merge tool.
+
+If you prefer for TortoiseHg to also use your selected merge tool for
+visual diffs, you can leave the :guilabel:`Visual Diff Tool`
+unspecified. Otherwise, select your favorite visual diff tool from the
+drop down list of detected visual diff tools.
+
+If there are no options in either drop-down list, you must install a
+diff/merge tool that is supported by our mergetools.rc or configure your
+own tool.
+
+Feel free to configure other global settings while you have the dialog
+open. You will have the chance later to override these global settings
+with repository local settings, if required.
+
+Click the :guilabel:`Ok` button to save the changes you have made and
+close the settings dialog.
+
+.. note::
+ Most TortoiseHg tools require a restart to pick up changes made in the
+ settings dialog.
+
+Getting Acquainted
+==================
+
Mercurial supports many different
`collaboration models <http://hgbook.red-bean.com/read/collaborating-with-other-people.html>`_.
This chapter describes just one of those models: a single central repository.
@@ -17,52 +100,6 @@non-Mercurial repositories into Mercurial repositories, but this example
assumes you are starting from scratch.
-This tutorial assumes you already have TortoiseHg properly installed,
-and you have your project folder open in your file browser.
-
-
-Configuring TortoiseHg
-======================
-
-First you need to make sure that you are correctly identified in
-TortoiseHg. You do this by adjusting the global settings of TortoiseHg.
-Right click in your source folder and select
-:menuselection:`TortoiseHg --> Global Settings`
-
-.. figure:: figures/cmenu-nofiles.jpg
- :alt: Context Menu
-
- Context menu with no files selected
-
-You must then select the :guilabel:`Commit` tab and enter a name in the
-:guilabel:`Username` field.
-
-.. note::
- If you forget to configure your username TortoiseHg will ask you to
- enter one when you *commit*, the only time the name is actually
- required.
-
-.. note::
- There are no hard rules on how to format your user name, the field
- is free form, but the following convention is commonly used::
-
- FullName <email>
-
- for example ::
-
- Donald Duck <donaldduck@example.net>
-
- The email address is stripped when viewing history in the changelog
- viewer, and the built-in web server obfuscates email addresses to
- prevent SPAM.
-
-If you are not using one of our Windows installers, you will also have
-to configure a visual diff tool. Type :command:`hgtk userconfig` and on
-the TortoiseHg tab you will find :guilabel:`Visual Diff Tool`. If
-there are no options in the drop-down list, you must install a diff tool
-that is supported by our mergetools.ini or configure your own tool.
-
-
Initialize the repository
=========================
@@ -215,7 +252,6 @@directories to find specific changes and commit them from Explorer. A
quicker way is to use the commit tool:
-.. {{images/image001.png}}
.. figure:: figures/overlayicons.png
:alt: Overlay Icons
|
|
|
@@ -38,7 +38,7 @@ self.dialogq = dialogq
self.responseq = responseq
self.setconfig('ui', 'interactive', 'on')
- self.setconfig('ui', 'progress', 'False')
+ self.setconfig('progress', 'disable', 'True')
def write(self, *args):
if hglib.uiwrite(self, args):
|
||
Add a tag
Loading...