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 Entire File hggtk/​bugreport.py Stacked
 
44
45
46
47
 
48
49
50
 
55
56
57
58
 
59
60
61
 
44
45
46
 
47
48
49
50
 
55
56
57
 
58
59
60
61
@@ -44,7 +44,7 @@
  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') @@ -55,7 +55,7 @@
  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  
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]