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

merge with stable

Changeset 77420c798b6a…

Parents c289629060a1…

Parents 56b110c292e9…

by Steve Borho

Changes to 10 files · Browse files at 77420c798b6a Showing diff from parent c289629060a1 56b110c292e9 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
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
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
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
 Changelog  =========    .. module:: changelog.dialog   :synopsis: Dialog used to view log    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 were modified and the contents of those changes.  These are the features that nearly all revision history browsers provide.    The TortoiseHg changelog browser offers much more. Since it is our best  tool for viewing and selecting changesets, we use it to perform nearly  all our tasks that involve changeset manipulation.    .. 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. The toolbar button also has   drop-down for common filters   :guilabel:`Datamine`   Open datamine application for history searches and file annotations   :guilabel:`Other Parent`   Toggles parent revision when viewing merge changesets   :guilabel:`Synchronize`   Opens synchronize tool to communicate changes with other repositories      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    The column visibility toggles are sticky settings.      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 containing 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 context menu has  commands that deal with arbitrary revision ranges.     :guilabel:`diff with selected`   Opens status viewer with cumulative changes of the range of   changesets.   :guilabel:`visual diff with selected` [#rcm5]_   Opens visual diff window with cumulative changes of the range   of changesets.   :guilabel:`email from here to selected`   Opens email dialog with range of changesets.   :guilabel:`bundle from here to selected`   Creates a bundle file with range of changesets.   :guilabel:`merge with selected` [#rcm6]_   Merges this revision with the current working directory parent   revision. This menu item is only sensitive when the working   parent is the current selected revision.    .. [#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://mercurial.selenic.com/wiki/EditingHistory>`_.  .. [#rcm5] :menuselection:`Global Settings --> TortoiseHg --> Visual Diff Command`  .. [#rcm6] Only sensitive if the selected revision is your current working   directory parent    Revision Filter Dialog  ----------------------    .. figure:: figures/logfilter.jpg   :alt: Revision filter dialog   + Log Filtering Dialog +  File 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:`Global Settings --> 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 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 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.    When opened in the 'diff change with' mode, 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 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  changes into a repository, so this must be done on the command line with  the :command:`hg import` command.    Keyboard navigation  -------------------    :kbd:`Ctrl-P`   Zoom to the working directory parent revision  :kbd:`Ctrl-D`   Display visual diffs for selected changeset or file      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 [OPTIONS] [FILE]     aliases: history     changelog viewer     options:     -l --limit limit number of changes displayed     use "hgtk -v help log" to show global options    .. vim: noet ts=4
Change 1 of 2 Show Entire File doc/​source/​clone.txt Stacked
 
10
11
12
 
 
13
14
15
 
49
50
51
52
 
 
 
10
11
12
13
14
15
16
17
 
51
52
53
 
 
54
@@ -10,6 +10,8 @@
   .. figure:: figures/clone.png   :alt: Clone dialog + + Clone Dialog    :guilabel:`Source Path`   It is the path (or URL) of the repository that will be cloned. Use the :guilabel:`Browse...` to @@ -49,4 +51,4 @@
   where [SOURCE] and [DEST] are, the paths of source repository and destination folder.   -.. vim: noet ts=4 \ No newline at end of file
+.. vim: noet ts=4
Change 1 of 1 Show Entire File doc/​source/​datamine.txt Stacked
 
15
16
17
18
 
19
20
21
 
15
16
17
 
18
19
20
21
@@ -15,7 +15,7 @@
 .. figure:: figures/search.png   :alt: Search dialog   - Search dialog + Search tabs    The search tab is used to search (*grep*) through your entire revision  history for keywords, variable names, functions, etc...
Change 1 of 1 Show Entire File doc/​source/​explorer.txt Stacked
 
39
40
41
42
 
43
44
45
 
39
40
41
 
42
43
44
45
@@ -39,7 +39,7 @@
  Taskbar Options Dialog    Release 0.8.1 introduced the ability to selectively disable overlay -icons in specific repositories. This can be done be editing the +icons in specific repositories. This can be done by editing the  :file:`.hg\\thgstatus` file inside the repository and replacing it's  contents with a single line containing::  
Change 1 of 1 Show Entire File doc/​source/​guess.txt Stacked
 
7
8
9
 
 
10
11
12
 
7
8
9
10
11
12
13
14
@@ -7,6 +7,8 @@
 .. figure:: figures/guess.jpg   :alt: Rename guessing dialog   + Rename Guessing Dialog +  This dialog is used to find renames, moves, and/or copies that were done  without Mercurial's knowledge. The dialog can be launched from the  shell context menu, or from the status or commit tools via the context
Change 1 of 1 Show Entire File doc/​source/​ignore.txt Stacked
 
13
14
15
 
 
16
17
18
 
13
14
15
16
17
18
19
20
@@ -13,6 +13,8 @@
 .. figure:: figures/ignore.jpg   :alt: Ignore filter dialog   + Ignore Filter Dialog +  From command line  -----------------  
Change 1 of 2 Show Entire File doc/​source/​init.txt Stacked
 
12
13
14
 
 
15
16
17
 
26
27
28
29
 
30
31
32
33
 
34
35
36
 
12
13
14
15
16
17
18
19
 
28
29
30
 
31
32
33
34
 
35
36
37
38
@@ -12,6 +12,8 @@
 .. figure:: figures/init.png   :alt: Init dialog   + Repository Init Dialog +  :guilabel:`Destination`   Is the directory where the repository will be created. It is   always filled with the current directory, so if you launch the @@ -26,11 +28,11 @@
   Creating a new repository means create a subdirectory called :file:`.hg`.  In this subdirectory Mercurial keeps all versioning information. - +  .. warning::   Never touch the files in :file:`.hg` directory, otherwise a repository   corruption can happen. - +  From command line  -----------------  
Change 1 of 1 Show Entire File doc/​source/​preface.txt Stacked
 
29
30
31
 
 
 
 
 
 
 
 
32
33
34
35
36
37
38
39
40
 
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
 
 
44
45
46
@@ -29,12 +29,18 @@
   :doc:`quick` is a quick tutorial on how to start with TortoiseHg.   +:doc:`daily` is the main chapter, it describes the frequently used +components of TortoiseHg. + +:doc:`settings` describes how to configure TortoiseHg. + +:doc:`recovery` describes the the recovery operations to do on +a project. +  :doc:`faq` has a list of common questions and their answers.    :doc:`debugging` describes how to debug any problems that you find.   -The remaining chapters describe the components that make up TortoiseHg. -  TortoiseHg is free!  ===================  
Change 1 of 6 Show Entire File doc/​source/​quick.txt Stacked
 
32
33
34
 
 
35
36
37
 
66
67
68
 
 
69
70
71
 
146
147
148
 
149
150
151
 
161
162
163
 
 
164
165
166
 
186
187
188
 
 
189
190
191
 
237
238
239
 
 
240
241
242
 
32
33
34
35
36
37
38
39
 
68
69
70
71
72
73
74
75
 
150
151
152
153
154
155
156
 
166
167
168
169
170
171
172
173
 
193
194
195
196
197
198
199
200
 
246
247
248
249
250
251
252
253
@@ -32,6 +32,8 @@
 .. figure:: figures/cmenu-nofiles.jpg   :alt: Context Menu   + Context menu with no files selected +  You must then select the :guilabel:`Commit` tab and enter a name in the  :guilabel:`Username` field.   @@ -66,6 +68,8 @@
 .. figure:: figures/init.png   :alt: Init dialog   + Repository Init Dialog +  We suggest you keep :guilabel:`Add special files (.hgignore, ...)`  checked, and do not check  :guilabel:`Make repo compatible with Mercurial 1.0` @@ -146,6 +150,7 @@
 .. figure:: figures/commit.png   :alt: Commit dialog   + Commit Tool    Share the repository  ==================== @@ -161,6 +166,8 @@
 .. figure:: figures/share.png   :alt: Clone dialog   + Clone Dialog +  When you create a clone for the purposes of generating a *central  repository* there is no reason for that clone to have a working  directory. Checking @@ -186,6 +193,8 @@
 .. figure:: figures/clone.png   :alt: Clone dialog   + Clone Dialog +  This time you do want to update the working directory because you want  to work on the project, uncheck  :guilabel:`do not update the new working directory` so Mercurial updates @@ -237,6 +246,8 @@
 .. figure:: figures/synchronize.png   :alt: Synchronize dialog   + Synchronize Dialog +  Mercurial makes collaboration easy, fast, and productive.  Learn more at Mercurial's `wiki <http://mercurial.selenic.com/wiki/>`_.  
Change 1 of 1 Show Entire File doc/​source/​recovery.txt Stacked
 
8
9
10
 
 
11
12
13
 
8
9
10
11
12
13
14
15
@@ -8,6 +8,8 @@
 .. figure:: figures/recover.png   :alt: Recovery dialog   + Recovery Dialog +  The toolbar buttons equate to a Mercurial command    :guilabel:`clean`