This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7593

status: split morestatus data loading from display
ClosedPublic

Authored by rdamazio on Dec 10 2019, 1:39 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGfb4a6d584756: status: split morestatus data loading from display

Summary

This is a small refactoring in preparation for adding more morestatus
functionality (notably for templated/JSON output) - the goal is to
use the data inside the status display loop, as well as output the
overall state in a templatable/structured way.

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

rdamazio created this revision.Dec 10 2019, 1:39 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 10 2019, 1:39 AM

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

rdamazio added a child revision: D7594: status: add template/json data about whether a file has unresolved conflicts.Dec 10 2019, 1:39 AM

pulkit accepted this revision.Dec 10 2019, 8:15 AM

This revision is now accepted and ready to land.Dec 10 2019, 8:15 AM

I pushed @martinvonz D7591, so these need to be rebased. Thanks!

In D7593#111696, @pulkit wrote:

I pushed @martinvonz D7591, so these need to be rebased. Thanks!

Are you asking me to do something, or are you going to?
This supersedes his change completely.

rdamazio updated this revision to Diff 18586.Dec 10 2019, 1:15 PM

Just phabsended after a rebase onto hg-committed, let me know if that's not what you expected.

In D7593#111728, @rdamazio wrote:

In D7593#111696, @pulkit wrote:

I pushed @martinvonz D7591, so these need to be rebased. Thanks!

Are you asking me to do something, or are you going to?
This supersedes his change completely.

He's asking you to rebase this series. Pull from http://mercurial-scm.org/repo/hg-committed and then rebase on top of @.

Even if my patch had not been queued, I would have preferred if you had split that change out from this patch since it's a separate change from what the commit message says.

In D7593#111733, @martinvonz wrote:

In D7593#111728, @rdamazio wrote:

In D7593#111696, @pulkit wrote:

I pushed @martinvonz D7591, so these need to be rebased. Thanks!

Are you asking me to do something, or are you going to?
This supersedes his change completely.

He's asking you to rebase this series. Pull from http://mercurial-scm.org/repo/hg-committed and then rebase on top of @.
Even if my patch had not been queued, I would have preferred if you had split that change out from this patch since it's a separate change from what the commit message says.

Thanks. Yes, that's what I did :)

rdamazio added a commit: rHGfb4a6d584756: status: split morestatus data loading from display.Dec 11 2019, 6:54 AM

