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

Parents 8f290e3ada3e…

Parents 77d621a7fd8f…

by Yuki KODAMA

Changes to one file · Browse files at a3c77aaba36c Showing diff from parent 8f290e3ada3e 77d621a7fd8f Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgtk/​guess.py Stacked
 
259
260
261
262
 
263
264
265
 
268
269
270
271
 
 
272
273
274
 
277
278
279
280
 
281
282
283
 
293
294
295
296
 
297
298
299
300
301
302
 
303
304
305
 
323
324
325
326
 
327
328
329
 
259
260
261
 
262
263
264
265
 
268
269
270
 
271
272
273
274
275
 
278
279
280
 
281
282
283
284
 
294
295
296
 
297
298
299
300
301
302
 
303
304
305
306
 
324
325
326
 
327
328
329
330
@@ -259,7 +259,7 @@
  self.settings.set_value('dims', (rect.width, rect.height))   self.settings.write()   - def find_renames(self): + def find_renames(self, copy=False):   'User pressed "find renames" button'   canmodel = self.cantree.get_model()   canmodel.clear() @@ -268,7 +268,8 @@
  return   tgts = [ umodel[p][0] for p in upaths ]   q = Queue.Queue() - thread = thread2.Thread(target=self.search_thread, args=(q, tgts)) + thread = thread2.Thread(target=self.search_thread, + args=(q, tgts, copy))   thread.start()   self.stbar.begin()   text = _('finding source of ') + ', '.join(tgts) @@ -277,7 +278,7 @@
  self.stbar.set_text(text)   gobject.timeout_add(50, self.search_wait, thread, q)   - def search_thread(self, q, tgts): + def search_thread(self, q, tgts, copy):   hglib.invalidaterepo(self.repo)   srcs = []   audit_path = util.path_auditor(self.repo.root) @@ -293,13 +294,13 @@
  if (not good or not util.lexists(target)   or (os.path.isdir(target) and not os.path.islink(target))):   srcs.append(abs) - elif not self.adjustment and status == 'n': + elif copy and status == 'n':   # looking for copies, so any revisioned file is a   # potential source (yes, this will be expensive)   # Added and removed files are not considered as copy   # sources.   srcs.append(abs) - if self.adjustment: + if not copy:   simularity = self.adjustment.get_value() / 100.0;   gen = cmdutil.findrenames   else: @@ -323,7 +324,7 @@
  def find_copies(self):   'User pressed "find copies" button'   # call rename function with simularity = 100% - self.find_renames() + self.find_renames(copy=True)     def accept_match(self):   'User pressed "accept match" button'