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

sync: add knowledge of 'svn+https://'; prefix (closes #621)

This tells the hgsubversion extension that the URL is an SVN URL and
thus it doesn't have to try to auto-detect that fact. Pushes and
pulls take much fewer round trips when this is used.

Changeset 25cbaeb58641…

Parent b781b0eed31e…

by Steve Borho

Changes to one file · Browse files at 25cbaeb58641 Showing diff from parent b781b0eed31e Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
21
22
23
24
25
26
27
28
 
40
41
42
43
 
44
45
46
 
73
74
75
 
 
 
 
76
77
78
 
178
179
180
181
 
182
183
184
 
403
404
405
406
 
407
408
409
 
416
417
418
419
 
420
421
422
 
450
451
452
453
 
454
455
456
 
21
22
23
 
 
24
25
26
 
38
39
40
 
41
42
43
44
 
71
72
73
74
75
76
77
78
79
80
 
180
181
182
 
183
184
185
186
 
405
406
407
 
408
409
410
411
 
418
419
420
 
421
422
423
424
 
452
453
454
 
455
456
457
458
@@ -21,8 +21,6 @@
 from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib, cmdui, thgrepo, rebase, resolve   -_schemes = ['local', 'ssh', 'http', 'https'] -  def parseurl(path):   if path.startswith('ssh://'):   scheme = 'ssh' @@ -40,7 +38,7 @@
  else:   qtlib.WarningMsgBox(_('Malformed ssh URL'), hglib.tounicode(path))   host, port, folder = '', '', '' - elif path.startswith('http://') or path.startswith('https://'): + elif path.startswith(('http://', 'https://', 'svn+https://')):   snpaqf = urlparse.urlparse(path)   scheme, netloc, folder, params, query, fragment = snpaqf   host, port, user, passwd = hglib.netlocsplit(netloc) @@ -73,6 +71,10 @@
  self.setLayout(layout)   self.setAcceptDrops(True)   + self._schemes = ['local', 'ssh', 'http', 'https'] + if 'hgsubversion' in repo.extensions(): + self._schemes.append('svn+https') +   self.repo = repo   self.finishfunc = None   self.curuser = None @@ -178,7 +180,7 @@
  tbar.setIconSize(QSize(16, 16))   hbox.addWidget(tbar)   self.schemecombo = QComboBox() - for s in _schemes: + for s in self._schemes:   self.schemecombo.addItem(s)   self.schemecombo.currentIndexChanged.connect(self.refreshUrl)   tbar.addWidget(self.schemecombo) @@ -403,7 +405,7 @@
  schemeIndex = self.schemecombo.currentIndex()   for w in self.HostAndPortWidgets:   w.setDisabled(schemeIndex == 0) - self.securebutton.setVisible(schemeIndex == 3) + self.securebutton.setVisible(schemeIndex >= 3)     opts = []   for opt, value in self.opts.iteritems(): @@ -416,7 +418,7 @@
  self.optionshdrlabel.setVisible(bool(opts))     def currentUrl(self, hidepw): - scheme = _schemes[self.schemecombo.currentIndex()] + scheme = self._schemes[self.schemecombo.currentIndex()]   if scheme == 'local':   return hglib.fromunicode(self.pathentry.text())   else: @@ -450,7 +452,7 @@
  except TypeError:   return   self.updateInProgress = True - for i, val in enumerate(_schemes): + for i, val in enumerate(self._schemes):   if scheme == val:   self.schemecombo.setCurrentIndex(i)   break