Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable sync: copy proxy override feature from GTK sync tool

Changeset 3dad7bf7991d…

Parent ccd117e91e73…

by Steve Borho

Changes to one file · Browse files at 3dad7bf7991d Showing diff from parent ccd117e91e73 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
537
538
539
 
 
540
541
542
 
1315
1316
1317
 
 
 
 
 
 
 
1318
1319
1320
 
1336
1337
1338
 
1339
1340
1341
 
537
538
539
540
541
542
543
544
 
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
 
1345
1346
1347
1348
1349
1350
1351
@@ -537,6 +537,8 @@
    if 'rev' in details and '--rev' not in cmdline:   cmdline = self.applyTargetOption(cmdline) + if self.opts.get('noproxy'): + cmdline += ['--config', 'http_proxy.host=']     url = self.currentUrl(False)   if not url: @@ -1315,6 +1317,13 @@
  self.subrepocb.setChecked(opts.get('subrepos', False))   layout.addRow(self.subrepocb, None)   + self.noproxycb = QCheckBox( + _('Temporarily disable configured HTTP proxy')) + self.noproxycb.setChecked(opts.get('noproxy', False)) + layout.addRow(self.noproxycb, None) + proxy = self.repo.ui.config('http_proxy', 'host') + self.noproxycb.setEnabled(bool(proxy)) +   lbl = QLabel(_('Remote command:'))   self.remotele = QLineEdit()   if opts.get('remotecmd'): @@ -1336,6 +1345,7 @@
  outopts['subrepos'] = self.subrepocb.isChecked()   outopts['force'] = self.forcecb.isChecked()   outopts['new-branch'] = self.newbranchcb.isChecked() + outopts['noproxy'] = self.noproxycb.isChecked()     self.outopts = outopts   QDialog.accept(self)