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 bb225e47ffb7…

Parents cccb9aaa6d4e…

Parents 2ad2ad3c07e2…

by Steve Borho

Changes to one file · Browse files at bb225e47ffb7 Showing diff from parent cccb9aaa6d4e 2ad2ad3c07e2 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
17
18
19
 
20
21
22
 
372
373
374
 
375
376
377
 
17
18
19
20
21
22
23
 
373
374
375
376
377
378
379
@@ -17,6 +17,7 @@
 import sys  import subprocess  import traceback +import zlib    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -372,6 +373,7 @@
  # It doesn't check the hierarchy of exception classes for simplicity.   _recoverableexc = {   error.RepoLookupError: _('Try refreshing your repository.'), + zlib.error: _('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 '