This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6738

unshelve: add --unresolved flag to unshelve mergestate with unresolved files
Needs RevisionPublic

Authored by navaneeth.suresh on Aug 17 2019, 4:39 PM.

Download Raw Diff

Details

Reviewers

baymax

Group Reviewers

hg-reviewers

Summary

hg unshelve --unresolved will get the user back to the old unresolved merge by
the following steps:

Step 1: If the user has committed new changesets after shelving the changes,
they must update the working directory to one of the merge parents.

Step 2: Change parents of dirstate to p1 and p2.

Step 3: In order to restore our partially resolved state, we will write from
data stored in changeset extras.

Step 4: We now have a state in which files marked as resolved might have
conflicts. But, we will apply the changes in shelve on the top of this so that we
can get our old unresolved merge again by the usual unshelve mechanism.

The usual rebase step is avoided on unresolved shelve changesets.

$ hg unshelve --unresolved will abort when:

The working directory is dirty.
If there is an ongoing merge.
If the working directory is not at either p1 or p2.

(p1, p2 are the parents of the unresolved shelve changeset)

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

navaneeth.suresh created this revision.Aug 17 2019, 4:39 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 17 2019, 4:39 PM

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

navaneeth.suresh added a parent revision: D6737: shelve: add --unresolved flag to shelve mergestate with unresolved files.Aug 17 2019, 4:48 PM

navaneeth.suresh added a child revision: D6739: unshelve: add abort on using --interactive and --unresolved together.

pulkit added a subscriber: pulkit.Aug 19 2019, 11:10 AM

pulkit added inline comments.

mercurial/shelve.py
788	we should write both the versions, `_writerecords()` should be used.

navaneeth.suresh added inline comments.Aug 20 2019, 9:20 AM

mercurial/shelve.py
788	i had tried to support it earlier. but, it throws the following error. i think it's okay to use the latest format only since, we haven't stored any mergestate using the previous format. the repo won't get corrupted. + Traceback (most recent call last): + File "/tmp/hgtests.TEheee/install/bin/hg", line 43, in <module> + dispatch.run() + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 99, in run + status = dispatch(req) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 225, in dispatch + ret = _runcatch(req) or 0 + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 376, in _runcatch + return _callcatch(ui, _runcatchfunc) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 384, in _callcatch + return scmutil.callcatch(ui, func) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/scmutil.py", line 167, in callcatch + return func() + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 367, in _runcatchfunc + return _dispatch(req) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1021, in _dispatch + cmdpats, cmdoptions) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 756, in runcommand + ret = _runcommand(ui, options, cmd, d) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1030, in _runcommand + return cmdfunc() + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1018, in <lambda> + d = lambda: util.checksignature(func)(ui, args, strcmdopt) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/util.py", line 1682, in check + return func(args, *kwargs) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/commands.py", line 6229, in unshelve + return shelvemod.dounshelve(ui, repo, shelved, **opts) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 1090, in dounshelve + restoreunresolvedshelve(ui, repo, shelvectx, basename) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 754, in restoreunresolvedshelve + ms._writerecords(_decodemergerecords(records)) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 452, in _writerecords + self._writerecordsv1(records) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 460, in _writerecordsv1 + assert lrecords[0] == RECORD_LOCAL + AssertionError + [1]

mercurial/shelve.py

788

i had tried to support it earlier. but, it throws the following error. i think it's okay to use the latest format only since, we haven't stored any mergestate using the previous format. the repo won't get corrupted.

