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

doc: white space cleanups

replace spaces with tabs
remove trailing spaces
remove white space from blank lines

Changeset 201efb81f7cc…

Parent cc9b19917daa…

by Steve Borho

Changes to 14 files · Browse files at 201efb81f7cc Showing diff from parent cc9b19917daa Diff from another changeset...

Change 1 of 7 Show Entire File doc/​source/​changelog.txt Stacked
 
3
4
5
6
 
7
8
9
 
10
11
12
 
 
13
14
15
 
61
62
63
64
65
 
 
66
67
68
 
83
84
85
86
 
 
87
88
89
 
99
100
101
102
 
103
104
105
 
130
131
132
133
 
134
135
136
 
155
156
157
158
 
159
160
161
 
171
172
173
174
 
175
176
177
 
3
4
5
 
6
7
8
 
9
10
 
 
11
12
13
14
15
 
61
62
63
 
 
64
65
66
67
68
 
83
84
85
 
86
87
88
89
90
 
100
101
102
 
103
104
105
106
 
131
132
133
 
134
135
136
137
 
156
157
158
 
159
160
161
162
 
172
173
174
 
175
176
177
178
@@ -3,13 +3,13 @@
 ===========================    .. module:: changelog.dialog - :synopsis: Dialog used to view log + :synopsis: Dialog used to view log    .. figure:: figures/log.png - :alt: Changelog + :alt: Changelog   - Changelog viewer dialog - + Changelog viewer dialog +  The toolbar buttons from left to right:    :guilabel:`Refresh` @@ -61,8 +61,8 @@
 :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 + display changes (visual diff) between this revision and your current + working directory  :guilabel:`update`   update your working directory to this revision [1]  :guilabel:`merge with` @@ -83,7 +83,8 @@
  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 [4] + Remove the selected revision and all of it's descendants from the + repository [4]      If you right-click on a row other than the one that was currently selected, you get a different context menu. @@ -99,7 +100,7 @@
  Description  :guilabel:`merge with selected` [6]   Description - +  1) Opens the TortoiseHg update/checkout dialog with this revision selected.  2) Opens the TortoiseHg merge dialog with this revision selected.  3) Opens the TortoiseHg email dialog with this revision selected. @@ -130,7 +131,7 @@
  Open this file in the datamine app, annotated at this revision  :guilabel:`revert file contents`   Checkout this specific revision of this file [3] - +  1) :menuselection:`Settings --> Global --> TortoiseHg --> Visual Editor`  2) Does not show revisions where a file was deleted, as this is only a   manifest change, it does not modify the file's history. @@ -155,7 +156,7 @@
 the :command:`hg import` command.    This changeset browser also supports the :kbd:`CTRL-C` keyboard -accelerator to copy hightlighted diff hunks to the clipboard. +accelerator to copy hightlighted diff hunks to the clipboard.    Configurables  ------------- @@ -171,7 +172,7 @@
  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: ::  
Change 1 of 13 Show Entire File doc/​source/​commit.txt Stacked
 
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
 
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
 
79
80
81
82
 
83
84
85
 
90
91
92
93
 
94
95
96
 
97
98
99
100
101
102
103
 
104
105
106
 
112
113
114
115
 
116
117
118
 
146
147
148
149
 
150
151
152
153
154
155
156
 
 
 
 
157
158
159
 
167
168
169
170
 
 
171
172
173
 
199
200
201
202
203
 
 
204
205
206
 
209
210
211
212
 
213
214
215
 
240
241
242
243
244
 
 
245
246
247
 
256
257
258
259
 
260
261
262
 
270
271
272
273
274
 
 
 
275
276
277
 
287
288
289
290
 
291
292
293
294
295
 
 
296
297
298
 
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
 
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
 
79
80
81
 
82
83
84
85
 
90
91
92
 
93
94
95
 
96
97
98
99
100
101
102
 
103
104
105
106
 
112
113
114
 
115
116
117
118
 
146
147
148
 
149
150
151
152
 
 
 
 
153
154
155
156
157
158
159
 
167
168
169
 
170
171
172
173
174
 
200
201
202
 
 
203
204
205
206
207
 
210
211
212
 
213
214
215
216
 
241
242
243
 
 
244
245
246
247
248
 
257
258
259
 
