Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with Yuki

Changeset 30d64724df5e…

Parents 4734f4675ed6…

Parents f56bd9a4fe87…

by Steve Borho

Changes to 4 files · Browse files at 30d64724df5e Showing diff from parent 4734f4675ed6 f56bd9a4fe87 Diff from another changeset...

Change 1 of 2 Show Changes Only hggtk/​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
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
 #  # TortoiseHg dialog to clone a repo  #  # Copyright (C) 2007 TK Soh <teekaysoh@gmail.com>  #    import gtk  import os  import pango  import traceback    from mercurial import ui, util  from thgutil.i18n import _ -from thgutil import shlib, settings +from thgutil import hglib, shlib, settings  from hggtk import gdialog, gtklib, hgcmd    class CloneDialog(gtk.Window):   """ Dialog to clone a Mercurial repo """   def __init__(self, repos=[]):   """ Initialize the Dialog """   gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)   gtklib.set_tortoise_icon(self, 'menuclone.ico')   gtklib.set_tortoise_keys(self)   self.set_default_size(520, 180)   self.set_title(_('TortoiseHg Clone'))     self.ui = ui.ui()   self.clonesettings = settings.Settings('clone')   self.recentsrc = self.clonesettings.mrul('src_paths')   self.recentdest = self.clonesettings.mrul('dest_paths')   - srcpath = os.getcwd() + srcpath = hglib.toutf(os.getcwd())   destpath = srcpath   if len(repos) > 1:   srcpath = repos[0]   destpath = repos[1]   elif len(repos):   srcpath = repos[0]     ewidth = 20     vbox = gtk.VBox()   self.add(vbox)     # clone source   srcbox = gtk.HBox()   lbl = gtk.Label(_('Source Path:'))   lbl.set_property('width-chars', ewidth)   lbl.set_alignment(0, 0.5)     # create drop-down list for source paths   self.srclist = gtk.ListStore(str)   srccombo = gtk.ComboBoxEntry(self.srclist, 0)   self.srcentry = srccombo.get_child()   self.srcentry.set_text(srcpath)   self.srcentry.set_position(-1)     # replace the drop-down widget so we can modify it's properties   srccombo.clear()   cell = gtk.CellRendererText()   cell.set_property('ellipsize', pango.ELLIPSIZE_MIDDLE)   srccombo.pack_start(cell)   srccombo.add_attribute(cell, 'text', 0)     srcbrowse = gtk.Button(_('Browse...'))   srcbrowse.connect('clicked', self.source_browse_clicked)   srcbox.pack_start(lbl, False, False)   srcbox.pack_start(srccombo, True, True)   srcbox.pack_end(srcbrowse, False, False, 5)   vbox.pack_start(srcbox, False, False, 2)     # 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])     # clone destination   destbox = gtk.HBox()   lbl = gtk.Label(_('Destination Path:'))   lbl.set_property('width-chars', ewidth)   lbl.set_alignment(0, 0.5)   self.destlist = gtk.ListStore(str)   destcombo = gtk.ComboBoxEntry(self.destlist, 0)   self.destentry = destcombo.get_child()   self.destentry.set_text(destpath)   self.destentry.set_position(-1)   self.destentry.connect('activate', self.clone_clicked)     # replace the drop-down widget so we can modify it's properties   destcombo.clear()   cell = gtk.CellRendererText()   cell.set_property('ellipsize', pango.ELLIPSIZE_MIDDLE)   destcombo.pack_start(cell)   destcombo.add_attribute(cell, 'text', 0)     srcbrowse = gtk.Button(_('Browse...'))   srcbrowse.connect('clicked', self.dest_browse_clicked)   destbox.pack_start(lbl, False, False)   destbox.pack_start(destcombo, True, True)   destbox.pack_end(srcbrowse, False, False, 5)   vbox.pack_start(destbox, False, False, 2)     # add most-recent dest paths to pull-down list   paths = list(self.recentdest)   paths.sort()   for p in paths:   self.destlist.append([p])     # revision input   revbox = gtk.HBox()   lbl = gtk.Label(_('Clone To Revision:'))   lbl.set_property('width-chars', ewidth)   lbl.set_alignment(0, 0.5)   self.reventry = gtk.Entry()   self.reventry.set_text("")   revbox.pack_start(lbl, False, False)   revbox.pack_start(self.reventry, False, False)   vbox.pack_start(revbox, False, False, 2)     # options   option_box = gtk.VBox()   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'))   self.optproxy = gtk.CheckButton(_('use proxy server'))   option_box.pack_start(self.optupdate, False, False)   option_box.pack_start(self.optpull, False, False)   option_box.pack_start(self.optuncomp, False, False)   option_box.pack_start(self.optproxy, False, False)   vbox.pack_start(option_box, False, False, 15)     if self.ui.config('http_proxy', 'host'):   self.optproxy.set_active(True)   else:   self.optproxy.set_sensitive(False)     # remote cmd   lbl = gtk.Label(_('Remote Cmd:'))   lbl.set_alignment(0, 0.5)   self.remotecmdentry = gtk.Entry()   vbox.pack_start(self.remotecmdentry, False, False, 1)   vbox.pack_start(lbl, False, False, 1)     accelgroup = gtk.AccelGroup()   self.add_accel_group(accelgroup)   mod = gtklib.get_thg_modifier()     hbbox = gtk.HButtonBox()   hbbox.set_layout(gtk.BUTTONBOX_END)   vbox.pack_start(hbbox, False, False, 2)     close = gtk.Button(_('Cancel'))   close.connect('clicked', lambda x: self.destroy())   key, modifier = gtk.accelerator_parse('Escape')   close.add_accelerator('clicked', accelgroup, key, 0,   gtk.ACCEL_VISIBLE)   self.close_button = close   hbbox.add(close)     clone = gtk.Button(_('Clone'))   key, modifier = gtk.accelerator_parse(mod+'Return')   clone.add_accelerator('clicked', accelgroup, key, modifier,   gtk.ACCEL_VISIBLE)   clone.connect('clicked', self.clone_clicked)   hbbox.add(clone)     destcombo.grab_focus()     def dest_browse_clicked(self, button):   'select folder as clone destination'   response = gtklib.NativeFolderSelectDialog(   initial=self.destentry.get_text(),   title=_('Select Destination Folder')).run()   if response:   self.destentry.set_text(response)     def source_browse_clicked(self, button):   'select source folder to clone'   response = gtklib.NativeFolderSelectDialog(   initial=self.destentry.get_text(),   title=_('Select Source Folder')).run()   if response:   self.srcentry.set_text(response)     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_clicked(self, toolbutton, data=None):   # 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 dest are the same'),   _('Please specify a different destination'), 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   try:   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(remotecmd)   if rev:   cmdline.append('--rev')   cmdline.append(rev)     cmdline.append('--verbose')   cmdline.append(src)   if dest:   cmdline.append(dest)     dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide()   except util.Abort, inst:   gdialog.Prompt(_('Clone aborted'), str(inst), self).run()   return False   except:   gdialog.Prompt(_('Clone error'),   traceback.format_exc(), self).run()   return False     self.add_src_to_recent(src)   self.add_dest_to_recent(dest)   self.close_button.grab_focus()     if dlg.return_code() == 0:   shlib.shell_notify([dest])    def run(_ui, *pats, **opts):   return CloneDialog(pats)
