This is an archive of the discontinued Mercurial Phabricator instance.

Differential D219

morestatus: move fb extension to core by plugging to `hg status --verbose`
ClosedPublic

Authored by pulkit on Aug 3 2017, 12:07 AM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG96f43981c1c4: morestatus: move fb extension to core by plugging to `hg status --verbose`

Summary

morestatus extension in fbext use to show more context about the state of the
repo like the repository is in a unfinished merge state, or a rebase is going
on, or histedit is going on, listing the files which need to be resolved and
also suggesting ways to handle the situation.

This patch moves the extension directly to core by plugging it into the
--verbose flag of the status command. So now if you are in any unfinished state
and you do hg status -v, it will show you details and help related to the state.

The extension in fbext also shows context about unfinished update state
which is not ported to core as that plug in hooks to update command which need
to be tackled somewhat differently.

The following configuration will turn the behaviour on by default

[commands]
status.verbose = 1

You can also skip considering some states like bisect as follows:

[commands]
status.skipstates=bisect

This patch also adds test for the feature.

.. feature::

``hg status -v`` can now show unfinished state. For example, when in
an unfinished rebase state, ``hg status -v`` might show::

# The repository is in an unfinished *rebase* state.
# No unresolved merge conflicts.
# To continue:                hg rebase --continue
# To abort:                   hg rebase --abort

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.Aug 3 2017, 12:07 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 3 2017, 12:07 AM

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

@durham and I thought on the flag name and had '--more' and '--repo-state' in our mind. Since '--repo-state' is more explicit, I went with that. Need suggestions for a better flag name. :)

In D219#3558, @pulkit wrote:

@durham and I thought on the flag name and had '--more' and '--repo-state' in our mind. Since '--repo-state' is more explicit, I went with that. Need suggestions for a better flag name. :)

Do we need a flag? Why not just a config option (whose value is ignored with HGPLAIN)?

So what does '--verbose' do for status currently? Didn't seem to do anything. Can this output be for verbose?

In D219#3562, @akushner wrote:

So what does '--verbose' do for status currently? Didn't seem to do anything. Can this output be for verbose?

Good question. From https://www.mercurial-scm.org/wiki/CompatibilityRules#Commands: "Adding messages at the verbose level is also usually acceptable."

I think it makes sense for this output to be part of the verbose form.

It would still be nice to have a config option for it. I don't like "morestatus" for that. I would think it should be in commands.status (along with ".relative"). Maybe commands.status.verbose=1 to enable it if we decide to use the --verbose flag for it.

@martinvonz - I like the commands.status.verbose=1 option. I think the verbose form of status makes sense when there's a large body of unsophisticated source control users and the more details on how to get out of the current predicament, the better.

@akushner @martinvonz : thanks for suggestions. I also like the --verbose option, I will send a new version with that.
@martinvonz: Since you don't like 'morestatus' much, shall I place the skipstates option which skips some states under some different config name, maybe status.skipstates?

In D219#3566, @pulkit wrote:

@akushner @martinvonz : thanks for suggestions. I also like the --verbose option, I will send a new version with that.
@martinvonz: Since you don't like 'morestatus' much, shall I place the skipstates option which skips some states under some different config name, maybe status.skipstates?

I'm not 100% sure, but I think we're trying to put command-specific configs under command.<command>, so it would probably be commands.status.skipstates. Also, shouldn't you be putting it in configitems.py?

Maybe this is a good case for the new release note extension. According to https://www.mercurial-scm.org/wiki/ReleasenotesExtension having the following in commit message would be helpful:

.. feature::

   ``hg status -v`` can now show unfinished state. For example, when in
   an unfinished rebase state, ``hg status -v`` might show::

     # The repository is in an unfinished *rebase* state.
     # No unresolved merge conflicts.
     # To continue:                hg rebase --continue
     # To abort:                   hg rebase --abort

I'm thinking about the difference between the deprecated [defaults] and [commands] (and also [alias]) but don't quite get it. It seems people wanting the behavior might just set alias.status = status -v, or use [defaults]. What's the advantage of using a [commands] option?

In D219#3661, @quark wrote:

