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 411efb45b828…

Parents 043e8034e9a9…

Parents 150a8475455f…

by Steve Borho

Changes to 2 files · Browse files at 411efb45b828 Showing diff from parent 043e8034e9a9 150a8475455f Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​bugreport.py Stacked
 
153
154
155
 
 
156
157
158
 
174
175
176
 
 
 
 
 
 
177
178
179
 
153
154
155
156
157
158
159
160
 
176
177
178
179
180
181
182
183
184
185
186
187
@@ -153,6 +153,8 @@
  bb = QDialogButtonBox(QDialogButtonBox.Close, centerButtons=True)   bb.rejected.connect(self.reject)   self.layout().addWidget(bb) + desktopgeom = qApp.desktop().availableGeometry() + self.resize(desktopgeom.size() * 0.20)     @pyqtSlot(QString)   def _openlink(self, ref): @@ -174,6 +176,12 @@
  qtlib.editfiles(fake, [fname], lineno, parent=self)   except Exception, e:   QDesktopServices.openUrl(QUrl.fromLocalFile(fname)) + if ref.startswith('#fix:'): + from tortoisehg.hgqt import settings + errtext = ref[5:].split(' ')[0] + sd = settings.SettingsDialog(configrepo=False, focus=errtext, + parent=self, root='') + sd.exec_()    def run(ui, *pats, **opts):   return BugReport(opts)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
374
375
376
 
 
377
378
379
 
374
375
376
377
378
379
380
381
@@ -374,6 +374,8 @@
  error.RepoLookupError: _('Try refreshing your repository.'),   error.ParseError: _('Error string "%(arg0)s" at %(arg1)s<br>Please '   '<a href="#edit:%(arg1)s">edit</a> your config'), + error.ConfigError: _('Configuration Error: "%(arg0)s",<br>Please ' + '<a href="#fix:%(arg0)s">fix</a> your config'),   error.Abort: _('Operation aborted:<br><br>%(arg0)s.'),   error.LockUnavailable: _('Repository is locked'),   }