260
261
262
263
 
271
272
273
 
 
274
275
276
277
278
279
 
289
290
291
 
292
293
294
295
 
 
296
297
298
299
300
@@ -3,25 +3,25 @@
 ======================    .. module:: commit.dialog - :synopsis: Dialog used to perform commit + :synopsis: Dialog used to perform commit    .. warning:: - The win32text extension can cause trouble with hunk selection. This - has been resolved in Mercurial 1.3 and TortoiseHg 0.8, but requires - proper configuration. See `issue #82 <http://bitbucket.org/tortoisehg/stable/issue/82/>`_. + The win32text extension can cause trouble with hunk selection. This + has been resolved in Mercurial 1.3 and TortoiseHg 0.8, but requires + proper configuration. See + `issue #82 <http://bitbucket.org/tortoisehg/stable/issue/82/>`_.   -  The commit tool is an important part of TortoiseHG. It is, in fact, the  only component that is launchable from the first level of the context  menu. This is mainly because it is the most heavily used tool. Not only  can you commit your changes, but you can examine the state of your  working directory and perform most routine maintenance tasks (add new  files, record renames, manage the repository ignore filter, etc). - +  .. figure:: figures/commit.png - :alt: Commit dialog + :alt: Commit dialog   - Commit dialog + Commit dialog    Features  -------- @@ -29,47 +29,47 @@
 Walking across the toolbar, the buttons perform the following tasks:    :guilabel:`Refresh` - Reload the state of the working directory. It tries to retain file - check and selection state across refresh, but not hunks. + Reload the state of the working directory. It tries to retain file + check and selection state across refresh, but not hunks.  :guilabel:`Commit`   Commit selected diffs in checked files.  :guilabel:`Undo` - Undo (rollback) last immediate commit. Your commit message will be - available in the message history, so you can re-do the commit after - fixing whatever problem you noticed. + Undo (rollback) last immediate commit. Your commit message will be + available in the message history, so you can re-do the commit after + fixing whatever problem you noticed.  :guilabel:`Revert`   Revert checked files to last revisioned state.  :guilabel:`Add` - Add checked files that were in unknown '?' state. These files will - then be versioned as soon as they are committed. + Add checked files that were in unknown '?' state. These files will + then be versioned as soon as they are committed.  :guilabel:`Move` - Move checked files to specified target directory. This move is done - with Mercurial's full knowledge. + Move checked files to specified target directory. This move is done + with Mercurial's full knowledge.  :guilabel:`Remove` - Delete checked unversioned files and/or remove (mark as deleted) any - versioned files. + Delete checked unversioned files and/or remove (mark as deleted) any + versioned files.    Below the toolbar are two other useful widgets:    :guilabel:`Branch name` - Shows the current branch name of the working directory. Normally - this is informational only, but you can create (open) a new branch - by changing this name before making a commit. Do not use this - feature unless you understand Mercurial's named branches. + Shows the current branch name of the working directory. Normally + this is informational only, but you can create (open) a new branch + by changing this name before making a commit. Do not use this + feature unless you understand Mercurial's named branches.  :guilabel:`Recent Commit Messages` - A drop-down list of the 10 most recent commit messages. The behavior - of this drop-down has been tweaked in 0.7, and should behave - naturally. + A drop-down list of the 10 most recent commit messages. The behavior + of this drop-down has been tweaked in 0.7, and should behave + naturally.  :guilabel:`Patch name` - If you have enabled the MQ extension, there will also be a text - entry for a new patch name. Entering a name here will switch the - commit tool into 'QNew' mode where the working directory changes - will be applied to a new patch. - + If you have enabled the MQ extension, there will also be a text + entry for a new patch name. Entering a name here will switch the + commit tool into 'QNew' mode where the working directory changes + will be applied to a new patch. +  Below the file list are checkboxes that toggle the inclusion of the  various classes of files {modified, added, removed, deleted, unknown,  clean, ignored}. - +  Removed means a revisioned file has been marked as removed. Deleted  means a revisioned file is missing but Mercurial has not been told to  quit tracking that file. For instance, if you rename a revisioned file @@ -79,7 +79,7 @@
 the rename by comparing file contents and mark the old file as removed  and the new file as added while recording the whole operation as a  rename. - +  Change Selection (record)  -------------------------   @@ -90,17 +90,17 @@
 individually selected to be included in the commit or left out of the  commit (but left in the working directory). Fans of darcs or  Mercurial's record extension will recognize this immediately. - +  When is this necessary?  ~~~~~~~~~~~~~~~~~~~~~~~ - +  Most often, it is when you have made more than a single coherent change  to your source code and you would like to commit your changes piecemeal.  This can often be accomplished by filtering the list of files in each  commit, but there will be times when your changes intermingle in the  same set of files and that's when this change selection feature becomes  indespensable. - +  How does it work?  ~~~~~~~~~~~~~~~~~   @@ -112,7 +112,7 @@
 updated to show the current selection state, the selected hunk count and  changed lines will be updated. Toggle the hunk a second time to reselect  it for inclusion in your commit. - +  When a file is partially selected for commit, it's icon is changed from  a checkbox to a radio button. At a glance at the file list, you should  be able to find which files are entirely included in the commit, @@ -146,14 +146,14 @@
   Keyboard navigation  ------------------- - +  :kbd:`CTRL-ENTER`   will trigger the commit  :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 - changes in your working directory. + 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 + changes in your working directory.    The code which copies the hunks to the clipboard is intelligent about  diff headers. If your highlighted list includes a hunk from a file but @@ -167,7 +167,8 @@
   By right clicking on files in the file list, you will get a context menu  of commands that are applicable to the selected file. If you configure a -visual editor in :menuselection:`Settings --> Global --> TortoiseHg --> Visual Editor` +visual editor in +:menuselection:`Settings --> Global --> TortoiseHg --> Visual Editor`  there will be an option to open the file in your editor. For unknown **?**  files, the context menu will allow you to detect renames (if you think  the unknown file was a copy or rename of a revisioned file) or configure @@ -199,8 +200,8 @@
   For your reference, *local* is the revision you had checked out when you  started the merge and *other* is the revision you merged with. - - + +  Commit Message Format  ---------------------   @@ -209,7 +210,7 @@
 will inform you if you try to commit with a non-conforming message.  There is also an :guilabel:`apply format` context menu option available  on the commit message pane that will try to enforce your policy. - +  MQ patches  ----------   @@ -240,8 +241,8 @@
 So, in summary, using MQ with TortoiseHg is still almost entirely a  command line operation, but you can use :command:`hgtk ci` to refresh your  patches and take advantage of our excellent change selection support. - - + +  Configurables  -------------   @@ -256,7 +257,7 @@
 :menuselection:`Commit --> Bottom Diffs`   Toggles diff pane from left to below file list  :menuselection:`TortoiseHg --> Max Diff Size` - Configures the diff size limit + Configures the diff size limit    External tool configuration is deprecated and will be removed in 0.9   @@ -270,8 +271,9 @@
 * The commit tool is now launchable from the merge dialog  * 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 many THG dialogs +* :guilabel:`Ctrl-O` keyboard accelerator for triggering commit has been + 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.  * There is now a limit on the size of files that will be diffed by the commit @@ -287,12 +289,12 @@
   Changes since 0.6  ----------------- - +  Large changes were made to the commit tool in the 0.7 release. The  previous default tool, Qct, was unbundled and TortoiseHg's native commit  tool was promoted to the top spot. See the `FAQ <http://bitbucket.org/tortoisehg/stable/wiki/FAQ#tortoisehg-faq>`_ -for instructions on recovering Qct, if you must, but we suggest you first -read the rest of this page to understand how the native tool now measures up. +for instructions on recovering Qct, if you must, but we suggest you first +read the rest of this page to understand how the native tool now measures up.    The default layout of the native commit tool is different than Qct. The  file list is on the left side of the diff panel. If you prefer the Qct
