This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3985

context: safegaurd against 'lx' being passed as file flag in manifest
ClosedPublic

Authored by pulkit on Jul 30 2018, 6:08 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd558e53cd6b6: context: safegaurd against 'lx' being passed as file flag in manifest
Summary

Subversion can have a file as executable link. When using hgsubversion, we will
have both islink and isexec True. This will lead to _flags being set to lx.
However, manifest expects flag to be one-byte so it will crash if 'lx' is
passed. Also it's impossible to have an executable link.

This patch will safegaurd us from having 'lx' being a possible value.

This was authored by Ivan Lezhankin from Yandex.

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.Jul 30 2018, 6:08 AM
indygreg accepted this revision.Jul 31 2018, 4:54 PM
This revision is now accepted and ready to land.Jul 31 2018, 4:54 PM
Closed by commit rHGd558e53cd6b6: context: safegaurd against 'lx' being passed as file flag in manifest (authored by pulkit). · Explain WhyJul 31 2018, 4:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (7 lines)

Diff 9677

mercurial/context.py

path is the normalized file path relative to repository root. path is the normalized file path relative to repository root.
data is the file content as a string. data is the file content as a string.
islink is True if the file is a symbolic link. islink is True if the file is a symbolic link.
isexec is True if the file is executable. isexec is True if the file is executable.
copied is the source file path if current file was copied in the copied is the source file path if current file was copied in the
revision being committed, or None.""" revision being committed, or None."""
super(memfilectx, self).__init__(repo, path, None, changectx) super(memfilectx, self).__init__(repo, path, None, changectx)
self._data = data self._data = data
self._flags = (islink and 'l' or '') + (isexec and 'x' or '') if islink:
self._flags = 'l'
elif isexec:
self._flags = 'x'
else:
self._flags = ''
self._copied = None self._copied = None
if copied: if copied:
self._copied = (copied, nullid) self._copied = (copied, nullid)
def data(self): def data(self):
return self._data return self._data
def remove(self, ignoremissing=False): def remove(self, ignoremissing=False):