+  Traceback (most recent call last):
+    File "/tmp/hgtests.TEheee/install/bin/hg", line 43, in <module>
+      dispatch.run()
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 99, in run
+      status = dispatch(req)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 225, in dispatch
+      ret = _runcatch(req) or 0
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 376, in _runcatch
+      return _callcatch(ui, _runcatchfunc)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 384, in _callcatch
+      return scmutil.callcatch(ui, func)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/scmutil.py", line 167, in callcatch
+      return func()
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 367, in _runcatchfunc
+      return _dispatch(req)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1021, in _dispatch
+      cmdpats, cmdoptions)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 756, in runcommand
+      ret = _runcommand(ui, options, cmd, d)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1030, in _runcommand
+      return cmdfunc()
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1018, in <lambda>
+      d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/util.py", line 1682, in check
+      return func(*args, **kwargs)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/commands.py", line 6229, in unshelve
+      return shelvemod.dounshelve(ui, repo, *shelved, **opts)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 1090, in dounshelve
+      restoreunresolvedshelve(ui, repo, shelvectx, basename)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 754, in restoreunresolvedshelve
+      ms._writerecords(_decodemergerecords(records))
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 452, in _writerecords
+      self._writerecordsv1(records)
+    File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 460, in _writerecordsv1
+      assert lrecords[0] == RECORD_LOCAL
+  AssertionError
+  [1]

pulkit added inline comments.Aug 25 2019, 10:25 AM

mercurial/shelve.py
788	Then we are somehow parsing or building the records in not correct way.

pulkit added inline comments.Sep 12 2019, 1:47 AM

mercurial/shelve.py
788	Did you manage to find why that error comes up?

navaneeth.suresh updated this revision to Diff 16808.Oct 4 2019, 4:46 PM

navaneeth.suresh added inline comments.Oct 4 2019, 4:53 PM

mercurial/shelve.py
788	Yes. This was because we are not storing the local version of the files. So, it will be `None` as returned while reading the mergestate. So, it should throw an `AssertionError`. We can get rid of this only when we store the local versions of the files in future.

navaneeth.suresh updated this revision to Diff 16815.Oct 5 2019, 9:55 AM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:31 PM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (4 lines)
M			mercurial/shelve.py (58 lines)
M			tests/test-completion.t (2 lines)
M			tests/test-shelve-unresolved.t (287 lines)

Commit	Parents	Author	Summary	Date
58745b7edb44	0d2d90e7b496	Navaneeth Suresh		Aug 17 2019, 3:57 PM

Status	Author	Revision
Needs Revision	navaneeth.suresh	D6739 unshelve: add abort on using --interactive and --unresolved together
Needs Revision	navaneeth.suresh	D6738 unshelve: add --unresolved flag to unshelve mergestate with unresolved files
Needs Revision	navaneeth.suresh	D6737 shelve: add --unresolved flag to shelve mergestate with unresolved files
Needs Revision	navaneeth.suresh	D6966 shelve: add method for storing mergestate in changeset extras

Diff 16808

mercurial/commands.py

	('i', 'interactive', None,			('i', 'interactive', None,
	_('use interactive mode (EXPERIMENTAL)')),			_('use interactive mode (EXPERIMENTAL)')),
	('k', 'keep', None,			('k', 'keep', None,
	_('keep shelve after unshelving')),			_('keep shelve after unshelving')),
	('n', 'name', '',			('n', 'name', '',
	_('restore shelved change with given name'), _('NAME')),			_('restore shelved change with given name'), _('NAME')),
	('t', 'tool', '', _('specify merge tool')),			('t', 'tool', '', _('specify merge tool')),
	('', 'date', '',			('', 'date', '',
	_('set date for temporary commits (DEPRECATED)'), _('DATE'))],			_('set date for temporary commits (DEPRECATED)'), _('DATE')),
				('', 'unresolved', None,
				_('unshelve mergestate with unresolved files'))],
	_('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),			_('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),
	helpcategory=command.CATEGORY_WORKING_DIRECTORY)			helpcategory=command.CATEGORY_WORKING_DIRECTORY)
	def unshelve(ui, repo, shelved, *opts):			def unshelve(ui, repo, shelved, *opts):
	"""restore a shelved change to the working directory			"""restore a shelved change to the working directory

	This command accepts an optional name of a shelved change to			This command accepts an optional name of a shelved change to
	restore. If none is given, the most recent shelved change is used.			restore. If none is given, the most recent shelved change is used.

