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: use dialog responses to perform commands

Changeset 9a5224bc27d2…

Parent 86d644951e26…

by Yuki KODAMA

Changes to one file · Browse files at 9a5224bc27d2 Showing diff from parent 86d644951e26 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​merge.py Stacked
 
17
18
19
 
 
 
 
20
21
22
 
26
27
28
 
29
30
31
 
83
84
85
86
87
88
 
 
 
89
90
 
 
 
 
 
 
 
 
 
 
 
91
92
93
 
17
18
19
20
21
22
23
24
25
26
 
30
31
32
33
34
35
36
 
88
89
90
 
 
 
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
@@ -17,6 +17,10 @@
   from tortoisehg.hgtk import changesetinfo, gtklib, commit, gdialog, hgcmd   +RES_MERGE = 1 +RES_COMMIT = 2 +RES_UNDO = 3 +  class MergeDialog(gtk.Dialog):   """ Dialog to merge revisions of a Mercurial repo """   def __init__(self, rev=None): @@ -26,6 +30,7 @@
  gtklib.set_tortoise_keys(self)   self.set_default_size(350, 120)   self.set_has_separator(False) + self.connect('response', self.dialog_response)   self.notify_func = None     if not rev: @@ -83,11 +88,22 @@
  for tool in hglib.mergetools(repo.ui):   vlist.append((hglib.toutf(tool), False))   - self.mergebtn.connect('clicked', lambda b: self.domerge()) - self.commitbtn.connect('clicked', lambda b: self.docommit()) - self.undobtn.connect('clicked', lambda b: self.doundo()) + self.mergebtn.connect('clicked', lambda b: self.response(RES_MERGE)) + self.commitbtn.connect('clicked', lambda b: self.response(RES_COMMIT)) + self.undobtn.connect('clicked', lambda b: self.response(RES_UNDO))   self.mergebtn.grab_focus()   + def dialog_response(self, dialog, response_id): + # Merge button + if response_id == RES_MERGE: + self.domerge() + # Commit button + elif response_id == RES_COMMIT: + self.docommit() + # Undo button + elif response_id == RES_UNDO: + self.doundo() +   def set_notify_func(self, func, *args):   self.notify_func = func   self.notify_args = args