This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10524

git: use the proper filenode for deleted files in changelog.changelogrevision
ClosedPublic

Authored by mharbison72 on Apr 27 2021, 7:52 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG03c73fc6f89a: git: use the proper filenode for deleted files in changelog.changelogrevision
Summary

Inline printing shows it still doesn't find the removed file in the test, but it
is at least a str instead of bytes like the immediate query before it that does
find files. Looking at the database, it doesn't look like the remove was
recorded. Additionally, hg log -r 'removes("re:.*")' stacktraces.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/git/gitlog.py (2 lines)

Diff 27432

hgext/git/gitlog.py

(hn, gitutil.nullgit), (hn, gitutil.nullgit),
) )
] ]
filesremoved = [ filesremoved = [
r[0] r[0]
for r in self._db.execute( for r in self._db.execute(
'SELECT filename FROM changedfiles ' 'SELECT filename FROM changedfiles '
'WHERE node = ? and filenode = ?', 'WHERE node = ? and filenode = ?',
(hn, nullhex), (hn, gitutil.nullgit),
) )
] ]
c = self.gitrepo[hn] c = self.gitrepo[hn]
return hgchangelog._changelogrevision( return hgchangelog._changelogrevision(
manifest=n, # pretend manifest the same as the commit node manifest=n, # pretend manifest the same as the commit node
user=b'%s <%s>' user=b'%s <%s>'
% (c.author.name.encode('utf8'), c.author.email.encode('utf8')), % (c.author.name.encode('utf8'), c.author.email.encode('utf8')),
date=(c.author.time, -c.author.offset * 60), date=(c.author.time, -c.author.offset * 60),