This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5889

context: replace repeated "self._repo.dirstate" by "ds" variable
ClosedPublic

Authored by martinvonz on Feb 8 2019, 1:31 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfbd4ce55bcbd: context: replace repeated "self._repo.dirstate" by "ds" variable
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

martinvonz created this revision.Feb 8 2019, 1:31 AM
pulkit accepted this revision.Feb 8 2019, 7:12 AM
Closed by commit rHGfbd4ce55bcbd: context: replace repeated "self._repo.dirstate" by "ds" variable (authored by martinvonz). · Explain WhyFeb 8 2019, 7:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (19 lines)

Diff 13913

mercurial/context.py

return rejected return rejected
def forget(self, files, prefix=""): def forget(self, files, prefix=""):
with self._repo.wlock(): with self._repo.wlock():
ds = self._repo.dirstate ds = self._repo.dirstate
uipath = lambda f: ds.pathto(pathutil.join(prefix, f)) uipath = lambda f: ds.pathto(pathutil.join(prefix, f))
rejected = [] rejected = []
for f in files: for f in files:
if f not in self._repo.dirstate: if f not in ds:
self._repo.ui.warn(_("%s not tracked!\n") % uipath(f)) self._repo.ui.warn(_("%s not tracked!\n") % uipath(f))
rejected.append(f) rejected.append(f)
elif self._repo.dirstate[f] != 'a': elif ds[f] != 'a':
self._repo.dirstate.remove(f) ds.remove(f)
else: else:
self._repo.dirstate.drop(f) ds.drop(f)
return rejected return rejected
def copy(self, source, dest): def copy(self, source, dest):
try: try:
st = self._repo.wvfs.lstat(dest) st = self._repo.wvfs.lstat(dest)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
self._repo.ui.warn(_("%s does not exist!\n") self._repo.ui.warn(_("%s does not exist!\n")
% self._repo.dirstate.pathto(dest)) % self._repo.dirstate.pathto(dest))
return return
if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
self._repo.ui.warn(_("copy failed: %s is not a file or a " self._repo.ui.warn(_("copy failed: %s is not a file or a "
"symbolic link\n") "symbolic link\n")
% self._repo.dirstate.pathto(dest)) % self._repo.dirstate.pathto(dest))
else: else:
with self._repo.wlock(): with self._repo.wlock():
if self._repo.dirstate[dest] in '?': ds = self._repo.dirstate
self._repo.dirstate.add(dest) if ds[dest] in '?':
elif self._repo.dirstate[dest] in 'r': ds.add(dest)
self._repo.dirstate.normallookup(dest) elif ds[dest] in 'r':
self._repo.dirstate.copy(source, dest) ds.normallookup(dest)
ds.copy(source, dest)
def match(self, pats=None, include=None, exclude=None, default='glob', def match(self, pats=None, include=None, exclude=None, default='glob',
listsubrepos=False, badfn=None): listsubrepos=False, badfn=None):
r = self._repo r = self._repo
# Only a case insensitive filesystem needs magic to translate user input # Only a case insensitive filesystem needs magic to translate user input
# to actual case in the filesystem. # to actual case in the filesystem.
icasefs = not util.fscasesensitive(r.root) icasefs = not util.fscasesensitive(r.root)