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: update docs with ini->rc extension changes

Changeset 2f5c9b8709fd…

Parent 2c1f08586fff…

by Steve Borho

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

Change 1 of 2 Show Changes Only doc/​source/​common.txt Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
 
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
 
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
 Common Features  ===============    .. module:: common.dialog   :synopsis: Common features to all the dialog    These features are common to many TortoiseHg tools, so we document them  here just once.    Keyboard Accelerators  ---------------------    We define a few keyboard accelerators that all of the TortoiseHg tools support.    :kbd:`Ctrl-Q`   quit the application, including all open windows    :kbd:`Ctrl-W`   close the current window (same as :kbd:`Ctrl-Q` if only one window is open)    :kbd:`Ctrl-D`   visual diff of currently selected file or changeset    :kbd:`Ctrl-Enter`   activation    :kbd:`Ctrl-.` and :kbd:`Ctrl-,`   select next or previous file in a file list    :kbd:`Ctrl-[` and :kbd:`Ctrl-]`   page up or down a text pane    :kbd:`F5`, :kbd:`Ctrl-R`   refresh    On `Mac OS X <http://bitbucket.org/tortoisehg/stable/wiki/MacOSX>`_, the  apple (command) key is used as the modifier instead of :kbd:`Ctrl`.  However some keyboard accelerators are internal to GTK+ so you must use  the control key to access cut-paste functionality, for instance.    Visual Diffs  ------------    .. figure:: figures/visual-diff.jpg   :alt: Visual Diff Window     Visual Diff Window    In TortoiseHg 1.0, the visual (external) diff infrastructure was  refactored. The new system uses tool descriptions in -:file:`mergetools.ini` to detect most common diff tools on your computer +:file:`mergetools.rc` to detect most common diff tools on your computer  (including KDiff3, which ships in our installer) and select the best  available tool.    If the user has selected a merge tool  (:menuselection:`TortoiseHg --> Three-way Merge Tool`), that tool will  also be used to perform visual diffs, bypassing the tool selection  process. However the user can still select a separate tool  (:menuselection:`TortoiseHg --> Visual Diff Tool`) for visual diffs if  they chose.    The merge tool configuration file contains optimal command lines for  each tool, so no further configuration is required by the user. They  only need to select the tools they wish use, or accept the defaults.    The visual diff system will use any existing extdiff configuration it  finds. Since extdiff did not support three way diff arguments until  very recently and still does not support label arguments, you will  likely have a better experience by disabling or deleting any extdiff  configuration you may have.    The visual diff system will directly use the selected diff tool unless  the action you are attempting requires the use of the TortoiseHg visual  diff window. The list of conditions includes:    1) The selection of files being compared require multiple tools  2) The selected tool forks detached background processes  3) The selected tool does not support the required directory diffs  4) The selected tool does not support three way comparisons  5) The file changes include renames or copies    When the visual diff window is used, the temporary files are cleaned up  when the dialog is closed. Thus it should be left open until you close  all of your diff tool instances. When your diff tool is launched  directly, the temporary files are deleted when your tool exits.    If your diff tool is launched directly to compare a working copy file,  it will directly diff against the working file so you may modify it from  within the diff tool. If you are comparing multiple files, the visual  diff system will make a snapshot of the working copy files and track  their initial sizes and timestamps. When your diff tool exits, the  system compares the sizes and timestamps and copies modified files back  over the original working copies. In this way, you can still modify  your working copy files from your visual diff tool even when performing  directory comparisons.    When the visual diff window is used to compare working copy files, it  always directly diffs against the working copy files since it always  operates on a single file at a time.    .. note::   The :menuselection:`TortoiseHg --> Skip Diff Window` configurable   has been removed because it is now redundant.    Adding Tools  ~~~~~~~~~~~~    If you have a visual diff tool installed that is not supported by  TortoiseHg, you can create a tool configuration for it in your user  :file:`Mercurial.ini` file. See Mercurial's  `documentation <http://www.selenic.com/mercurial/hgrc.5.html#merge-tools>`_  on how to configure your tool for use in file merges. When that is  complete, you can add the extra keys used by TortoiseHg for visual  diff::     diffargs: the arguments to use for two-way file comparisons   diff3args: the arguments to use for three-way file comparisons   dirdiff: this tool supports two-way directory comparisons   dir3diff: this tool supports three-way directory comparisons    When building command line arguments, you can use the following  variables::     $parent1: the file or directory from the first parent revision   $parent2: the file or directory from the second parent revision   $child: the file or directory from the revision being compared   $ancestor: the file or directory from the ancestor of a merge   $parent: a synonym for $parent1     $plabel1: a symbolic name for the first parent revision   $plabel2: a symbolic name for the second parent revision   $clabel: a symbolic name for the revision being compared   $alabel: a symbolic name for the ancestor revision    Obviously, $parent2 and $ancestor are only meaningful when used in three  way diff arguments, for viewing merge changesets. If your diff tool  cannot use the ancestor revision in any productive way, it is safe to  leave it out of the diff3args command line.    .. note::   On Windows, the `executable` parameter can use environment variables   using the syntax ${ProgramFiles}    If unconfigured, the default value of **diffargs** is '$parent $child'.  The default value of **diff3args** is "", indicating the visual diff  tool cannot perform three way comparisons.    If you create a new visual diff tool configuration, or improve upon an  existing configuration, please email it to our development mailing list  so it may be incorporated in a future release.      Word Diffs  ~~~~~~~~~~    The TortoiseHg Windows installers now include TortoiseSVN's scripts for  comparing (and sometimes merging) many binary document formats. These -are configured in the site-wide :file:`mergepatterns.ini` as handlers for +are configured in the site-wide :file:`mergepatterns.rc` as handlers for  each binary format's common file extensions, so no user intervention is  required.    In order to support file extension based tool selection, TortoiseHg has  added support for a **[diff-patterns]** section equivalent to Mercurial's  `merge-patterns <http://www.selenic.com/mercurial/hgrc.5.html#merge-patterns>`_  section.      Treeview searches  -----------------    Many TortoiseHg dialogs use treeviews to present lists of data to the  user. The file lists in the status, commit, shelve, and changelog tools  are treeviews. The changelog graph pane is a treeview. And even the  annotate pane in the datamine tool is a treeview.    Most of the TortoiseHg treeviews are configured for live searches.  Ensure that the treeview has focus (by clicking on a row), and begin  typing a search phrase. A small entry window will appear containing the  text you have typed, and the treeview will immediately jump to the first  row that matches the text you have entered thus far. As you enter more  characters, the search is refined. (Do not hit return to 'complete' the  search, before using the keys mentioned below, or the entry window will  disappear, ending the search instead.)    * :kbd:`Ctrl-F` opens the search window explicitly  * :kbd:`Ctrl-G` advances the search to the next match  * :kbd:`Shift-Ctrl-G` searches backwards  * The mouse scroll wheel will advance forwards and backwards through   matching lines    Hg command dialog  -----------------    Many TortoiseHg tools use the *hgcmd* dialog to execute Mercurial  commands that could potentially be interactive.    .. figure:: figures/hgcmd.jpg   :alt: Mercurial command dialog     Interactive Mercurial Command Dialog    .. note::   Error messages are given a dark red color for contrast    When the Mercurial command has completed, the dialog gives focus to its  :guilabel:`Close` button. So pressing :kbd:`Enter` is all that is  required to close the window.    .. vim: noet ts=4
Change 1 of 1 Show Entire File doc/​source/​intro.txt Stacked
 
130
131
132
133
 
134
135
136
 
130
131
132
 
133
134
135
136
@@ -130,7 +130,7 @@
   .. note::   If you install TortoiseHg from source, you need to add our - contrib/mergetools.ini file to your HGRC path in some way. One + contrib/mergetools.rc file to your HGRC path in some way. One   approach is to %include it from your ~/.hgrc file.    Language settings