Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset 3916f1f4b7c1

Parents c6ce272c89e2

Parents bb7d19eb4ddb

by André Sintzoff

Changes to one file · Browse files at 3916f1f4b7c1 Showing diff from parent c6ce272c89e2 bb7d19eb4ddb Diff from another changeset...

 
686
687
688
689
 
690
691
692
 
1198
1199
1200
1201
 
1202
1203
1204
 
686
687
688
 
689
690
691
692
 
1198
1199
1200
 
1201
1202
1203
1204
@@ -686,7 +686,7 @@
  cmdline.append('--insecure')   if user:   cleanurl = hglib.removeauth(cururl) - res = hglib.readauthforuri(self.repo.ui, cleanurl) + res = hglib.readauthforuri(self.repo.ui, cleanurl, user)   if res:   group, auth = res   if auth.get('username'): @@ -1198,7 +1198,7 @@
    # if the already user has an [auth] configuration for this URL, use it   cleanurl = hglib.removeauth(origurl) - res = hglib.readauthforuri(repo.ui, cleanurl) + res = hglib.readauthforuri(repo.ui, cleanurl, user)   if res:   self.alias, auth = res   else: