--- a/mercurial/phases.py Tue Dec 20 20:28:41 2016 -0800
+++ b/mercurial/phases.py Sun Dec 18 01:34:41 2016 +0530
@@ -103,7 +103,6 @@
from __future__ import absolute_import
import errno
-import os
from .i18n import _
from .node import (
@@ -114,6 +113,7 @@
short,
)
from . import (
+ encoding,
error,
)
@@ -137,7 +137,7 @@
roots = [set() for i in allphases]
try:
f = None
- if 'HG_PENDING' in os.environ:
+ if 'HG_PENDING' in encoding.environ:
try:
f = repo.svfs('phaseroots.pending')
except IOError as inst: