Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable doc: purge obviously obsolete descriptions, replace hgtk with thg

Changeset 496ad911ed86

Parent 2275cf18a744

by Steve Borho

Changes to 12 files · Browse files at 496ad911ed86 Showing diff from parent 2275cf18a744 Diff from another changeset...

 
6
7
8
9
 
10
11
12
 
48
49
50
51
 
52
53
54
55
 
56
57
58
 
6
7
8
 
9
10
11
12
 
48
49
50
 
51
52
53
54
 
55
56
57
58
@@ -6,7 +6,7 @@
   To clone a repository you have to run the clone dialog.  From the explorer context menu select :menuselection:`TortoiseHg... --> Clone a repository` -or type :command:`hgtk clone`. +or type :command:`thg clone`.    .. figure:: figures/clone.png   :alt: Clone dialog @@ -48,11 +48,11 @@
   The clone tool can be started from command line ::   - hgtk clone + thg clone    The syntax is ::   - hgtk clone [SOURCE] [DEST] + thg clone [SOURCE] [DEST]    where [SOURCE] and [DEST] are, the paths of source repository and destination folder.  
 
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
 
 
 
 
 
22
23
24
 
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
 
82
83
84
85
86
87
88
 
 
 
 
 
 
89
90
91
 
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
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
 
270
271
272
273
274
275
276
277
278
279
 
345
346
347
348
349
350
351
352
353
 
354
355
356
 
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
 
428
429
430
431
432
433
434
435
436
437
438
439
440
441
 
449
450
451
452
453
454
455
456
 
459
460
461
462
 
463
464
465
 
470
471
472
473
 
474
475
476
 
4
5
6
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
7
8
9
10
11
12
13
14
 
18
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
21
22
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
23
24
25
 
29
30
31
 
 
 
 
32
33
34
35
36
37
38
39
40
 
86
87
88
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
89
90
91
92
93
 
 
 
 
 
 
94
95
96
97
 
 
 
 
98
99
100
 
166
167
168
 
 
 
 
 
 
169
170
171
172
 
185
186
187
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
188
189
190
 
193
194
195
 
 
196
197
198
 
 
 
199
200
201
 
209
210
211
 
 
212
213
214
 
217
218
219
 
220
221
222
223
 
228
229
230
 
