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

doc: further updates

Changeset a142d364c3a2…

Parent 3cad469048c9…

by Steve Borho

Changes to 3 files · Browse files at a142d364c3a2 Showing diff from parent 3cad469048c9 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​TODO Stacked
 
4
5
6
7
 
8
9
10
11
12
13
14
15
16
 
 
 
 
 
 
 
4
5
6
 
7
8
9
10
11
12
13
 
 
14
15
16
17
18
19
20
@@ -4,13 +4,17 @@
   intro: cmenu reg files will be included in the installer   -update screenshots (intro.txt) +update screenshots  .. figure:: figures/cmenu-nofiles.jpg  .. figure:: figures/init.png  .. figure:: figures/share.png  .. figure:: figures/clone.png  .. {{images/image001.png}} (intro: overlay example)  .. figure:: figures/synchronize.png (syncbar closeup) - -(common.txt)  .. figure:: figures/hgcmd.jpg (show cmdwidget) +.. figure:: figures/cmenu-files.jpg +.. figure:: figures/overlayicons.png +.. figure:: figures/taskbarui.jpg +.. figure:: figures/rename.jpg +.. figure:: figures/init.png +.. figure:: figures/settings.png
Change 1 of 1 Show Entire File doc/​source/​init.txt Stacked
 
22
23
24
25
 
26
27
28
29
30
 
31
32
33
34
 
 
 
35
36
37
 
22
23
24
 
25
26
27
28
29
 
30
31
32
 
 
33
34
35
36
37
38
@@ -22,16 +22,17 @@
  If selected TortoiseHg creates an empty :file:`.hgignore` file   in the working directory.  :guilabel:`Make repo compatible with Mercurial 1.0` - If selected TortoiseHg creates an old type Mercurial repository. + If selected TortoiseHg creates an older format Mercurial repository.   Do not check unless you have a strong reason to do, and you know   what you are doing.    Creating a new repository means create a subdirectory called :file:`.hg`. -In this subdirectory Mercurial keeps all versioning information. +In this subdirectory Mercurial keeps all its versioning information.    .. warning:: - Never touch the files in :file:`.hg` directory, otherwise a repository - corruption can happen. + It is dangerous to manually edit the files in :file:`.hg` directory, + repository corruption can occur. :file:`.hg/hgrc` is perhaps the + only exception to this rule.    From command line  -----------------
Change 1 of 8 Show Entire File doc/​source/​settings.txt Stacked
 
38
39
40
41
42
 
 
43
44
45
46
47
48
 
49
50
51
 
69
70
71
72
 
73
74
75
 
81
82
83
84
85
86
 
 
 
 
87
88
89
 
113
114
115
116
117
 
118
119
120
 
124
125
126
 
 
 
 
 
 
 
 
 
127
128
129
 
151
152
153
 
 
 
 
 
 
 
 
 
 
 
 
154
155
156
 
179
180
181
 
 
 
 
 
 
 
 
 
 
 
182
183
184
 
354
355
356
 
 
 
 
357
358
359
 
38
39
40
 
 
41
42
43
44
45
46
47
 
48
49
50
51
 
69
70
71
 
72
73
74
75
 
81
82
83
 
 
 
84
85
86
87
88
89
90
 
114
115
116
 
 
117
118
119
120
 
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
 
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
 
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
 
386
387
388
389
390
391
392
393
394
395
@@ -38,14 +38,14 @@
 Repository   edits a repository :file:`.hg/hgrc` file   -In TortoiseHg 0.8, you may toggle between the two modes using the combo -box at the top of the dialog. +You may toggle between the two modes using the combo box at the top of +the dialog, or directly edit the file in your configured visual editor.    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  override many configurables per-repository (a common example is to -configure a different username for use in a repository). Also note that +configure a username for use in a specific repository). Also note that  the user and repository configuration files may not exist until you run  the Settings dialog for the first time.   @@ -69,7 +69,7 @@
 Please consult the Mercurial wiki for more detailed information about  these configurables (except for the first three tabs:  :guilabel:`TortoiseHg`, :guilabel:`Commit`, :guilabel:`Changelog`, which -are specifically for TortoiseHg). +are specific to TortoiseHg).    .. module:: TortoiseHg.settings   :synopsis: Dialog used to set general TortoiseHg preferences @@ -81,9 +81,10 @@
  Graphical merge program for resolving merge conflicts. If left   unspecified, Mercurial will use the first applicable tool it finds   on your system or use its internal merge tool that leaves conflict - markers in place. Chose :guilabel:`internal:merge` to force conflict markers, - :guilabel:`internal:prompt` to always select local or other, or :guilabel:`internal:dump` - to leave files in the working directory for manual merging. + markers in place. Chose :guilabel:`internal:merge` to force + conflict markers, :guilabel:`internal:prompt` to always select local + or other, or :guilabel:`internal:dump` to leave files in the working + directory for manual merging.    :guilabel:`Visual Diff Command:`   Specify visual diff tool; must be an extdiff command. @@ -113,8 +114,7 @@
   :guilabel:`Bottom Diffs:`   Show the diff panel below the file list in status, shelve, and - commit dialogs. - Default: False (show diffs to right of file list). + commit dialogs. Default: False (show diffs to right of file list).    :guilabel:`Capture Stderr:`   Redirect stderr to a buffer which is parsed at the end of the process @@ -124,6 +124,15 @@
  When running hgtk from the command line, fork a background process   to run graphical dialogs. Default: True.   +:guilabel:`Full path title:` + Show a full directory path of the repository in the dialog title + instead of just the root directory name. Default: False + +:guilabel:`Spell Check Language:` + Default language for spell check. System language is used if not + specified. Examples: en, en_GB, en_US. Spell checking requires + gtkspell, which is only available on Gnome PCs. +  .. module:: commit.settings   :synopsis: Dialog used to set commit specific preferences   @@ -151,6 +160,18 @@
  if any lines are too long at commit.   Default: 0 (unenforced).   +:guilabel:`Push After Commit:` + Attempt to push to default push target after every successful + commit. Default: False + +:guilabel:`Auto Commit List:` + Comma separated list of files that are automatically included in + every commit. Intended for use only as a repository setting. + Default: None + +:guilabel:`Auto Exclude List:` + Comma separated list of files that are automatically unchecked when + the status, commit, and shelve dialogs are opened. Default: None    .. module:: changelog.settings   :synopsis: Dialog used to set changelog specific preferences @@ -179,6 +200,17 @@
  of the currently selected changeset into the clipboard.   Default: False.   +:guilabel:`Dead Branches:` + Comma separated list of branch names that should be ignored when + building a list of branch names for a repository. Default: None + +:guilabel:`Branch Colors:` + Space separated list of branch names and colors of the form + branch:#XXXXXX. Spaces and colons in the branch name must be escaped + using a backslash (\\). Likewise some other characters can be + escaped in this way, e.g. \\u0040 will be decoded to the @ + character, and \\n to a linefeed. Default: None +  :guilabel:`Hide Tags:`   Space separated list of tags that will not be shown.   Useful example: Specify "qbase qparent qtip" to hide the @@ -354,6 +386,10 @@
 Diff  ----   +:guilabel:`Patch EOL:` + Normalize file line endings during and after patch to lf or crlf. + Strict does no normalization. Default: strict +  :guilabel:`Git Format:`   Use git extended diff header format.   Default: False.