Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.4rc1, 0.4rc2, and 0.4rc3

hggtk/thgconfig: add diff tab, move ui.merge to user tab

Changeset 33753d10447f…

Parent 1cd79d191c06…

by Steve Borho

Changes to one file · Browse files at 33753d10447f Showing diff from parent 1cd79d191c06 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​thgconfig.py Stacked
 
90
91
92
 
 
 
 
93
94
95
 
261
262
263
264
265
266
267
268
269
270
271
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
272
273
274
 
538
539
540
541
542
543
544
545
 
90
91
92
93
94
95
96
97
98
99
 
265
266
267
 
 
 
 
 
 
 
 
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
 
551
552
553
 
 
554
555
556
@@ -90,6 +90,10 @@
  self._user_info = (   ('Username', 'ui.username', [],   'Name associated with commits'), + ('3-way Merge Tool', 'ui.merge', [], +'Graphical merge program for resolving merge conflicts. If left' +' unspecified, the Mercurial will use the first applicable' +' tool it finds on your system or default to its internal algorithm.'),   ('Editor', 'ui.editor', [],   'The editor to use during a commit and other'   ' instances where Mercurial needs multiline input from' @@ -261,14 +265,23 @@
  self.email_frame = self.add_page(notebook, 'Email')   self.fill_frame(self.email_frame, self._email_info)   - self._hgmerge_info = ( - ('Default 3-way Merge Tool', 'ui.merge', [], -'Textual merge program for resolving merge conflicts. If left' -' unspecified, the Mercurial will use the first applicable' -' tool it finds on your system or default to its internal algorithm.'),) - self.hgmerge_frame = self.add_page(notebook, 'Merge') - self.fill_frame(self.hgmerge_frame, self._hgmerge_info) - # TODO add ability to specify file extension based merge tools + self._diff_info = ( + ('Git Format', 'diff.git', ['False', 'True'], + 'Use git extended diff format.'), + ('No Dates', 'diff.nodates', ['False', 'True'], + 'Do no include dates in diff headers.'), + ('Show Function', 'diff.showfunc', ['False', 'True'], + 'Show which function each change is in.'), + ('Ignore White Space', 'diff.ignorews', ['False', 'True'], + 'Ignore white space when comparing lines.'), + ('Ignore WS Amount', 'diff.ignorewsamount', ['False', 'True'], + 'Ignore changes in the amount of white space.'), + ('Ignore Blank Lines', 'diff.ignoreblanklines', + ['False', 'True'], + 'Ignore changes whose lines are all blank.'), + ) + self.diff_frame = self.add_page(notebook, 'Diff') + self.fill_frame(self.diff_frame, self._diff_info)     # Force dialog into clean state in the beginning   self._btn_apply.set_sensitive(False) @@ -538,8 +551,6 @@
  if name not in ('default', 'default-push'):   del self.ini['paths'][name]   - # TODO: Add special code for flushing hgmerge extensions -   # Flush changes on all pages   for vbox, info, widgets in self.pages:   for w, (label, cpath, values, tip) in enumerate(info):