231
232
233
234
@@ -4,21 +4,11 @@
 .. module:: commit.dialog   :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 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 also -examine the state of your working directory and perform most routine -maintenance tasks (add new files, record renames, manage the ignore -filter, etc). +The commit tool is second most commonly used application (behind the +Workbech). 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 @@ -28,51 +18,8 @@
 Features  --------   -At the top of the commit tool is a menu bar, newly introduced in version 0.9. - - :guilabel:`Tools` - Launch common TortoiseHg tools in separate processes - :guilabel:`View` - Toggle the display of optional features, or refresh the working - directory contents. - :guilabel:`Operations` - These menu items correspond to the toolbar buttons. - :guilabel:`Help` - Open a web browser to this web page, or launch TortoiseHg About - dialog. -  Enumerating the toolbar buttons:   - :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 easily repeat the - commit if necessary. - :guilabel:`Diff` - Visual diff checked files. - :guilabel:`Revert` - Revert checked files to last revisioned state. If merging, it - allows you to select the revert parent. - :guilabel:`Add` - Add checked files that were in unknown '?' or ignored 'I' state. - :guilabel:`Move` - Move checked files to specified target directory in versioned - manner. - :guilabel:`Remove` - Delete checked unversioned files and/or remove (mark as deleted) any - versioned files. - :guilabel:`Forget` - Forget checked versioned files. - :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: -   :guilabel:`Branch dialog`   Shows the current branch name of the working directory. Normally   this is informational only, but pressing this button opens up a @@ -82,10 +29,12 @@
  :guilabel:`Recent Commit Messages`   A drop-down list of the 10 most recent commit messages. The   the drop-down list is filled the first time it is opened. - :guilabel:`QNew` - If you have enabled the MQ extension, there will also be a text - entry for a new patch name. Entering a patch name switches the - commit tool into 'QNew' mode. + :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 easily repeat the + commit if necessary.      The file list has four columns: @@ -137,143 +86,15 @@
 user includes such a file in a selection (explorer) or provides the file  name on the command line.   -.. figure:: figures/parentbar.png - :alt: Parent bar - - Parent bar in commit dialog - -Below both the file list and diff pane is a narrow -:guilabel:`Parents Bar`. This bar shows you the current working -directory parent(s), and gives you some warnings if a commit would -introduce a new head. The parents bar can be hidden by an option in the -:guilabel:`View` menu. - -To the right of the file list is the diff pane. The diff pane is newly -tabbed in the 0.9 release. - - :guilabel:`Text Diff` - Shows the textual diffs in the currently selected file. - :guilabel:`Hunk Selection` - In releases 0.7 through 0.8, this tab was the only content shown - to the user. The diffs in this tab can be toggled per "hunk", - allowing the user to cherry pick changes to be included in the - commit. As in 0.8, this tab only shows diff hunks for the - currently selected file. This tab cannot show binary diffs or - renames. That data can only be seen in the Text Diff tab. - :guilabel:`Commit Preview` - This tab previews all of the selected hunks in every checked - file, essentially a preview of what will be committed when you - press the commit button. - :guilabel:`Patch Contents` - Only visible when the commit tool is in QRefresh mode. It - displays the current contents of the patch being refreshed. - -.. figure:: figures/advancedbar.png - :alt: Advanced bar - - Advanced bar in commit dialog - -If the :guilabel:`Advanced Bar` is enabled in the :guilabel:`View` menu, -a bar is inserted between the toolbar and the message history bar. The -advanced bar contains: - - :guilabel:`Committer` - The username to use for this commit. This value is usually read - from your Mercurial.ini file, but it can be specified on the - hgtk command line or read from a patch file. Lastly, the user - could manually specify a different username here. - :guilabel:`Auto-includes` - A text entry that allows the user to modify the comma separated - list of files that are always included in the commit list, - regardless of whether they have been checked. This is intended - for use in repositories that have pre-commit hooks that modify - certain files (say a changelog). - :guilabel:`Push after commit` - A toggle button that determines whether TortoiseHg will attempt - to push outgoing changes to your default push target after each - successful commit. - -Change Selection ----------------- - -So what does the phrase 'commit the selected diffs in checked files' -mean? Simple, the TortoiseHg commit tool supports change selection -intrinsically in the diff browser. This means that all of the changes -you make to versioned files can be 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 feature immediately. - -When is this necessary? -^^^^^^^^^^^^^^^^^^^^^^^ - -When you have more than a single coherent change in 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 is when this change selection feature becomes indispensable. - -How does it work? -^^^^^^^^^^^^^^^^^ - -By double-clicking on individual change hunks in the -:guilabel:`Hunk Selection` tab of the diff panel. *Technically, any -action which activates a change hunk row will toggle it's selection -status. The spacebar will also work.* When a hunk is unselected, the -syntax highlighting of the diff is disabled and the background is turned -gray. At the same time, the file's diff header is 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, -partially included, or entirely excluded. - -What happens at commit time? -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The short answer is that the selected hunks in checked files are -committed to the repository and the unselected changes are left in your -working directory for the next commit. - -The long answer is a little more complicated. What happens behind the -scenes is that the files which are partially selected are backed up in a -safe location, reverted to their last revisioned state, have their -selected change hunks applied back to them, committed, and then finally -recovered from backup (thus placing the rejected change hunks back into -the working copy). Files which are not partially selected avoid the -entire *backup, revert, patch, commit, recover* round trip and instead -are committed in place. - -This longer answer is only interesting when something goes wrong, which -on Windows unfortunately has a probability greater than 0. If some -program (virus checker, compiler) locks your file in the middle of this -process you may see an error about a failed patch. These errors are -recoverable. Delete any new :file:`.rej` files left in your repository -and retry the commit. - - -  Keyboard navigation  -------------------    :kbd:`Ctrl-Enter`   Trigger the commit -:kbd:`Ctrl-C` - When pressed in the diff panel, ctrl-c will copy the currently - highlighted (repeat highlighted, not selected) 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. -:kbd:`Alt-Q` +:kbd:`Ctrl-E`   Reflow the paragraph currently under the cursor. You must configure   a message format policy for this key combination to work.   -The code which copies the hunks to the clipboard is intelligent about -diff headers. The clipboard contents will always be a valid patch. - -  File Context Menus  ------------------   @@ -345,12 +166,7 @@
    :guilabel:`Summary Line Length`:   Maximum length of the commit message summary line. If set, - TortoiseHg will issue a warning if the summary line is too long - or not separated by a blank line. Default: 0 (unenforced) - :guilabel:`Message Line Length`: - Word wrap length of the commit message. If set, the popup menu - can be used to format the message and a warning will be issued - if any lines are too long at commit. Default: 0 (unenforced) + TortoiseHg will draw a line at the specified width.      Subrepositories @@ -369,57 +185,6 @@
 a commit, the subrepo is committed along with the other changes,  updating the .hgsubstate file in the main repository root.   -Prior to TortoiseHg 1.0, dirty subrepos were not shown in the commit -tool and .hgsubstate was not updated during commits. - - -MQ patches ----------- - -Many advanced Mercurial users use the MQ extension to manage a patch -queue. The commit tool will recognize when a patch is applied and enter -*patch refresh* mode. The title bar will say "refreshing patch -*patchname*" and the patch comment will appear in the commit message -pane. - -A new 'Patch Contents' tab will appear in the diff pane with the full -contents of the top patch. The Text Diff and Hunk Selection tabs will -show the combined diff of the patch and working directory changes so -that you can move changes into or out of the patch during the qrefresh. - -This is essentially what the qdiff command would show you. There is, in -fact, no way to get just the working copy diffs beyond running -:command:`hg diff` on the command line or typing a name into the QNew -entry which toggles the dialog into QNew mode (more below). - -The :guilabel:`Commit` button, which has been renamed :guilabel:`QRefresh` -in this context, will refresh the top patch with the changes you -have selected, including the patch description. This may be a bit -confusing at first because the changes you leave out of the patch are -still going to be in the working directory after the refresh, so unless -you look at the patch contents it will not seem as if anything changed. - -QNew Mode ---------- - -The commit tool can be used to create a new patch for your patch queue. -If you have the MQ extension enabled, a text entry will be inserted -between the branch maintenance button and the message history drop-down -box. If you enter a filename in this entry the commit tool will switch -out of *commit* or *qrefresh* mode into *qnew* mode. In *qnew* mode, -the commit tool shows only working directory modifications (the changes -that would typically get added to a new patch by :command:`hg qnew -f`). -The :guilabel:`Commit` button will change into a :guilabel:`QNew` button -as well, to make the mode switch more obvious. - -When the :guilabel:`QNew` button is pressed, the selected change hunks -are written into a new patch (given the filename you specified), and the -dialog is refreshed. After this refresh, the commit tool will obviously -switch to *qrefresh* mode since there will now be at least one applied -patch. - -You may give the new patch a commit message at the initial *qnew* event, -or you can do it afterwords while in *qrefresh* mode.    Configurables  ------------- @@ -428,14 +193,9 @@
  Sets username associated with your commits (see :doc:`quick`)  :menuselection:`Commit --> Summary Line Length`   Configures a 'policy' limit for summary lines -:menuselection:`Commit --> Message Line Length` - Configures a 'policy' limit for message lines  :menuselection:`Commit --> Close After Commit`:   When set to True, the commit tool will close after a   successful commit. -:menuselection:`Commit --> Default Tab`: - The tab on which the status and commit tools will open. - 0 - Text Diff, 1 - Hunk Selection, 2 - Commit Preview.    And three other features for *advanced* users.   @@ -449,8 +209,6 @@
  Comma separated list of files that are automatically unchecked   when the status, commit, and shelve tools are opened.   -:menuselection:`TortoiseHg --> Bottom Diffs` - Toggles diff pane from left to below file list  :menuselection:`TortoiseHg --> Max Diff Size`   Configures the diff size limit   @@ -459,7 +217,7 @@
   The commit tool can be started from command line::   - hgtk commit [OPTIONS] [FILE]... + thg commit [OPTIONS] [FILE]...     aliases: ci   @@ -470,7 +228,7 @@
  -u --user record user as committer   -d --date record datecode as commit date   - use "hgtk -v help commit" to show global options + use "thg -v help commit" to show global options    For a quick help on the format of date type::  
 
