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 with stable

Changeset 5a1aad3c0092…

Parents ca98dcc20b29…

Parents 34bb27cc3a6e…

by Steve Borho

Changes to 6 files · Browse files at 5a1aad3c0092 Showing diff from parent ca98dcc20b29 34bb27cc3a6e Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​changeset.py Stacked
 
497
498
499
500
 
501
502
503
 
527
528
529
530
531
 
532
533
534
535
536
537
538
539
 
540
541
542
 
497
498
499
 
500
501
502
503
 
527
528
529
 
 
530
531
532
533
534
535
 
 
 
536
537
538
539
@@ -497,7 +497,7 @@
  return False   if not self.curfile:   return False - self._diff_file('M', self.curfile) + self._do_diff([self.curfile], {'change' : self.currev})     def file_row_act(self, tree, path, column) :   'Default action is the first entry in the context menu' @@ -527,16 +527,13 @@
  def diff_to_local(self, menuitem):   if not self.curfile:   return - self.opts['rev'] = [str(self.currev)] - self._diff_file('M', self.curfile) + self._do_diff([self.curfile], {'rev' : str(self.currev)})     def diff_file_rev(self, menuitem):   'User selected visual diff file from the file list context menu'   if not self.curfile:   return - self.opts['change'] = str(self.currev) - self._diff_file('M', self.curfile) - del self.opts['change'] + self._do_diff([self.curfile], {'change' : str(self.currev)})     def view_file_rev(self, menuitem):   'User selected view file revision from the file list context menu'
Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
165
166
167
168
 
169
170
171
 
615
616
617
618
 
619
620
621
 
165
166
167
 
168
169
170
171
 
615
616
617
 
618
619
620
621
@@ -165,7 +165,7 @@
  return True     def grep_thgdiff(self, treeview): - self._do_diff([], {'change' : self.currev}, modal=True) + self._do_diff([], {'change' : self.currev})     def grep_row_act(self, tree, path, column):   'Default action is the first entry in the context menu' @@ -615,7 +615,7 @@
  return True     def annotate_thgdiff(self, treeview): - self._do_diff([], {'change' : self.currev}, modal=True) + self._do_diff([], {'change' : self.currev})     def toggle_annatate_columns(self, button, treeview, col):   b = button.get_active()
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
405
406
407
408
 
409
410
411
412
413
414
415
416
417
 
 
418
419
420
 
405
406
407
 
408
409
410
411
412
413
414
 
 
 
415
416
417
418
419
@@ -405,16 +405,15 @@
    return True, textout   - def _do_diff(self, canonpats, options, modal=False): + def _do_diff(self, canonpats, options):   from hggtk import visdiff   options['canonpats'] = canonpats   dialog = visdiff.run(self.ui, **options)   if not dialog:   return   dialog.show_all() - if modal: - dialog.run() - dialog.hide() + dialog.run() + dialog.hide()     def _diff_file(self, stat, file):   self._do_diff(file and [file] or [], self.opts)
Change 1 of 2 Show Entire File hggtk/​history.py Stacked
 
638
639
640
641
 
642
643
644
645
646
 
647
648
649
 
659
660
661
662
663
664
665
666
667
 
 
668
669
670
 
638
639
640
 
641
642
643
644
645
 
646
647
648
649
 
659
660
661
 
 
 
 
 
 
662
663
664
665
666
@@ -638,12 +638,12 @@
    def vdiff_change(self, menuitem, pats=[]):   rev = self.currow[treemodel.REVID] - self._do_diff(pats, {'change' : rev}, modal=True) + self._do_diff(pats, {'change' : rev})     def vdiff_local(self, menuitem, pats=[]):   rev = self.currow[treemodel.REVID]   opts = {'rev' : ["%s" % rev]} - self._do_diff(pats, opts, modal=True) + self._do_diff(pats, opts)     def diff_revs(self, menuitem):   rev0, rev1 = self.revs @@ -659,12 +659,8 @@
  return True     def vdiff_selected(self, menuitem): - rev0, rev1 = self.revs - self.opts['rev'] = ["%s:%s" % (rev0, rev1)] - if len(self.pats) == 1: - self._diff_file(None, self.pats[0]) - else: - self._diff_file(None, None) + strrevs = [str(r) for r in self.revs] + self._do_diff(self.pats, {'rev' : strrevs})     def email_revs(self, menuitem):   revs = list(self.revs)