Change 1 of 3 Show Entire File doc/​source/​common.txt Stacked
 
3
4
5
6
 
7
8
9
 
37
38
39
40
 
41
42
43
 
45
46
47
48
 
49
50
51
 
52
53
54
 
55
56
57
 
3
4
5
 
6
7
8
9
 
37
38
39
 
40
41
42
43
 
45
46
47
 
48
49
50
 
51
52
53
 
54
55
56
57
@@ -3,7 +3,7 @@
 ===============    .. module:: common.dialog - :synopsis: Common features to all the dialog + :synopsis: Common features to all the dialog    These features are common to many TortoiseHg tools, so we document them  here just once. @@ -37,7 +37,7 @@
 =====================    We define a few keyboard accelerators that all of the TortoiseHg tools support. - +  :kbd:`CTRL-Q`   quit the application, including all open windows   @@ -45,13 +45,13 @@
  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 + visual diff of currently selected file or changeset    :kbd:`CTRL-ENTER` - activation + activation    :kbd:`F5` - refresh + 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
Change 1 of 5 Show Entire File doc/​source/​datamine.txt Stacked
 
3
4
5
6
 
7
8
9
 
29
30
31
32
 
33
34
35
36
 
37
38
39
 
46
47
48
49
50
 
 
51
52
53
54
55
 
 
 
 
 
