Mercurial > hg > hg-git

diff hggit/git_handler.py @ 966:07473e474bc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Siddharth Agarwal <sid0@fb.com>
date Thu, 31 Dec 2015 12:45:30 -0800 (2015-12-31)
parents f2391790aaf6 06385a2b30f3
children afea0e32db20
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -1537,7 +1537,7 @@
             from mercurial import encoding
             old = encoding.encoding
             encoding.encoding = new_encoding
-        except ImportError:
+        except (AttributeError, ImportError):
             old = hgutil._encoding
             hgutil._encoding = new_encoding
         return old