This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11849

dirstate: remove unused method
ClosedPublic

Authored by Alphare on Dec 3 2021, 9:10 AM.

Details

Reviewers
SimonSapin
Group Reviewers
hg-reviewers
Commits
rHGc6d00759dc2b: dirstate: remove unused method
Summary

Its last usage was inlined in merge.py.

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

Alphare created this revision.Dec 3 2021, 9:10 AM
SimonSapin accepted this revision.Dec 7 2021, 6:16 AM
Alphare added a commit: rHGc6d00759dc2b: dirstate: remove unused method.Dec 7 2021, 9:38 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc6d00759dc2b: dirstate: remove unused method (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (8 lines)

Diff 31346

mercurial/dirstate.py

if self._map.hastrackeddir(d): if self._map.hastrackeddir(d):
break break
entry = self._map.get(d) entry = self._map.get(d)
if entry is not None and not entry.removed: if entry is not None and not entry.removed:
msg = _(b'file %r in dirstate clashes with %r') msg = _(b'file %r in dirstate clashes with %r')
msg %= (pycompat.bytestr(d), pycompat.bytestr(filename)) msg %= (pycompat.bytestr(d), pycompat.bytestr(filename))
raise error.Abort(msg) raise error.Abort(msg)
def _get_filedata(self, filename):
"""returns"""
s = os.lstat(self._join(filename))
mode = s.st_mode
size = s.st_size
mtime = timestamp.mtime_of(s)
return (mode, size, mtime)
def _discoverpath(self, path, normed, ignoremissing, exists, storemap): def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
if exists is None: if exists is None:
exists = os.path.lexists(os.path.join(self._root, path)) exists = os.path.lexists(os.path.join(self._root, path))
if not exists: if not exists:
# Maybe a path component exists # Maybe a path component exists
if not ignoremissing and b'/' in path: if not ignoremissing and b'/' in path:
d, f = path.rsplit(b'/', 1) d, f = path.rsplit(b'/', 1)
d = self._normalize(d, False, ignoremissing, None) d = self._normalize(d, False, ignoremissing, None)