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 4da67d0db91b…

Parents 160a08dd5551…

Parents de756a7ca8d8…

by Steve Borho

Changes to 5 files · Browse files at 4da67d0db91b Showing diff from parent 160a08dd5551 de756a7ca8d8 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
 
237
238
239
 
240
241
242
 
237
238
239
240
241
242
243
@@ -237,6 +237,7 @@
    def setRepo(self, repo):   self.repo = repo + self.sci.repo = repo     @pyqtSlot(QAction)   def setMode(self, action):
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​hgemail.py Stacked
 
357
358
359
360
 
361
362
363
 
387
388
389
390
 
391
392
393
 
357
358
359
 
360
361
362
363
 
387
388
389
 
390
391
392
393
@@ -357,7 +357,7 @@
  _COLUMNS = [('rev', lambda ctx: '%d:%s' % (ctx.rev(), ctx)),   ('author', lambda ctx: hglib.username(ctx.user())),   ('date', lambda ctx: util.shortdate(ctx.date())), - ('description', lambda ctx: ctx.description().splitlines()[0])] + ('description', lambda ctx: ctx.longsummary())]     def __init__(self, repo, revs, selectedrevs, parent=None):   super(_ChangesetsModel, self).__init__(parent) @@ -387,7 +387,7 @@
  return rev in self._selectedrevs and Qt.Checked or Qt.Unchecked   if role == Qt.DisplayRole:   coldata = self._COLUMNS[index.column()][1] - return QVariant(hglib.tounicode(coldata(self._repo[rev]))) + return QVariant(hglib.tounicode(coldata(self._repo.changectx(rev))))     return QVariant()  
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
 
379
380
381
382
383
384
 
385
 
 
 
 
 
 
 
 
 
386
387
388
 
393
394
395
 
396
397
398
 
379
380
381
 
 
 
382
383
384
385
386
387
388
389
390
391
392
393
394
395
 
400
401
402
403
404
405
406
@@ -379,10 +379,17 @@
  def data(self, index, role):   if not index.isValid():   return nullvariant - if role in self._roleoffsets: - offset = self._roleoffsets[role] - else: + if role not in self._roleoffsets:   return nullvariant + try: + return self.safedata(index, role) + except Exception, e: + if role == Qt.DisplayRole: + return QVariant(hglib.tounicode(str(e))) + else: + return nullvariant + + def safedata(self, index, role):   row = index.row()   self.ensureBuilt(row=row)   graphlen = len(self.graph) @@ -393,6 +400,7 @@
  if data is None:   data = [None,] * (self._roleoffsets[Qt.DecorationRole]+1)   column = self._columns[index.column()] + offset = self._roleoffsets[role]   if role == Qt.DecorationRole:   if column != 'Graph':   return nullvariant
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
347
348
349
 
 
350
351
352
 
347
348
349
350
351
352
353
354
@@ -347,6 +347,8 @@
    def clearRevisionSet(self):   if not self.revset: + self.filterbar.hide() + self.toolbarVisibilityChanged.emit()   return   self.revset = []   if self.revsetfilter:
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
512
513
514
 
 
 
515
516
517
 
1072
1073
1074
1075
 
1076
1077
1078
 
1083
1084
1085
 
 
 
 
1086
1087
1088
 
512
513
514
515
516
517
518
519
520
 
1075
1076
1077
 
1078
1079
1080
1081
 
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
@@ -512,6 +512,9 @@
  try:   os.chdir(folder)   QProcess.startDetached(shell) + except EnvironmentError, e: + qtlib.InfoMsgBox(_('Repository not found'), + hglib.tounicode(str(e)))   finally:   os.chdir(cwd)   else: @@ -1072,7 +1075,7 @@
    def genfingerprint():   try: - pem = ssl.get_server_certificate( (host, 443) ) + pem = ssl.get_server_certificate( (host, port) )   der = ssl.PEM_cert_to_DER_cert(pem)   except Exception, e:   qtlib.WarningMsgBox(_('Certificate Query Error'), @@ -1083,6 +1086,10 @@
  le.setText(pretty)     user, host, port, folder, passwd, scheme = parseurl(origurl) + if port is None: + port = 443 + else: + port = int(port)   uhost = hglib.tounicode(host)   self.setWindowTitle(_('Security: ') + uhost)   self.setWindowFlags(self.windowFlags() & \