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 4cb61cbf5683…

Parents dca6906a5926…

Parents 60c8419346dc…

by Steve Borho

Changes to 2 files · Browse files at 4cb61cbf5683 Showing diff from parent dca6906a5926 60c8419346dc Diff from another changeset...

Change 1 of 2 Show Changes Only hggtk/​bugreport.py 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
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
 #  # bugreport.py - Bug report dialog for TortoiseHg  #  # Copyright (C) 2009 Steve Borho <steve@borho.org>  #    import os  import gtk  import pango    from mercurial import extensions  from thgutil.i18n import _  from thgutil import hglib, version  from hggtk import gdialog    class BugReport(gdialog.GDialog):   """GTK+ based dialog for displaying traceback info to the user in a   cut-paste friendly manner. And include a number of useful bit of   information like version numbers, etc.   """     def get_title(self):   return _('TortoiseHg Bug Report')     def get_icon(self):   return 'menudelete.ico'     def get_body(self):   textview = gtk.TextView()   textview.set_wrap_mode(gtk.WRAP_NONE)   textview.set_editable(False)   textview.modify_font(pango.FontDescription(self.fontlist))   scroller = gtk.ScrolledWindow()   scroller.set_shadow_type(gtk.SHADOW_IN)   scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   scroller.add(textview)   scroller.set_border_width(5)   vbox = gtk.VBox()   vbox.pack_start(scroller, True, True, 2)   hbbox = gtk.HButtonBox()   hbbox.set_layout(gtk.BUTTONBOX_END)   vbox.pack_start(hbbox, False, False, 2)   close = gtk.Button(_('Close'))   close.connect('clicked', gtk.main_quit)   hbbox.add(close)   - text = '\n{{{\n' # Wrap in Bitbucket wiki preformat markers + text = '{{{\n#!python\n' # Wrap in Bitbucket wiki preformat markers   text += _('** Please report this bug to'   ' tortoisehg-discuss@lists.sourceforge.net or'   ' http://bitbucket.org/tortoisehg/stable/issues\n')   text += '** Mercurial version (%s). TortoiseHg version (%s)\n' % (   hglib.hgversion, version.version())   text += '** Command: %s\n' % (self.opts['cmd'])   text += '** CWD: %s\n' % os.getcwd()   extlist = [x[0] for x in extensions.extensions()]   text += '** Extensions loaded: %s\n' % ', '.join(extlist)   text += self.opts['error'] - text += '\n}}}\n' + text += '\n}}}'   textview.get_buffer().set_text(text)   return vbox    def run(_ui, *pats, **opts):   return BugReport(_ui, None, None, None, opts)
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
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
 
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
@@ -74,26 +74,27 @@
  key, modifier = gtk.accelerator_parse('Escape')   close.add_accelerator('clicked', accelgroup, key, 0,   gtk.ACCEL_VISIBLE) - hbbox.add(close)     undo = gtk.Button(_('Undo')) - hbbox.add(undo)   undo.set_sensitive(False)     commit = gtk.Button(_('Commit')) - hbbox.add(commit)   commit.set_sensitive(False)     merge = gtk.Button(_('Merge'))   key, modifier = gtk.accelerator_parse(mod+'Return')   merge.add_accelerator('clicked', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE) +   hbbox.add(merge) - merge.grab_focus() + hbbox.add(commit) + hbbox.add(undo) + hbbox.add(close)   + commit.connect('clicked', self.commit)   undo.connect('clicked', self.undo, local, merge, commit)   merge.connect('clicked', self.merge, other, commit, undo) - commit.connect('clicked', self.commit) + merge.grab_focus()     def revdesc(self, repo, revid):   ctx = repo[revid]