Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 30636:f1c9fafcbf46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: replace os.environ with encoding.environ (part 3 of 5)
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 18 Dec 2016 01:54:36 +0530
parents c2154979409d
children 4d019d0e1b3b
comparison
equal deleted inserted replaced
30635:a150173da1c1 30636:f1c9fafcbf46
14 14
15 from .i18n import _ 15 from .i18n import _
16 from .node import nullid, short 16 from .node import nullid, short
17 17
18 from . import ( 18 from . import (
19 encoding,
19 error, 20 error,
20 formatter, 21 formatter,
21 match, 22 match,
22 pycompat, 23 pycompat,
23 scmutil, 24 scmutil,
163 else: 164 else:
164 # mimic HGMERGE if given tool not found 165 # mimic HGMERGE if given tool not found
165 return (force, force) 166 return (force, force)
166 167
167 # HGMERGE takes next precedence 168 # HGMERGE takes next precedence
168 hgmerge = os.environ.get("HGMERGE") 169 hgmerge = encoding.environ.get("HGMERGE")
169 if hgmerge: 170 if hgmerge:
170 if changedelete and not supportscd(hgmerge): 171 if changedelete and not supportscd(hgmerge):
171 return ":prompt", None 172 return ":prompt", None
172 else: 173 else:
173 return (hgmerge, hgmerge) 174 return (hgmerge, hgmerge)