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 f7e45cdf3f0c…

Parents 2b4cdcba8019…

Parents c477cecc73a6…

by Steve Borho

Changes to 5 files · Browse files at f7e45cdf3f0c Showing diff from parent 2b4cdcba8019 c477cecc73a6 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
308
309
310
 
311
312
313
 
668
669
670
671
 
672
673
674
 
308
309
310
311
312
313
314
 
669
670
671
 
672
673
674
675
@@ -308,6 +308,7 @@
  objs = (includes, excludes, follow)   includes.connect('changed', self.update_following_possible, objs)   excludes.connect('changed', self.update_following_possible, objs) + self.update_following_possible(includes, objs)     if hasattr(self.notebook, 'set_tab_reorderable'):   self.notebook.set_tab_reorderable(frame, True) @@ -668,7 +669,7 @@
  (frame, treeview, path, graphview) = objs   q = Queue.Queue()   args = [self.repo.root, q, 'annotate', '--follow', '--number', - '--rev', str(rev), path] + '--rev', str(rev), 'path:'+path]   thread = thread2.Thread(target=hgcmd_toq, args=args)   thread.start()   frame._mythread = thread
Change 1 of 1 Show Entire File hggtk/​logview/​revgraph.py Stacked
 
156
157
158
 
159
160
161
 
156
157
158
159
160
161
162
@@ -156,6 +156,7 @@
    stack = []   get = util.cachefunc(lambda r: repo.changectx(r).changeset()) + pats = ['path:'+p for p in pats]   changeiter, matchfn = cmdutil.walkchangerevs(repo.ui, repo, pats, get, opts)   for st, rev, fns in changeiter:   if st == 'iter':
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
87
88
89
90
 
 
91
92
93
 
94
95
96
 
87
88
89
 
90
91
92
93
94
95
96
97
98
@@ -87,10 +87,12 @@
  self.filechunks = {}     def auto_check(self): - if self.pats or self.opts.get('check'): + # Only auto-check files once, and only if a pattern was given. + if self.pats and self.opts.get('check'):   for entry in self.filemodel:   entry[FM_CHECKED] = True   self.update_check_count() + self.opts['check'] = False     def get_menu_info(self):   """Returns menu info in this order:
Change 1 of 2 Show Entire File hggtk/​thgconfig.py Stacked
 
278
279
280
281
282
283
284
285
 
 
 
 
 
 
 
 
 
286
287
288
 
318
319
320
321
 
 
 
 
322
323
324
 
278
279
280
 
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
 
326
327
328
 
329
330
331
332
333
334
335
@@ -278,11 +278,19 @@
  self.sethandlers()     self.lastproto = None - self.protcombo.connect('changed', self.changed)   self.update_sensitive()   self.show_all()     def sethandlers(self, enable=True): + # protocol combobox + if enable: + self.pcombo_hid = self.protcombo.connect('changed', self.changed) + else: + h = self.pcombo_hid + if h and self.protcombo.handler_is_connected(h): + self.protcombo.disconnect(h) + + # other entries   for n, (e, l, h) in self.entries.iteritems():   if enable:   handler = self.changedurl if n == 'URL' else self.changed @@ -318,7 +326,10 @@
  user, host, port, folder, pw, scheme = self.urlparse(path)     self.entries['Alias'][0].set_text(alias) - self.entries['URL'][0].set_text(url.hidepassword(path)) + if scheme == 'local': + self.entries['URL'][0].set_text(path) + else: + self.entries['URL'][0].set_text(url.hidepassword(path))   self.entries['User'][0].set_text(user or '')   self.entries['Host'][0].set_text(host or '')   self.entries['Port'][0].set_text(port or '')
win32/​thg-cmenu-en-US.reg
 
 
(Binary files differ)