We are currently indexing your data, so search results may be incomplete until we finish.
stable docs: finish documenting the sync tool, still needs a new screenshot
Changeset 00db0183423a…
Parent cd119e1f59cb…
by
Changes to 2 files · Browse files at 00db0183423a Showing diff from parent cd119e1f59cb Diff from another changeset...
|
@@ -66,32 +66,36 @@ creates the destination repository and pulls all changes from
the p4 depot into it.
+The **perfarce.tags** configuration option determines whether perfarce
+tries to import Perforce labels as Mercurial tags.
+
*TortoiseHg Integration*
When the perfarce extension is enabled, it adds a :guilabel:`start revision`
-configurable option to the clone tool, and a :guilabel:`Perforce` menu
-to the Repository Explorer. The menu has two items:
+configurable option to the clone tool, and a :guilabel:`P4` toolbar
+button to the sync tool.
-identity::
-
- Finds the tip Perforce changelist in your local repository and
- selects it in the changelog window.
-
-pending::
-
- Detects pending Perforce changelists that have been "push"ed to your
- Perforce client but have not been submitted, or have not been pulled
- back. This opens the pending changelist dialog so that you can view
- these pending changelists and either submit or revert them.
+The toolbar button performs the p4pending operation. It detects pending
+Perforce changelists that have been "push"ed to your Perforce client but
+have not been submitted, or have not been pulled back. This opens the
+pending changelist dialog so that you can view these pending changelists
+and either submit or revert them. If Perforce fails the submit because
+your files are out of date, you must revert the changelist, pull from
+Perforce, merge, then push again.
*Installation*
-Perfarce comes bundled with TortoiseHg 1.0 Windows installers, so you
+Perfarce comes bundled with TortoiseHg Windows installers, so you
enable perfarce by simply adding it to your Mercurial.ini or a
repository's hgrc like this::
[extensions]
perfarce=
+
+.. note::
+ The perfarce extension has been known to not work together with
+ hgsubversion, so if you plan to use both extensions they should be
+ enabled locally on the repositories that require them.
hgsubversion (SVN)
==================
@@ -123,10 +127,10 @@See the hgsubversion wiki for details of use.
.. warning::
- When doing a clone of a Subversion server, it is highly recommended
- to clone only the first few revisions, then pull the rest. Clone's
- failure behavior is to delete the entire incomplete cloned
- repository. Pull is much more forgiving.
+ When cloning a Subversion server, it is highly recommended
+ to clone only the first few revisions then pull the rest. The
+ failure behavior of the clone command is to delete the incomplete
+ clone, while pull is much more forgiving.
*TortoiseHg Integration*
|
||
|
|
@@ -9,12 +9,6 @@
Synchronize dialog
-TODO: describe drag & drop
-TODO: describe stored vs related paths
-TODO: describe behavior differences in and out of Workbench
-TODO: describe perfarce integration
-TODO: describe URL context menu and shortcuts
-
The synchronize tool is used to transmit changesets between repositories
or to email recipients.
@@ -35,11 +29,10 @@ :guilabel:`Stop`
stop current operation
-The :guilabel:`Post Pull Operation` frame contains radio buttons for
-selecting the operation which is performed after a pull. This behavior
-is configurable via the :guilabel:`Configure` button. You can select a
-default behavior for your user account and override that selection on a
-per-repository basis.
+The :guilabel:`Post Pull` dialog contains radio buttons for selecting
+the operation which is performed after a pull. If you open the
+configuration tool, you can select a default behavior for your user
+account and override that selection on a per-repository basis.
:guilabel:`None`
No operations are performed after a pull. You will be allowed to
@@ -64,16 +57,8 @@ merge conflicts without user interaction. If not checked, all
merges will be interactive.
-All operations which require authentication will pop up dialog boxes to
-get the required information from the user. TortoiseHg uses the
-TortoisePlink tool (borrowed from the TortoiseSVN distribution) to
-handle *ssh:* connections and authentication. See the FAQ_ for help if
-you have trouble connecting to ssh servers.
-
-.. _FAQ: http://bitbucket.org/tortoisehg/stable/wiki/FAQ#tortoisehg-faq
-
-Under the :guilabel:`Options` fold-up panel are a number of
-configurables that are valid for most push/pull operations.
+The :guilabel:`Options` dialog provides checkboxes for selecting
+infrequently used command options.
:guilabel:`Allow push of a new branch`
allow a new named branch to be pushed
@@ -82,36 +67,48 @@ :guilabel:`Recurse into subdirectories`
incoming or outgoing commands can recurse into subdirectories
and provide a full report
+ :guilabel:`Temporarily disable configured proxy`
+ only sensitive when a web proxy is configured for the given
+ repository. While checked it will disable that proxy.
:guilabel:`Remote Command`
- provides --removecmd argument
+ provides a --remotecmd argument
+When the sync tool is opened within the Workbench, the toolbar has a
+:guilabel:`Target` checkbox. While checked, the target dropdown box is
+sensitive and the selected target revision, bookmark, or branch will be
+added to every synchronization command. When the sync tool is opened
+outside of the Workbench, the target checkbox and dropdown box is
+hidden.
-Email
------
+At the very right of the toolbar is the currently selected URL. All
+synchronization commands will use this URL. The general effect of the
+toolbar is that it can be read as a Mercurial command line. The tool
+buttons select the command, the :guilabel:`Post Pull` and
+:guilabel:`Options` dialog specify options, the target dropdown box can
+specify revisions, and finally the URL completes the command.
-.. figure:: figures//email.png
- :alt: Email dialog
+Adding an URL
+-------------
- Email dialog
-
-The email dialog can be launched from two TortoiseHg tools.
+By far the easiest way to add a new URL to your respository is to drag
+and drop the URL from another application, then press the save button
+and provide the URL an alias.
-1) The Workbench, in which case the user intends to email a selection
- of revisions.
+The two list panes display URLs that are stored in the current
+repository's configuration file (:guilabel:`Stored Paths`) and URLs that are
+stored in other related repositories that are listed in the Workbench
+repository registry (:guilabel:`Related Paths`). When the sync tool is opened
+outside of the Workbench, the :guilabel:`Related Paths` list will be empty.
-2) The synchronize tool, in which case the user intends to email all
- outgoing changes to the current target repository.
+.. note::
+ Being related means two repositories share at least a common root
+ changeset. Cloned are obviously related. Push and pull operations
+ require that repositories to be related, or that you use --force to
+ override the relationship check.
-The :guilabel:`Send` button is obvious, and the :guilabel:`Configure`
-dialog predictably opens the TortoiseHg Settings dialog to the email tab
-where you can configure your SMTP settings and set default
-:guilabel:`To:` and :guilabel:`From:` addresses.
-
-:guilabel:`In-Reply-To:` is used to make your patches properly threaded
-in mailing lists.
-
-Please consult the Mercurial documentation for the differences between
-plain patches, Hg patches, Git patches, and bundles.
+The URL lists have a context menu that allows you to browse, open a
+terminal, or delete an URL from your local configuration file. The
+platform standard delete key sequence will also remove an URL.
Security
--------
@@ -226,6 +223,37 @@scenarios, and thus is up to four times slower than openssh and other
clients. TortoiseHg recommends the use of HTTPS for Windows clients.
+See the FAQ_ for help if you have trouble connecting to ssh servers.
+
+.. _FAQ: http://bitbucket.org/tortoisehg/stable/wiki/FAQ#tortoisehg-faq
+
+Email
+-----
+
+.. figure:: figures//email.png
+ :alt: Email dialog
+
+ Email dialog
+
+The email dialog can be launched from two TortoiseHg tools.
+
+1) The Workbench, in which case the user intends to email a selection
+ of revisions.
+
+2) The synchronize tool, in which case the user intends to email all
+ outgoing changes to the current target repository.
+
+The :guilabel:`Send` button is obvious, and the :guilabel:`Configure`
+dialog predictably opens the TortoiseHg Settings dialog to the email tab
+where you can configure your SMTP settings and set default
+:guilabel:`To:` and :guilabel:`From:` addresses.
+
+:guilabel:`In-Reply-To:` is used to make your patches properly threaded
+in mailing lists.
+
+Please consult the Mercurial documentation for the differences between
+plain patches, Hg patches, Git patches, and bundles.
+
From command line
-----------------
|
|
Add a tag
Loading...