Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable doc: Minor cleanups and improvements

Changeset f7a449c68406…

Parent 2f5c9b8709fd…

by Steve Borho

Changes to 2 files · Browse files at f7a449c68406 Showing diff from parent 2f5c9b8709fd Diff from another changeset...

Change 1 of 3 Show Entire File doc/​source/​commit.txt Stacked
 
10
11
12
13
 
14
15
16
17
18
19
20
 
 
 
 
21
22
23
 
66
67
68
 
 
 
69
70
71
 
92
93
94
95
 
 
96
97
98
99
 
100
101
102
 
10
11
12
 
13
14
15
16
17
 
 
 
18
19
20
21
22
23
24
 
67
68
69
70
71
72
73
74
75
 
96
97
98
 
99
100
101
102
103
 
104
105
106
107
@@ -10,14 +10,15 @@
  proper configuration. See   `issue #82 <http://bitbucket.org/tortoisehg/stable/issue/82/>`_.   -The commit tool is one of the main two applications of TortoiseHg. +The commit tool is one of the two main applications of TortoiseHg.  Together with the Repository Explorer (aka, the changelog tool) these  two tools can perform or access nearly every function that TortoiseHg  supports.   -Not only can the commit tool commit your changes, but it can examine the -state of your working directory and perform most routine maintenance -tasks (add new files, record renames, manage the ignore filter, etc). +Not only can the commit tool commit your changes, but it can also +examine the state of your working directory and perform most routine +maintenance tasks (add new files, record renames, manage the ignore +filter, etc).    .. figure:: figures/commit.png   :alt: Commit dialog @@ -66,6 +67,9 @@
  :guilabel:`Refresh`   Reload the state of the working directory. It tries to retain   check and selection state across refresh. + :guilabel:`Patch Queue` + If the MQ extension is enabled, this toggle button for the patch + queue pane will be visible.    Below the toolbar are useful widgets:   @@ -92,11 +96,12 @@
  column header is checkable, it will toggle the file selection   states.   2) The :guilabel:`st` column holds the status of the file, defined - by Mercurial's status command, one of 'MARD?IC'. + by Mercurial's status command, one of 'MARD?IC'. A status of 'S' + indicates a dirty subrepository that needs to be committed.   3) The :guilabel:`ms` column holds the merge state of the file,   defined by Mercurial's resolve command, one of ' RU'. See the   merge section below. - 4) The canonical path of the file (relative to the repository root) + 4) The canonical path of the file relative to the repository root    .. note::   If the commit tool was started with a file pattern or selection, a
Change 1 of 2 Show Entire File doc/​source/​explorer.txt Stacked
 
26
27
28
29
30
31
32
33
34
 
 
 
 
35
36
37
 
38
39
 
40
41
42
43
44
 
 
 
45
46
47
48
49
50
51
52
53
54
 
 
 
55
56
57
 
67
68
69
70
71
72
73
74
75
76
 
 
77
78
79
 
26
27
28
 
 
 
 
 
 
29
30
31
32
33
34
 
35
36
 
37
38
 
 
 
 
39
40
41
42
43
44
45
46
47
 
 
 
 
48
49
50
51
52
53
 
63
64
65
 
 
 
 
 
 
 
66
67
68
69
70
@@ -26,32 +26,28 @@
 directory icons will turn into question marks while this refresh is in  progress.   -The new C++ shell extension is an order of magnitude faster than the -Python extension used in previous releases, but we still make the -overlays configurable via the taskbar menu. Simply click on the -Mercurial (droplet) icon in the system tray and select -:guilabel:`Options`. In the options dialog you can disable overlays -globally, or enable them for local disks only. +The overlay handler and context menus are configurable. From any folder +background (even the desktop), right click and select +:menuselection:`TortoiseHg --> Explorer Extension Settings`. In the settings +dialog you can promote individual menu options to the top menu.    .. figure:: figures/taskbarui.png - :alt: Taskbar options dialog + :alt: Shell Configuration dialog   - Taskbar Options Dialog + Shell Configuration Dialog   -Release 0.8.1 introduced the ability to selectively disable overlay -icons in specific repositories. This can be done by editing the -:file:`.hg\\thgstatus` file inside the repository and replacing it's -contents with a single line containing:: +One can selectively disable overlay icons in a specific repository by +editing the :file:`.hg\\thgstatus` file inside the repository and +replacing it's contents with a single line containing::     @@noicons    Context Menus  -------------   -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. Here is the context menu for a revisioned folder: +TortoiseHg commands may be accessed via the context menu of Explorer +windows and other applications which use the standard File/Open dialogs. +Here is the context menu for a revisioned folder:    .. figure:: figures/cmenu-nofiles.jpg   :alt: Context menu @@ -67,13 +63,8 @@
   TortoiseHg provides dialogs for the most regularly used Mercurial  commands. Less frequently used and newly added Mercurial commands -must need be accessed on the CLI (command line interface) through -:file:`cmd.exe` windows. - -The context menus are configurable via the taskbar menu. Simply click on -the Mercurial (droplet) icon in the system tray and select -:guilabel:`Options`. In the options dialog you can promote individual -menu options to the top menu. +may be accessed from the CLI (command line interface) through +:file:`cmd.exe` on Windows.    Nautilus  --------