Mercurial > public > mercurial-scm > hg

diff mercurial/phases.py @ 30634:ad15646dc61c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace os.environ with encoding.environ (part 1 of 5) os.environ is a dictionary which has string elements on Python 3. We have encoding.environ which take care of all these things. This is the first patch of 5 patch series which tend to replace the occurences of os.environ with encoding.environ as using os.environ will result in unusual behaviour.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 18 Dec 2016 01:34:41 +0530
parents 3a2357c31d2a
children bf81d3b7b2ba
line wrap: on
line diff
--- 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: