This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18561		Dec 10 2019, 1:39 AM	★	★
Diff 2	18587		Dec 10 2019, 1:15 PM	★	★
Diff 3	18606	rHG7315464f0613c2bcc75a415ac117d114e653ebe4	Dec 10 2019, 1:06 AM	★	★

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 18606

mercurial/cmdutil.py

	class morestatus(object):			class morestatus(object):
	reporoot = attr.ib()			reporoot = attr.ib()
	unfinishedop = attr.ib()			unfinishedop = attr.ib()
	unfinishedmsg = attr.ib()			unfinishedmsg = attr.ib()
	inmergestate = attr.ib()			inmergestate = attr.ib()
	unresolvedpaths = attr.ib()			unresolvedpaths = attr.ib()
	_label = b'status.morestatus'			_label = b'status.morestatus'

				def formatfile(self, path, fm):
				if self.inmergestate and path in self.unresolvedpaths:
				martinvonzUnsubmitted Done That's an O(n) lookup. Probably fine since you very rarely have thousands of conflicts... martinvonz: That's an O(n) lookup. Probably fine since you very rarely have thousands of conflicts...
				rdamazioAuthorUnsubmitted Done Yes, I thought of storing it as a set, but then thought that it either didn't matter or would be slower because there are so few items. rdamazio: Yes, I thought of storing it as a set, but then thought that it either didn't matter or would…
				fm.data(unresolved=True)

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

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

mercurial/commands.py

	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 morestatus:
				morestatus.formatfile(f, fm)

	if morestatus:			if morestatus:
	morestatus.formatfooter(fm)			morestatus.formatfooter(fm)
	fm.end()			fm.end()


	@command(			@command(
	b'summary\|sum',			b'summary\|sum',

tests/test-conflict.t


	# To continue: hg commit			# To continue: hg commit
	# To abort: hg merge --abort			# To abort: hg merge --abort

	$ hg status -Tjson			$ hg status -Tjson
	[			[
	{			{
	"path": "a",			"path": "a",
	"status": "M"			"status": "M",
				"unresolved": true
	},			},
	{			{
	"path": "a.orig",			"path": "a.orig",
	"status": "?"			"status": "?"
	}			}
	]			]

	$ cat a			$ cat a

This is an archive of the discontinued Mercurial Phabricator instance.

status: add template/json data about whether a file has unresolved conflictsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 18606

mercurial/cmdutil.py

mercurial/commands.py

tests/test-conflict.t

status: add template/json data about whether a file has unresolved conflicts
ClosedPublic

Revision Contents
Changeset List