Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

stable history: show the correct push string in the push confirmation dialog box

If the user selects a URL(https://aaa:***@host/hg) the dialog box shows the
real one used to push (https://aaa:bbb@host/hg) but it should show the one
the user types.

Changeset 7d27fa92f10a…

Parent 038d56979aae…

by Diego Oliveira

Changes to one file · Browse files at 7d27fa92f10a Showing diff from parent 038d56979aae Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1384
1385
1386
1387
1388
1389
1390
1391
1392
 
 
1393
1394
1395
 
1402
1403
1404
1405
 
1406
1407
1408
1409
 
1410
1411
1412
1413
1414
1415
 
1416
1417
1418
 
1384
1385
1386
 
 
 
 
 
 
1387
1388
1389
1390
1391
 
1398
1399
1400
 
1401
1402
1403
1404
 
1405
1406
1407
1408
1409
1410
 
1411
1412
1413
1414
@@ -1384,12 +1384,8 @@
  self.show_dialog(dlg)     def push_clicked(self, toolbutton): - remote_path = hglib.fromutf(self.pathentry.get_text()).strip() - for alias, path in self.repo.ui.configitems('paths'): - if remote_path == alias: - remote_path = path - elif remote_path == url.hidepassword(path): - remote_path = path + original_path = hglib.fromutf(self.pathentry.get_text()).strip() + remote_path = hglib.validate_synch_path(original_path, self.repo)   if not remote_path:   gdialog.Prompt(_('No remote path specified'),   _('Please enter or select a remote path'), @@ -1402,17 +1398,17 @@
  if self.forcepush:   title = _('Confirm Forced Push to Remote Repository')   text = _('Forced push to remote repository\n%s\n' - '(creating new heads in remote if needed)?') % remote_path + '(creating new heads in remote if needed)?') % original_path   buttontext = _('Forced &Push')   else:   title = _('Confirm Push to remote Repository') - text = _('Push to remote repository\n%s\n?') % remote_path + text = _('Push to remote repository\n%s\n?') % original_path   buttontext = _('&Push')   confirm_push = True   elif self.forcepush:   title = _('Confirm Forced Push')   text = _('Forced push to repository\n%s\n' - '(creating new heads if needed)?') % remote_path + '(creating new heads if needed)?') % original_path   buttontext = _('Forced &Push')   confirm_push = True   if confirm_push: