# HG changeset patch # User Augie Fackler # Date 1240625279 18000 # Node ID 8ff0b3261b7fd4144d695c943d4a2097811c1241 # Parent 4a327bfc69c6b6f5f6f31bac4bfc4e9b029a6fc2 util: drop 1.2 support in the encoding swap. diff --git a/util.py b/util.py --- a/util.py +++ b/util.py @@ -114,12 +114,9 @@ def describe_commit(ui, h, b): def swap_out_encoding(new_encoding="UTF-8"): - """ Utility for mercurial incompatibility changes, can be removed after 1.3""" - try: - from mercurial import encoding - old = encoding.encoding - encoding.encoding = new_encoding - except ImportError: - old = hgutil._encoding - hgutil._encoding = new_encoding + """ Utility for mercurial incompatibility changes, can be removed after 1.3 + """ + from mercurial import encoding + old = encoding.encoding + encoding.encoding = new_encoding return old