mercurial/shelve.py


	def _includeunknownfiles(repo, pats, opts, extra):			def _includeunknownfiles(repo, pats, opts, extra):
	s = repo.status(match=scmutil.match(repo[None], pats, opts),			s = repo.status(match=scmutil.match(repo[None], pats, opts),
	unknown=True)			unknown=True)
	if s.unknown:			if s.unknown:
	extra['shelve_unknown'] = '\0'.join(s.unknown)			extra['shelve_unknown'] = '\0'.join(s.unknown)
	repo[None].add(s.unknown)			repo[None].add(s.unknown)

				def _isunresolvedshelve(shelvectx):
				"""Checks whether the given shelve is unresolved or not"""
				return shelvectx.extra().get('unresolved-merge')

	def _finishshelve(repo, tr):			def _finishshelve(repo, tr):
	if phases.supportinternal(repo):			if phases.supportinternal(repo):
	tr.close()			tr.close()
	else:			else:
	_aborttransaction(repo, tr)			_aborttransaction(repo, tr)

	def createcmd(ui, repo, pats, opts):			def createcmd(ui, repo, pats, opts):
	"""subcommand that creates a new shelve"""			"""subcommand that creates a new shelve"""
	ui.popbuffer()			ui.popbuffer()

	def restorebranch(ui, repo, branchtorestore):			def restorebranch(ui, repo, branchtorestore):
	if branchtorestore and branchtorestore != repo.dirstate.branch():			if branchtorestore and branchtorestore != repo.dirstate.branch():
	repo.dirstate.setbranch(branchtorestore)			repo.dirstate.setbranch(branchtorestore)
	ui.status(_('marked working directory as branch %s\n')			ui.status(_('marked working directory as branch %s\n')
	% branchtorestore)			% branchtorestore)

				def restoreunresolvedshelve(ui, repo, shelvectx, basename):
				"""Change the parents of the dirstate to the parents of the stored
				unresolved shelvectx.

				Rewrite the mergestate from changeset extra to restore the status
				of the resolved files in the shelvectx.
				"""
				p1, p2 = shelvectx.parents()
				repo.dirstate.setparents(p1.node(), p2.node())

				data = shelvectx.extra().get('mergerecords')
				records = []
				off = 0
				pulkitUnsubmitted Not Done we should write both the versions, `_writerecords()` should be used. pulkit: we should write both the versions, `_writerecords()` should be used.
				navaneeth.sureshAuthorUnsubmitted Not Done i had tried to support it earlier. but, it throws the following error. i think it's okay to use the latest format only since, we haven't stored any mergestate using the previous format. the repo won't get corrupted. + Traceback (most recent call last): + File "/tmp/hgtests.TEheee/install/bin/hg", line 43, in <module> + dispatch.run() + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 99, in run + status = dispatch(req) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 225, in dispatch + ret = _runcatch(req) or 0 + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 376, in _runcatch + return _callcatch(ui, _runcatchfunc) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 384, in _callcatch + return scmutil.callcatch(ui, func) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/scmutil.py", line 167, in callcatch + return func() + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 367, in _runcatchfunc + return _dispatch(req) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1021, in _dispatch + cmdpats, cmdoptions) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 756, in runcommand + ret = _runcommand(ui, options, cmd, d) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1030, in _runcommand + return cmdfunc() + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/dispatch.py", line 1018, in <lambda> + d = lambda: util.checksignature(func)(ui, args, strcmdopt) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/util.py", line 1682, in check + return func(args, *kwargs) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/commands.py", line 6229, in unshelve + return shelvemod.dounshelve(ui, repo, shelved, opts) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 1090, in dounshelve + restoreunresolvedshelve(ui, repo, shelvectx, basename) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/shelve.py", line 754, in restoreunresolvedshelve + ms._writerecords(_decodemergerecords(records)) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 452, in _writerecords + self._writerecordsv1(records) + File "/tmp/hgtests.TEheee/install/lib/python/mercurial/merge.py", line 460, in _writerecordsv1 + assert lrecords[0] == RECORD_LOCAL + AssertionError + [1] navaneeth.suresh:** i had tried to support it earlier. but, it throws the following error. i think it's okay to use…
				pulkitUnsubmitted Not Done Then we are somehow parsing or building the records in not correct way. pulkit: Then we are somehow parsing or building the records in not correct way.
				pulkitUnsubmitted Not Done Did you manage to find why that error comes up? pulkit: Did you manage to find why that error comes up?
				navaneeth.sureshAuthorUnsubmitted Done Yes. This was because we are not storing the local version of the files. So, it will be `None` as returned while reading the mergestate. So, it should throw an `AssertionError`. We can get rid of this only when we store the local versions of the files in future. navaneeth.suresh: Yes. This was because we are not storing the local version of the files. So, it will be `None`…
				end = len(data)
				while off < end:
				rtype = data[off:off + 1]
				off += 1
				length = _unpack('>I', data[off:(off + 4)])[0]
				off += 4
				record = data[off:(off + length)]
				off += length
				if rtype == RECORD_OVERRIDE:
				rtype, record = record[0:1], record[1:]
				records.append((rtype, record))
				ms = merge.mergestate.clean(repo)
				ms._writerecordsv2(records)

	def unshelvecleanup(ui, repo, name, opts):			def unshelvecleanup(ui, repo, name, opts):
	"""remove related files after an unshelve"""			"""remove related files after an unshelve"""
	if not opts.get('keep'):			if not opts.get('keep'):
	for filetype in shelvefileextensions:			for filetype in shelvefileextensions:
	shfile = shelvedfile(repo, name, filetype)			shfile = shelvedfile(repo, name, filetype)
	if shfile.exists():			if shfile.exists():
	shfile.movetobackup()			shfile.movetobackup()
	cleanupoldbackups(repo)			cleanupoldbackups(repo)
	hint = _("run hg status to see which files are missing")			hint = _("run hg status to see which files are missing")
	raise error.Abort(m, hint=hint)			raise error.Abort(m, hint=hint)

	def dounshelve(ui, repo, shelved, *opts):			def dounshelve(ui, repo, shelved, *opts):
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	abortf = opts.get('abort')			abortf = opts.get('abort')
	continuef = opts.get('continue')			continuef = opts.get('continue')
	interactive = opts.get('interactive')			interactive = opts.get('interactive')
				unresolved = opts.get('unresolved')
	if not abortf and not continuef:			if not abortf and not continuef:
	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	shelved = list(shelved)			shelved = list(shelved)
	if opts.get("name"):			if opts.get("name"):
	shelved.append(opts["name"])			shelved.append(opts["name"])

	if interactive and opts.get('keep'):			if interactive and opts.get('keep'):
	raise error.Abort(_('--keep on --interactive is not yet supported'))			raise error.Abort(_('--keep on --interactive is not yet supported'))
	raise error.Abort(_('no shelved changes to apply!'))			raise error.Abort(_('no shelved changes to apply!'))
	basename = util.split(shelved[0][1])[1]			basename = util.split(shelved[0][1])[1]
	ui.status(_("unshelving change '%s'\n") % basename)			ui.status(_("unshelving change '%s'\n") % basename)
	else:			else:
	basename = shelved[0]			basename = shelved[0]

	if not shelvedfile(repo, basename, patchextension).exists():			if not shelvedfile(repo, basename, patchextension).exists():
	raise error.Abort(_("shelved change '%s' not found") % basename)			raise error.Abort(_("shelved change '%s' not found") % basename)
				if unresolved:
				cmdutil.bailifchanged(repo)

	repo = repo.unfiltered()			repo = repo.unfiltered()
	lock = tr = None			lock = tr = None
	try:			try:
	lock = repo.lock()			lock = repo.lock()
	tr = repo.transaction('unshelve', report=lambda x: None)			tr = repo.transaction('unshelve', report=lambda x: None)
	oldtiprev = len(repo)			oldtiprev = len(repo)

	pctx = repo['.']			pctx = repo['.']
	tmpwctx = pctx			tmpwctx = pctx
	# The goal is to have a commit structure like so:			# The goal is to have a commit structure like so:
	# ...-> pctx -> tmpwctx -> shelvectx			# ...-> pctx -> tmpwctx -> shelvectx
	# where tmpwctx is an optional commit with the user's pending changes			# where tmpwctx is an optional commit with the user's pending changes
	# and shelvectx is the unshelved changes. Then we merge it all down			# and shelvectx is the unshelved changes. Then we merge it all down
	# to the original pctx.			# to the original pctx.

	activebookmark = _backupactivebookmark(repo)			activebookmark = _backupactivebookmark(repo)
	tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts,			tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts,
	tmpwctx)			tmpwctx)
	repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)			repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
				unresolvedshelve = _isunresolvedshelve(shelvectx)
	_checkunshelveuntrackedproblems(ui, repo, shelvectx)			_checkunshelveuntrackedproblems(ui, repo, shelvectx)
	branchtorestore = ''			branchtorestore = ''
	if shelvectx.branch() != shelvectx.p1().branch():			if shelvectx.branch() != shelvectx.p1().branch():
	branchtorestore = shelvectx.branch()			branchtorestore = shelvectx.branch()

	shelvectx, ispartialunshelve = _rebaserestoredcommit(ui, repo, opts,			if unresolved:
	tr, oldtiprev, basename, pctx, tmpwctx, shelvectx,			ispartialunshelve = False
				if not unresolvedshelve:
				raise error.Abort(_('%s is not an unresolved shelve\n') %
				basename)
				p1, p2 = shelvectx.parents()
				if pctx.node() not in [p1.node(), p2.node()]:
				raise error.Abort(_('dirstate is not on either of the merge'
				' parents.\nuse hg update to one of the'
				' merge parents.'))
				elif unresolvedshelve:
				raise error.Abort(_('%s is an unresolved shelve, use'
				' --unresolved to unshelve it') % basename)
				else:
				shelvectx, ispartialunshelve = _rebaserestoredcommit(ui, repo,
				opts, tr, oldtiprev, basename, pctx, tmpwctx, shelvectx,
	branchtorestore, activebookmark)			branchtorestore, activebookmark)
	overrides = {('ui', 'forcemerge'): opts.get('tool', '')}			overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
	with ui.configoverride(overrides, 'unshelve'):			with ui.configoverride(overrides, 'unshelve'):
	mergefiles(ui, repo, pctx, shelvectx)			mergefiles(ui, repo, pctx, shelvectx)
				if unresolved:
				with repo.dirstate.parentchange():
				restoreunresolvedshelve(ui, repo, shelvectx, basename)
	restorebranch(ui, repo, branchtorestore)			restorebranch(ui, repo, branchtorestore)
	shelvedstate.clear(repo)			shelvedstate.clear(repo)
	_finishunshelve(repo, oldtiprev, tr, activebookmark)			_finishunshelve(repo, oldtiprev, tr, activebookmark)
	_forgetunknownfiles(repo, shelvectx, addedbefore)			_forgetunknownfiles(repo, shelvectx, addedbefore)
	if not ispartialunshelve:			if not ispartialunshelve:
	unshelvecleanup(ui, repo, basename, opts)			unshelvecleanup(ui, repo, basename, opts)
	finally:			finally:
	if tr:			if tr:
	tr.release()			tr.release()
	lockmod.release(lock)			lockmod.release(lock)

