| hg-reviewers |
We are gonna pass atomictemp keyword argument from merge.bachget to
vfs.call. Update all the frames to accept **kwargs and pass it to the next
function.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (15 lines) | |||
| M | mercurial/localrepo.py (5 lines) | |||
| M | mercurial/vfs.py (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | lothiraldan | ||
| Closed | lothiraldan |
| # fctx should be a filectx (not a workingfilectx) | # fctx should be a filectx (not a workingfilectx) | ||||
| # invert comparison to reuse the same code path | # invert comparison to reuse the same code path | ||||
| return fctx.cmp(self) | return fctx.cmp(self) | ||||
| def remove(self, ignoremissing=False): | def remove(self, ignoremissing=False): | ||||
| """wraps unlink for a repo's working directory""" | """wraps unlink for a repo's working directory""" | ||||
| self._repo.wvfs.unlinkpath(self._path, ignoremissing=ignoremissing) | self._repo.wvfs.unlinkpath(self._path, ignoremissing=ignoremissing) | ||||
| def write(self, data, flags, backgroundclose=False): | def write(self, data, flags, backgroundclose=False, **kwargs): | ||||
| """wraps repo.wwrite""" | """wraps repo.wwrite""" | ||||
| self._repo.wwrite(self._path, data, flags, | self._repo.wwrite(self._path, data, flags, | ||||
| backgroundclose=backgroundclose) | backgroundclose=backgroundclose, | ||||
| **kwargs) | |||||
| def markcopied(self, src): | def markcopied(self, src): | ||||
| """marks this file a copy of `src`""" | """marks this file a copy of `src`""" | ||||
| if self._repo.dirstate[self._path] in "nma": | if self._repo.dirstate[self._path] in "nma": | ||||
| self._repo.dirstate.copy(src, self._path) | self._repo.dirstate.copy(src, self._path) | ||||
| def clearunknown(self): | def clearunknown(self): | ||||
| """Removes conflicting items in the working directory so that | """Removes conflicting items in the working directory so that | ||||
| if len(matches) == 1 and matches.keys()[0] == path: | if len(matches) == 1 and matches.keys()[0] == path: | ||||
| return | return | ||||
| raise error.Abort("error: file '%s' cannot be written because " | raise error.Abort("error: file '%s' cannot be written because " | ||||
| " '%s/' is a folder in %s (containing %d " | " '%s/' is a folder in %s (containing %d " | ||||
| "entries: %s)" | "entries: %s)" | ||||
| % (path, path, self.p1(), len(matches), | % (path, path, self.p1(), len(matches), | ||||
| ', '.join(matches.keys()))) | ', '.join(matches.keys()))) | ||||
| def write(self, path, data, flags=''): | def write(self, path, data, flags='', **kwargs): | ||||
| if data is None: | if data is None: | ||||
| raise error.ProgrammingError("data must be non-None") | raise error.ProgrammingError("data must be non-None") | ||||
| self._auditconflicts(path) | self._auditconflicts(path) | ||||
| self._markdirty(path, exists=True, data=data, date=util.makedate(), | self._markdirty(path, exists=True, data=data, date=util.makedate(), | ||||
| flags=flags) | flags=flags) | ||||
| def setflags(self, path, l, x): | def setflags(self, path, l, x): | ||||
| self._markdirty(path, exists=True, date=util.makedate(), | self._markdirty(path, exists=True, date=util.makedate(), | ||||
| pass | pass | ||||
| def flags(self): | def flags(self): | ||||
| return self._parent.flags(self._path) | return self._parent.flags(self._path) | ||||
| def setflags(self, islink, isexec): | def setflags(self, islink, isexec): | ||||
| return self._parent.setflags(self._path, islink, isexec) | return self._parent.setflags(self._path, islink, isexec) | ||||
| def write(self, data, flags, backgroundclose=False): | def write(self, data, flags, backgroundclose=False, **kwargs): | ||||
| return self._parent.write(self._path, data, flags) | return self._parent.write(self._path, data, flags, **kwargs) | ||||
| def remove(self, ignoremissing=False): | def remove(self, ignoremissing=False): | ||||
| return self._parent.remove(self._path) | return self._parent.remove(self._path) | ||||
| def clearunknown(self): | def clearunknown(self): | ||||
| pass | pass | ||||
| class workingcommitctx(workingctx): | class workingcommitctx(workingctx): | ||||
| def data(self): | def data(self): | ||||
| return self._data | return self._data | ||||
| def remove(self, ignoremissing=False): | def remove(self, ignoremissing=False): | ||||
| """wraps unlink for a repo's working directory""" | """wraps unlink for a repo's working directory""" | ||||
| # need to figure out what to do here | # need to figure out what to do here | ||||
| del self._changectx[self._path] | del self._changectx[self._path] | ||||
| def write(self, data, flags): | def write(self, data, flags, **kwargs): | ||||
| """wraps repo.wwrite""" | """wraps repo.wwrite""" | ||||
| self._data = data | self._data = data | ||||
| class overlayfilectx(committablefilectx): | class overlayfilectx(committablefilectx): | ||||
| """Like memfilectx but take an original filectx and optional parameters to | """Like memfilectx but take an original filectx and optional parameters to | ||||
| override parts of it. This is useful when fctx.data() is expensive (i.e. | override parts of it. This is useful when fctx.data() is expensive (i.e. | ||||
| flag processor is expensive) and raw data, flags, and filenode could be | flag processor is expensive) and raw data, flags, and filenode could be | ||||
| reused (ex. rebase or mode-only amend a REVIDX_EXTSTORED file). | reused (ex. rebase or mode-only amend a REVIDX_EXTSTORED file). | ||||
| def decodeddata(self): | def decodeddata(self): | ||||
| with open(self._path, "rb") as f: | with open(self._path, "rb") as f: | ||||
| return f.read() | return f.read() | ||||
| def remove(self): | def remove(self): | ||||
| util.unlink(self._path) | util.unlink(self._path) | ||||
| def write(self, data, flags): | def write(self, data, flags, **kwargs): | ||||
| assert not flags | assert not flags | ||||
| with open(self._path, "w") as f: | with open(self._path, "w") as f: | ||||
| f.write(data) | f.write(data) | ||||
| def wread(self, filename): | def wread(self, filename): | ||||
| if self.wvfs.islink(filename): | if self.wvfs.islink(filename): | ||||
| data = self.wvfs.readlink(filename) | data = self.wvfs.readlink(filename) | ||||
| else: | else: | ||||
| data = self.wvfs.read(filename) | data = self.wvfs.read(filename) | ||||
| return self._filter(self._encodefilterpats, filename, data) | return self._filter(self._encodefilterpats, filename, data) | ||||
| def wwrite(self, filename, data, flags, backgroundclose=False): | def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs): | ||||
| """write ``data`` into ``filename`` in the working directory | """write ``data`` into ``filename`` in the working directory | ||||
| This returns length of written (maybe decoded) data. | This returns length of written (maybe decoded) data. | ||||
| """ | """ | ||||
| data = self._filter(self._decodefilterpats, filename, data) | data = self._filter(self._decodefilterpats, filename, data) | ||||
| if 'l' in flags: | if 'l' in flags: | ||||
| self.wvfs.symlink(data, filename) | self.wvfs.symlink(data, filename) | ||||
| else: | else: | ||||
| self.wvfs.write(filename, data, backgroundclose=backgroundclose) | self.wvfs.write(filename, data, backgroundclose=backgroundclose, | ||||
| **kwargs) | |||||
| if 'x' in flags: | if 'x' in flags: | ||||
| self.wvfs.setflags(filename, False, True) | self.wvfs.setflags(filename, False, True) | ||||
| return len(data) | return len(data) | ||||
| def wwritedata(self, filename, data): | def wwritedata(self, filename, data): | ||||
| return self._filter(self._decodefilterpats, filename, data) | return self._filter(self._decodefilterpats, filename, data) | ||||
| def currenttransaction(self): | def currenttransaction(self): | ||||
| def read(self, path): | def read(self, path): | ||||
| with self(path, 'rb') as fp: | with self(path, 'rb') as fp: | ||||
| return fp.read() | return fp.read() | ||||
| def readlines(self, path, mode='rb'): | def readlines(self, path, mode='rb'): | ||||
| with self(path, mode=mode) as fp: | with self(path, mode=mode) as fp: | ||||
| return fp.readlines() | return fp.readlines() | ||||
| def write(self, path, data, backgroundclose=False): | def write(self, path, data, backgroundclose=False, **kwargs): | ||||
| with self(path, 'wb', backgroundclose=backgroundclose) as fp: | with self(path, 'wb', backgroundclose=backgroundclose, **kwargs) as fp: | ||||
| return fp.write(data) | return fp.write(data) | ||||
| def writelines(self, path, data, mode='wb', notindexed=False): | def writelines(self, path, data, mode='wb', notindexed=False): | ||||
| with self(path, mode=mode, notindexed=notindexed) as fp: | with self(path, mode=mode, notindexed=notindexed) as fp: | ||||
| return fp.writelines(data) | return fp.writelines(data) | ||||
| def append(self, path, data): | def append(self, path, data): | ||||
| with self(path, 'ab') as fp: | with self(path, 'ab') as fp: | ||||