This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D9040 merge: use in-memory mergestate when using in-memory context
Closed	martinvonz	D9039 mergestate: extract a base class to be shared by future memmergestate
Closed	martinvonz	D9038 mergestate: extract overridable methods for making/restoring file backups
Closed	martinvonz	D9037 mergestate: initialize all properties in __init__()
Closed	martinvonz	D9036 mergestate: remove unnecessary clearing of `localctx` and `otherctx`
Closed	martinvonz	D9035 mergestate: move most of of reset() into start()
Closed	martinvonz	D9034 mergestate: make clean() only be about creating a clean mergestate
Closed	martinvonz	D9033 mergestate: split up reset() for its two use cases
Closed	martinvonz	D9032 mergestate: simplify reset(), knowing that `other` and `node` go together
Closed	martinvonz	D9031 mergestate: make some callers not pass pointless node argument

Diff 22679

	dirstate = repo.dirstate			dirstate = repo.dirstate
	dirchanges = [f for f in dirstate if dirstate[f] != b'n']			dirchanges = [f for f in dirstate if dirstate[f] != b'n']
	changedfiles.extend(dirchanges)			changedfiles.extend(dirchanges)

	repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)			repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
	repo.dirstate.write(repo.currenttransaction())			repo.dirstate.write(repo.currenttransaction())

	# clear resolve state			# clear resolve state
	mergestatemod.mergestate.clean(repo, repo[b'.'].node())			mergestatemod.mergestate.clean(repo)

	update = False			update = False

	strip(			strip(
	ui,			ui,
	repo,			repo,
	revs,			revs,
	backup=backup,			backup=backup,
	update=update,			update=update,
	force=opts.get(b'force'),			force=opts.get(b'force'),
	bookmarks=bookmarks,			bookmarks=bookmarks,
	soft=opts[b'soft'],			soft=opts[b'soft'],
	)			)

	return 0			return 0

	b'revisions %d and %d\n'			b'revisions %d and %d\n'
	)			)
	% parents			% parents
	)			)
	else:			else:
	ui.status(			ui.status(
	_(b'working directory now based on revision %d\n') % parents			_(b'working directory now based on revision %d\n') % parents
	)			)
	mergestatemod.mergestate.clean(self, self[b'.'].node())			mergestatemod.mergestate.clean(self)

	# TODO: if we know which new heads may result from this rollback, pass			# TODO: if we know which new heads may result from this rollback, pass
	# them to destroy(), which will prevent the branchhead cache from being			# them to destroy(), which will prevent the branchhead cache from being
	# invalidated.			# invalidated.
	self.destroyed()			self.destroyed()
	return 0			return 0

	def _buildcacheupdater(self, newtransaction):			def _buildcacheupdater(self, newtransaction):