16
17
18
19
 
20
21
 
22
23
24
 
30
31
32
33
 
34
35
36
 
39
40
41
42
 
43
44
45
 
16
17
18
 
19
20
 
21
22
23
24
 
30
31
32
 
33
34
35
36
 
39
40
41
 
42
43
44
45
@@ -16,9 +16,9 @@
   If you have a bit of Python knowledge, you can also use::   - hgtk --debugger <command> + thg --debugger <command>   -To disable the forking behavior of hgtk, you can either set an +To disable the forking behavior of thg, you can either set an  environment variable **THG_HGTK_SPAWN**, or add the command line  parameter '--nofork'.   @@ -30,7 +30,7 @@
 into a :command:`cmd.exe` window, while inside the repository::     set THGDEBUG=1 - hgtk --nofork log + thg --nofork log    Linux/MacOSX  ~~~~~~~~~~~~ @@ -39,7 +39,7 @@
 into your shell window, while inside the repository::     export THGDEBUG=1 - hgtk --nofork log + thg --nofork log      
 
50
51
52
53
 
54
55
56
57
 
58
59
 
50
51
52
 
53
54
55
56
 
57
58
59
@@ -50,10 +50,10 @@
   The guess tool can be started from command line::   - hgtk guess + thg guess     guess previous renames or copies   - use "hgtk -v help guess" to show global options + use "thg -v help guess" to show global options    .. vim: noet ts=4
 
