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...

 
128
129
130
 
 
131
132
133
 
128
129
130
131
132
133
134
135
@@ -128,6 +128,8 @@
 .. figure:: figures/logfilter.jpg   :alt: Revision filter dialog   + Log Filtering Dialog +  File Context Menus  ------------------  
 
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
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
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
 Datamine  ========    .. module:: datamine.dialog   :synopsis: Dialog used to search repository history    The datamine application is used to inspect the revision history of your  repository. It is a tabbed application that supports two tab types,  *Search* and *Annotate*.      Search Tabs  -----------    .. 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...    The text entry fields have these purposes:     :guilabel:`regexp`   Regular expression search criteria.   :guilabel:`includes`   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.   :guilabel:`excludes`   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`   follow searches through copies and renames out of inclusion filters   :guilabel:`Ignore case`   Perform the search without case considerations   :guilabel:`Show line numbers`   Show line numbers at the front of the matching lines   :guilabel:`Show all matching revisions`   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).    Matches  ^^^^^^^    Each match will be a link to a changeset and will have a descriptive  tooltip (author, date/time, summary). Right clicking on a matched line  will bring up a context menu with these features:     :guilabel:`display change`   open a changeset window with this changeset, to see the full context   :guilabel:`annotate file`   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     Annotate tabs      The revision graph has a simple context menu for opening the entire  changeset in the changeset browser. Activating a row in the revision  graph updates the file annotation to that revision.    In the bottom pane is the actual annotation. Each line in the annotation  is also a link to the changeset which provided that line. Activating a  row will zoom the changelog (top pane) to the changeset that introduced  that line and change focus to the top pane.    The color scheme in the annotation pane is two dimensional. Authors  determine hue, and age determines saturation. The older a change, the  lighter the color.    By right-clicking on the annotate pane's column headers (Line, Rev,  Source) you can bring up a menu for showing two optional columns:  :guilabel:`filename` and :guilabel:`user`.    Following Renames  ^^^^^^^^^^^^^^^^^    The annotation data will automatically follow lines of code back through  copies and renames to find the initial changeset that introduced the  line. The graph log pane will not follow renames or copies  automtaically. Instead, when you click on a changeset in the revision  graph that involved a rename or copy event, a button will appear that  will allow you to follow the history graph back through the rename.  Clicking on the button will open a new tab with the older filename  annotated at the same changeset.    Configurables  ^^^^^^^^^^^^^    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:`Changelog --> Long Summary`   Concatenates lines of commit message together to reach an 80   character summary.  :menuselection:`TortoiseHg --> Tab width`   Number of spaces to expand tabs in diffs and annotate output    From command line  -----------------    The datamine tool can be started from command line ::     hgtk datamine     aliases: annotate, blame     repository search and annotate tool     use "hgtk -v help datamine" to show global options    .. vim: noet ts=4
 
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::  
 
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
 
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  -----------------  
 
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  -----------------  
 
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!  ===================  
 
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/>`_.  
 
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`