Closed by commit rHGfb4a6d584756: status: split morestatus data loading from display (authored by rdamazio). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/cmdutil.py (90 lines)
M			mercurial/commands.py (12 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18560		Dec 10 2019, 1:39 AM	★	★
Diff 2	18586		Dec 10 2019, 1:15 PM	★	★
Diff 3	18605	rHGfb4a6d5847569f18efd22e82f4ead4d26a8fac43	Dec 9 2019, 9:15 PM	★	★

Status	Author	Revision
Closed	rdamazio	D7595 status: outputting structured unfinished-operation information
Closed	rdamazio	D7594 status: add template/json data about whether a file has unresolved conflicts
Closed	rdamazio	D7593 status: split morestatus data loading from display

Diff 18605

mercurial/cmdutil.py

	nullrev,			nullrev,
	short,			short,
	)			)
	from .pycompat import (			from .pycompat import (
	getattr,			getattr,
	open,			open,
	setattr,			setattr,
	)			)
				from .thirdparty import attr

	from . import (			from . import (
	bookmarks,			bookmarks,
	changelog,			changelog,
	copies,			copies,
	crecord as crecordmod,			crecord as crecordmod,
	dirstateguard,			dirstateguard,
	encoding,			encoding,

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


	def _conflictsmsg(repo):			@attr.s(frozen=True)
	mergestate = mergemod.mergestate.read(repo)			class morestatus(object):
	if not mergestate.active():			reporoot = attr.ib()
				unfinishedop = attr.ib()
				unfinishedmsg = attr.ib()
				inmergestate = attr.ib()
				unresolvedpaths = attr.ib()
				_label = b'status.morestatus'

				def formatfooter(self, fm):
				statemsg = _(b'The repository is in an unfinished %s state.'
				) % self.unfinishedop
				fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)

				self._formatconflicts(fm)
				if self.unfinishedmsg:
				fm.plain(b'%s\n' % _commentlines(self.unfinishedmsg),
				label=self._label)

				def _formatconflicts(self, fm):
				if not self.inmergestate:
	return			return

	unresolvedlist = sorted(mergestate.unresolved())			if self.unresolvedpaths:
	if unresolvedlist:
	mergeliststr = b'\n'.join(			mergeliststr = b'\n'.join(
	[			[
	b' %s' % util.pathto(repo.root, encoding.getcwd(), path)			b' %s' % util.pathto(self.reporoot, encoding.getcwd(),
	for path in unresolvedlist			path)
				for path in self.unresolvedpaths
	]			]
	)			)
	msg = (			msg = (
	_(			_(
	'''Unresolved merge conflicts:			'''Unresolved merge conflicts:

	%s			%s

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

	return _commentlines(msg)			fm.plain(b'%s\n' % _commentlines(msg), label=self._label)


	def morestatus(repo, fm):			def readmorestatus(repo):
				"""Returns a morestatus object if the repo has unfinished state."""
	statetuple = statemod.getrepostate(repo)			statetuple = statemod.getrepostate(repo)
	label = b'status.morestatus'			if not statetuple:
	if statetuple:			return None
	state, helpfulmsg = statetuple
	statemsg = _(b'The repository is in an unfinished %s state.') % state			unfinishedop, unfinishedmsg = statetuple
	fm.plain(b'%s\n' % _commentlines(statemsg), label=label)			mergestate = mergemod.mergestate.read(repo)
	conmsg = _conflictsmsg(repo)			unresolved = None
	if conmsg:			if mergestate.active():
	fm.plain(b'%s\n' % conmsg, label=label)			unresolved = sorted(mergestate.unresolved())
	if helpfulmsg:			return morestatus(repo.root, unfinishedop, unfinishedmsg,
	fm.plain(b'%s\n' % _commentlines(helpfulmsg), label=label)			unresolved is not None, unresolved)


	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.
	"""			"""

mercurial/commands.py

	copy = {}			copy = {}
	if (			if (
	opts.get(b'all')			opts.get(b'all')
	or opts.get(b'copies')			or opts.get(b'copies')
	or ui.configbool(b'ui', b'statuscopies')			or ui.configbool(b'ui', b'statuscopies')
	) and not opts.get(b'no_status'):			) and not opts.get(b'no_status'):
	copy = copies.pathcopies(ctx1, ctx2, m)			copy = copies.pathcopies(ctx1, ctx2, m)

				morestatus = None
				if (
				ui.verbose or ui.configbool(b'commands', b'status.verbose')
				) and not ui.plain():
				morestatus = cmdutil.readmorestatus(repo)

	ui.pager(b'status')			ui.pager(b'status')
	fm = ui.formatter(b'status', opts)			fm = ui.formatter(b'status', opts)
	fmt = b'%s' + end			fmt = b'%s' + end
	showchar = not opts.get(b'no_status')			showchar = not opts.get(b'no_status')

	for state, char, files in changestates:			for state, char, files in changestates:
	if state in show:			if state in show:
	label = b'status.' + state			label = b'status.' + state
	for f in files:			for f in files:
	fm.startitem()			fm.startitem()
	fm.context(ctx=ctx2)			fm.context(ctx=ctx2)
	fm.data(path=f)			fm.data(path=f)
	fm.condwrite(showchar, b'status', b'%s ', char, label=label)			fm.condwrite(showchar, b'status', b'%s ', char, label=label)
	fm.plain(fmt % uipathfn(f), label=label)			fm.plain(fmt % uipathfn(f), label=label)
	if f in copy:			if f in copy:
	fm.data(source=copy[f])			fm.data(source=copy[f])
	fm.plain(			fm.plain(
	(b' %s' + end) % uipathfn(copy[f]),			(b' %s' + end) % uipathfn(copy[f]),
	label=b'status.copied',			label=b'status.copied',
	)			)

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


	@command(			@command(
	b'summary\|sum',			b'summary\|sum',
	[(b'', b'remote', None, _(b'check for push and pull'))],			[(b'', b'remote', None, _(b'check for push and pull'))],
	b'[--remote]',			b'[--remote]',
	helpcategory=command.CATEGORY_WORKING_DIRECTORY,			helpcategory=command.CATEGORY_WORKING_DIRECTORY,