This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1797

py3: make sure we open the file to write in bytes mode
ClosedPublic

Authored by pulkit on Dec 28 2017, 7:49 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGf2f0a777b2e2: py3: make sure we open the file to write in bytes mode
Summary

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

pulkit created this revision.Dec 28 2017, 7:49 PM
durin42 accepted this revision.Jan 10 2018, 5:56 PM
This revision is now accepted and ready to land.Jan 10 2018, 5:56 PM
Closed by commit rHGf2f0a777b2e2: py3: make sure we open the file to write in bytes mode (authored by pulkit). · Explain WhyJan 10 2018, 6:04 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 11 2018, 9:39 AM
yuja added inline comments.
mercurial/subrepo.py
844

No. Here we explicitly states that we want to open a file in "text" mode.

Needs something like ac69675fff1c.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (4 lines)

Diff 4780

mercurial/subrepo.py

Each remote repo requires its own store hash cache, because a subrepo Each remote repo requires its own store hash cache, because a subrepo
store may be "clean" versus a given remote repo, but not versus another store may be "clean" versus a given remote repo, but not versus another
''' '''
cachefile = _getstorehashcachename(remotepath) cachefile = _getstorehashcachename(remotepath)
with self._repo.lock(): with self._repo.lock():
storehash = list(self._calcstorehash(remotepath)) storehash = list(self._calcstorehash(remotepath))
vfs = self._cachestorehashvfs vfs = self._cachestorehashvfs
vfs.writelines(cachefile, storehash, mode='w', notindexed=True) vfs.writelines(cachefile, storehash, mode='wb', notindexed=True)
def _getctx(self): def _getctx(self):
'''fetch the context for this subrepo revision, possibly a workingctx '''fetch the context for this subrepo revision, possibly a workingctx
''' '''
if self._ctx.rev() is None: if self._ctx.rev() is None:
return self._repo[None] # workingctx if parent is workingctx return self._repo[None] # workingctx if parent is workingctx
else: else:
rev = self._state[1] rev = self._state[1]
self.ui.setconfig('paths', key, value, 'subrepo') self.ui.setconfig('paths', key, value, 'subrepo')
defpath = _abssource(self._repo, abort=False) defpath = _abssource(self._repo, abort=False)
defpushpath = _abssource(self._repo, True, abort=False) defpushpath = _abssource(self._repo, True, abort=False)
addpathconfig('default', defpath) addpathconfig('default', defpath)
if defpath != defpushpath: if defpath != defpushpath:
addpathconfig('default-push', defpushpath) addpathconfig('default-push', defpushpath)
fp = self._repo.vfs("hgrc", "w", text=True) fp = self._repo.vfs("hgrc", "wb", text=True)
yujaUnsubmitted
Not Done

No. Here we explicitly states that we want to open a file in "text" mode.

Needs something like ac69675fff1c.

yuja: No. Here we explicitly states that we want to open a file in "text" mode. Needs something like…
try: try:
fp.write(''.join(lines)) fp.write(''.join(lines))
finally: finally:
fp.close() fp.close()
@annotatesubrepoerror @annotatesubrepoerror
def add(self, ui, match, prefix, explicitonly, **opts): def add(self, ui, match, prefix, explicitonly, **opts):
return cmdutil.add(ui, self._repo, match, return cmdutil.add(ui, self._repo, match,