Change 1 of 1 Show Entire File hggtk/​logfilter.py Stacked
 
197
198
199
200
201
 
 
202
203
204
205
206
207
208
209
210
211
212
 
 
 
 
 
 
 
 
 
 
213
214
215
 
197
198
199
 
 
200
201
202
203
 
 
 
 
 
 
 
 
 
204
205
206
207
208
209
210
211
212
213
214
215
216
@@ -197,19 +197,20 @@
  self.dateentry.grab_focus()   return   elif self.revradio.get_active(): - rev0 = self.rev0Entry.get_text() - rev1 = self.rev1Entry.get_text() + rev0 = self.rev0Entry.get_text().strip() + rev1 = self.rev1Entry.get_text().strip()   if not rev1:   rev1 = rev0 - try: - rrange = cmdutil.revrange(self.repo, [rev0, rev1]) - rrange.sort() - rrange.reverse() - opts['revrange'] = rrange - except Exception, e: - gdialog.Prompt(_('Invalid revision range'), str(e), self).run() - self.rev0Entry.grab_focus() - return + if rev0: + try: + rrange = cmdutil.revrange(self.repo, [rev0, rev1]) + rrange.sort() + rrange.reverse() + opts['revrange'] = rrange + except Exception, e: + gdialog.Prompt(_('Invalid revision range'), str(e), self).run() + self.rev0Entry.grab_focus() + return   elif self.branchradio.get_active():   branch = self.branchbox.child.get_text()   if branch:
