This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3120		Oct 26 2017, 12:48 AM	★	★
Diff 2	4193		Dec 7 2017, 4:22 PM	★	★
Diff 3	4212		Dec 7 2017, 4:45 PM	★	★
Diff 4	4264	rHG2bac2d836ce004c69e1dabab78bd086111586f48	Dec 7 2017, 7:07 PM	★	★

Status	Author	Revision
Closed	phillco	D1617 rebase: extract _assignworkingcopy
Closed	phillco	D1616 rebase: disable `inmemory` if the rebaseset contains the working copy
Closed	phillco	D1249 rebase: rerun a rebase on-disk if IMM merge conflicts arise
Closed	phillco	D1248 rebase: add concludememorynode(), and call it when rebasing in-memory
Closed	phillco	D1247 rebase: pass the wctx object (IMM or on-disk) to merge.update
Closed	phillco	D1246 rebase: do not update if IMM; instead, set the overlaywctx's parents
Closed	phillco	D1245 rebase: pass wctx to rebasenode()
Closed	phillco	D1244 overlayworkingctx: invalidate the manifest cache when changing parents
Closed	phillco	D1243 overlayworkingctx: add `_compact()`
Closed	phillco	D1242 overlayworkingctx: add ``tomemctx()`` and ``commit()``
Closed	phillco	D1241 overlayworkingctx: add _auditconflicts to write()
Closed	phillco	D1240 overlayworkingctx: inherit from committablectx instead of workingctx
Closed	phillco	D1239 overlayworkingctx: add a no-op ``clearunknown()``
Closed	phillco	D1238 overlayworkingctx: add _manifest, files(), added(), removed(), modified()
Closed	phillco	D1237 overlayworkingctx: add `_checkexist(path)`
Closed	phillco	D1236 overlayworkingctx: fix a bad reference to `self._path`
Closed	phillco	D1235 overlayworkingctx: track copy information in the context
Closed	phillco	D1234 rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Closed	phillco	D1233 rebase: do not bail on uncomitted changes if rebasing in-memory
Closed	phillco	D1232 rebase: add the --inmemory option flag; assign a wctx object for the rebase
Closed	phillco	D1231 overlayworkingctx: move _wrappedctx out of the constructor
Closed	phillco	D1230 overlayworkingctx: make clean() public
Closed	phillco	D1216 overlayworkingctx: remove flushall()
Closed	phillco	D1215 merge: skip subrepo state, update hooks, and updating the dirstate in IMM
Closed	phillco	D1214 merge: don't check for unknown files in IMM
Closed	phillco	D1213 merge: remove calls to flushall()
Closed	phillco	D1212 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Closed	phillco	D1211 context: switch ctx() use to changectx()
Abandoned	phillco	D1527 context: add an abstract base class for filectx

Diff 3120

hgext/rebase.py

	repo.ui.debug(" already in destination\n")			repo.ui.debug(" already in destination\n")
	repo.dirstate.write(repo.currenttransaction())			repo.dirstate.write(repo.currenttransaction())
	repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))			repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
	if base is not None:			if base is not None:
	repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))			repo.ui.debug(" detach base %d:%s\n" % (base, repo[base]))
	# When collapsing in-place, the parent is the common ancestor, we			# When collapsing in-place, the parent is the common ancestor, we
	# have to allow merging with it.			# have to allow merging with it.
	stats = mergemod.update(repo, rev, True, True, base, collapse,			stats = mergemod.update(repo, rev, True, True, base, collapse,
	labels=['dest', 'source'])			labels=['dest', 'source'], wc=wctx)
	if collapse:			if collapse:
	copies.duplicatecopies(repo, wctx, rev, dest)			copies.duplicatecopies(repo, wctx, rev, dest)
	else:			else:
	# If we're not using --collapse, we need to			# If we're not using --collapse, we need to
	# duplicate copies between the revision we're			# duplicate copies between the revision we're
	# rebasing and its first parent, but not			# rebasing and its first parent, but not
	# duplicate any copies that have already been			# duplicate any copies that have already been
	# performed in the destination.			# performed in the destination.

This is an archive of the discontinued Mercurial Phabricator instance.

rebase: pass the wctx object (IMM or on-disk) to merge.updateClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3120

hgext/rebase.py

rebase: pass the wctx object (IMM or on-disk) to merge.update
ClosedPublic

Revision Contents
Changeset List