I'm thinking about the difference between the deprecated [defaults] and [commands] (and also [alias]) but don't quite get it. It seems people wanting the behavior might just set alias.status = status -v, or use [defaults]. What's the advantage of using a [commands] option?

Good point, there's probably no good reason to use [commands] for this. [defaults] has been discouraged, but I don't know if there's a good reason to discourage it (I think it's already ignored when HGPLAIN is in effect). [commands] make sense when there's no command line flag for the behavior, but we do have that here. So if we agree on using --verbose for this, I don't think I see a reason to a special config for it and we can use [defaults] instead.

Hmm, I just realized there is a somewhat good reason to avoid [defaults]: it applies to *all* options at once. Let me clarify with an example. Let's say your sysadmin has set "defaults.status = --relative" (hypothetical option -- it's currently a config in [commands]) and you want to keep that *and* get verbose status output, you now have to copy the default config from the system hgrc. I don't think I've heard that argument against [defaults] before, but that seems more relevant than the scripting argument (which, again, goes away with HGPLAIN). Or am I mistaken?

In D219#3755, @martinvonz wrote:

In D219#3661, @quark wrote:

I'm thinking about the difference between the deprecated [defaults] and [commands] (and also [alias]) but don't quite get it. It seems people wanting the behavior might just set alias.status = status -v, or use [defaults]. What's the advantage of using a [commands] option?

Good point, there's probably no good reason to use [commands] for this. [defaults] has been discouraged, but I don't know if there's a good reason to discourage it (I think it's already ignored when HGPLAIN is in effect).

The discouragement is twofold: we didn't used to have HGPLAIN, and it used to be there was no way to un-do the setting of a boolean flag in [defaults]. Both of those limitations are now fixed, so I'm less worried about it overall. That said, I would like a config knob for this, so it can be part of ui.tweakdefaults.

[commands] make sense when there's no command line flag for the behavior, but we do have that here. So if we agree on using --verbose for this, I don't think I see a reason to a special config for it and we can use [defaults] instead.
Hmm, I just realized there is a somewhat good reason to avoid [defaults]: it applies to *all* options at once. Let me clarify with an example. Let's say your sysadmin has set "defaults.status = --relative" (hypothetical option -- it's currently a config in [commands]) and you want to keep that *and* get verbose status output, you now have to copy the default config from the system hgrc. I don't think I've heard that argument against [defaults] before, but that seems more relevant than the scripting argument (which, again, goes away with HGPLAIN). Or am I mistaken?

That's another argument in favor of a config knob IMO.

I'm not sure if --verbose should be (ab)used for this, given that we've got --terse. --verbose almost sounds like the opposite of --terse, so it might be confusing. Meditate on that, I guess.

(Marking as "Request changes" for now, since we seem largely agreed that --verbose is a decent way to go, and if nobody else is worried about the conceptual overlap with --terse I'm fine with it, especially since I more or less expect this to be on in tweakdefaults soon.)

This revision now requires changes to proceed.Aug 4 2017, 5:55 PM

pulkit edited edge metadata.Aug 5 2017, 4:26 AM

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

pulkit retitled this revision from morestatus: move fb extension to core as '--repo-state' option to status to morestatus: move fb extension to core by plugging to `hg status --verbose`.

pulkit updated this revision to Diff 577.

I'm still a tiny bit worried about potential confusion between --terse and --verbose (in that they're not opposites), but I'm also fine with this. I'll take it in a couple of days if I don't hear any objections.

In D219#4343, @durin42 wrote:

I'm still a tiny bit worried about potential confusion between --terse and --verbose (in that they're not opposites), but I'm also fine with this. I'll take it in a couple of days if I don't hear any objections.

Currently if we do hg status --terse u --verbose, it will still terse the output. I think the best way is to document that --verbose and --terse are not opposites.

I've heard no objections, but also the suggestion that --terse be something like --terse-dirs or similar so it's obviously not the antonym of --verbose.

This revision is now accepted and ready to land.Aug 11 2017, 2:43 PM

Closed by commit rHG96f43981c1c4: morestatus: move fb extension to core by plugging to `hg status --verbose` (authored by pulkit). · Explain WhyAug 11 2017, 2:52 PM