20
21
22
23
 
24
25
26
27
28
29
 
30
31
 
20
21
22
 
23
24
25
26
27
28
 
29
30
31
@@ -20,12 +20,12 @@
   The ignore tool can be started from command line::   - hgtk hgignore [FILE] + thg hgignore [FILE]     aliases: ignore, filter     ignore filter editor   - use "hgtk -v help hgignore" to show global options + use "thg -v help hgignore" to show global options    .. vim: noet ts=4
 
7
8
9
10
 
11
12
13
 
39
40
41
42
 
43
44
45
46
 
47
48
49
 
7
8
9
 
10
11
12
13
 
39
40
41
 
42
43
44
45
 
46
47
48
49
@@ -7,7 +7,7 @@
 To create a new repository into an existing directory (project) you  have to run the init dialog. From the explorer context menu select  :menuselection:`TortoiseHg... --> Create Repository Here` over the directory, or, within -the folder, type :command:`hgtk init`. +the folder, type :command:`thg init`.    .. figure:: figures/init.png   :alt: Init dialog @@ -39,11 +39,11 @@
   The init tool can be started from command line ::   - hgtk init + thg init    The syntax is ::   - hgtk init [DEST] + thg init [DEST]    where [DEST] is the path to destination folder.  
 
46
47
48
49
50
51
52
53
54
 
 
 
55
56
57
 
132
133
134
135
136
137
138
 
 
139
140
141
 
 
142
143
144
 
46
47
48
 
 
 
 
 
 
49
50
51
52
53
54
 
129
130
131
 
 
 
 
132
133
134
 
 
135
136
137
138
139
@@ -46,12 +46,9 @@
 Applying a patch is not a foolproof operation. If the source file has  diverged from the file that was used to create the patch, there may be  conflicts during the patch application. These are written to a file -with an .rej extension. TortoiseHg 1.0 includes an experimental -:command:`hgtk mpatch` command that can try *harder* to apply the -rejected patch hunks. This command is based on Chris Mason's `mpatch -<http://oss.oracle.com/~mason/mpatch/>`_ utility. If mpatch cannot -apply the rejected hunks, your only remaining choice is to apply them by -hand. +with an .rej extension. TortoiseHg 2.0 includes an experimental +:command:`thg rejects` command that can aid in the merging of the +rejected chunks into the source file.      Export Patches @@ -132,13 +129,11 @@
  Import dialog of Repository Explorer    The import dialog can be opened from the sync bar or menu of the -Repository Explorer, or via :command:`hgtk import`. The dialog supports -file and directory drag and drop. The drop down menu in the upper right -corner next to the :guilabel:`Browse` button has the options: -:guilabel:`Browse Directory..` and :guilabel:`Import from Clipboard`. +Repository Explorer, or via :command:`thg import`. The dialog supports +file and directory drag and drop.   -You have the choice of importing directly into the repository, or -importing into your patch queue. +You have the choice of importing directly into the repository, the +working folder, or your patch queue.    .. note::   Importing a patch requires a clean working directory state. You
 
99
100
101
102
 
103
104
105
 
99
100
101
 
102
103
104
105
@@ -99,7 +99,7 @@
 :file:`.hg/hgrc`   Indicates a filename or directory name.   -:command:`hgtk log` +:command:`thg log`   Indicates a command to enter into command window.    ``myproxy:8000``
 
43
44
45
46
 
47
48
49
 
51
52
53
54
 
55
56
57
 
59
60
61
62
 
