This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8271

git: correctly handle p1() on dirstate when underlying git repo is empty
ClosedPublic

Authored by durin42 on Mar 10 2020, 1:15 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGeb061d272af4: git: correctly handle p1() on dirstate when underlying git repo is empty
Summary

This shows up in my next change, which ends up making an empty git
repo and then running hg.

Diff Detail

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

Event Timeline

durin42 created this revision.Mar 10 2020, 1:15 PM
durin42 added a commit: rHGeb061d272af4: git: correctly handle p1() on dirstate when underlying git repo is empty.Mar 10 2020, 1:26 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGeb061d272af4: git: correctly handle p1() on dirstate when underlying git repo is empty (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 20668

hgext/git/dirstate.py

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 = {}
def p1(self): def p1(self):
try:
return self.git.head.peel().id.raw return self.git.head.peel().id.raw
except pygit2.GitError:
# Typically happens when peeling HEAD fails, as in an
# empty repository.
return nodemod.nullid
def p2(self): def p2(self):
# TODO: MERGE_HEAD? something like that, right? # TODO: MERGE_HEAD? something like that, right?
return nodemod.nullid return nodemod.nullid
def setparents(self, p1, p2=nodemod.nullid): def setparents(self, p1, p2=nodemod.nullid):
assert p2 == nodemod.nullid, b'TODO merging support' assert p2 == nodemod.nullid, b'TODO merging support'
self.git.head.set_target(gitutil.togitnode(p1)) self.git.head.set_target(gitutil.togitnode(p1))