This revision was automatically updated to reflect the committed changes.

martinvonz added inline comments.Aug 19 2017, 1:31 AM

tests/test-bisect.t
190	What does None mean here?

pulkit added inline comments.Aug 19 2017, 7:00 PM

tests/test-bisect.t
190	Oh, _conflictsmsg() is returning None which is getting printed. I will send a follow-up for this.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (105 lines)
M			mercurial/commands.py (17 lines)
M			mercurial/configitems.py (6 lines)
M			tests/test-bisect.t (9 lines)
M			tests/test-conflict.t (19 lines)
M			tests/test-graft.t (19 lines)
M			tests/test-histedit-fold.t (14 lines)
M			tests/test-rebase-conflicts.t (15 lines)
M			tests/test-shelve.t (17 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	516		Aug 3 2017, 12:07 AM	★	★
Diff 2	577		Aug 5 2017, 4:26 AM	★	★
Diff 3	798	rHG96f43981c1c4d4002892dc74b7fb6dcba148560a	Aug 2 2017, 7:42 PM	★	★

Diff 798

mercurial/cmdutil.py

	return statlist			return statlist

	for x in xrange(len(indexes)):			for x in xrange(len(indexes)):
	if not finalrs[x]:			if not finalrs[x]:
	finalrs[x] = statlist[x]			finalrs[x] = statlist[x]

	return finalrs			return finalrs

				def _commentlines(raw):
				'''Surround lineswith a comment char and a new line'''
				lines = raw.splitlines()
				commentedlines = ['# %s' % line for line in lines]
				return '\n'.join(commentedlines) + '\n'

				def _conflictsmsg(repo):
				# avoid merge cycle
				from . import merge as mergemod
				mergestate = mergemod.mergestate.read(repo)
				if not mergestate.active():
				return

				m = scmutil.match(repo[None])
				unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u']
				if unresolvedlist:
				mergeliststr = '\n'.join(
				[' %s' % os.path.relpath(
				os.path.join(repo.root, path),
				pycompat.getcwd()) for path in unresolvedlist])
				msg = _('''Unresolved merge conflicts:

				%s

				To mark files as resolved: hg resolve --mark FILE''') % mergeliststr
				else:
				msg = _('No unresolved merge conflicts.')

				return _commentlines(msg)

				def _helpmessage(continuecmd, abortcmd):
				msg = _('To continue: %s\n'
				'To abort: %s') % (continuecmd, abortcmd)
				return _commentlines(msg)

				def _rebasemsg():
				return _helpmessage('hg rebase --continue', 'hg rebase --abort')

				def _histeditmsg():
				return _helpmessage('hg histedit --continue', 'hg histedit --abort')

				def _unshelvemsg():
				return _helpmessage('hg unshelve --continue', 'hg unshelve --abort')

				def _updatecleanmsg(dest=None):
				warning = _('warning: this will discard uncommitted changes')
				return 'hg update --clean %s (%s)' % (dest or '.', warning)

				def _graftmsg():
				# tweakdefaults requires `update` to have a rev hence the `.`
				return _helpmessage('hg graft --continue', _updatecleanmsg())

				def _mergemsg():
				# tweakdefaults requires `update` to have a rev hence the `.`
				return _helpmessage('hg commit', _updatecleanmsg())

				def _bisectmsg():
				msg = _('To mark the changeset good: hg bisect --good\n'
				'To mark the changeset bad: hg bisect --bad\n'
				'To abort: hg bisect --reset\n')
				return _commentlines(msg)

				def fileexistspredicate(filename):
				return lambda repo: repo.vfs.exists(filename)

				def _mergepredicate(repo):
				return len(repo[None].parents()) > 1

				STATES = (
				# (state, predicate to detect states, helpful message function)
				('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
				('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
				('graft', fileexistspredicate('graftstate'), _graftmsg),
				('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg),
				('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
				# The merge state is part of a list that will be iterated over.
				# They need to be last because some of the other unfinished states may also
				# be in a merge or update state (eg. rebase, histedit, graft, etc).
				# We want those to have priority.
				('merge', _mergepredicate, _mergemsg),
				)

				def _getrepostate(repo):
				# experimental config: commands.status.skipstates
				skip = set(repo.ui.configlist('commands', 'status.skipstates'))
				for state, statedetectionpredicate, msgfn in STATES:
				if state in skip:
				continue
				if statedetectionpredicate(repo):
				return (state, statedetectionpredicate, msgfn)

				def morestatus(repo, fm):
				statetuple = _getrepostate(repo)
				label = 'status.morestatus'
				if statetuple:
				fm.startitem()
				state, statedetectionpredicate, helpfulmsg = statetuple
				statemsg = _('The repository is in an unfinished %s state.') % state
				fm.write('statemsg', '%s\n', _commentlines(statemsg), label=label)
				conmsg = _conflictsmsg(repo)
				fm.write('conflictsmsg', '%s\n', conmsg, label=label)
				if helpfulmsg:
				helpmsg = helpfulmsg()
				fm.write('helpmsg', '%s\n', helpmsg, label=label)

	def findpossible(cmd, table, strict=False):			def findpossible(cmd, table, strict=False):
	"""			"""
	Return cmd -> (aliases, command table entry)			Return cmd -> (aliases, command table entry)
	for each matching command.			for each matching command.
	Return debug commands (or their aliases) only if no normal command matches.			Return debug commands (or their aliases) only if no normal command matches.
	"""			"""
	choice = {}			choice = {}
	debugchoice = {}			debugchoice = {}

mercurial/commands.py

	which can be a string formed by using 'm', 'a', 'r', 'd', 'u', 'i', 'c'			which can be a string formed by using 'm', 'a', 'r', 'd', 'u', 'i', 'c'
	where, 'm' stands for 'modified', 'a' for 'added', 'r' for 'removed',			where, 'm' stands for 'modified', 'a' for 'added', 'r' for 'removed',
	'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean.			'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean.

	It terses the output of only those status which are passed. The ignored			It terses the output of only those status which are passed. The ignored
	files are not considered while tersing until 'i' is there in --terse value			files are not considered while tersing until 'i' is there in --terse value
	or the --ignored option is used.			or the --ignored option is used.

				--verbose option shows more context about the state of the repo
				like the repository is in unfinised merge, shelve, rebase state etc.
				You can have this behaviour turned on by default by following config:

				[commands]
				status.verbose = true

				You can also skip some states like bisect by adding following in
				configuration file.

				[commands]
				status.skipstates = bisect

	Examples:			Examples:

	- show changes in the working directory relative to a			- show changes in the working directory relative to a
	changeset::			changeset::

	hg status --rev 9353			hg status --rev 9353

	- show changes in the working directory relative to the			- show changes in the working directory relative to the
	label = 'status.' + state			label = 'status.' + state
	for f in files:			for f in files:
	fm.startitem()			fm.startitem()
	fm.condwrite(showchar, 'status', '%s ', char, label=label)			fm.condwrite(showchar, 'status', '%s ', char, label=label)
	fm.write('path', fmt, repo.pathto(f, cwd), label=label)			fm.write('path', fmt, repo.pathto(f, cwd), label=label)
	if f in copy:			if f in copy:
	fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),			fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
	label='status.copied')			label='status.copied')

				if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
				and not ui.plain()):
				cmdutil.morestatus(repo, fm)
	fm.end()			fm.end()

	@command('^summary\|sum',			@command('^summary\|sum',
	[('', 'remote', None, _('check for push and pull'))], '[--remote]')			[('', 'remote', None, _('check for push and pull'))], '[--remote]')
	def summary(ui, repo, **opts):			def summary(ui, repo, **opts):
	"""summarize working directory state			"""summarize working directory state

	This generates a brief summary of the working directory state,			This generates a brief summary of the working directory state,

mercurial/configitems.py

	default='auto',			default='auto',
	)			)
	coreconfigitem('color', 'pagermode',			coreconfigitem('color', 'pagermode',
	default=dynamicdefault,			default=dynamicdefault,
	)			)
	coreconfigitem('commands', 'status.relative',			coreconfigitem('commands', 'status.relative',
	default=False,			default=False,
	)			)
				coreconfigitem('commands', 'status.skipstates',
				default=[],
				)
				coreconfigitem('commands', 'status.verbose',
				default=False,
				)
	coreconfigitem('commands', 'update.requiredest',			coreconfigitem('commands', 'update.requiredest',
	default=False,			default=False,
	)			)
	coreconfigitem('devel', 'all-warnings',			coreconfigitem('devel', 'all-warnings',
	default=False,			default=False,
	)			)
	coreconfigitem('devel', 'bundle2.debug',			coreconfigitem('devel', 'bundle2.debug',
	default=False,			default=False,

tests/test-bisect.t


	$ hg up -C			$ hg up -C
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved

	bisect test			bisect test

	$ hg bisect -r			$ hg bisect -r
	$ hg bisect -b			$ hg bisect -b
				$ hg status -v
				# The repository is in an unfinished bisect state.

				None
				martinvonzUnsubmitted Not Done What does None mean here? martinvonz: What does None mean here?
				pulkitAuthorUnsubmitted Not Done Oh, _conflictsmsg() is returning None which is getting printed. I will send a follow-up for this. pulkit: Oh, _conflictsmsg() is returning None which is getting printed. I will send a follow-up for…
				# To mark the changeset good: hg bisect --good
				# To mark the changeset bad: hg bisect --bad
				# To abort: hg bisect --reset

				$ hg status -v --config commands.status.skipstates=bisect
	$ hg summary			$ hg summary
	parent: 31:58c80a7c8a40 tip			parent: 31:58c80a7c8a40 tip
	msg 31			msg 31
	branch: default			branch: default
	commit: (clean)			commit: (clean)
	update: (current)			update: (current)
	phases: 32 draft			phases: 32 draft
	$ hg bisect -g 1			$ hg bisect -g 1

tests/test-conflict.t

	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
	[1]			[1]

	$ hg id			$ hg id
	618808747361+c0c68e4fe667+ tip			618808747361+c0c68e4fe667+ tip

				$ echo "[commands]" >> $HGRCPATH
				$ echo "status.verbose=true" >> $HGRCPATH
				$ hg status
				M a
				? a.orig
				# The repository is in an unfinished merge state.

				# Unresolved merge conflicts:
				#
				# a
				#
				# To mark files as resolved: hg resolve --mark FILE

				# To continue: hg commit
				# To abort: hg update --clean . (warning: this will discard uncommitted changes)


	$ cat a			$ cat a
	Small Mathematical Series.			Small Mathematical Series.
	1			1
	2			2
	3			3
	<<<<<<< working copy: 618808747361 - test: branch2			<<<<<<< working copy: 618808747361 - test: branch2
	6			6
	8			8
	=======			=======
	4			4
	5			5
	>>>>>>> merge rev: c0c68e4fe667 - test: branch1			>>>>>>> merge rev: c0c68e4fe667 - test: branch1
	Hop we are done.			Hop we are done.

	$ hg status			$ hg status --config commands.status.verbose=0
	M a			M a
	? a.orig			? a.orig

	Verify custom conflict markers			Verify custom conflict markers

	$ hg up -q --clean .			$ hg up -q --clean .
	$ cat <<EOF >> .hg/hgrc			$ cat <<EOF >> .hg/hgrc
	> [ui]			> [ui]

tests/test-graft.t

	(use 'hg resolve' and 'hg graft --continue --log')			(use 'hg resolve' and 'hg graft --continue --log')
	[255]			[255]

	Summary should mention graft:			Summary should mention graft:

	$ hg summary \|grep graft			$ hg summary \|grep graft
	commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)			commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)

				Using status to get more context

				$ hg status --verbose
				M d
				M e
				? a.orig
				? e.orig
				# The repository is in an unfinished graft state.

				# Unresolved merge conflicts:
				#
				# e
				#
				# To mark files as resolved: hg resolve --mark FILE

				# To continue: hg graft --continue
				# To abort: hg update --clean . (warning: this will discard uncommitted changes)


	Commit while interrupted should fail:			Commit while interrupted should fail:

	$ hg ci -m 'commit interrupted graft'			$ hg ci -m 'commit interrupted graft'
	abort: graft in progress			abort: graft in progress
	(use 'hg graft --continue' or 'hg update' to abort)			(use 'hg graft --continue' or 'hg update' to abort)
	[255]			[255]

	Abort the graft and try committing:			Abort the graft and try committing:

