Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

sync: force reference to loadpath

Changeset 3295b736ec5a…

Parent 653c95574fe6…

by Steve Borho

Changes to one file · Browse files at 3295b736ec5a Showing diff from parent 653c95574fe6 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
14
15
16
17
 
18
19
20
 
23
24
25
 
26
27
28
29
 
30
31
 
32
33
34
 
14
15
16
 
17
18
19
20
 
23
24
25
26
27
28
29
 
30
31
32
33
34
35
36
@@ -14,7 +14,7 @@
 from PyQt4.QtCore import *  from PyQt4.QtGui import *   -from mercurial import hg, ui, url, util, error +from mercurial import hg, ui, url, util, error, demandimport  from mercurial import merge as mergemod    from tortoisehg.util import hglib, wconfig @@ -23,12 +23,14 @@
   _schemes = ['local', 'ssh', 'http', 'https']   +demandimport.disable()  try:   # hg <= 1.8   from mercurial.hg import localpath -except AttributeError: +except ImportError:   # hg >= 1.9   from mercurial.url import localpath +demandimport.enable()    def parseurl(path):   if path.startswith('ssh://'):