56
57
58
 
66
67
68
69
 
70
71
72
73
74
 
75
76
 
77
78
79
 
97
98
99
100
 
101
102
103
 
3
4
5
 
6
7
8
9
 
29
30
31
 
32
33
34
35
 
36
37
38
39
 
46
47
48
 
 
49
50
51
 
 
 
 
52
53
54
55
56
57
58
59
 
67
68
69
 
70
71
72
73
74
 
75
76
 
77
78
79
80
 
98
99
100
 
101
102
103
104
@@ -3,7 +3,7 @@
 ===================    .. module:: datamine.dialog - :synopsis: Dialog used to search in the history + :synopsis: Dialog used to search in the history    The datamine application is used to inspect the revision history of your  repository. It is a tabbed application that supports two tab types, @@ -29,11 +29,11 @@
  a comma separated list of paths to include in your search. If no   paths are given, the search is assumed to be repository wide. In   other words, specifying an include path actually narrows the search - criteria. + criteria.  *excludes*   a comma separated list of paths to exclude from your search.   Exclusion patterns are applied after inclusion patterns. - +  The toggle buttons below the entry fields are for:    :guilabel:`Follow copies and renames` @@ -46,13 +46,14 @@
  Show every instance where the search criteria matches in a file, not   just the most recent revision. It shows +/- to indicate whether the   change adds or removes your search text. - - + +  Search tabs are named after the search string most recently used to -start a search. The :guilabel:`New Search` toolbar button will obviously open a -new search tab while the :guilabel:`Stop` button will terminate an ongoing search -(the :guilabel:`Stop` button is only sensitive when a search is in progress). - +start a search. The :guilabel:`New Search` toolbar button will +obviously open a new search tab while the :guilabel:`Stop` button will +terminate an ongoing search (the :guilabel:`Stop` button is only +sensitive when a search is in progress). +  Matches  -------   @@ -66,14 +67,14 @@
  open an annotation tab for this file at this revision  :guilabel:`file history`   open a changelog window with this file's revision history - +  Annotate Tabs  -------------    .. figure:: figures/annotate.png - :alt: Annotate tabs + :alt: Annotate tabs   - Annotate tabs + Annotate tabs      The revision graph has a simple context menu for opening the entire @@ -97,7 +98,7 @@
   The annotate tabs support the following configurations defined primarily  for other tools: - +  :menuselection:`Changelog --> Author Coloring`   Give each author a separate color in the changelog graph  :menuselection:`TortoiseHg --> Tab width`
Change 1 of 4 Show Entire File doc/​source/​explorer.txt Stacked
 
3
4
5
6
 
7
8
9
 
16
17
18
19
 
20
21
 
22
23
24
25
26
27
28
 
29
30
31
 
34
35
36
37
 
38
39
40
 
53
54
55
56
 
57
58
 
59
60
61
62
63
64
 
65
66
67
 
3
4
5
 
6
7
8
9
 
16
17
18
 
19
20
 
21
22
23
24
25
26
27
 
28
29
30
31
 
34
35
36
 
37
38
39
40
 
53
54
55
 
56
57
 
58
59
60
61
62
63
 
