Changeset ee4ba636ac44…
Parent f12814f40d93…
by
Changes to 6 files · Browse files at ee4ba636ac44 Showing diff from parent f12814f40d93 Diff from another changeset...
@@ -122,7 +122,11 @@ .. [#rcm6] Only sensitive if the selected revision is your current working
directory parent
+Revision Filter Dialog
+----------------------
+.. figure:: figures/logfilter.jpg
+ :alt: Revision filter dialog
File Context Menus
------------------
|
@@ -48,7 +48,11 @@ Visual Diffs
------------
-0.8 introduced a visual diff dialog that solves four usability issues:
+.. figure:: figures/visual-diff.jpg
+ :alt: Visual Diff Window
+
+TortoiseHg 0.8 introduced a visual diff dialog that solves four
+usability issues:
1) Allows you to select a visual diff tool for each individual file
2) Allows you to use visual diff tools that fork background processes
@@ -117,6 +121,9 @@Many TortoiseHg tools use the *hgcmd* dialog to execute Mercurial
commands that could potentially be interactive.
+.. figure:: figures/hgcmd.jpg
+ :alt: Mercurial command dialog
+
.. note::
Error messages are given a dark red color for contrast
|
|
@@ -33,6 +33,11 @@ :guilabel:`Options`. In the options dialog you can disable overlays
globally, or enable them for local disks only.
+.. figure:: figures/taskbarui.jpg
+ :alt: Taskbar options dialog
+
+ Taskbar Options Dialog
+
Release 0.8.1 introduced the ability to selectively disable overlay
icons in specific repositories. This can be done be editing the
:file:`.hg\\thgstatus` file inside the repository and replacing it's
@@ -46,12 +51,19 @@The TortoiseHg commands (GUI window & dialogs) may be accessed via the
context menu of Explorer windows. The TortoiseHg context menu is
context sensitive and which varies according to the current folder and
-file selection.
+file selection. Here is the context menu for a revisioned folder:
-.. figure:: figures/contextmenu.png
+.. figure:: figures/cmenu-nofiles.jpg
:alt: Context menu
- Context menu for a folder under Mercurial revision control (version 0.7)
+ Context menu for a folder under Mercurial revision control
+
+And here is the context menu for selected files or folders:
+
+.. figure:: figures/cmenu-files.jpg
+ :alt: Context menu
+
+ Context menu for file or folder selection
TortoiseHg provides dialogs for the most regularly used Mercurial
commands. Less frequently used, and newly added, Mercurial commands
@@ -63,6 +75,12 @@:guilabel:`Options`. In the options dialog you can promote individual
menu options to the top menu.
+This is the file rename/move dialog:
+
+.. figure:: figures/rename.jpg
+ :alt: Rename file dialog
+
+
Nautilus
--------
|
|
@@ -0,0 +1,57 @@ + Rename Guessing
+===============
+
+.. module:: guess.dialog
+ :synopsis: Dialog used to detect copies and/or renames
+
+.. figure:: figures/guess.jpg
+ :alt: Rename guessing dialog
+
+This dialog is used to find renames, moves, and/or copies that were done
+without Mercurial's knowledge. The dialog can be launched from the
+shell context menu, or from the status or commit tools via the context
+menu of an unknown file.
+
+Follow these steps:
+
+1) select one or more of the :guilabel:`Unrevisioned Files`
+2) slide the simularity bar to the percentage match you desire
+3) press either :guilabel:`Find Renames` or :guilabel:`Find Copies`.
+4) select candidate matches and accept good matches
+5) repeat until all unrevisioned files are matched
+
+Find Renames
+------------
+
+This feature will search the repository for missing files (files which
+were revisioned but are now gone). For each missing file, it compares
+the last revisioned data against the unrevisioned file and if the
+percentage of matching lines is above the
+:guilabel:`Minimum Simularity Percentage`, it adds the pair to the
+:guilabel:`Candidate Matches`.
+
+Find Copies
+-----------
+
+This feature will check every revisioned file in the repository to see
+if it exactly matches the unrevisioned file.
+
+Candidate Matches
+-----------------
+
+When you select a match in this list, the differences between the two
+files are shown in the bottom pane. Pressing :guilabel:`Accept Match`
+will record the rename or copy event with Mercurial.
+
+From command line
+-----------------
+
+The guess tool can be started from command line::
+
+ hgtk guess
+
+ guess previous renames or copies
+
+ use "hgtk -v help guess" to show global options
+
+.. vim: noet ts=4
|
|
@@ -0,0 +1,29 @@ + Ignore Filter
+=============
+
+.. module:: ignore.dialog
+ :synopsis: Dialog used to maintain the ignore filter
+
+The ignore dialog is used to maintain your Mercurial repository's ignore
+filter, which can be found in an :file:`.hgignore` file in the
+repository root. The dialog can be launched from the shell context
+menu, or from the status or commit tools via the context menu of an
+unknown file.
+
+.. figure:: figures/ignore.jpg
+ :alt: Ignore filter dialog
+
+From command line
+-----------------
+
+The ignore tool can be started from command line::
+
+ hgtk hgignore [FILE]
+
+ aliases: ignore, filter
+
+ ignore filter editor
+
+ use "hgtk -v help hgignore" to show global options
+
+.. vim: noet ts=4
|
Loading...