Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

guess: fix 'hglib' importing

Changeset ce78eee50f48…

Parent 798069826e23…

by Yuki KODAMA

Changes to one file · Browse files at ce78eee50f48 Showing diff from parent 798069826e23 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgtk/​guess.py Stacked
 
16
17
18
19
20
 
21
22
23
 
45
46
47
48
 
49
50
51
52
53
 
54
55
56
 
214
215
216
217
 
218
219
220
 
274
275
276
277
 
278
279
280
 
342
343
344
345
 
346
347
348
349
 
350
351
352
 
353
354
355
356
357
 
358
359
360
 
16
17
18
 
 
19
20
21
22
 
44
45
46
 
47
48
49
50
51
 
52
53
54
55
 
213
214
215
 
216
217
218
219
 
273
274
275
 
276
277
278
279
 
341
342
343
 
344
345
346
347
 
348
349
350
 
351
352
353
354
355
 
356
357
358
359
@@ -16,8 +16,7 @@
 from mercurial import hg, ui, mdiff, cmdutil, match, util    from tortoisehg.util.i18n import _ -from tortoisehg.util.hglib import toutf, fromutf, diffexpand, RepoError -from tortoisehg.util import shlib, paths, thread2, settings +from tortoisehg.util import hglib, shlib, paths, thread2, settings    from tortoisehg.hgtk import gtklib   @@ -45,12 +44,12 @@
    try:   repo = hg.repository(ui.ui(), path=paths.find_root()) - except RepoError: + except hglib.RepoError:   gobject.idle_add(self.destroy)   return   self.repo = repo   self.notify_func = None - path = toutf(os.path.basename(self.repo.root)) + path = hglib.toutf(os.path.basename(self.repo.root))   self.set_title(_('Detect Copies/Renames in ') + path)   self._settings = settings.Settings('guess')   dims = self._settings.get_value('dims', (800, 600)) @@ -214,7 +213,7 @@
  def unknown_wait(self, thread, q, unkmodel):   while q.qsize():   wfile = q.get(0) - unkmodel.append( [wfile, toutf(wfile)] ) + unkmodel.append( [wfile, hglib.toutf(wfile)] )   return thread.isAlive()     def save_settings(self, w, event, settings, hpaned, vpaned, adjustment): @@ -274,7 +273,7 @@
  def search_wait(self, thread, q, cmodel, stbar):   while q.qsize():   source, dest, sim = q.get(0) - cmodel.append( [source, toutf(source), dest, toutf(dest), sim, True] ) + cmodel.append( [source, hglib.toutf(source), dest, hglib.toutf(dest), sim, True] )   if thread.isAlive():   return True   else: @@ -342,19 +341,19 @@
  continue   difflines = difftext.splitlines(True)   for line in difflines: - line = toutf(line) + line = hglib.toutf(line)   if line.startswith('---') or line.startswith('+++'):   buf.insert_with_tags_by_name(bufiter, line, 'header')   elif line.startswith('-'): - line = diffexpand(line) + line = hglib.diffexpand(line)   buf.insert_with_tags_by_name(bufiter, line, 'removed')   elif line.startswith('+'): - line = diffexpand(line) + line = hglib.diffexpand(line)   buf.insert_with_tags_by_name(bufiter, line, 'added')   elif line.startswith('@@'):   buf.insert_with_tags_by_name(bufiter, line, 'position')   else: - line = diffexpand(line) + line = hglib.diffexpand(line)   buf.insert(bufiter, line)    def run(ui, *pats, **opts):