Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

doc: fix case of keyboard accelerators

Changeset 3df8bec175c0…

Parent c70477d8190f…

by Giampaolo Fadel

Changes to 5 files · Browse files at 3df8bec175c0 Showing diff from parent c70477d8190f Diff from another changeset...

Change 1 of 1 Show Changes Only doc/​source/​changelog.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
210
211
212
213
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
210
211
212
213
 ===========================  TortoiseHg Changelog Viewer  ===========================    .. module:: changelog.dialog   :synopsis: Dialog used to view log    .. figure:: figures/log.png   :alt: Changelog     Changelog viewer dialog    The toolbar buttons from left to right:    :guilabel:`Refresh`   Reload the revision history (if you commit in another window, etc)  :guilabel:`Filter`   Open revision filter dialog, also has drop-down for common filters  :guilabel:`Datamine`   Open datamine application for history searches and file annotations  :guilabel:`Other Parent`   Only active when viewing merge changesets, toggles parents  :guilabel:`Synchronize`   Communicate changes with other repositories    The changelog tool is primarily used to visualize the revision history  of your repository. It presents a graph of the revision history, showing  the parent/child relationship of each change. At each revision you can  view the files that it modified and the contents of those changes. These  are the obvious features that a revision history browser provides.    This changelog browser offers much more.    Revision Graph Details  ----------------------    The graph column shows the child-parent relationships between revisions  in your repository history. This column auto-sizes for as many lines of  ancestry that are required to visualize the revisions you have loaded.  The column does have a hard-limit width to prevent some degenerative  cases from breaking the viewer.    On the right of the revision graph are three buttons. From top to bottom  these are:    :guilabel:`column toggles`   toggle the display of columns in the graph  :guilabel:`next-N revisions`   load the next N revisions into the graph  :guilabel:`all revisions`   load all remaining revisions into the graph    Revision Context Menus  ----------------------    Right-clicking on a revision in the (top) graph pane will bring up the  revision context menu.    :guilabel:`visualize change`   open this change in your visual diff tool  :guilabel:`display change`   open this changeset in the changeset browser (more below)  :guilabel:`diff to local`   display changes (visual diff) between this revision and your current   working directory  :guilabel:`update`   update your working directory to this revision [#rcm1]_  :guilabel:`merge with`   merge with this revision [#rcm2]_  :guilabel:`copy hash`   copy current revision's full hash to the clipboard  :guilabel:`export patch`   generate a patch file of this revision's changes  :guilabel:`email patch`   send this revision's changes to email recipient [#rcm3]_  :guilabel:`bundle rev:tip`   create a bundle with all revs from selected to tip  :guilabel:`add/remove tag`   opens the TortoiseHg tag dialog with this revision selected  :guilabel:`backout`   create a backout changeset for selected revision  :guilabel:`revert`   revert working copy to this revision's contents, without updating working   directory parent revision. Use with care.  :guilabel:`strip`   Remove the selected revision and all of it's descendants from the   repository [#rcm4]_      If you right-click on a row other than the one that was currently selected, you get a different context menu.  This one is for visualizing diffs between two arbitrary revisions.    :guilabel:`diff with selected`   Description  :guilabel:`visual diff with selected` [#rcm5]_   Description  :guilabel:`email from here to selected`   Description  :guilabel:`bundle from here to selected`   Description  :guilabel:`merge with selected` [#rcm6]_   Description    .. [#rcm1] Opens the TortoiseHg update/checkout dialog with this revision selected.  .. [#rcm2] Opens the TortoiseHg merge dialog with this revision selected.  .. [#rcm3] Opens the TortoiseHg email dialog with this revision selected.  .. [#rcm4] The strip command will store the stripped revisions in a bundle file   that can later be reapplied.   See `also <http://www.selenic.com/mercurial/wiki/index.cgi/EditingHistory>`_.  .. [#rcm5] :menuselection:`Settings --> Global --> TortoiseHg --> Visual Diff Command`  .. [#rcm6] Only sensitive if the selected revision is your current working   directory parent        File List Context Menus  -----------------------    Right-clicking on filenames in the file list (bottom left) pane will  bring up a context menu for the selected file:    :guilabel:`visual diff`   Open this revision of the file in your visual editor [#flcm1]_  :guilabel:`diff to local`   Visualize differences between this revision and your checked out version  :guilabel:`save at revision`   Write this revision of the file to specified location  :guilabel:`file history`   Show revisions that modified this file [#flcm2]_  :guilabel:`annotate file`   Open this file in the datamine app, annotated at this revision  :guilabel:`revert file contents`   Checkout this specific revision of this file [#flcm3]_    .. [#flcm1] :menuselection:`Settings --> Global --> TortoiseHg --> Visual Editor`  .. [#flcm2] Does not show revisions where a file was deleted, as this is only a   manifest change, it does not modify the file's history.  .. [#flcm3] The new contents will appear as local changes and must be committed.      Changeset browser  -----------------  The changelog and datamine tools can open the changeset browser to view  a single revision or the combined effect of a range of revisions. The  changeset browser is very similar to the commit and shelve tools. It has  a file list on the left of all files that have been changed, and a diff  pane on the right with the changes to each file.    In release 0.7 of TortoiseHg, the 'diff change with' changeset browser  now supports change selection. You can select files and hunks that you  wish to extract from the changeset(s) you are browsing and write them to  a patch file using the :guilabel:`Save as` toolbar button. This is a very  efficient way to cherry pick changes made to a repository.  Unfortunately, TortoiseHg still does not have a dialog for importing  changes into a repository, so this must be done on the command line with  the :command:`hg import` command.   -This changeset browser also supports the :kbd:`CTRL-C` keyboard +This changeset browser also supports the :kbd:`Ctrl-C` keyboard  accelerator to copy hightlighted diff hunks to the clipboard.    Configurables  -------------    The changelog browser has a few configurable options that can be set in  the TortoiseHg Settings dialog on the Changelog tab.    :guilabel:`Author coloring`   If true, each author's changeset will be given a unique color  :guilabel:`Long Summary`   Concatenate commit message lines until 80 chars are reached  :guilabel:`Graph batch limit`   Number of revisions to read in each batch load  :guilabel:`Copy Hash`   Copy a revision's changeset id hash to the clipboard when selected    The exact colors given to particular users can be configured by adding  lines like these to your :file:`Mercurial.ini` file: ::     [tortoisehg]   authorcolor.USERNAME = color    The changelog browser also respects the following settings on the  TortoiseHg tab:    :guilabel:`Tab Width`   Number of spaces to expand tabs in diffs  :guilabel:`Max Diff Size`   Maximum size of file to be diffed  :guilabel:`Bottom Diffs`   Show diffs below file list      From command line  -----------------    The changelog viewer can be started from command line ::     hgtk log    or ::     hgtk history    The syntax is ::     hgtk log [OPTIONS]    Valid [OPTIONS] are:    ``-l``, ``--limit``   Specify the limit number of changes displayed.    .. vim: noet ts=4
Change 1 of 2 Show Entire File doc/​source/​commit.txt Stacked
 
147
148
149
150
 
151
152
 
153
154
155
 
305
306
307
308
 
309
310
311
 
147
148
149
 
150
151
 
152
153
154
155
 
305
306
307
 
308
309
310
311
@@ -147,9 +147,9 @@
 Keyboard navigation  -------------------   -:kbd:`CTRL-ENTER` +:kbd:`Ctrl-Enter`   will trigger the commit -:kbd:`CTRL-C` +:kbd:`Ctrl-C`   In the diff panel will copy the currently highlighted (not selected,   but highlighted) diff hunks to the clipboard. These can be pasted   into a text buffer to generate any arbitrary patch based from the @@ -305,7 +305,7 @@
 * The message pane context menu now has options for inserting selected   filenames, and configuring/applying a layout format.  * :guilabel:`Ctrl-O` keyboard accelerator for triggering commit has been - replaced with :guilabel:`CTRL-Enter` accelerator which is common to + replaced with :guilabel:`Ctrl-Enter` accelerator which is common to   many THG dialogs  * Support for two-parent state (merging) has been improved, especially   the file context menus.
Change 1 of 3 Show Entire File doc/​source/​common.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
 
75
76
77
78
79
80
 
 
 
81
82
83
 
93
94
95
96
97
 
 
98
99
 
26
27
28
 
29
30
31
 
 
32
33
34
 
35
36
37
 
38
39
40
41
42
43
44
 
45
46
47
48
 
75
76
77
 
 
 
78
79
80
81
82
83
 
93
94
95
 
 
96
97
98
99
@@ -26,23 +26,23 @@
   We define a few keyboard accelerators that all of the TortoiseHg tools support.   -:kbd:`CTRL-Q` +: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-W` + close the current window (same as :kbd:`Ctrl-Q` if only one window is open)   -:kbd:`CTRL-D` +:kbd:`Ctrl-D`   visual diff of currently selected file or changeset   -:kbd:`CTRL-ENTER` +:kbd:`Ctrl-Enter`   activation    :kbd:`F5`   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 +(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.   @@ -75,9 +75,9 @@
 jump to the first row that matches the text you have entered thus far.  As you enter more characters, the search is refined.   -* :kbd:`CTRL-F` opens the search window explicitly -* :kbd:`CTRL-G` advances the search to the next match -* :kbd:`SHIFT-CTRL-G` searches backwards +* :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   @@ -93,7 +93,7 @@
 completed, so a simple :kbd:`Enter` is all that is required to close  the window.   -*hgcmd* also responds appropriately to the global :kbd:`CTRL-W` and -:kbd:`CTRL-Q` keyboard accelerators. +*hgcmd* also responds appropriately to the global :kbd:`Ctrl-W` and +:kbd:`Ctrl-Q` keyboard accelerators.    .. vim: noet ts=4
Change 1 of 1 Show Entire File doc/​source/​preface.txt Stacked
 
59
60
61
62
 
63
64
65
 
59
60
61
 
62
63
64
65
@@ -59,7 +59,7 @@
   The following typographical conventions are used in this manual:   -:kbd:`CTRL-A` +:kbd:`Ctrl-A`   Indicates a key, or combination of keys, to press.    :guilabel:`Commit`
Change 1 of 1 Show Entire File doc/​source/​shelve.txt Stacked
 
103
104
105
106
 
107
108
109
 
103
104
105
 
106
107
108
109
@@ -103,7 +103,7 @@
 Keyboard navigation  -------------------   -:guilabel:`CTRL-C` +:guilabel:`Ctrl-C`   in the diff panel will copy the currently highlighted (not selected,   but highlighted) diff hunks to the clipboard. These can be pasted   into a text buffer to generate any arbitrary patch based from the