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

mercurial.url.hidepassword moved to util

Changeset e4f4755ba8d9…

Parent 08d1a86c2dc3…

by Adrian Buehlmann

Changes to 2 files · Browse files at e4f4755ba8d9 Showing diff from parent 08d1a86c2dc3 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
1346
1347
1348
1349
 
1350
1351
1352
 
1346
1347
1348
 
1349
1350
1351
1352
@@ -1346,7 +1346,7 @@
  self.headers = (_('Alias'), _('URL'))   self.rows = []   for alias, path in pathlist: - safepath = url.hidepassword(path) + safepath = hglib.hidepassword(path)   ualias = hglib.tounicode(alias)   usafepath = hglib.tounicode(safepath)   self.rows.append([ualias, usafepath, path])
Change 1 of 3 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
10
11
12
13
 
14
15
16
 
27
28
29
 
 
 
 
 
 
30
31
32
 
564
565
566
567
 
568
569
570
 
10
11
12
 
13
14
15
16
 
27
28
29
30
31
32
33
34
35
36
37
38
 
570
571
572
 
573
574
575
576
@@ -10,7 +10,7 @@
 import shlex  import time   -from mercurial import ui, util, extensions, match, bundlerepo, url, cmdutil +from mercurial import ui, util, extensions, match, bundlerepo, cmdutil  from mercurial import dispatch, encoding, templatefilters, filemerge, error  from mercurial import demandimport   @@ -27,6 +27,12 @@
 except ImportError:   # hg <= 1.8   from mercurial.hg import localpath +try: + # hg >= 1.9 + from mercurial.util import hidepassword +except ImportError: + # hg <= 1.8 + from mercurial.url import hidepassword  demandimport.enable()    _encoding = encoding.encoding @@ -564,7 +570,7 @@
  for alias, path_aux in repo.ui.configitems('paths'):   if path == alias:   return_path = path_aux - elif path == url.hidepassword(path_aux): + elif path == hidepassword(path_aux):   return_path = path_aux   return return_path