This is an archive of the discontinued Mercurial Phabricator instance.

rebase: use context to load mergestate instead of loading it directly
AbandonedPublic

Authored by durin42 on May 18 2020, 6:08 PM.

Reviewers

martinvonz
marmoute

Group Reviewers

hg-reviewers

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

According to IRC discussion, this series is not ready for review, so moving it out of yadda.

This revision now requires changes to proceed.Jul 31 2020, 12:03 PM

obsoleted by work martinvonz did

			Path	Packages
M			hgext/rebase.py (2 lines)

Commit	Parents	Author	Summary	Date
539525f4e7b3	bb575cebb495	Augie Fackler		May 18 2020, 4:02 PM

Status	Author	Revision
Abandoned	durin42	D8624 wip: this does not help but seems less wrong
Closed	durin42	D8623 rebase: add a config knob for forcing in-memory rebasing
Abandoned	durin42	D8570 rebase: use context to load mergestate instead of loading it directly
Abandoned	durin42	D8569 merge: get mergestate from context instead of directly
Abandoned	durin42	D8568 overlayworkingctx: implement mergestate() using in-memory mergestate
Abandoned	durin42	D8567 mergestate: implement trivial in-memory mergestate
Closed	durin42	D8566 cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))

	repo,			repo,
	wctx=self.wctx,			wctx=self.wctx,
	extra=extra,			extra=extra,
	commitmsg=commitmsg,			commitmsg=commitmsg,
	editor=editor,			editor=editor,
	user=ctx.user(),			user=ctx.user(),
	date=date,			date=date,
	)			)
	mergestatemod.mergestate.clean(repo)			self.wctx.mergestate(clean=True)
	else:			else:
	newnode = commitnode(			newnode = commitnode(
	repo,			repo,
	extra=extra,			extra=extra,
	commitmsg=commitmsg,			commitmsg=commitmsg,
	editor=editor,			editor=editor,
	user=ctx.user(),			user=ctx.user(),
	date=date,			date=date,

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	21447			May 18 2020, 6:08 PM	★	★