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

Merge with stable

Changeset a2b311fa5405…

Parents 2a6db97a7aba…

Parents 7c905f0daee9…

by Steve Borho

Changes to 3 files · Browse files at a2b311fa5405 Showing diff from parent 2a6db97a7aba 7c905f0daee9 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​postreview.py Stacked
 
36
37
38
39
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
 
387
388
389
390
391
 
 
 
 
 
392
393
394
 
36
37
38
 
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
60
61
 
383
384
385
 
 
386
387
388
389
390
391
392
393
@@ -36,30 +36,26 @@
  msg = _("Invalid Settings - Please provide your ReviewBoard username")   else:   rb = extensions.find("reviewboard") - plugin_msg = _("Invalid reviewboard plugin. Please download the " + try: + pwd = self.dialog.password + #if we don't have a password send something here to skip + #the cli getpass in the extension. We will set the password + #later + if not pwd: + pwd = "None" + + self.reviewboard = rb.make_rbclient(self.dialog.server, + self.dialog.user, + pwd) + self.loadCombos() + + except rb.ReviewBoardError, e: + msg = e.msg + except TypeError: + msg = _("Invalid reviewboard plugin. Please download the "   "mercurial reviewboard plugin version 3.5 or higher "   "from the website below.\n\n %s") % \   u'http://bitbucket.org/mdelagra/mercurial-reviewboard/' - try: - if float(rb.__version__[:3]) < 3.5: - msg = plugin_msg - else: - pwd = self.dialog.password - #if we don't have a password send something here to skip - #the cli getpass in the extension. We will set the password - #later - if not pwd: - pwd = "None" - - self.reviewboard = rb.make_rbclient(self.dialog.server, - self.dialog.user, - pwd) - self.loadCombos() - - except rb.ReviewBoardError, e: - msg = e.msg - except AttributeError: - msg = plugin_msg     self.dialog.error_message = msg   @@ -387,8 +383,11 @@
  @pyqtSlot()   def onSettingsButtonClicked(self):   from tortoisehg.hgqt import settings - - settings.SettingsDialog(parent=self, focus='reviewboard.server').exec_() + if settings.SettingsDialog(parent=self, focus='reviewboard.server').exec_(): + # not use repo.configChanged because it can clobber user input + # accidentally. + self.repo.invalidateui() # force reloading config immediately + self.readSettings()    def run(ui, *pats, **opts):   revs = opts.get('rev') or None
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​postreview.ui Stacked
 
338
339
340
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
341
342
343
 
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
@@ -338,6 +338,22 @@
  </hints>   </connection>   <connection> + <sender>settings_button</sender> + <signal>clicked()</signal> + <receiver>PostReviewDialog</receiver> + <slot>onSettingsButtonClicked()</slot> + <hints> + <hint type="sourcelabel"> + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel"> + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection>   <sender>close_button</sender>   <signal>clicked()</signal>   <receiver>PostReviewDialog</receiver>
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
54
55
56
57
58
 
 
59
60
61
 
 
62
63
64
 
54
55
56
 
 
57
58
59
 
 
60
61
62
63
64
@@ -54,11 +54,11 @@
  vbox = QVBoxLayout()   vbox.setContentsMargins(*MARGINS)   hbox.addLayout(vbox) - auto = QPushButton(_('Auto Resolve')) - auto.setToolTip(_('Attempt automatic merge')) + auto = QPushButton(_('Mercurial Resolve')) + auto.setToolTip(_('Attempt automatic (trivial) merge'))   auto.clicked.connect(lambda: self.merge('internal:merge')) - manual = QPushButton(_('Manual Resolve')) - manual.setToolTip(_('Merge with selected merge tool')) + manual = QPushButton(_('Tool Resolve')) + manual.setToolTip(_('Merge using selected merge tool'))   manual.clicked.connect(self.merge)   local = QPushButton(_('Take Local'))   local.setToolTip(_('Accept the local file version (yours)'))