Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

clone: fix fatal issue on complete cloning

it should pass gtk.RESPONSE_CLOSE, not gtk.RESPONSE_OK.
If gtk.RESPONSE_OK is passed, it will enter the infinite loop.

Changeset 59337c5fc902…

Parent 96b0612d17a6…

by Yuki KODAMA

Changes to one file · Browse files at 59337c5fc902 Showing diff from parent 96b0612d17a6 Diff from another changeset...

Change 1 of 2 Show Changes Only tortoisehg/​hgtk/​clone.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
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
 
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
 
331
332
333
334
335
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
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
 
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
 
330
331
332
333
334
335
 # clone.py - Clone dialog for TortoiseHg  #  # 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  import pango  import traceback    from mercurial import ui, util    from tortoisehg.util.i18n import _  from tortoisehg.util import hglib, shlib, settings  from tortoisehg.hgtk import gdialog, gtklib, hgcmd    MODE_NORMAL = 'normal'  MODE_WORKING = 'working'    class CloneDialog(gtk.Dialog):   """ Dialog to clone a Mercurial repo """   def __init__(self, repos=[]):   """ Initialize the Dialog """   gtk.Dialog.__init__(self, title=_('TortoiseHg Clone'))   gtklib.set_tortoise_icon(self, 'menuclone.ico')   gtklib.set_tortoise_keys(self)   self.set_resizable(False)   self.set_has_separator(False)   self.connect('response', self.dialog_response)     # add clone button   self.clonebtn = self.add_button(_('Clone'), gtk.RESPONSE_OK)   self.cancelbtn = self.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CLOSE)     self.ui = ui.ui()     # persistent settings   self.clonesettings = settings.Settings('clone')   self.recentsrc = self.clonesettings.mrul('src_paths')   self.recentdest = self.clonesettings.mrul('dest_paths')     srcpath = hglib.toutf(os.getcwd())   destpath = srcpath   if len(repos) > 1:   srcpath = repos[0]   destpath = repos[1]   elif len(repos):   srcpath = repos[0]     def createcombo(path, label, title):   # comboentry   model = gtk.ListStore(str)   combo = gtk.ComboBoxEntry(model, 0)   combo.set_size_request(280, -1)   combo.size_request()   entry = combo.get_child()   entry.set_text(path)   entry.set_position(-1)   entry.connect('activate',   lambda b: self.response(gtk.RESPONSE_OK))     # replace the drop-down widget so we can modify it's properties   combo.clear()   cell = gtk.CellRendererText()   cell.set_property('ellipsize', pango.ELLIPSIZE_MIDDLE)   combo.pack_start(cell)   combo.add_attribute(cell, 'text', 0)     # browse button   browse = gtk.Button(_('Browse...'))   browse.connect('clicked', self.browse_clicked, title, entry)     table.add_row(label, combo, 0, browse)     return model, combo     # layout table for fixed options   self.table = table = gtklib.LayoutTable()   self.vbox.pack_start(table, True, True, 2)     ## comboentry for source paths   self.srclist, srccombo = createcombo(srcpath,   _('Source path:'),   _('Select Source Folder'))   self.srcentry = srccombo.get_child()     ## add pre-defined src paths to pull-down list   sync_src = settings.Settings('synch').mrul('src_paths')   sympaths = [x[1] for x in self.ui.configitems('paths')]   recent = [x for x in self.recentsrc]   syncsrc = [x for x in sync_src]   paths = list(set(sympaths + recent + syncsrc))   paths.sort()   for p in paths:   self.srclist.append([p])     ## comboentry for destination paths   self.destlist, destcombo = createcombo(destpath,   _('Destination path:'),   _('Select Destination Folder'))   self.destentry = destcombo.get_child()     ## add most-recent dest paths to pull-down list   paths = list(self.recentdest)   paths.sort()   for p in paths:   self.destlist.append([p])     # expander for advanced options   self.expander = expander = gtk.Expander(_('Advanced options'))   self.vbox.pack_start(expander, True, True, 2)     # layout table for advanced options   table = gtklib.LayoutTable()   expander.add(table)     ## revision option   self.reventry = gtk.Entry()   self.reventry.set_sensitive(False)   self.optrev = gtk.CheckButton(_('Clone to revision:'))   self.optrev.connect('toggled', self.checkbutton_toggled, self.reventry)   table.add_row(self.optrev, self.reventry)     ## options   self.optupdate = gtk.CheckButton(_('Do not update the new working directory'))   self.optpull = gtk.CheckButton(_('Use pull protocol to copy metadata'))   self.optuncomp = gtk.CheckButton(_('Use uncompressed transfer'))   table.add_row(self.optupdate)   table.add_row(self.optpull)   table.add_row(self.optuncomp)     ## proxy options   self.optproxy = gtk.CheckButton(_('Use proxy server'))   table.add_row(self.optproxy)   if self.ui.config('http_proxy', 'host'):   self.optproxy.set_active(True)   else:   self.optproxy.set_sensitive(False)     ## remote cmd option   self.remotecmdentry = gtk.Entry()   self.remotecmdentry.set_sensitive(False)   self.optremote = gtk.CheckButton(_('Remote command:'))   self.optremote.connect('toggled', self.checkbutton_toggled, self.remotecmdentry)   table.add_row(self.optremote)   table.add_row(self.remotecmdentry, padding=False)     # prepare to show   self.load_settings()   destcombo.grab_focus()   gobject.idle_add(self.after_init)     def after_init(self):   #CmdWidget   self.cmd = hgcmd.CmdWidget()   self.cmd.show_all()   self.cmd.hide()   self.vbox.pack_start(self.cmd, True, True, 6)     # abort button   self.abortbtn = self.add_button(_('Abort'), gtk.RESPONSE_CANCEL)   self.abortbtn.hide()     def load_settings(self):   expanded = self.clonesettings.get_value('expanded', False, True)   self.expander.set_property('expanded', expanded)     def store_settings(self):   expanded = self.expander.get_property('expanded')   self.clonesettings.set_value('expanded', expanded)   self.clonesettings.write()     def dialog_response(self, dialog, response_id):   def abort():   self.cmd.stop()   self.cmd.show_log()   self.switch_to(MODE_NORMAL, cmd=False)   # Clone button   if response_id == gtk.RESPONSE_OK:   self.clone()   # Cancel button or dialog closing by the user   elif response_id in (gtk.RESPONSE_CLOSE, gtk.RESPONSE_DELETE_EVENT):   if self.cmd.is_alive():   ret = gdialog.Confirm(_('Confirm Abort'), [], self,   _('Do you want to abort?')).run()   if ret == gtk.RESPONSE_YES:   abort()   else:   self.store_settings()   return # close dialog   # Abort button   elif response_id == gtk.RESPONSE_CANCEL:   abort()   else:   raise _('unexpected response id: %s') % response_id   - self.run() # doesn't close dialog + self.run() # don't close dialog     def browse_clicked(self, button, title, entry):   res = gtklib.NativeFolderSelectDialog(   initial=entry.get_text(), title=title).run()   if res:   entry.set_text(res)     def checkbutton_toggled(self, checkbutton, entry):   state = checkbutton.get_active()   entry.set_sensitive(state)   if state:   entry.grab_focus()     def switch_to(self, mode, cmd=True):   if mode == MODE_NORMAL:   normal = True   self.cancelbtn.grab_focus()   elif mode == MODE_WORKING:   normal = False   self.abortbtn.grab_focus()   else:   raise _('unknown mode name: %s') % mode   working = not normal     self.table.set_sensitive(normal)   self.expander.set_sensitive(normal)   self.clonebtn.set_property('visible', normal)   self.cancelbtn.set_property('visible', normal)   if cmd:   self.cmd.set_property('visible', working)   self.abortbtn.set_property('visible', working)     def add_src_to_recent(self, src):   if os.path.exists(src):   src = os.path.abspath(src)     # save path to recent list in history   self.recentsrc.add(src)   self.clonesettings.write()     # update drop-down list   self.srclist.clear()   sympaths = [x[1] for x in self.ui.configitems('paths')]   paths = list(set(sympaths + [x for x in self.recentsrc]))   paths.sort()   for p in paths:   self.srclist.append([p])     def add_dest_to_recent(self, dest):   if not dest:   return   if os.path.exists(dest):   dest = os.path.abspath(dest)     # save path to recent list in history   self.recentdest.add(dest)   self.clonesettings.write()     # update drop down list   paths = list(self.recentdest)   paths.sort()   self.destlist.clear()   for p in paths:   self.destlist.append([p])     def clone(self):   # gather input data   src = self.srcentry.get_text()   dest = self.destentry.get_text() or os.path.basename(src)   remotecmd = self.remotecmdentry.get_text()   rev = self.reventry.get_text()     # verify input   if src == '':   gdialog.Prompt(_('Source path is empty'),   _('Please enter a valid source path'), self).run()   self.srcentry.grab_focus()   return False     if src == dest:   gdialog.Prompt(_('Source and destination are the same'),   _('Please specify different paths'), self).run()   self.destentry.grab_focus()   return False     if dest == os.getcwd():   if os.listdir(dest):   # cur dir has files, specify no dest, let hg take   # basename   dest = None   else:   dest = '.'   else:   abs = os.path.abspath(dest)   dirabs = os.path.dirname(abs)   if dirabs == src:   dest = os.path.join(os.path.dirname(dirabs), dest)     # start cloning   cmdline = ['hg', 'clone']   if self.optupdate.get_active():   cmdline.append('--noupdate')   if self.optuncomp.get_active():   cmdline.append('--uncompressed')   if self.optpull.get_active():   cmdline.append('--pull')   if self.ui.config('http_proxy', 'host'):   if not self.optproxy.get_active():   cmdline += ['--config', 'http_proxy.host=']   if remotecmd:   cmdline.append('--remotecmd')   cmdline.append(hglib.fromutf(remotecmd))   if rev:   cmdline.append('--rev')   cmdline.append(rev)     cmdline.append('--verbose')   cmdline.append(hglib.fromutf(src))   if dest:   cmdline.append(hglib.fromutf(dest))     def cmd_done(returncode):   self.switch_to(MODE_NORMAL, cmd=False)   self.add_src_to_recent(src)   self.add_dest_to_recent(dest)   if returncode == 0:   shlib.shell_notify([dest])   if not self.cmd.is_show_log(): - self.response(gtk.RESPONSE_OK) + self.response(gtk.RESPONSE_CLOSE)   self.switch_to(MODE_WORKING)   self.cmd.execute(cmdline, cmd_done)    def run(_ui, *pats, **opts):   return CloneDialog(pats)