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

postreview: added reviewboard server repository id to settings and fixed close event

Changeset c1f759023025…

Parent fc19db55e9e5…

by Michael De Wildt

Changes to 2 files · Browse files at c1f759023025 Showing diff from parent fc19db55e9e5 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​postreview.py Stacked
 
155
156
157
158
 
 
 
 
 
 
 
159
160
161
162
163
 
164
165
166
 
298
299
300
301
 
302
303
304
 
155
156
157
 
158
159
160
161
162
163
164
165
166
167
168
 
169
170
171
172
 
304
305
306
 
307
308
309
310
@@ -155,12 +155,18 @@
  self.qui.summary_edit.addItems(   s.value('reviewboard/summary_edit_history').toStringList())   - self.repo_id = s.value('reviewboard/repo_id').toInt()[0] + try: + self.repo_id = int(self.repo.ui.config('reviewboard', 'repoid')) + except Exception: + self.repo_id = None + + if not self.repo_id: + self.repo_id = s.value('reviewboard/repo_id').toInt()[0]     self.server = self.repo.ui.config('reviewboard', 'server')   self.user = self.repo.ui.config('reviewboard', 'user')   self.password = self.repo.ui.config('reviewboard', 'password') - self.browser = self.repo.ui.config('reviewboard', 'browser') + self.browser = self.repo.ui.config('reviewboard', 'browser')     def writeSettings(self):   s = QSettings() @@ -298,7 +304,7 @@
  self.qui.changesets_view.setEnabled(True)     def close(self): - super(PostReviewDialog, self).accept() + super(PostReviewDialog, self).close()     def accept(self):   if not self.password and not self.passwordPrompt():
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
558
559
560
 
 
561
562
563
 
558
559
560
561
562
563
564
565
@@ -558,6 +558,8 @@
  _('User name to authenticate with review board')),   _fi(_('Password'), 'reviewboard.password', genPasswordEntry,   _('Password to authenticate with review board')), + _fi(_('Server Repository ID'), 'reviewboard.repoid', genEditCombo, + _('The default repository id for this repo on the review board server')),   _fi(_('Target Groups'), 'reviewboard.target_groups', genEditCombo,   _('A comma separated list of target groups')),   _fi(_('Target People'), 'reviewboard.target_people', genEditCombo,