tests/test-histedit-fold.t

	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	merging file			merging file
	warning: conflicts while merging file! (edit, then use 'hg resolve --mark')			warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
	Fix up the change (fold 251d831eeec5)			Fix up the change (fold 251d831eeec5)
	(hg histedit --continue to resume)			(hg histedit --continue to resume)
	[1]			[1]
	There were conflicts, we keep P1 content. This			There were conflicts, we keep P1 content. This
	should effectively drop the changes from +6.			should effectively drop the changes from +6.
	$ hg status
				$ hg status -v
	M file			M file
	? file.orig			? file.orig
				# The repository is in an unfinished histedit state.

				# Unresolved merge conflicts:
				#
				# file
				#
				# To mark files as resolved: hg resolve --mark FILE

				# To continue: hg histedit --continue
				# To abort: hg histedit --abort

	$ hg resolve -l			$ hg resolve -l
	U file			U file
	$ hg revert -r 'p1()' file			$ hg revert -r 'p1()' file
	$ hg resolve --mark file			$ hg resolve --mark file
	(no more unresolved files)			(no more unresolved files)
	continue: hg histedit --continue			continue: hg histedit --continue
	$ hg histedit --continue			$ hg histedit --continue
	251d831eeec5: empty changeset			251d831eeec5: empty changeset

