This is an archive of the discontinued Mercurial Phabricator instance.

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

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

Download Raw Diff

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.

Event Timeline

mharbison72 created this revision.Apr 27 2021, 7:52 PM

Herald added a reviewer: durin42. · View Herald TranscriptApr 27 2021, 7:52 PM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-patches. · View Herald Transcript

mharbison72 added a child revision: D10525: git: use the correct type for stopping changelog.revs().Apr 27 2021, 7:52 PM

pulkit accepted this revision.Apr 28 2021, 6:27 AM

This revision is now accepted and ready to land.Apr 28 2021, 6:27 AM

mharbison72 added a commit: rHG03c73fc6f89a: git: use the proper filenode for deleted files in changelog.changelogrevision.May 3 2021, 10:07 AM

Closed by commit rHG03c73fc6f89a: git: use the proper filenode for deleted files in changelog.changelogrevision (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/git/gitlog.py (2 lines)

Status	Author	Revision
Closed	mharbison72	D10528 git: initialize `extra` to have at least the branch name for nullid
Closed	mharbison72	D10527 git: consistently use str for parents when rebuilding the index database
Closed	mharbison72	D10526 git: pass the correct type to the sqlite3 query for baselog.hasnode()
Closed	mharbison72	D10525 git: use the correct type for stopping changelog.revs()
Closed	mharbison72	D10524 git: use the proper filenode for deleted files in changelog.changelogrevision
Closed	mharbison72	D10523 tests: add coverage for git.changelog.headrevs(...)
Closed	mharbison72	D10522 git: make changelog.tiprev() return int instead of tuple (issue6510)
Closed	mharbison72	D10521 git: fix partial node matching
Closed	mharbison72	D10520 tests: stabilize test-git-interop.t for some versions of git

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),

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	27176		Apr 27 2021, 7:52 PM	★	★
Diff 2	27432	rHG03c73fc6f89a367135de78b6d08805a2fdbe7068	Apr 27 2021, 4:58 PM	★	★