This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7544

subrepo: use pycompat.open directly instead of importing open from pycompat
ClosedPublic

Authored by spectral on Dec 3 2019, 8:35 PM.

Details

Reviewers
dlax
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGaea70ca7dd85: subrepo: use pycompat.open directly instead of importing open from pycompat

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Dec 3 2019, 8:35 PM
mharbison72 added a subscriber: mharbison72.Dec 3 2019, 11:51 PM

I don't think this is correct, because open is imported from pycompat at the top of the file, and that will sysstr() the mode. But this does seem confusing- see D7517.

spectral retitled this revision from py3: remove incorrect b prefix on second argument to open in subrepo.py to subrepo: use pycompat.open directly instead of importing open from pycompat.Dec 4 2019, 1:16 AM
spectral updated this revision to Diff 18468.
spectral added a comment.Dec 4 2019, 1:21 AM
In D7544#110954, @mharbison72 wrote:

I don't think this is correct, because open is imported from pycompat at the top of the file, and that will sysstr() the mode. But this does seem confusing- see D7517.

Ah, so it is. Since this is the only use of open in this file, I've switched to just using pycompat.open directly in this location. I'm also fine with just dropping this change.

dlax accepted this revision.Dec 4 2019, 3:46 AM
mharbison72 accepted this revision.Dec 4 2019, 7:32 AM
spectral added a commit: rHGaea70ca7dd85: subrepo: use pycompat.open directly instead of importing open from pycompat.Dec 4 2019, 2:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGaea70ca7dd85: subrepo: use pycompat.open directly instead of importing open from pycompat (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (3 lines)

Diff 18469

mercurial/subrepo.py

import re import re
import stat import stat
import subprocess import subprocess
import sys import sys
import tarfile import tarfile
import xml.dom.minidom import xml.dom.minidom
from .i18n import _ from .i18n import _
from .pycompat import open
from . import ( from . import (
cmdutil, cmdutil,
encoding, encoding,
error, error,
exchange, exchange,
logcmdutil, logcmdutil,
match as matchmod, match as matchmod,
node, node,
env[b'LC_ALL'] = b'C' env[b'LC_ALL'] = b'C'
# fix for Git CVE-2015-7545 # fix for Git CVE-2015-7545
if b'GIT_ALLOW_PROTOCOL' not in env: if b'GIT_ALLOW_PROTOCOL' not in env:
env[b'GIT_ALLOW_PROTOCOL'] = b'file:git:http:https:ssh' env[b'GIT_ALLOW_PROTOCOL'] = b'file:git:http:https:ssh'
# unless ui.quiet is set, print git's stderr, # unless ui.quiet is set, print git's stderr,
# which is mostly progress and useful info # which is mostly progress and useful info
errpipe = None errpipe = None
if self.ui.quiet: if self.ui.quiet:
errpipe = open(os.devnull, b'w') errpipe = pycompat.open(os.devnull, b'w')
if self.ui._colormode and len(commands) and commands[0] == b"diff": if self.ui._colormode and len(commands) and commands[0] == b"diff":
# insert the argument in the front, # insert the argument in the front,
# the end of git diff arguments is used for paths # the end of git diff arguments is used for paths
commands.insert(1, b'--color') commands.insert(1, b'--color')
p = subprocess.Popen( p = subprocess.Popen(
pycompat.rapply( pycompat.rapply(
procutil.tonativestr, [self._gitexecutable] + commands procutil.tonativestr, [self._gitexecutable] + commands
), ),