Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

update: make merging (when possible) the default, without asking

Changeset 49a7f14a6975…

Parent e3be646769d5…

by paulm

Changes to one file · Browse files at 49a7f14a6975 Showing diff from parent e3be646769d5 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
13
14
15
16
 
17
18
19
 
43
44
45
 
 
 
46
47
48
 
60
61
62
 
 
 
 
 
63
64
65
 
106
107
108
 
109
110
111
112
 
 
 
 
 
 
 
 
 
 
113
114
115
 
138
139
140
 
141
142
143
 
244
245
246
 
 
 
247
248
249
250
 
251
252
253
 
13
14
15
 
16
17
18
19
 
43
44
45
46
47
48
49
50
51
 
63
64
65
66
67
68
69
70
71
72
73
 
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
 
157
158
159
160
161
162
163
 
264
265
266
267
268
269
270
271
272
 
273
274
275
276
@@ -13,7 +13,7 @@
 from mercurial import hg, ui, error    from tortoisehg.util.i18n import _ -from tortoisehg.util import hglib, paths +from tortoisehg.util import hglib, paths, settings    from tortoisehg.hgtk import csinfo, gtklib, gdialog, hgcmd   @@ -43,6 +43,9 @@
  self.updatebtn = self.add_button(_('Update'), gtk.RESPONSE_OK)   self.closebtn = self.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CLOSE)   + # persistent settings + self.settings = settings.Settings('update') +   # layout table for fixed items   table = gtklib.LayoutTable()   self.vbox.pack_start(table, True, True, 2) @@ -60,6 +63,11 @@
  self.opt_clean = btn   table.add_row(None, btn)   + ## automatically merge, if possible (similar to command-line behavior) + check = gtk.CheckButton(_('Always merge (when possible)')) + self.opt_merge = check + table.add_row(None, check) +   ## fill list of combo   if rev != None:   combo.append_text(str(rev)) @@ -106,10 +114,21 @@
  self.opt_clean.connect('toggled', lambda b: self.update_summaries())     # prepare to show + self.load_settings()   self.update_summaries()   self.updatebtn.grab_focus()   gtklib.idle_add_single_call(self.after_init)   + def load_settings(self): + merge = self.settings.get_value('mergedefault', False) + self.opt_merge.set_active(merge) + + def store_settings(self): + checked = self.opt_merge.get_active() + self.settings.set_value('mergedefault', checked) + + self.settings.write() +   def after_init(self):   # CmdWidget   self.cmd = hgcmd.CmdWidget() @@ -138,6 +157,7 @@
  if ret == gtk.RESPONSE_YES:   self.abort()   else: + self.store_settings()   self.destroy()   return # close dialog   # Abort button @@ -244,10 +264,13 @@
  retid = [ id for id, (label, desc) in data.items() \   if label == retlabel ][0]   return dict([(id, id == retid) for id in data.keys()]) + # If merge-by-default, we want to merge whenever possible, + # without prompting user (similar to command-line behavior) + defaultmerge = self.opt_merge.get_active()   clean = isclean()   if clean:   cmdline.append('--check') - else: + elif not (defaultmerge and islocalmerge(cur, node, clean)):   ret = confirmupdate(clean)   if ret['discard']:   cmdline.append('--clean')