Change 1 of 1 Show Changes Only hggtk/​visdiff.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
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
 # visdiff.py - launch external visual diff tools  #  # Copyright 2009 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 gtk  import gobject  import os  import shlex  import subprocess  import shutil  import tempfile    from mercurial import hg, ui, cmdutil, util    from thgutil.i18n import _  from thgutil import hglib, settings, paths    from hggtk import gdialog, gtklib    try:   import win32con   openflags = win32con.CREATE_NO_WINDOW  except ImportError:   openflags = 0    def snapshot_node(repo, files, node, tmproot):   '''snapshot files as of some revision'''   dirname = os.path.basename(repo.root)   if dirname == "":   dirname = "root"   dirname = '%s.%s' % (dirname, str(repo[node]))   base = os.path.join(tmproot, dirname)   os.mkdir(base)   ctx = repo[node]   for fn in files:   wfn = util.pconvert(fn)   if not wfn in ctx:   # skipping new file after a merge ?   continue   dest = os.path.join(base, wfn)   destdir = os.path.dirname(dest)   if not os.path.isdir(destdir):   os.makedirs(destdir)   data = repo.wwritedata(wfn, ctx[wfn].data())   open(dest, 'wb').write(data)   return dirname    class FileSelectionDialog(gtk.Dialog):   'Dialog for selecting visual diff candidates'   def __init__(self, canonpats, opts):   'Initialize the Dialog'   gtk.Dialog.__init__(self)   gtklib.set_tortoise_icon(self, 'menushowchanged.ico')   gtklib.set_tortoise_keys(self)     self.set_title(_('Visual Diffs'))   self.set_default_size(400, 150)     lbl = gtk.Label(_('Temporary files are removed when this dialog'   ' is closed'))   self.vbox.pack_start(lbl, False, False, 2)     scroller = gtk.ScrolledWindow()   scroller.set_shadow_type(gtk.SHADOW_IN)   scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)   model = gtk.ListStore(str, str)   treeview = gtk.TreeView(model)   treeview.get_selection().set_mode(gtk.SELECTION_SINGLE)   treeview.set_search_equal_func(self.search_filelist)   scroller.add(treeview)   self.vbox.pack_start(scroller, True, True, 2)     hbox = gtk.HBox()   self.vbox.pack_start(hbox, False, False, 2)   vsettings = settings.Settings('visdiff')   single = vsettings.get_value('launchsingle', False)   check = gtk.CheckButton(_('Always launch single files'))   check.set_active(single)   hbox.pack_start(check, True, True, 2)   self.singlecheck = check     treeview.connect('row-activated', self.rowactivated)   treeview.set_headers_visible(False)   treeview.set_property('enable-grid-lines', True)   treeview.set_enable_search(False)     cell = gtk.CellRendererText()   stcol = gtk.TreeViewColumn('Status', cell)   stcol.set_resizable(True)   stcol.add_attribute(cell, 'text', 0)   treeview.append_column(stcol)     cell = gtk.CellRendererText()   fcol = gtk.TreeViewColumn('Filename', cell)   fcol.set_resizable(True)   fcol.add_attribute(cell, 'text', 1)   treeview.append_column(fcol)     try:   repo = hg.repository(ui.ui(), path=paths.find_root())   except hglib.RepoError:   # hgtk should catch this earlier   gdialog.Prompt(_('No repository'),   _('No repository found here'), None).run()   return     tools = readtools(repo.ui)   preferred = repo.ui.config('tortoisehg', 'vdiff', 'vdiff')   if preferred and preferred in tools:   if len(tools) > 1:   lbl = gtk.Label(_('Select diff tool'))   combo = gtk.combo_box_new_text()   for i, name in enumerate(tools.iterkeys()):   combo.append_text(name)   if name == preferred:   defrow = i   combo.connect('changed', self.toolselect, tools)   combo.set_active(defrow)   hbox.pack_start(lbl, False, False, 2)   hbox.pack_start(combo, False, False, 2)   else:   self.diffpath, self.diffopts = tools[preferred]   cwd = os.getcwd()   try:   os.chdir(repo.root)   self.find_files(repo, canonpats, opts, model)   finally:   os.chdir(cwd)   else:   gdialog.Prompt(_('No visual diff tool'),   _('No visual diff tool has been configured'), None).run()     def search_filelist(self, model, column, key, iter):   'case insensitive filename search'   key = key.lower()   if key in model.get_value(iter, 1).lower():   return False   return True     def toolselect(self, combo, tools):   sel = combo.get_active_text()   if sel in tools:   self.diffpath, self.diffopts = tools[sel]     def find_files(self, repo, pats, opts, model):   revs = opts.get('rev')   change = opts.get('change')     if change:   title = _('changeset ') + str(change)   node2 = repo.lookup(change)   node1 = repo[node2].parents()[0].node()   else:   if revs:   title = _('revision(s) ') + ' to '.join(revs)   else:   title = _('working changes')   node1, node2 = cmdutil.revpair(repo, revs)     title = _('Visual Diffs - ') + title   if pats:   title += ' filtered'   self.set_title(title)     matcher = cmdutil.match(repo, pats, opts)   modified, added, removed = repo.status(node1, node2, matcher)[:3]   if not (modified or added or removed):   gdialog.Prompt(_('No file changes'),   _('There are no file changes to view'), self).run()   # GTK+ locks up if this is done immediately here   gobject.idle_add(self.destroy)   return     tmproot = tempfile.mkdtemp(prefix='extdiff.')   self.connect('destroy', self.delete_tmproot, tmproot)   dir2 = ''   dir2root = ''   # Always make a copy of node1   dir1 = snapshot_node(repo, modified + removed, node1, tmproot)     # If node2 in not the wc or there is >1 change, copy it   if node2:   dir2 = snapshot_node(repo, modified + added, node2, tmproot)   else:   # This lets the diff tool open the changed file directly   dir2root = repo.root     self.dirs = (dir1, dir2, dir2root, tmproot)     for m in modified:   model.append(['M', hglib.toutf(m)])   for a in added:   model.append(['A', hglib.toutf(a)])   for r in removed:   model.append(['R', hglib.toutf(r)])   if len(model) == 1 and self.singlecheck.get_active():   self.launch(*model[0])     def delete_tmproot(self, window, tmproot):   vsettings = settings.Settings('visdiff')   vsettings.set_value('launchsingle', self.singlecheck.get_active())   vsettings.write()   while True:   try:   shutil.rmtree(tmproot)   return   except (IOError, OSError), e:   resp = gdialog.CustomPrompt(_('Unable to delete temp files'),   _('Close diff tools and try again, or quit to leak files?'),   self, (_('Try &Again'), _('&Quit')), 1).run()   if resp == 0:   continue   else:   return     def rowactivated(self, tree, path, column):   selection = tree.get_selection()   if selection.count_selected_rows() != 1:   return False   model, paths = selection.get_selected_rows()   self.launch(*model[paths[0]])     def launch(self, st, fname):   fname = hglib.fromutf(fname)   dir1, dir2, dir2root, tmproot = self.dirs   if st == 'A':   dir1 = os.devnull   dir2 = os.path.join(dir2root, dir2, util.localpath(fname))   elif st == 'R':   dir1 = os.path.join(dir1, util.localpath(fname))   dir2 = os.devnull   else:   dir1 = os.path.join(dir1, util.localpath(fname))   dir2 = os.path.join(dir2root, dir2, util.localpath(fname))   if os.name == 'nt':   cmdline = ('%s %s %s %s' %   (util.shellquote(self.diffpath), ' '.join(self.diffopts),   util.shellquote(dir1), util.shellquote(dir2)))   else:   cmdline = [self.diffpath] + self.diffopts + [dir1, dir2]   try:   subprocess.Popen(cmdline, shell=False, cwd=tmproot,   creationflags=openflags,   stderr=subprocess.PIPE,   stdout=subprocess.PIPE,   stdin=subprocess.PIPE)   except (OSError, EnvironmentError), e:   gdialog.Prompt(_('Tool launch failure'),   _('%s : %s') % (self.diffpath, str(e)), None).run()    def readtools(ui):   tools = {}   for cmd, path in ui.configitems('extdiff'):   if cmd.startswith('cmd.'):   cmd = cmd[4:]   if not path:   path = cmd   diffopts = ui.config('extdiff', 'opts.' + cmd, '')   diffopts = diffopts and [diffopts] or []   tools[cmd] = [path, diffopts]   elif cmd.startswith('opts.'):   continue   else:   # command = path opts   if path:   diffopts = shlex.split(path)   path = diffopts.pop(0)   else:   path, diffopts = cmd, []   tools[cmd] = [path, diffopts]   return tools    def rawextdiff(ui, *pats, **opts):   'launch raw extdiff command, block until finish'   from hgext import extdiff   try:   repo = hg.repository(ui, path=paths.find_root())   except hglib.RepoError:   # hgtk should catch this earlier   ui.warn(_('No repository found here') + '\n')   return   tools = readtools(ui)   preferred = ui.config('tortoisehg', 'vdiff', 'vdiff')   try:   diffcmd, diffopts = tools[preferred]   except KeyError:   ui.warn(_('Extdiff command not recognized\n'))   return   pats = hglib.canonpaths(pats)   ret = extdiff.dodiff(ui, repo, diffcmd, diffopts, pats, opts)   if ret == 0:   gdialog.Prompt(_('No file changes'),   _('There are no file changes to view'), None).run()    def run(ui, *pats, **opts):   if ui.configbool('tortoisehg', 'vdiffnowin'):   import sys   # Spawn background process and exit   if hasattr(sys, "frozen"):   args = [sys.argv[0]]   else:   args = [sys.executable] + [sys.argv[0]]   args.extend(['vdiff', '--nofork', '--raw'])   revs = opts.get('rev', [])   change = opts.get('change')   if change:   args.extend(['--change', str(change)]) - if len(revs) == 1: - args.extend(['--change', str(revs[0])]) - else: - for r in revs: - args.extend(['--rev', str(r)]) + for r in revs: + args.extend(['--rev', str(r)])   args.extend(pats)   args.extend(opts.get('canonpats', []))   if os.name == 'nt':   args = ['"%s"' % arg for arg in args]   oldcwd = os.getcwd() - root = paths.find_root() - os.chdir(root) - os.spawnv(os.P_NOWAIT, sys.executable, args) - os.chdir(oldcwd) + root = paths.find_root(oldcwd) + try: + os.chdir(root) + os.spawnv(os.P_NOWAIT, sys.executable, args) + finally: + os.chdir(oldcwd)   return None   else:   pats = hglib.canonpaths(pats)   if opts.get('canonpats'):   pats = list(pats) + opts['canonpats']   return FileSelectionDialog(pats, opts)