This is an archive of the discontinued Mercurial Phabricator instance.

hgit: make sure repository is local before checking for store type
ClosedPublic

Authored by pulkit on Mar 4 2020, 11:47 AM.

Download Raw Diff

Details

Reviewers

durin42
mharbison72

Group Reviewers

hg-reviewers

Commits

rHGa2b49606a837: hgit: make sure repository is local before checking for store type

Summary

httppeer (and maybe others too) does not have a store attribute. This was
causing hg pull being broken on a hg repository when the extension is enabled.

localpeer.local() does returns a non-None value but I am not sure if it matters.

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

pulkit created this revision.Mar 4 2020, 11:47 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 4 2020, 11:47 AM

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

mharbison72 added a subscriber: mharbison72.Mar 4 2020, 12:30 PM

mharbison72 added inline comments.

hgext/git/__init__.py
233	It seems like the usual `reposetup()` check to handle peers is if not repo.local(): return IDK if it matters though. It looks like `localpeer.local()` returns a non-None value.

Could you rebase this on the new version of 6734?

This revision now requires changes to proceed.Mar 4 2020, 1:47 PM

durin42 edited parent revisions, added: D6734: git: skeleton of a new extension to _directly_ operate on git repos; removed: D8216: hgit: add addparentchangecallback() to dirstate.Mar 4 2020, 1:48 PM

pulkit retitled this revision from hgit: make sure repository has store attribute before checking for type to hgit: make sure repository is local before checking for store type.Mar 5 2020, 3:17 AM

pulkit edited the summary of this revision. (Show Details)

pulkit updated this revision to Diff 20493.

mharbison72 accepted this revision.Mar 5 2020, 7:06 AM

pulkit added a commit: rHGa2b49606a837: hgit: make sure repository is local before checking for store type.Mar 11 2020, 12:36 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGa2b49606a837: hgit: make sure repository is local before checking for store type (authored by pulkit). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	20460		Mar 4 2020, 11:47 AM	★	★
Diff 2	20493		Mar 5 2020, 3:17 AM	★	★
Diff 3	20736	rHGa2b49606a83759b26814d1fc10050e20f9caf528	Mar 4 2020, 11:43 AM	★	★

Status	Author	Revision
Closed	durin42	D6837 cleanup: fix leakage of dirstate._map to client code
Abandoned	durin42	D6748 hgit: define invalidatecaches for gitstore()
Abandoned	durin42	D6747 hgit: fix some pyflakes and check-code warning
Abandoned	durin42	D7189 git: use bytes in command name, not unicode
Abandoned	durin42	D7188 git: force using bytes in command name
Abandoned	durin42	D8177 hgit: fix some issues spotted by pylint integration with editor
Abandoned	durin42	D8216 hgit: add addparentchangecallback() to dirstate
Closed	pulkit	D8217 hgit: make sure repository is local before checking for store type
Closed	durin42	D6734 git: skeleton of a new extension to _directly_ operate on git repos
Closed	durin42	D6839 idirstate: group private methods and attrs that are in the interface
Closed	durin42	D6838 idirstate: remove now non-public _map attribute
Closed	durin42	D6836 interfaces: introduce an interface for dirstate implementations

Diff 20736

hgext/git/init.py

	path = os.path.abspath(dest)			path = os.path.abspath(dest)
	# TODO: walk up looking for the git repo			# TODO: walk up looking for the git repo
	_setupdothg(ui, path)			_setupdothg(ui, path)
	return 0			return 0
	return orig(ui, dest=dest, **opts)			return orig(ui, dest=dest, **opts)


	def reposetup(ui, repo):			def reposetup(ui, repo):
	if isinstance(repo.store, gitstore):			if repo.local() and isinstance(repo.store, gitstore):
				mharbison72Unsubmitted Not Done It seems like the usual `reposetup()` check to handle peers is if not repo.local(): return IDK if it matters though. It looks like `localpeer.local()` returns a non-None value. mharbison72: It seems like the usual `reposetup()` check to handle peers is if not repo.local()…
	orig = repo.__class__			orig = repo.__class__
	repo.store._progress_factory = repo.ui.makeprogress			repo.store._progress_factory = repo.ui.makeprogress

	class gitlocalrepo(orig):			class gitlocalrepo(orig):
	def _makedirstate(self):			def _makedirstate(self):
	# TODO narrow support here			# TODO narrow support here
	return dirstate.gitdirstate(			return dirstate.gitdirstate(
	self.ui, self.vfs.base, self.store.git			self.ui, self.vfs.base, self.store.git