( )⚙ D11234 git: restore basic functionality (issue6545)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11234

git: restore basic functionality (issue6545)
ClosedPublic

Authored by durin42 on Jul 29 2021, 5:05 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0bdcb5ef932c: git: restore basic functionality (issue6545)
Summary

It looks like a big refactor happened on dirstate, and the git extension was
just ignored.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

durin42 created this revision.Jul 29 2021, 5:05 PM
durin42 added a commit: rHG0bdcb5ef932c: git: restore basic functionality (issue6545).Jul 29 2021, 11:31 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0bdcb5ef932c: git: restore basic functionality (issue6545) (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/git/dirstate.py (30 lines)

Diff 29742

hgext/git/dirstate.py

@interfaceutil.implementer(intdirstate.idirstate) @interfaceutil.implementer(intdirstate.idirstate)
class gitdirstate(object): class gitdirstate(object):
def __init__(self, ui, root, gitrepo): def __init__(self, ui, root, gitrepo):
self._ui = ui self._ui = ui
self._root = os.path.dirname(root) self._root = os.path.dirname(root)
self.git = gitrepo self.git = gitrepo
self._plchangecallbacks = {} self._plchangecallbacks = {}
# TODO: context.poststatusfixup is bad and uses this attribute
self._dirty = False
def p1(self): def p1(self):
try: try:
return self.git.head.peel().id.raw return self.git.head.peel().id.raw
except pygit2.GitError: except pygit2.GitError:
# Typically happens when peeling HEAD fails, as in an # Typically happens when peeling HEAD fails, as in an
# empty repository. # empty repository.
return sha1nodeconstants.nullid return sha1nodeconstants.nullid
return r return r
def matches(self, match): def matches(self, match):
for x in self.git.index: for x in self.git.index:
p = pycompat.fsencode(x.path) p = pycompat.fsencode(x.path)
if match(p): if match(p):
yield p yield p
def normal(self, f, parentfiledata=None): def set_clean(self, f, parentfiledata=None):
"""Mark a file normal and clean.""" """Mark a file normal and clean."""
# TODO: for now we just let libgit2 re-stat the file. We can # TODO: for now we just let libgit2 re-stat the file. We can
# clearly do better. # clearly do better.
def normallookup(self, f): def set_possibly_dirty(self, f):
"""Mark a file normal, but possibly dirty.""" """Mark a file normal, but possibly dirty."""
# TODO: for now we just let libgit2 re-stat the file. We can # TODO: for now we just let libgit2 re-stat the file. We can
# clearly do better. # clearly do better.
def walk(self, match, subrepos, unknown, ignored, full=True): def walk(self, match, subrepos, unknown, ignored, full=True):
# TODO: we need to use .status() and not iterate the index, # TODO: we need to use .status() and not iterate the index,
# because the index doesn't force a re-walk and so `hg add` of # because the index doesn't force a re-walk and so `hg add` of
# a new file without an intervening call to status will # a new file without an intervening call to status will
def savebackup(self, tr, backupname): def savebackup(self, tr, backupname):
# TODO: figure out a strategy for saving index backups. # TODO: figure out a strategy for saving index backups.
pass pass
def restorebackup(self, tr, backupname): def restorebackup(self, tr, backupname):
# TODO: figure out a strategy for saving index backups. # TODO: figure out a strategy for saving index backups.
pass pass
def set_tracked(self, f):
uf = pycompat.fsdecode(f)
if uf in self.git.index:
return False
index = self.git.index
index.read()
index.add(uf)
index.write()
return True
def add(self, f): def add(self, f):
index = self.git.index index = self.git.index
index.read() index.read()
index.add(pycompat.fsdecode(f)) index.add(pycompat.fsdecode(f))
index.write() index.write()
def drop(self, f): def drop(self, f):
index = self.git.index index = self.git.index
index.read() index.read()
fs = pycompat.fsdecode(f) fs = pycompat.fsdecode(f)
if fs in index: if fs in index:
index.remove(fs) index.remove(fs)
index.write() index.write()
def set_untracked(self, f):
index = self.git.index
index.read()
fs = pycompat.fsdecode(f)
if fs in index:
index.remove(fs)
index.write()
return True
return False
def remove(self, f): def remove(self, f):
index = self.git.index index = self.git.index
index.read() index.read()
index.remove(pycompat.fsdecode(f)) index.remove(pycompat.fsdecode(f))
index.write() index.write()
def copied(self, path): def copied(self, path):
# TODO: track copies? # TODO: track copies?
return None return None
def prefetch_parents(self): def prefetch_parents(self):
# TODO # TODO
pass pass
def update_file(self, *args, **kwargs):
# TODO
pass
@contextlib.contextmanager @contextlib.contextmanager
def parentchange(self): def parentchange(self):
# TODO: track this maybe? # TODO: track this maybe?
yield yield
def addparentchangecallback(self, category, callback): def addparentchangecallback(self, category, callback):
# TODO: should this be added to the dirstate interface? # TODO: should this be added to the dirstate interface?
self._plchangecallbacks[category] = callback self._plchangecallbacks[category] = callback