Change 1 of 1 Show Entire File hggtk/​hgcmd.py Stacked
 
28
29
30
31
 
32
33
34
 
28
29
30
 
31
32
33
34
@@ -28,7 +28,7 @@
    gtklib.set_tortoise_icon(self, 'hg.ico')   gtklib.set_tortoise_keys(self) - self.cmdline = cmdline + self.cmdline = [hglib.fromutf(item) for item in cmdline]   self.returncode = None   self.hgthread = None  
Change 1 of 4 Show Entire File hggtk/​hgignore.py Stacked
 
24
25
26
27
 
28
29
30
 
69
70
71
72
 
73
74
75
 
137
138
139
140
 
141
142
143
 
167
168
169
 
 
170
171
172
173
174
175
 
 
176
177
178
 
24
25
26
 
27
28
29
30
 
69
70
71
 
72
73
74
75
 
137
138
139
 
140
141
142
143
 
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
@@ -24,7 +24,7 @@
  gtklib.set_tortoise_keys(self)     self.root = paths.find_root() - self.set_title(_('Ignore filter for ') + os.path.basename(self.root)) + self.set_title(_('Ignore filter for ') + hglib.toutf(os.path.basename(self.root)))   self.set_default_size(630, 400)   self.notify_func = None   @@ -69,7 +69,7 @@
  if len(ignorefiles) > 1:   combo = gtk.combo_box_new_text()   for f in ignorefiles: - combo.append_text(f) + combo.append_text(hglib.toutf(f))   combo.set_active(0)   combo.connect('changed', self.fileselect)   mainvbox.pack_start(combo, False, False, 4) @@ -137,7 +137,7 @@
    def fileselect(self, combo):   'select another ignore file' - self.ignorefile = combo.get_active_text() + self.ignorefile = hglib.fromutf(combo.get_active_text())   self.refresh()     def unknown_search(self, model, column, key, iter): @@ -167,12 +167,16 @@
    def add_glob(self, widget, glob_entry):   newglob = hglib.fromutf(glob_entry.get_text()) + if newglob == '': + return   self.ignorelines.append('glob:' + newglob)   self.write_ignore_lines()   self.refresh()     def add_regexp(self, widget, regexp_entry):   newregexp = hglib.fromutf(regexp_entry.get_text()) + if newregexp == '': + return   self.ignorelines.append('regexp:' + newregexp)   self.write_ignore_lines()   self.refresh()
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
48
49
50
51
 
52
53
54
 
48
49
50
 
51
52
53
54
@@ -48,7 +48,7 @@
  self.origchangecount = len(self.repo)     name = self.repo.ui.config('web', 'name') or os.path.basename(self.root) - self.set_title(_('TortoiseHg Synchronize - ') + name) + self.set_title(_('TortoiseHg Synchronize - ') + hglib.toutf(name))     self.connect('delete-event', self.delete)