64
65
66
67
@@ -3,7 +3,7 @@
 ============================    .. module:: explorer - :synopsis: Windows explorer integration + :synopsis: Windows explorer integration    Overlay Icons  ------------- @@ -16,16 +16,16 @@
 (another project created by TortoiseSVN team).    .. figure:: figures/overlayicons.png - :alt: Overlay icons + :alt: Overlay icons   - Overlay icons in Icons view (this image shows release 0.7 overlays) + Overlay icons in Icons view (this image shows release 0.7 overlays)    In release 0.8, we added an :guilabel:`Update Icons` context menu option  which forces TortoiseHg to refresh the icons in the currently browsed  repository or directory of repositories. The taskbar icon will turn  green and the directory icons will turn into question marks while this  refresh is in progress. - +  Performance Issues  ------------------  When the repository being viewed contains a large number of folders or @@ -34,7 +34,7 @@
 more prominent when the first time the repositories are viewed.  Subsequently the caching of the file system usually helps to reduce the  delay rather significantly. - +  The delay may also be felt on repositories located on network drives or  other slower media.   @@ -53,15 +53,15 @@
 context sensitive, which varies according to the folder being viewed.    .. figure:: figures/contextmenu.png - :alt: Context menu + :alt: Context menu   - Context menu for a folder under Mercurial revision control (version 0.7) + Context menu for a folder under Mercurial revision control (version 0.7)    Currently TortoiseHg provides only the most regularly used Mercurial  commands, hence the less frequently used, or newly add, Mercurial  commands may still need be accessed on the CLI (command line interface)  through the :file:`cmd.exe` windows. - +  In 0.8, the new C++ shell extension makes the context menu somewhat  configurable via the taskbar menu. Simply click on the Mercurial  (droplet) icon in the system tray and select :guilabel:`Options`.
Change 1 of 1 Show Entire File doc/​source/​faq.txt Stacked
 
44
45
46
47
 
48
49
50
 
44
45
46
 
47
48
49
50
@@ -44,7 +44,7 @@
  We recommend that you try the commit tool that comes with TortoiseHg   before running back to Qct, but here are the instructions should you   decide to stick with ole' reliable: - +   1. Download and install Qct-1.7-standalone-win32.exe from   http://qct.sourceforge.net   2. Add (or merge) the following into your :file:`Mercurial.ini` ::
Change 1 of 1 Show Entire File doc/​source/​index.txt Stacked
 
9
10
11
12
 
13
14
15
16
17
18
19
20
21
22
23
24
25
26
 
 
 
 
 
 
 
 
 
 
 
 
 
27
28
29
 
9
10
11
 
12
13
 
 
 
 
 
 
 
 
 
 
 
 
 
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
@@ -9,21 +9,21 @@
 Contents:    .. toctree:: - :maxdepth: 2 + :maxdepth: 2   - preface - intro - common - explorer - commit - shelve - changelog - datamine - synchronize - serve - settings - recovery - faq + preface + intro + common + explorer + commit + shelve + changelog + datamine + synchronize + serve + settings + recovery + faq    Indices and tables  ==================
Change 1 of 1 Show Entire File doc/​source/​intro.txt Stacked
 
3
4
5
6
 
7
8
9
10
11
12
13
14
15
16
17
 
 
 
 
 
18
19
20
21
22
 
 
 
23
24
25
 
3
4
5
 
6
7
8
9
10
11
12
 
 
 
 
 
13
14
15
16
17
18
19
 
 
 
20
21
22
23
24
25
@@ -3,23 +3,23 @@
 =======================    .. module:: introduction - :synopsis: Introduce TortoiseHg and its various parts + :synopsis: Introduce TortoiseHg and its various parts    TortoiseHg is a set of graphical tools and a shell extension for the  `Mercurial <http://www.selenic.com/mercurial>`_ distributed revision control  system.    On Windows, - TortoiseHg consists of a shell extension, which provides overlay - icons and context menus in your file explorer, and a command line - program named hgtk.exe which can launch the TortoiseHg tools. - Binary packages of TortoiseHg for Windows come with Mercurial and a - merge tool and are thus completely ready for use "Out of the Box". + TortoiseHg consists of a shell extension, which provides overlay + icons and context menus in your file explorer, and a command line + program named hgtk.exe which can launch the TortoiseHg tools. + Binary packages of TortoiseHg for Windows come with Mercurial and a + merge tool and are thus completely ready for use "Out of the Box".    On Linux, - TortoiseHg consists of a command line hgtk script, and a Nautilus - extension which provides overlays and context menus in your file - explorer. + TortoiseHg consists of a command line hgtk script, and a Nautilus + extension which provides overlays and context menus in your file + explorer.    TortoiseHg is primarily written in Python and PyGtk (the Windows shell  extension being a noticeable exception). The hgtk script can be used
