Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.3, 2.0.4, and 2.0.5

stable update: clean up unused/redefined imports and reorder them

Changeset b98ec20d5b41…

Parent f782969444c3…

by Yuya Nishihara

Changes to one file · Browse files at b98ec20d5b41 Showing diff from parent f782969444c3 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
7
8
9
10
11
12
13
 
14
15
16
17
18
 
 
 
19
20
21
 
319
320
321
322
323
324
325
 
7
8
9
 
 
 
 
10
11
12
13
14
15
16
17
18
19
20
21
 
319
320
321
 
322
323
324
@@ -7,15 +7,15 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from PyQt4.QtCore import * -from PyQt4.QtGui import * - -from mercurial import error, merge as mergemod +from mercurial import error    from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import cmdui, csinfo, qtlib, thgrepo, resolve   +from PyQt4.QtCore import * +from PyQt4.QtGui import * +  class UpdateDialog(QDialog):     output = pyqtSignal(QString, QString) @@ -319,7 +319,6 @@
  self.cancel_btn.setDisabled(True)    def run(ui, *pats, **opts): - from tortoisehg.util import paths   repo = thgrepo.repository(ui, path=paths.find_root())   rev = None   if opts.get('rev'):