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.removeauth moved to util

Changeset 697fd2f42a54…

Parent a99542763aae…

by André Sintzoff

Changes to 2 files · Browse files at 697fd2f42a54 Showing diff from parent a99542763aae Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
626
627
628
629
 
630
631
632
 
1033
1034
1035
1036
 
1037
1038
1039
 
1116
1117
1118
1119
 
1120
1121
1122
 
626
627
628
 
629
630
631
632
 
1033
1034
1035
 
1036
1037
1038
1039
 
1116
1117
1118
 
1119
1120
1121
1122
@@ -626,7 +626,7 @@
  if self.repo.ui.configbool('insecurehosts', host):   cmdline.append('--insecure')   if user: - cleanurl = url.removeauth(cururl) + cleanurl = hglib.removeauth(cururl)   res = url.readauthforuri(self.repo.ui, cleanurl)   if res:   group, auth = res @@ -1033,7 +1033,7 @@
    user, host, port, folder, passwd, scheme = parseurl(origurl)   if (user or passwd) and scheme in ('http', 'https'): - cleanurl = url.removeauth(origurl) + cleanurl = hglib.removeauth(origurl)   def showurl(showclean):   newurl = showclean and cleanurl or safeurl   self.urllabel.setText(hglib.tounicode(newurl)) @@ -1116,7 +1116,7 @@
  ~Qt.WindowContextHelpButtonHint)     # if the already user has an [auth] configuration for this URL, use it - cleanurl = url.removeauth(origurl) + cleanurl = hglib.removeauth(origurl)   res = url.readauthforuri(repo.ui, cleanurl)   if res:   self.alias, auth = res
Change 1 of 3 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
34
35
36
 
 
 
 
 
 
37
38
39
 
610
611
612
613
 
614
615
616
 
617
618
619
 
629
630
631
632
 
633
634
635
 
34
35
36
37
38
39
40
41
42
43
44
45
 
616
617
618
 
619
620
621
 
622
623
624
625
 
635
636
637
 
638
639
640
641
@@ -34,6 +34,12 @@
 except ImportError:   # hg <= 1.8   from mercurial.url import hidepassword +try: + # hg >= 1.9 + from mercurial.util import removeauth +except ImportError: + # hg <= 1.8 + from mercurial.url import removeauth  demandimport.enable()    _encoding = encoding.encoding @@ -610,10 +616,10 @@
 def getDeepestSubrepoContainingFile(wfile, ctx):   """   Given a filename and context, get the deepest subrepo that contains the file - +   Also return the corresponding subrepo context and the filename relative to   its containing subrepo - """ + """   if wfile in ctx.manifest():   return '', wfile, ctx   for wsub in ctx.substate: @@ -629,7 +635,7 @@
  sctx = ctx.sub(wsub)._repo[srev]   except:   # The selected revision does not exist in the working copy - continue + continue   wfileinsub = wfile[len(wsub)+1:]   if wfileinsub in sctx.substate or wfileinsub in sctx.manifest():   return wsub, wfileinsub, sctx