Change 1 of 2 Show Entire File doc/​source/​preface.txt Stacked
 
3
4
5
6
 
7
8
9
 
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
 
3
4
5
 
6
7
8
9
 
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
@@ -3,7 +3,7 @@
 =======    .. module:: preface - :synopsis: About this manual + :synopsis: About this manual    Audience  ======== @@ -62,29 +62,29 @@
 The following typographical conventions are used in this manual:    :kbd:`CTRL-A` - Indicates a key, or combination of keys, to press. - + Indicates a key, or combination of keys, to press. +  :guilabel:`Commit` - Indicates a label, button or anything that appears in user interfaces. - + Indicates a label, button or anything that appears in user interfaces. +  :menuselection:`TortoiseHG... --> About` - Indicates a menu choice, or a combination of menu choice, tab - selection and GUI label. For example - :menuselection:`TortoiseHG... --> Global settings --> Commit --> User name` - means do something in :guilabel:`User name` label under - :guilabel:`Commit` tab selectable from the menu choice - :menuselection:`TortoiseHG... --> Global settings`. + Indicates a menu choice, or a combination of menu choice, tab + selection and GUI label. For example + :menuselection:`TortoiseHG... --> Global settings --> Commit --> User name` + means do something in :guilabel:`User name` label under + :guilabel:`Commit` tab selectable from the menu choice + :menuselection:`TortoiseHG... --> Global settings`.    :file:`.hg/hgrc` - Indicates a filename or directory name. + Indicates a filename or directory name.    :command:`hgtk log` - Indicates a command to enter into command window. + Indicates a command to enter into command window.    .. note:: - This is a note. + This is a note.    .. warning:: - An important note. Pay attention. + An important note. Pay attention.    .. vim: noet ts=4
Change 1 of 1 Show Entire File doc/​source/​recovery.txt Stacked
 
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
 
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
@@ -3,28 +3,28 @@
 ===================    .. module:: recovery.dialog - :synopsis: Dialog used to perform recovery operations + :synopsis: Dialog used to perform recovery operations    .. figure:: figures/recover.png - :alt: Recovery dialog + :alt: Recovery dialog    The buttons all equate to a single Mercurial command (save stop, obviously)    :guilabel:`clean` - :command:`hg update --clean` - performs a clean checkout of the existing - working directory parent revision. Undoes a partially completed - merge. + :command:`hg update --clean` - performs a clean checkout of the existing + working directory parent revision. Undoes a partially completed + merge.    :guilabel:`rollback` - :command:`hg rollback` - undo operation for most recent repository - transaction. Can undo a commit or pull. + :command:`hg rollback` - undo operation for most recent repository + transaction. Can undo a commit or pull.    :guilabel:`recover` - :command:`hg recover` - recover from a badly aborted operation. Rarely - necessary, Mercurial will tell you if it needs to be performed. + :command:`hg recover` - recover from a badly aborted operation. Rarely + necessary, Mercurial will tell you if it needs to be performed.    :guilabel:`verify` - :command:`hg verify` - perform a consistency check of the contents of your - repository + :command:`hg verify` - perform a consistency check of the contents of your + repository    .. vim: noet ts=4
Change 1 of 2 Show Entire File doc/​source/​serve.txt Stacked
 
3
4
5
6
 
 
 
 
7
8
9
10
11
12
13
14
 
15
16
17
 
45
46
47
48
 
49
50
51
 
3
4
5
 
6
7
8
9
10
11
12
13
 
 
 
 
14
15
16
17
 
45
46
47
 
48
49
50
51
@@ -3,15 +3,15 @@
 ================    .. module:: serve.dialog - :synopsis: Dialog used to start/stop the web server + :synopsis: Dialog used to start/stop the web server + +.. figure:: figures/serve.png + :alt: Web server dialog    The serve tool is a wrapper for Mercurial's built-in web server. Once  launched, any computer can attach to the http port and browse your  repository(ies) or perform clone, pull, or even push operations (if you -configure your server to allow it). - -.. figure:: figures/serve.png - :alt: Web server dialog +configure your server to allow it).    :guilabel:`Start`   start the web server @@ -45,7 +45,7 @@
 command line via: :command:`hgtk serve --webdir-conf=hgwebdir.conf`. In a  future release of TortoiseHg, we hope to make this launchable from the  shell context menu. - +  Changes since 0.7  -----------------  * Improved error handling
