We are currently indexing your data, so search results may be incomplete until we finish.
merge with stable
by
Changes to 5 files · Browse files at 895e1d1a817e Showing diff from parent 2d8344bfc7f0 00e17bea2d22 Diff from another changeset...
|
@@ -63,6 +63,12 @@ pushd .
cd %OUTPUTDIR%\pdf
%PDFLATEX% TortoiseHG.tex
+ %PDFLATEX% TortoiseHG.tex
+ %PDFLATEX% TortoiseHG.tex
+ makeindex -s python.ist TortoiseHG.idx
+ makeindex -s python.ist modTortoiseHG.idx
+ %PDFLATEX% TortoiseHG.tex
+ %PDFLATEX% TortoiseHG.tex
popd
echo.
echo.Build finished; the PDF file is in %OUTPUTDIR%/pdf.
|
||
|
@@ -252,12 +252,13 @@ the commit tool will switch out of *commit* or *qrefresh* mode into
*qnew* mode. In *qnew* mode, the commit tool shows only working
directory modifications (the changes that would typically get added to a
-new patch by :command:`hg qnew -f`). The commit button will change into
-a Qnew button as well, to make the mode switch more obvious.
+new patch by :command:`hg qnew -f`). The :guilabel:`Commit` button will
+change into a :guilabel:`QNew` button as well, to make the mode switch
+more obvious.
-When the Qnew button is pressed, the selected change hunks are written
+When the :guilabel:`QNew` button is pressed, the selected change hunks are written
into a new patch (given the filename you specified), and the dialog is
-refreshed. At refresh, the commit tool will obviously swith to
+refreshed. At refresh, the commit tool will obviously switch to
*qrefresh* mode since there will now be at least one applied patch.
You may give the new patch a commit message at the initial *qnew* event,
|
||
|
@@ -82,6 +82,9 @@ :command:`hgtk log`
Indicates a command to enter into command window.
+``myproxy:8000``
+ Indicates a text to enter into a text input field in the GUI.
+
.. note::
This is a note.
|
||
|
|
|
@@ -58,7 +58,7 @@ file, though there is a certain amount of overlap. Some sections were
split across multiple tabs for clarity.
-Every tab but :guilabel:`Paths` has the same format, a list of
+Every tab but :guilabel:`Sync` has the same format, a list of
configurable options with a drop-down combo box with possible values and
a history of options you have used for that setting. The configurable
name (label) has a tooltip which describes in more detail what you are
@@ -66,22 +66,14 @@focused configurable is also shown in a text box at the bottom of the
dialog.
-The :guilabel:`Paths` tab is where you can store URLs (paths) to related
-repositories. It is rare to store paths in the site-wide or user
-configuration files, most of the time you will only store these in a
-repository configuration file. Mercurial has two special path names that
-can be used as default targets for some operations.
-
-default
- the default URL to pull from, usually clone source
-default-push
- the default push target when using the command line
-
Please consult the Mercurial wiki for more detailed information about
these configurables (except for the first three tabs:
:guilabel:`TortoiseHg`, :guilabel:`Commit`, :guilabel:`Changelog`, which
are specifically for TortoiseHg).
+.. module:: TortoiseHg.settings
+ :synopsis: Dialog used to set general TortoiseHg preferences
+
TortoiseHg
----------
@@ -89,8 +81,8 @@ Graphical merge program for resolving merge conflicts. If left
unspecified, Mercurial will use the first applicable tool it finds
on your system or use its internal merge tool that leaves conflict
- markers in place. Chose internal:merge to force conflict markers,
- internal:prompt to always select local or other, or internal:dump
+ markers in place. Chose :guilabel:`internal:merge` to force conflict markers,
+ :guilabel:`internal:prompt` to always select local or other, or :guilabel:`internal:dump`
to leave files in the working directory for manual merging.
:guilabel:`Visual Diff Command:`
@@ -124,6 +116,9 @@ commit dialogs.
Default: False (show diffs to right of file list).
+.. module:: commit.settings
+ :synopsis: Dialog used to set commit specific preferences
+
Commit
------
@@ -148,6 +143,9 @@ if any lines are too long at commit.
Default: 0 (unenforced).
+.. module:: changelog.settings
+ :synopsis: Dialog used to set changelog specific preferences
+
Changelog
---------
@@ -172,13 +170,26 @@ of the currently selected changeset into the clipboard.
Default: False.
+.. module:: synchronize.settings
+ :synopsis: Dialog used to set synchronize specific preferences
+
Sync
----
+The :guilabel:`Sync` tab is where you can store URLs (paths) to related
+repositories. It is rare to store paths in the site-wide or user
+configuration files, most of the time you will only store these in a
+repository configuration file. Mercurial has two special path names that
+can be used as default targets for some operations.
+
+* *default* - the default URL to pull from, usually clone source
+* *default-push* - the default push target when using the command line
+
:guilabel:`After pull operation:`
Operation which is performed directly after a successful pull.
- update equates to pull --update, fetch equates to the fetch
- extension, rebase equates to pull --rebase. Default: none.
+ :guilabel:`update` equates to :command:`pull --update`, :guilabel:`fetch`
+ equates to the fetch extension, :guilabel:`rebase` equates to
+ :command:`pull --rebase`. Default: none.
:guilabel:`Remote repository paths`
In this pane you can configure aliases for repositories that you
@@ -187,6 +198,9 @@ be listed in the Synchronize tool path drop-down box, and they can
be used as short-cuts on the command line.
+.. module:: web.settings
+ :synopsis: Dialog used to set web server specific preferences
+
Web
---
@@ -246,12 +260,15 @@:guilabel:`Encoding:`
Character encoding name.
+.. module:: proxy.settings
+ :synopsis: Dialog used to set proxy specific preferences
+
Proxy
-----
:guilabel:`Host:`
Host name and (optional) port of proxy server, for
- example "myproxy:8000".
+ example ``myproxy:8000``.
:guilabel:`Bypass List:`
Optional. Comma-separated list of host names that
@@ -266,6 +283,9 @@ proxy server.
+.. module:: email.settings
+ :synopsis: Dialog used to set email specific preferences
+
Email
-----
@@ -286,9 +306,9 @@:guilabel:`method:`
Optional. Method to use to send email messages. If value is "smtp" (default),
use SMTP (configured below). Otherwise, use as name of program to run that
- acts like sendmail (takes "-f" option for sender, list of recipients on
- command line, message on stdin). Normally, setting this to "sendmail" or
- "/usr/sbin/sendmail" is enough to use sendmail to send messages.
+ acts like sendmail (takes :command:`-f` option for sender, list of recipients on
+ command line, message on stdin). Normally, setting this to ``sendmail`` or
+ ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.
:guilabel:`SMTP Host:`
Host name of mail server.
@@ -311,6 +331,9 @@ Hostname the sender can use to identify itself to the mail server.
+.. module:: diff.settings
+ :synopsis: Dialog used to set diff specific preferences
+
Diff
----
@@ -346,11 +369,11 @@
hgtk repoconfig
-for the repository settings or ::
+for the repository settings (:file:`.hg/hgrc` file) or ::
hgtk userconfig
-for the user configuration.
+for the user configuration (:file:`Mercurial.ini` file).
The syntax is simple, no options or parameters are needed, except the global options.
|
|
@@ -130,7 +130,7 @@ ' Default is 1; set to 0 to disable.')),
(_('Max Files'), 'web.maxfiles', ['10'],
_('Maximum number of files to list per changeset.')),
- (_('Max Changes'), 'web.maxfiles', ['10'],
+ (_('Max Changes'), 'web.maxchanges', ['10'],
_('Maximum number of changes to list on the changelog.')),
(_('Allow Push'), 'web.allow_push', ['*'],
_('Whether to allow pushing to the repository. If empty or not'
|
||
Add a tag
Loading...