Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

fileview: cleanup imports

Changeset 31114c4a2f7d…

Parent 0c143f77f1c5…

by Steve Borho

Changes to one file · Browse files at 31114c4a2f7d Showing diff from parent 0c143f77f1c5 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
21
22
23
24
 
25
26
27
 
29
30
31
32
33
34
35
36
 
37
38
39
 
193
194
195
196
 
197
198
199
 
403
404
405
406
 
407
408
409
 
414
415
416
417
 
418
419
420
 
684
685
686
 
687
688
689
 
21
22
23
 
24
25
26
27
 
29
30
31
 
32
 
 
 
33
34
35
36
 
190
191
192
 
193
194
195
196
 
400
401
402
 
403
404
405
406
 
411
412
413
 
414
415
416
417
 
681
682
683
684
685
686
687
@@ -21,7 +21,7 @@
 import difflib  import re   -from mercurial import hg, error, match, patch, subrepo, commands, util +from mercurial import hg, error, match, patch, util  from mercurial import ui as uimod, mdiff    from PyQt4.QtCore import * @@ -29,11 +29,8 @@
 from PyQt4 import Qsci    from tortoisehg.util import hglib, patchctx -  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt.lexers import get_lexer, get_diff_lexer -from tortoisehg.hgqt.blockmatcher import BlockList -from tortoisehg.hgqt import qscilib, qtlib +from tortoisehg.hgqt import qscilib, qtlib, blockmatcher, lexers    qsci = Qsci.QsciScintilla   @@ -193,7 +190,7 @@
  ll.addWidget(w)   self._spacer = w   - self.blk = BlockList(self) + self.blk = blockmatcher.BlockList(self)   self.blk.linkScrollBar(self.sci.verticalScrollBar())   ll2.addWidget(self.blk)   self.blk.setVisible(False) @@ -403,7 +400,7 @@
  self._lostMode = None     if self._mode == 'diff': - lexer = get_diff_lexer(self) + lexer = lexers.get_diff_lexer(self)   self.sci.setLexer(lexer)   # trim first three lines, for example:   # diff -r f6bfc41af6d7 -r c1b18806486d tortoisehg/hgqt/thgrepo.py @@ -414,7 +411,7 @@
  elif fd.contents is None:   return   else: - lexer = get_lexer(filename, fd.contents, self) + lexer = lexers.get_lexer(filename, fd.contents, self)   self.sci.setLexer(lexer)   nlines = fd.contents.count('\n')   # margin 1 is used for line numbers @@ -684,6 +681,7 @@
    if status == 'S':   try: + from mercurial import subrepo, commands   assert(ctx.rev() is None)   out = []   _ui = uimod.ui()