Change 1 of 3 Show Entire File doc/​source/​settings.txt Stacked
 
3
4
5
6
 
7
8
9
 
10
11
 
12
13
14
 
40
41
42
43
 
44
45
46
 
69
70
71
72
 
73
74
75
 
3
4
5
 
6
7
8
 
9
10
 
11
12
13
14
 
40
41
42
 
43
44
45
46
 
69
70
71
 
72
73
74
75
@@ -3,12 +3,12 @@
 ===================    .. module:: settings.dialog - :synopsis: Dialog used to set preferences + :synopsis: Dialog used to set preferences    .. figure:: figures/settings.png - :alt: Settings dialog + :alt: Settings dialog   - Settings dialog + Settings dialog    The Settings dialog is used to configure both TortoiseHg and the  underlying Mercurial DVCS. Since TortoiseHg uses Mercurial's underlying @@ -40,7 +40,7 @@
   In TortoiseHg 0.8, you may toggle between the two modes using the combo  box at the top of the dialog. - +  Most TortoiseHg users will want to store all configurables in their  global user settings, and only use the repository hgrc to store paths  (remote repository aliases) and web settings, though it is possible to @@ -69,7 +69,7 @@
 configuration files, most of the time you will only store these in a  repository configuration file. Mercurial has two special path names that  can be used as default targets for some operations. - +  default   the default URL to pull from, usually clone source  default-push
Change 1 of 4 Show Entire File doc/​source/​shelve.txt Stacked
 
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
 
39
40
41
42
43
 
 
44
45
46
47
 
 
 
48
49
50
51
 
52
53
54
 
60
61
62
63
 
64
65
66
 
67
68
69
 
107
108
109
110
 
111
112
113
 
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
 
40
41
42
 
 
43
44
45
 
 
 
46
47
48
49
50
51
 
52
53
54
55
 
61
62
63
 
64
65
66
 
67
68
69
70
 
108
109
110
 
111
112
113
114
@@ -3,29 +3,30 @@
 ======================    .. module:: commit.dialog - :synopsis: Dialog used to perform shelve/unshelve operations + :synopsis: Dialog used to perform shelve/unshelve operations    .. warning:: - The win32text extension can cause trouble with hunk selection. This - has been resolved in Mercurial 1.3 and TortoiseHg 0.8, but requires - proper configuration. See `issue #82 <http://bitbucket.org/tortoisehg/stable/issue/82/>`_. - + The win32text extension can cause trouble with hunk selection. This + has been resolved in Mercurial 1.3 and TortoiseHg 0.8, but requires + proper configuration. See + `issue #82 <http://bitbucket.org/tortoisehg/stable/issue/82/>`_. +  .. figure:: figures/shelve.png - :alt: Shelve dialog + :alt: Shelve dialog   - Shelve dialog + Shelve dialog    Visually it is very similar to the status dialog in 0.6 and the commit  tool in 0.7. The purpose of this dialog is to allow the user to  *shelve* selected changes from the working directory, store them in a  special patch file in the repository, and then *unshelve* them back at a  later time. - +  Walking across the toolbar, the buttons perform the following tasks:    :guilabel:`Refresh` - Reload the state of the working directory. It retains file check and - selection state across refresh, but not hunks. + Reload the state of the working directory. It retains file check and + selection state across refresh, but not hunks.  :guilabel:`Shelve`   Shelve selected diffs in checked files.  :guilabel:`Unshelve` @@ -39,16 +40,16 @@
  Move checked files to specified target directory.   This move is done with Mercurial's full knowledge.  :guilabel:`Remove` - Delete checked unversioned files and/or remove (mark as deleted) any - versioned files. + Delete checked unversioned files and/or remove (mark as deleted) any + versioned files.  :guilabel:`Show Diff` - This is a toggle button that shows and hides the entire diff panel. - Hiding the diff panel can sometimes be useful in large repositories. - + This is a toggle button that shows and hides the entire diff panel. + Hiding the diff panel can sometimes be useful in large repositories. +  Below the file list are checkboxes that toggle the inclusion of the  various classes of files {modified, added, removed, deleted, unknown,  clean, ignored}. - +  Shelving Changes  ----------------   @@ -60,10 +61,10 @@
 file. If the shelf already had changes in it, you will be asked whether  to replace those changes or to merge these new changes into it. When  the shelf has changes, the unshelve button will be active. - +  When the unshelve button is pressed, the shelved changes are reapplied  to the working directory. - +  How is this different from record/commit?  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   @@ -107,7 +108,7 @@
  but highlighted) diff hunks to the clipboard. These can be pasted   into a text buffer to generate any arbitrary patch based from the   changes in your working directory. - +  The code which copies the hunks to the clipboard is intelligent about  diff headers. If your highlighted list includes a hunk from a file but  not it's file diff header, the diff header will be added to the
