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: cleanup method arguments

Changeset 86d644951e26…

Parent 63e3bf7c5fcf…

by Yuki KODAMA

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

Change 1 of 5 Show Changes Only tortoisehg/​hgtk/​merge.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
64
65
66
 
 
 
 
 
 
 
67
68
69
70
71
 
 
 
 
72
73
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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
 
 
 
 
119
120
 
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
 
139
140
141
142
143
 
144
145
146
147
148
149
150
151
152
153
 
 
 
 
154
155
156
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
64
65
66
67
 
 
 
 
68
69
70
71
72
73
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
101
102
103
104
105
106
107
108
109
110
111
112
113
 
114
 
 
 
115
116
117
118
119
 
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
 
138
139
140
141
142
 
143
144
145
146
147
148
 
 
 
149
 
150
151
152
153
154
155
156
 # merge.py - TortoiseHg's dialog for merging revisions  #  # Copyright 2007 TK Soh <teekaysoh@gmail.com>  # Copyright 2007 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.    import os  import gtk  import gobject    from mercurial import hg, ui    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, paths    from tortoisehg.hgtk import changesetinfo, gtklib, commit, gdialog, hgcmd    class MergeDialog(gtk.Dialog):   """ Dialog to merge revisions of a Mercurial repo """   def __init__(self, rev=None):   """ Initialize the Dialog """   gtk.Dialog.__init__(self)   gtklib.set_tortoise_icon(self, 'menumerge.ico')   gtklib.set_tortoise_keys(self)   self.set_default_size(350, 120)   self.set_has_separator(False)   self.notify_func = None     if not rev:   gdialog.Prompt(_('Unable to merge'),   _('Must supply a target revision'), self).run()   gobject.idle_add(self.destroy)   return     try:   repo = hg.repository(ui.ui(), path=paths.find_root())   except hglib.RepoError:   gobject.idle_add(self.destroy)   return   self.set_title(_('Merging in %s') % hglib.get_reponame(repo))     frame = gtk.Frame(_('Merge target (other)')) - other, desc = changesetinfo.changesetinfo(repo, rev, True) + self.otherrev, desc = changesetinfo.changesetinfo(repo, rev, True)   frame.add(desc)   frame.set_border_width(5)   self.vbox.pack_start(frame, False, False)     frame = gtk.Frame(_('Current revision (local)')) - local, desc = changesetinfo.changesetinfo(repo, '.', True) + self.localrev, desc = changesetinfo.changesetinfo(repo, '.', True)   frame.add(desc)   frame.set_border_width(5)   self.vbox.pack_start(frame, False, False)     accelgroup = gtk.AccelGroup()   self.add_accel_group(accelgroup)   mod = gtklib.get_thg_modifier()   - close = gtk.Button(_('Close')) - close.connect('clicked', lambda x: self.destroy()) - undo = gtk.Button(_('Undo')) - undo.set_sensitive(False) - commit = gtk.Button(_('Commit')) - commit.set_sensitive(False) - merge = gtk.Button(_('Merge')) + self.closebtn = gtk.Button(_('Close')) + self.closebtn.connect('clicked', lambda x: self.destroy()) + self.undobtn = gtk.Button(_('Undo')) + self.undobtn.set_sensitive(False) + self.commitbtn = gtk.Button(_('Commit')) + self.commitbtn.set_sensitive(False) + self.mergebtn = gtk.Button(_('Merge'))   - self.action_area.add(merge) - self.action_area.add(commit) - self.action_area.add(undo) - self.action_area.add(close) + self.action_area.add(self.mergebtn) + self.action_area.add(self.commitbtn) + self.action_area.add(self.undobtn) + self.action_area.add(self.closebtn)     vlist = gtk.ListStore(str, bool)   combo = gtk.ComboBoxEntry(vlist, 0)   self.mergetool = combo   combo.set_row_separator_func(lambda model, path: model[path][1])   combo.child.set_width_chars(8)   lbl = gtk.Label(_('Merge tool:'))   lbl.set_alignment(1, 0.5)   self.action_area.add(lbl)   self.action_area.add(combo)   vlist.append(('', False))   for tool in hglib.mergetools(repo.ui):   vlist.append((hglib.toutf(tool), False))   - commit.connect('clicked', self.docommit) - undo.connect('clicked', self.undo, local, merge, commit) - merge.connect('clicked', self.merge, other, commit, undo) - merge.grab_focus() + 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.grab_focus()     def set_notify_func(self, func, *args):   self.notify_func = func   self.notify_args = args   - def merge(self, button, other, commit, undo): - cmdline = ['hg', 'merge', '--rev', other] + def domerge(self): + cmdline = ['hg', 'merge', '--rev', self.otherrev]   tool = hglib.fromutf(self.mergetool.child.get_text())   if tool:   oldmergeenv = os.environ.get('HGMERGE')   os.environ['HGMERGE'] = tool   dlg = hgcmd.CmdDialog(cmdline, False)   dlg.run()   dlg.hide()   repo = hg.repository(ui.ui(), path=paths.find_root())   if len(repo.parents()) == 1:   return   if tool:   if oldmergeenv:   os.environ['HGMERGE'] = oldmergeenv   else:   del os.environ['HGMERGE']   if self.notify_func:   self.notify_func(self.notify_args) - button.set_sensitive(False)   self.mergetool.set_sensitive(False) - undo.set_sensitive(True) - commit.set_sensitive(True) - commit.grab_focus() + self.mergebtn.set_sensitive(False) + self.undobtn.set_sensitive(True) + self.commitbtn.set_sensitive(True) + self.commitbtn.grab_focus()   - def docommit(self, button): + def docommit(self):   dlg = commit.run(ui.ui())   dlg.set_transient_for(self)   dlg.set_modal(True)   dlg.set_notify_func(self.commit_notify, dlg)   dlg.display()     def commit_notify(self, dlg):   # refresh the log tool   if self.notify_func:   self.notify_func(self.notify_args)   # hide merge dialog   self.hide()   # hide commit tool   dlg.ready = False # disables refresh   dlg.hide()   gobject.timeout_add(50, self.destroy)   - def undo(self, button, local, merge, commit): + def doundo(self):   response = gdialog.Confirm(_('Confirm undo merge'), [], self,   _('Clean checkout of original revision?')).run()   if response != gtk.RESPONSE_YES:   return - cmdline = ['hg', 'update', '--rev', local, '--clean'] + cmdline = ['hg', 'update', '--rev', self.localrev, '--clean']   dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide()   if self.notify_func:   self.notify_func(self.notify_args) - button.set_sensitive(False) - commit.set_sensitive(False) - merge.set_sensitive(True)   self.mergetool.set_sensitive(True) - merge.grab_focus() + self.mergebtn.set_sensitive(True) + self.mergebtn.grab_focus() + self.undobtn.set_sensitive(False) + self.commitbtn.set_sensitive(False)    def run(ui, *pats, **opts):   return MergeDialog(opts.get('rev'))