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 c3ea4b949391…

Parents 7fc45062a3b4…

Parents 887a043dd524…

by Steve Borho

Changes to 4 files · Browse files at c3ea4b949391 Showing diff from parent 7fc45062a3b4 887a043dd524 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​about.py Stacked
 
53
54
55
56
 
57
58
59
 
60
61
62
 
72
73
74
75
 
76
77
78
 
53
54
55
 
56
57
58
 
59
60
61
62
 
72
73
74
 
75
76
77
78
@@ -53,10 +53,10 @@
    self.set_website("http://bitbucket.org/tortoisehg/stable/")   self.set_name("TortoiseHg") - self.set_version("(version %s)" % version.version()) + self.set_version(_("(version %s)") % version.version())   if hasattr(self, 'set_wrap_license'):   self.set_wrap_license(True) - self.set_copyright("Copyright 2009 TK Soh and others") + self.set_copyright(_("Copyright 2009 TK Soh and others"))     thg_logo = paths.get_tortoise_icon('thg_logo_92x50.png')   thg_icon = paths.get_tortoise_icon('thg_logo.ico') @@ -72,7 +72,7 @@
  license = hgtk.shortlicense.splitlines()[1:]   self.set_license('\n'.join(license))   - self.set_comments("with " + lib_versions + "\n\n" + comment) + self.set_comments(_("with %s") % lib_versions + "\n\n" + comment)   self.set_logo(gtk.gdk.pixbuf_new_from_file(thg_logo))   self.set_icon_from_file(thg_icon)   self.connect('response', self.response)
Change 1 of 4 Show Entire File hggtk/​changeset.py Stacked
 
148
149
150
 
 
 
 
 
 
151
152
153
 
157
158
159
160
161
162
 
 
 
 
 
 
 
 
 
 
163
164
165
 
418
419
420
 
 
 
421
422
423
 
430
431
432
 
 
 
433
 
434
 
435
436
437
 
148
149
150
151
152
153
154
155
156
157
158
159
 
163
164
165
 
 
 
166
167
168
169
170
171
172
173
174
175
176
177
178
 
431
432
433
434
435
436
437
438
439
 
446
447
448
449
450
451
452
453
454
455
456
457
458
@@ -148,6 +148,12 @@
  if ctx.branch() != 'default':   title_line(_('branch:'), ctx.branch(), 'greybg')   title_line(_('user/date:'), ctx.user() + '\t' + date, 'changeset') + + if len(ctx.parents()) == 2 and self.parent_toggle.get_active(): + parentindex = 1 + else: + parentindex = 0 +   for pctx in ctx.parents():   try:   summary = pctx.description().splitlines()[0] @@ -157,9 +163,16 @@
  change = str(pctx.rev()) + ' : ' + str(pctx)   title = _('parent:')   title += ' ' * (12 - len(title)) - buf.insert_with_tags_by_name(eob, title, 'parent') - buf.insert_with_tags_by_name(eob, change, 'link') - buf.insert_with_tags_by_name(eob, ' ' + summary, 'parent') + + if len(ctx.parents()) == 2 and pctx == ctx.parents()[parentindex]: + buf.insert_with_tags_by_name(eob, title, 'parenthl') + buf.insert_with_tags_by_name(eob, change, 'linkhl') + buf.insert_with_tags_by_name(eob, ' ' + summary, 'parenthl') + else: + buf.insert_with_tags_by_name(eob, title, 'parent') + buf.insert_with_tags_by_name(eob, change, 'link') + buf.insert_with_tags_by_name(eob, ' ' + summary, 'parent') +   buf.insert(eob, "\n")   for cctx in ctx.children():   try: @@ -418,6 +431,9 @@
  paragraph_background='#F0F0F0'))   tag_table.add(make_texttag('parent', foreground='#000090',   paragraph_background='#F0F0F0')) + tag_table.add(make_texttag('parenthl', foreground='#000090', + paragraph_background='#F0F0F0', + weight=pango.WEIGHT_BOLD ))     tag_table.add( make_texttag( 'mono', family='Monospace' ))   tag_table.add( make_texttag( 'blue', foreground='blue' )) @@ -430,8 +446,13 @@
  tag_table.add( make_texttag( 'yellowbg', background='yellow' ))   link_tag = make_texttag( 'link', foreground='blue',   underline=pango.UNDERLINE_SINGLE ) + linkhl_tag = make_texttag( 'linkhl', foreground='blue', + underline=pango.UNDERLINE_SINGLE, + weight=pango.WEIGHT_BOLD )   link_tag.connect('event', self.link_event ) + linkhl_tag.connect('event', self.link_event )   tag_table.add( link_tag ) + tag_table.add( linkhl_tag )     def file_button_release(self, widget, event):   if event.button == 3 and not (event.state & (gtk.gdk.SHIFT_MASK |
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
55
56
57
58
 
 
 
 
 
 
 
59
60
61
 
55
56
57
 
58
59
60
61
62
63
64
65
66
67
@@ -55,7 +55,13 @@
  (_('Bottom Diffs'), 'gtools.diffbottom', ['False', 'True'],   _('Show the diff panel below the file list in status, shelve, and'   ' commit dialogs.' - ' Default: False (show diffs to right of file list)'))) + ' Default: False (show diffs to right of file list)')), + (_('Capture Stderr'), 'tortoisehg.stderrcapt', ['True', 'False'], + _('Redirect stderr to a buffer which is parsed at the end of' + ' the process for runtime errors. Default: True')), + (_('Fork hgtk'), 'tortoisehg.hgtkfork', ['True', 'False'], + _('When running hgtk from the command line, fork a background' + ' process to run graphical dialogs. Default: True')))    _commit_info = (   (_('Username'), 'ui.username', [],
Change 1 of 2 Show Entire File hgtk Stacked
 
27
28
29
30
 
 
 
 
 
 
 
31
32
33
 
67
68
69
70
 
71
72
73
 
27
28
29
 
30
31
32
33
34
35
36
37
38
39
 
73
74
75
 
76
77
78
79
@@ -27,7 +27,13 @@
  if os.fork():   sys.exit(0)   -if '--nofork' not in sys.argv and 'HGTK_NOFORK' not in os.environ: +from mercurial import ui + +_ui = ui.ui() +fork = _ui.configbool('tortoisehg', 'hgtkfork', True) +capt = _ui.configbool('tortoisehg', 'stderrcapt', True) + +if fork and '--nofork' not in sys.argv:   for i, arg in enumerate(sys.argv):   if 'hgtk' in arg and len(sys.argv) > i+1:   cmd = sys.argv[i+1] @@ -67,7 +73,7 @@
  sys.stderr.write("(check your install and PYTHONPATH)\n")   sys.exit(-1)   -if 'THGDEBUG' in os.environ: +if not capt or 'THGDEBUG' in os.environ:   sys.exit(hggtk.hgtk.dispatch(sys.argv[1:]))  else:   sys.stderr = cStringIO.StringIO()