Change 1 of 4 Show Entire File doc/​source/​synchronize.txt Stacked
 
3
4
5
6
 
7
8
9
 
10
11
 
12
13
14
 
31
32
33
34
 
35
36
 
37
38
39
 
46
47
48
49
50
51
 
 
 
52
53
54
55
56
 
 
 
 
57
58
59
 
 
60
61
62
63
64
 
 
 
 
65
66
67
 
109
110
111
112
 
113
114
 
115
116
117
 
3
4
5
 
6
7
8
 
9
10
 
11
12
13
14
 
31
32
33
 
34
35
 
36
37
38
39
 
46
47
48
 
 
 
49
50
51
52
 
 
 
 
53
54
55
56
57
 
 
58
59
60
 
 
 
 
61
62
63
64
65
66
67
 
109
110
111
 
112
113
 
114
115
116
117
@@ -3,12 +3,12 @@
 ======================    .. module:: synchronize.dialog - :synopsis: Dialog used to perform synchronization operations + :synopsis: Dialog used to perform synchronization operations    .. figure:: figures/synchronize.png - :alt: Synchronize dialog + :alt: Synchronize dialog   - Synchronize dialog + Synchronize dialog    The synchronize tool is used to transmit changesets between repositories  or optionally to email recipients. @@ -31,9 +31,9 @@
 Below the toolbar are two buttons and a text entry:    :guilabel:`Repo:` - browse for a local repository to synchronize with + browse for a local repository to synchronize with  :guilabel:`Bundle:` - browse for a local bundle file to pull from + browse for a local bundle file to pull from    The text entry/combo box is where you enter or select paths of target  repositories. The synchronize tool will seed the drop-down list with @@ -46,22 +46,22 @@
 per-repository basis.    :guilabel:`Nothing` - No operations are performed after a pull. You will be allowed to - view the pulled changesets in the log viewer, and you will have the - option to update to the new tip if applicable. + No operations are performed after a pull. You will be allowed to + view the pulled changesets in the log viewer, and you will have the + option to update to the new tip if applicable.  :guilabel:`Update` - Automatically update to the new branch tip if, and only if, new - revisions were pulled into the local repository. This could trigger - a merge if the pulled changes conflict with local uncommitted - changes. + Automatically update to the new branch tip if, and only if, new + revisions were pulled into the local repository. This could trigger + a merge if the pulled changes conflict with local uncommitted + changes.  :guilabel:`Fetch` - Equivalent to hg fetch. See the fetch extension documentation for - it's behavior. + Equivalent to hg fetch. See the fetch extension documentation for + it's behavior.  :guilabel:`Rebase` - Equivalent to pull --rebase. See the rebase extension documentation - for it's behavior. Rebase operations disable connections to any - changelog tools, since it is very destructive to any app which is - holding a repository object. + Equivalent to pull --rebase. See the rebase extension documentation + for it's behavior. Rebase operations disable connections to any + changelog tools, since it is very destructive to any app which is + holding a repository object.    The :guilabel:`use proxy` button is a quick way to disable your proxy  configuration for individual operations. The button is only sensitive @@ -109,9 +109,9 @@
 -----    .. figure:: figures//email.png - :alt: Email dialog + :alt: Email dialog   - Email dialog + Email dialog    The email dialog can be launched from two TortoiseHg tools.