Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 0979c4f0d9f1…

Parents 617028baf703…

Parents 4f989b278461…

by Steve Borho

Changes to 3 files · Browse files at 0979c4f0d9f1 Showing diff from parent 617028baf703 4f989b278461 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​guess.py Stacked
 
271
272
273
274
 
 
 
 
275
276
277
 
271
272
273
 
274
275
276
277
278
279
280
@@ -271,7 +271,10 @@
  thread = thread2.Thread(target=self.search_thread, args=(q, tgts))   thread.start()   self.stbar.begin() - self.stbar.set_text(_('finding source of ') + ', '.join(tgts)) + text = _('finding source of ') + ', '.join(tgts) + if len(text) > 60: + text = text[:60]+'...' + self.stbar.set_text(text)   gobject.timeout_add(50, self.search_wait, thread, q)     def search_thread(self, q, tgts):
Change 1 of 3 Show Entire File tortoisehg/​hgtk/​status.py Stacked
 
122
123
124
125
126
127
128
129
130
 
927
928
929
930
 
931
932
933
 
1737
1738
1739
1740
 
1741
1742
1743
 
122
123
124
 
 
 
125
126
127
 
924
925
926
 
927
928
929
930
 
1734
1735
1736
 
1737
1738
1739
1740
@@ -122,9 +122,6 @@
  for opt in self.opts:   if opt in self._show_checks and self.opts[opt]:   self._show_checks[opt].set_active(True) - if self.pats: - for name, check in self._show_checks.iteritems(): - check.set_sensitive(False)   self.ready = True     @@ -927,7 +924,7 @@
  elif stat == '?':   text_renderer.set_property('foreground', gtklib.DORANGE)   elif stat == 'I': - text_renderer.set_property('foreground', gtklib.NORMAL) + text_renderer.set_property('foreground', '#404040')   else:   text_renderer.set_property('foreground', gtklib.NORMAL)   @@ -1737,7 +1734,7 @@
  return False    def run(ui, *pats, **opts): - showclean = pats and True or False + showclean = util.any(os.path.isfile(e) for e in pats)   rev = opts.get('rev', [])   cmdoptions = {   'all':False, 'clean':showclean, 'ignored':False, 'modified':True,
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​visdiff.py Stacked
 
172
173
174
175
 
 
 
 
 
 
 
 
 
176
177
178
 
172
173
174
 
175
176
177
178
179
180
181
182
183
184
185
186
@@ -172,7 +172,15 @@
  else:   toollist.add(preferred)   - if len(toollist) > 1 or cpy: + cto = cpy.keys() + cfrom = cpy.values() + for path in MAR: + if path in cto or path in cfrom: + hascopies = True + break + else: + hascopies = False + if len(toollist) > 1 or hascopies:   usewin = True   else:   preferred = toollist.pop()