63
64
 
43
44
45
 
46
47
48
49
 
51
52
53
 
54
55
56
57
 
59
60
61
 
62
63
64
@@ -43,7 +43,7 @@
 can be found on your computer. Multiple entries are possible.    To use this file you must launch the TortoiseHg serve dialog from the -command line via: :command:`hgtk serve --webdir-conf=hgwebdir.conf`. +command line via: :command:`thg serve --webdir-conf=hgwebdir.conf`.      From command line @@ -51,7 +51,7 @@
   The server tool can be started from command line ::   - hgtk serve [OPTION]... + thg serve [OPTION]...     web server   @@ -59,6 +59,6 @@
    --webdir-conf name of the webdir config file   - use "hgtk -v help serve" to show global options + use "thg -v help serve" to show global options    .. vim: noet ts=4
 
123
124
125
126
127
 
 
128
129
130
 
471
472
473
474
 
475
476
477
478
 
479
480
481
 
123
124
125
 
 
126
127
128
129
130
 
471
472
473
 
474
475
476
477
 
478
479
480
481
@@ -123,8 +123,8 @@
  Redirect stderr to a buffer which is parsed at the end of the process   for runtime errors. Default: True.   -:guilabel:`Fork hgtk:` - When running hgtk from the command line, fork a background process +:guilabel:`Fork GUI:` + When running thg from the command line, fork a background process   to run graphical dialogs. Default: True.    :guilabel:`Full Path Title:` @@ -471,11 +471,11 @@
   The setting dialog can be started from command line ::   - hgtk repoconfig + thg repoconfig    for the repository settings (:file:`.hg/hgrc` file) or ::   - hgtk userconfig + thg userconfig    for the user configuration (:file:`Mercurial.ini` file).  
 
148
149
150
151
 
152
153
154
155
156
157
 
158
159
160
 
148
149
150
 
151
152
153
154
155
156
 
157
158
159
160
@@ -148,13 +148,13 @@
   The synchronize tool can be started from command line ::   - hgtk synch + thg sync     aliases: pull, push, incoming, outgoing, email     repository synchronization tool   - use "hgtk -v help synch" to show global options + use "thg -v help sync" to show global options    The syntax is simple, no options or parameters are needed, except the  global options. If the synchronize tool is started via push, outgoing,
 
1
 
2
3
4
5
6
7
8
9
10
11
12
 
 
 
 
 
13
14
15
 
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
 
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
 
 
 
401
402
403
 
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
 
457
458
459
460
461
462
463
 
 
 
 
464
465
466
 
475
476
477
478
479
480
481
482
483
 
491
492
493
494
495
496
497
498
499
500
 
509
510
511
512
513
514
515
516
517
518
519
 
520
521
 
522
523
524
 
528
529
530
531
 
532
533
 
 
1
2
3
4
5
6
 
 
 
 
 
 
7
8
9
10
11
12
13
14
 
34
35
36
 
 
 
 
 
37
38
 
 
 
 
39
40
41
42
 
 
 
 
 
 
 
43
44
45
 
346
347
348
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
349
350
351
 
 
 
352
353
354
355
356
357
 
384
385
386
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
387
388
389
 
392
393
394
 
 
 
 
395
396
397
398
399
400
401
 
410
411
412
 
 
 
413
414
415
 
423
424
425
 
 
 
 
426
427
428
 
437
438
439
 
 
440
441
442
443
444
 
445
446
 
447
448
449
450
 
454
455
456
 
