This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9068

git: pass `id` attribute of `pygit2.Tree` object
ClosedPublic

Authored by sheehan on Sep 22 2020, 9:40 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG73a5aa5e1857: git: pass `id` attribute of `pygit2.Tree` object
Summary

pygit2's Repository object expects an instance of Oid
to return the corresponding object, instead of the object
itself.

After this change and D9062, hg commit -i seems to work,
unless it hits a case folding assertion (ie trying to add
a file like README.md).

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

sheehan created this revision.Sep 22 2020, 9:40 AM
sheehan added a comment.Sep 22 2020, 9:41 AM

There are test failures on test-git-interop.t that also fail on 89f0d9f87701cb, but I'm pretty sure this doesn't break anything.

sheehan added a commit: rHG73a5aa5e1857: git: pass `id` attribute of `pygit2.Tree` object.Sep 22 2020, 1:19 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG73a5aa5e1857: git: pass `id` attribute of `pygit2.Tree` object (authored by sheehan). · Explain Why
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Sep 22 2020, 1:19 PM

All tests are passing for me under python3, including with this patch. Pushed, thanks!

(Can I interest you in a follow-up to cover this for hg commit -i somehow?)

Revision Contents
Changeset List

PathPackages
Mhgext/git/manifest.py (3 lines)

Diff 22758

hgext/git/manifest.py

if d == b'': if d == b'':
# loaded root tree above # loaded root tree above
continue continue
comps = d.split(b'/') comps = d.split(b'/')
full = b'' full = b''
for part in comps: for part in comps:
parent = trees[full] parent = trees[full]
try: try:
new = self._repo[parent[pycompat.fsdecode(part)]] parent_tree_id = parent[pycompat.fsdecode(part)].id
new = self._repo[parent_tree_id]
except KeyError: except KeyError:
# new directory # new directory
new = None new = None
full += b'/' + part full += b'/' + part
if new is not None: if new is not None:
# existing directory # existing directory
trees[full] = new trees[full] = new
builders[full] = self._repo.TreeBuilder(new) builders[full] = self._repo.TreeBuilder(new)