tests/test-rebase-conflicts.t

	$ hg rebase -s 3 -d 2			$ hg rebase -s 3 -d 2
	rebasing 3:3163e20567cc "L1"			rebasing 3:3163e20567cc "L1"
	rebasing 4:46f0b057b5c0 "L2"			rebasing 4:46f0b057b5c0 "L2"
	merging common			merging common
	warning: conflicts while merging common! (edit, then use 'hg resolve --mark')			warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see hg resolve, then hg rebase --continue)			unresolved conflicts (see hg resolve, then hg rebase --continue)
	[1]			[1]

				$ hg status --config commands.status.verbose=1
				M common
				? common.orig
				# The repository is in an unfinished rebase state.

				# Unresolved merge conflicts:
				#
				# common
				#
				# To mark files as resolved: hg resolve --mark FILE

				# To continue: hg rebase --continue
				# To abort: hg rebase --abort


	Try to continue without solving the conflict:			Try to continue without solving the conflict:

	$ hg rebase --continue			$ hg rebase --continue
	abort: unresolved merge conflicts (see 'hg help resolve')			abort: unresolved merge conflicts (see 'hg help resolve')
	[255]			[255]

	Conclude rebase:			Conclude rebase:

tests/test-shelve.t

	unshelving change 'default'			unshelving change 'default'
	temporarily committing pending changes (restore with 'hg unshelve --abort')			temporarily committing pending changes (restore with 'hg unshelve --abort')
	rebasing shelved changes			rebasing shelved changes
	rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)			rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)
	merging a/a			merging a/a
	warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')			warning: conflicts while merging a/a! (edit, then use 'hg resolve --mark')
	unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')			unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
	[1]			[1]
				$ hg status -v
				M a/a
				M b.rename/b
				M c.copy
				R b/b
				? a/a.orig
				# The repository is in an unfinished unshelve state.

				# Unresolved merge conflicts:
				#
				# a/a
				#
				# To mark files as resolved: hg resolve --mark FILE

				# To continue: hg unshelve --continue
				# To abort: hg unshelve --abort


	ensure that we have a merge with unresolved conflicts			ensure that we have a merge with unresolved conflicts

	$ hg heads -q --template '{rev}\n'			$ hg heads -q --template '{rev}\n'
	5			5
	4			4
	$ hg parents -q --template '{rev}\n'			$ hg parents -q --template '{rev}\n'
	4			4