This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8313

phabricator: extract logic to print the status when posting a commit
ClosedPublic

Authored by mharbison72 on Mar 20 2020, 5:24 PM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG949a87145336: phabricator: extract logic to print the status when posting a commit

Summary

This will make it easier to list each commit when folding. That makes the
output less confusing because it matches the output of --confirm and the
revisions listed on the command line.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Mar 20 2020, 5:24 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 20 2020, 5:24 PM

Herald added subscribers: mercurial-devel, Kwan. · View Herald Transcript

mharbison72 added a child revision: D8314: phabricator: add an option to fold several commits into one review (issue6244).Mar 20 2020, 5:24 PM

mharbison72 updated this revision to Diff 20909.Mar 29 2020, 12:57 AM

Alphare accepted this revision.Mar 31 2020, 4:39 AM

mharbison72 added a commit: rHG949a87145336: phabricator: extract logic to print the status when posting a commit.Apr 1 2020, 11:23 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG949a87145336: phabricator: extract logic to print the status when posting a commit (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

mharbison72 removed a child revision: D8314: phabricator: add an option to fold several commits into one review (issue6244).Apr 8 2020, 5:52 PM

Revision Contents
Changeset List

			Path	Packages
M			hgext/phabricator.py (36 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	20853		Mar 20 2020, 5:24 PM	★	★
Diff 2	20909		Mar 29 2020, 12:57 AM	★	★
Diff 3	20946	rHG949a8714533689fb57f303a7a599f4f6b1fdf095	Mar 18 2020, 2:53 PM	★	★

Commit	Parents	Author	Summary	Date
8df8ec1bf8f7	406d372b96d8	Matt Harbison		Mar 18 2020, 2:53 PM

Status	Author	Revision
Closed	mharbison72	D8313 phabricator: extract logic to print the status when posting a commit
Closed	mharbison72	D8312 phabricator: extract the logic to amend diff properties to a function
Closed	mharbison72	D8311 phabricator: teach `getoldnodedrevmap()` to handle folded reviews
Closed	mharbison72	D8310 phabricator: teach createdifferentialrevision() to allow a folded commit range
Closed	mharbison72	D8309 phabricator: combine commit messages into the review when folding commits
Closed	mharbison72	D8308 phabricator: record all local commits used to create a Differential revision
Closed	mharbison72	D8307 phabricator: account for `basectx != ctx` when calculating renames
Closed	mharbison72	D8306 phabricator: add basectx arguments to file related `phabsend` utilities
Closed	mharbison72	D8305 phabricator: eliminate a couple of duplicate filectx lookups

Diff 20853

hgext/phabricator.py

	unresolved = set(names) - resolved			unresolved = set(names) - resolved
	if unresolved:			if unresolved:
	raise error.Abort(			raise error.Abort(
	_(b'unknown username: %s') % b' '.join(sorted(unresolved))			_(b'unknown username: %s') % b' '.join(sorted(unresolved))
	)			)
	return [entry[b'phid'] for entry in data]			return [entry[b'phid'] for entry in data]


				def _print_phabsend_action(ui, ctx, newrevid, action):
				"""print the ``action`` that occurred when posting ``ctx`` for review

				This is a utility function for the sending phase of ``phabsend``, which
				makes it easier to show a status for all local commits with `--fold``.
				"""
				actiondesc = ui.label(
				{
				b'created': _(b'created'),
				b'skipped': _(b'skipped'),
				b'updated': _(b'updated'),
				}[action],
				b'phabricator.action.%s' % action,
				)
				drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev')
				nodedesc = ui.label(bytes(ctx), b'phabricator.node')
				desc = ui.label(ctx.description().split(b'\n')[0], b'phabricator.desc')
				ui.write(_(b'%s - %s - %s: %s\n') % (drevdesc, actiondesc, nodedesc, desc))


	def _amend_diff_properties(unfi, drevid, newnodes, diff):			def _amend_diff_properties(unfi, drevid, newnodes, diff):
	"""update the local commit list for the ``diff`` associated with ``drevid``			"""update the local commit list for the ``diff`` associated with ``drevid``

	This is a utility function for the amend phase of ``phabsend``, which			This is a utility function for the amend phase of ``phabsend``, which
	converts failures to warning messages.			converts failures to warning messages.
	"""			"""
	try:			try:
	writediffproperties([unfi[newnode] for newnode in newnodes], diff)			writediffproperties([unfi[newnode] for newnode in newnodes], diff)
	)			)
	else:			else:
	# Nothing changed. But still set "newrevphid" so the next revision			# Nothing changed. But still set "newrevphid" so the next revision
	# could depend on this one and "newrevid" for the summary line.			# could depend on this one and "newrevid" for the summary line.
	newrevphid = querydrev(repo.ui, b'%d' % revid)[0][b'phid']			newrevphid = querydrev(repo.ui, b'%d' % revid)[0][b'phid']
	newrevid = revid			newrevid = revid
	action = b'skipped'			action = b'skipped'

	actiondesc = ui.label(
	{
	b'created': _(b'created'),
	b'skipped': _(b'skipped'),
	b'updated': _(b'updated'),
	}[action],
	b'phabricator.action.%s' % action,
	)
	drevdesc = ui.label(b'D%d' % newrevid, b'phabricator.drev')
	nodedesc = ui.label(bytes(ctx), b'phabricator.node')
	desc = ui.label(ctx.description().split(b'\n')[0], b'phabricator.desc')
	ui.write(
	_(b'%s - %s - %s: %s\n') % (drevdesc, actiondesc, nodedesc, desc)
	)
	drevids.append(newrevid)			drevids.append(newrevid)
	lastrevphid = newrevphid			lastrevphid = newrevphid

				_print_phabsend_action(ui, ctx, newrevid, action)

	# Update commit messages and remove tags			# Update commit messages and remove tags
	if opts.get(b'amend'):			if opts.get(b'amend'):
	unfi = repo.unfiltered()			unfi = repo.unfiltered()
	drevs = callconduit(ui, b'differential.query', {b'ids': drevids})			drevs = callconduit(ui, b'differential.query', {b'ids': drevids})
	with repo.wlock(), repo.lock(), repo.transaction(b'phabsend'):			with repo.wlock(), repo.lock(), repo.transaction(b'phabsend'):
	wnode = unfi[b'.'].node()			wnode = unfi[b'.'].node()
	mapping = {} # {oldnode: [newnode]}			mapping = {} # {oldnode: [newnode]}
	for i, rev in enumerate(revs):			for i, rev in enumerate(revs):