tests/test-completion.t

	serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos			serve: accesslog, daemon, daemon-postexec, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate, print-url, subrepos
	shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, unresolved, include, exclude			shelve: addremove, unknown, cleanup, date, delete, edit, keep, list, message, name, patch, interactive, stat, unresolved, include, exclude
	status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template			status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, terse, copies, print0, rev, change, include, exclude, subrepos, template
	summary: remote			summary: remote
	tag: force, local, rev, remove, edit, message, date, user			tag: force, local, rev, remove, edit, message, date, user
	tags: template			tags: template
	tip: patch, git, style, template			tip: patch, git, style, template
	unbundle: update			unbundle: update
	unshelve: abort, continue, interactive, keep, name, tool, date			unshelve: abort, continue, interactive, keep, name, tool, date, unresolved
	update: clean, check, merge, date, rev, tool			update: clean, check, merge, date, rev, tool
	verify: full			verify: full
	version: template			version: template

	$ hg init a			$ hg init a
	$ cd a			$ cd a
	$ echo fee > fee			$ echo fee > fee
	$ hg ci -q -Amfee			$ hg ci -q -Amfee

tests/test-shelve-unresolved.t

	+++ b/file2			+++ b/file2
	@@ -1,2 +1,6 @@			@@ -1,2 +1,6 @@
	A			A
	+<<<<<<< working copy: 69004294ad57 - test: C			+<<<<<<< working copy: 69004294ad57 - test: C
	C			C
	+=======			+=======
	+B			+B
	+>>>>>>> merge rev: fd9a4049234b - test: B			+>>>>>>> merge rev: fd9a4049234b - test: B

				-- now, fix an urgent bug
				$ echo fixed >> bug
				$ ls
				bar
				bug
				file1
				file1.orig
				file2
				file2.orig
				$ hg add bug
				$ hg ci -m "fix bug"
				$ hg log -G
				@ changeset: 3:a53a9a7475b3
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: fix bug
				\|
				o changeset: 2:69004294ad57
				\| parent: 0:c32ef6121744
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: C
				\|
				\| o changeset: 1:fd9a4049234b
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B
				\|
				o changeset: 0:c32ef6121744
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: A

				-- let's get back to the old mergestate
				-- we need to update to one of the merge parents. otherwise, abort.
				$ hg unshelve --unresolved
				unshelving change 'default'
				abort: dirstate is not on either of the merge parents.
				use hg update to one of the merge parents.
				[255]

				$ hg up 2
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ cat file2
				A
				C

				-- flag --unshelve is not passed. but, the last shelve is unresolved
				$ hg unshelve
				unshelving change 'default'
				abort: default is an unresolved shelve, use --unresolved to unshelve it
				[255]

				$ hg unshelve --unresolved
				unshelving change 'default'

				$ hg log -G
				o changeset: 3:a53a9a7475b3
				\| tag: tip
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: fix bug
				\|
				@ changeset: 2:69004294ad57
				\| parent: 0:c32ef6121744
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: C
				\|
				\| @ changeset: 1:fd9a4049234b
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B
				\|
				o changeset: 0:c32ef6121744
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: A

				$ cat file1
				A
				B
				C
				$ hg diff
				diff -r 69004294ad57 file1
				--- a/file1 Thu Jan 01 00:00:00 1970 +0000
				+++ b/file1 Thu Jan 01 00:00:00 1970 +0000
				@@ -1,2 +1,3 @@
				A
				+B
				C
				diff -r 69004294ad57 file2
				--- a/file2 Thu Jan 01 00:00:00 1970 +0000
				+++ b/file2 Thu Jan 01 00:00:00 1970 +0000
				@@ -1,2 +1,6 @@
				A
				+<<<<<<< working copy: 69004294ad57 - test: C
				C
				+=======
				+B
				+>>>>>>> merge rev: fd9a4049234b - test: B
				$ cat file2
				A
				<<<<<<< working copy: 69004294ad57 - test: C
				C
				=======
				B
				>>>>>>> merge rev: fd9a4049234b - test: B
				$ hg resolve -l
				R file1
				U file2

				-- flag --unresolved is passed but the top most shelve is not unresolved
				$ hg shelve --unresolved
				shelved as default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo garbage >> bug
				$ hg st
				? bar
				? bug
				? file1.orig
				? file2.orig
				$ hg add bug
				$ hg shelve
				shelved as default-01
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg unshelve --unresolved
				unshelving change 'default-01'
				abort: default-01 is not an unresolved shelve

				[255]

				-- now, unshelve default
				$ hg unshelve -n default --unresolved

				-- commit the merge after completing conflict resolution
				$ cat >> file2 <<EOF
				> A
				> B
				> C
				> EOF
				$ hg resolve -m file2
				(no more unresolved files)
				$ hg ci -m merge
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				checked 5 changesets with 9 changes to 3 files
				$ hg log -G
				@ changeset: 4:745dca2ee1f1
				\|\ tag: tip
				\| \| parent: 2:69004294ad57
				\| \| parent: 1:fd9a4049234b
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: merge
				\| \|
				\| \| o changeset: 3:a53a9a7475b3
				\| \|/ user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: fix bug
				\| \|
				\| o changeset: 2:69004294ad57
				\| \| parent: 0:c32ef6121744
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: C
				\| \|
				o \| changeset: 1:fd9a4049234b
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B
				\|
				o changeset: 0:c32ef6121744
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: A


				-- flag --unresolved is passed but we don’t have any unresolved shelve
				$ hg unshelve --unresolved
				unshelving change 'default-01'
				abort: default-01 is not an unresolved shelve

				[255]

				-- when working directory is dirty
				$ addunresolvedmerge file1 file2 5
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				created new head
				merging file1
				merging file2
				warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
				warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 2 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
				[1]

				$ hg shelve --unresolved
				shelved as default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo dirt >> bar
				$ hg add bar
				$ hg unshelve --unresolved
				unshelving change 'default'
				abort: uncommitted changes
				[255]

				--- unshelve --unresolved when there is another merge going on
				$ hg ci -m dirt
				$ hg up 7
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ echo foo >> bug
				$ hg add bug
				$ hg ci -m foo2
				created new head
				$ hg log -G
				@ changeset: 9:c74a624102ed
				\| tag: tip
				\| parent: 7:974ec4298b79
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: foo2
				\|
				\| o changeset: 8:4acf09fb3a59
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: dirt
				\|
				o changeset: 7:974ec4298b79
				\| parent: 5:db68c6c84fe6
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: C
				\|
				\| o changeset: 6:e236d497f76b
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B
				\|
				o changeset: 5:db68c6c84fe6
				\| user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: A
				\|
				o changeset: 4:745dca2ee1f1
				\|\ parent: 2:69004294ad57
				\| \| parent: 1:fd9a4049234b
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: merge
				\| \|
				\| \| o changeset: 3:a53a9a7475b3
				\| \|/ user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: fix bug
				\| \|
				\| o changeset: 2:69004294ad57
				\| \| parent: 0:c32ef6121744
				\| \| user: test
				\| \| date: Thu Jan 01 00:00:00 1970 +0000
				\| \| summary: C
				\| \|
				o \| changeset: 1:fd9a4049234b
				\|/ user: test
				\| date: Thu Jan 01 00:00:00 1970 +0000
				\| summary: B
				\|
				o changeset: 0:c32ef6121744
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: A

				$ hg merge -r 8
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg unshelve --unresolved
				abort: outstanding uncommitted merge
				(use 'hg commit' or 'hg merge --abort')
				[255]

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	16254		Aug 17 2019, 4:39 PM	★	★
Diff 2	16808		Oct 4 2019, 4:46 PM	★	★
Diff 3	16815		Oct 5 2019, 9:54 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

unshelve: add --unresolved flag to unshelve mergestate with unresolved filesNeeds RevisionPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16808

mercurial/commands.py

mercurial/shelve.py

tests/test-completion.t

tests/test-shelve-unresolved.t

unshelve: add --unresolved flag to unshelve mergestate with unresolved files
Needs RevisionPublic

Revision Contents
Changeset List