457
458
459
@@ -1,15 +1,14 @@
-Changelog +Workbench  =========    .. module:: changelog.dialog   :synopsis: Dialog used to view log   -The changelog tool (*also known as the repository explorer*) is -used to visualize the revision history of your repository and to perform -any maintenence tasks that involve changesets. 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 were modified and -the contents of those changes. +The Workbench is used to visualize the revision history of your +repositories and to perform any maintenence tasks that involve +changesets. 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 were modified and the contents of those changes.    .. figure:: figures/log.png   :alt: Changelog @@ -35,28 +34,12 @@
    :guilabel:`Refresh`   Reload the revision history (if you commit in another window, etc) - :guilabel:`Reset Marks` - Remove 'new', 'incoming', and 'outgoing' revision marks and refresh - :guilabel:`Patch Queue` - Toggles the display of the MQ pane. This button is only visible - when the MQ extension has been enabled by the user.   :guilabel:`Commit`   Launch the commit tool in a separate process - :guilabel:`Datamine` - Launch the data mining tool in a separate process - :guilabel:`Recovery` - Launch the recovery dialog in a separate process   :guilabel:`Web Server`   Launch the web server dialog in a separate process   :guilabel:`Shelve`   Launch the shelve tool in a separate process - :guilabel:`Patch Branch` - Toggles the display of the Patch Branch pane. This button is only - visible when the pbranch extension has been enabled by the user. - :guilabel:`Load more` - Load the next N revisions into the graph - :guilabel:`Load all` - Load all remaining revisions into the graph    Sync Bar  --------- @@ -363,41 +346,12 @@
 .. [#flcm3] The new contents will appear as local changes and must be committed.     -Changeset browser ------------------ - -The changeset browser will only show a single file's diffs at a time, as -a performance optimization. If you would like to see all of the file -diffs at once, click on the :guilabel:`[All Files]` row. The changeset -browser will also skip displaying diffs for files which are above a -maximum limit. See -:menuselection:`Global Settings --> TortoiseHg --> Max Diff Size`. The -size limit can be temporarily disabled by toggling :menuselection:`View --> Ignore Max Diff Size`. - -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. - -The diff pane is tabbed and allows one to 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 from a repository. This -changeset browser also supports the :kbd:`Ctrl-C` keyboard accelerator -to copy hightlighted diff hunks to the clipboard. - -Unfortunately, TortoiseHg still does not have a dialog for importing -patches into a repository, so this must be done on the command line with -the :command:`hg import` command. -  Message Parsing  ---------------   -New in TortoiseHg 1.0, the repository browser will detect and underline -changeset hashes, HTTP(s) URLs, and bug report identifiers inside -changeset messages. These underlined phrases are clickable links. +The changeset display pane will detect and underline changeset hashes, +HTTP(s) URLs, and bug report identifiers inside changeset messages. +These underlined phrases are clickable links.    Every word-boundary delimited string of 12 or 40 characters from the  range [0-9a-f] is considered a changeset link. Clicking on it in the @@ -430,25 +384,6 @@
  issue.regex = \bissue\d+\b   issue.link = http://mercurial.selenic.com/bts/   -Bisect ------- - -TortoiseHg 1.0 introduced support for bisect bug searching to help find -changesets which introduce problems. To use, mark the earliest changeset -you know exhibits the problem as bad, then mark the latest changeset -which is free from the problem as good. The changelog tool will select -a changeset for you to test. Once you have performed tests, mark the -changeset as good or bad, and bisect will either update to another -candidate changeset or announce that it has found the bad revision. - -As a shortcut, you can also mark a revision as good or bad without -checking it out first. - -For more automated bisecting, you must use the Mercurial command line -and provide an automated test that can build and run a changeset and -return 0-good, 125-skip, or 127-abort, or anything else to mean bad. -See the :command:`hg bisect` command help for more information. -    Keyboard navigation  ------------------- @@ -457,10 +392,10 @@
  Zoom to the working directory parent revision  :kbd:`Ctrl-D`   Display visual diffs for selected changeset or file -:kbd:`Ctrl-R` - Refresh repository contents -:kbd:`Ctrl-G` - Go to a specific revision +:kbd:`Ctrl-S` + Toggle revision set / filter toolbar +:kbd:`Ctrl-T` + Toggle the goto revision toolbar      Configurables @@ -475,9 +410,6 @@
  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 - [DEPRECATED]   :guilabel:`Dead Branches`   Comma separated list of branch names that should be ignored   when building a list of branch names for a repository. @@ -491,10 +423,6 @@
  Space separated list of tags that will not be shown. Useful   example: Specify "qbase qparent qtip" to hide the standard tags   inserted by the Mercurial Queues Extension. - :guilabel:`Use Expander` - Show changeset details within an expander. When contained - within the expander, the details do not scroll with the - changeset contents.    The exact colors given to particular users can be configured by adding  lines like these to your :file:`Mercurial.ini` file: :: @@ -509,16 +437,14 @@
  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 :: +The Workbench can be started from command line ::   - hgtk log [OPTIONS] [FILE] + thg log [OPTIONS] [FILE]     aliases: history   @@ -528,6 +454,6 @@
    -l --limit limit number of changes displayed   - use "hgtk -v help log" to show global options + use "thg -v help workbench" to show global options    .. vim: noet ts=4