This is an archive of the discontinued Mercurial Phabricator instance.

Differential D515

phabricator: standardize colors
ClosedPublic

Authored by quark on Aug 24 2017, 9:15 PM.

Details

Reviewers
indygreg
yuja
Group Reviewers
hg-reviewers
Commits
rHG941c33cfde81: phabricator: standardize colors
Summary

Previously, the --confirm text could have colors but the main phabsend
does not. This patch adjusts the main command so it also has colors.
A default color table was added so the colors are visible by default.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 24 2017, 9:15 PM
indygreg requested changes to this revision.Aug 25 2017, 12:11 AM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
contrib/phabricator.py
444

I suspect Python 3 won't be happy with this. You probably want bytes().

This revision now requires changes to proceed.Aug 25 2017, 12:11 AM
quark edited edge metadata.Aug 25 2017, 12:33 AM
quark updated this revision to Diff 1280.
quark marked an inline comment as done.Aug 25 2017, 12:34 AM
quark added inline comments.
contrib/phabricator.py
444

Good to know bytes could be used here!

yuja requested changes to this revision.Sep 1 2017, 9:03 AM
yuja added a subscriber: yuja.
yuja added inline comments.
contrib/phabricator.py
443

You'll need a mapping from action to _('...'). gettext isn't smart
to capture all possible action values.

This revision now requires changes to proceed.Sep 1 2017, 9:03 AM
quark edited edge metadata.Sep 1 2017, 3:20 PM
quark marked an inline comment as done.
quark added a child revision: D605: phabricator: add a config to use curl for communication.
quark updated this revision to Diff 1546.
Closed by commit rHG941c33cfde81: phabricator: standardize colors (authored by quark). · Explain WhySep 3 2017, 10:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/phabricator.py (23 lines)

Diff 1280

contrib/phabricator.py

tags, tags,
url as urlmod, url as urlmod,
util, util,
) )
cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
colortable = {
'phabricator.action.created': 'green',
'phabricator.action.skipped': 'magenta',
'phabricator.action.updated': 'magenta',
'phabricator.desc': '',
'phabricator.drev': 'bold',
'phabricator.node': '',
}
def urlencodenested(params): def urlencodenested(params):
"""like urlencode, but works with nested parameters. """like urlencode, but works with nested parameters.
For example, if params is {'a': ['b', 'c'], 'd': {'e': 'f'}}, it will be For example, if params is {'a': ['b', 'c'], 'd': {'e': 'f'}}, it will be
flattened to {'a[0]': 'b', 'a[1]': 'c', 'd[e]': 'f'} and then passed to flattened to {'a[0]': 'b', 'a[1]': 'c', 'd[e]': 'f'} and then passed to
urlencode. Note: the encoding is consistent with PHP's http_build_query. urlencode. Note: the encoding is consistent with PHP's http_build_query.
""" """
flatparams = util.sortdict() flatparams = util.sortdict()
oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None)) oldnode, olddiff, revid = oldmap.get(ctx.node(), (None, None, None))
if oldnode != ctx.node() or opts.get('amend'): if oldnode != ctx.node() or opts.get('amend'):
# Create or update Differential Revision # Create or update Differential Revision
revision, diff = createdifferentialrevision( revision, diff = createdifferentialrevision(
ctx, revid, lastrevid, oldnode, olddiff, actions) ctx, revid, lastrevid, oldnode, olddiff, actions)
diffmap[ctx.node()] = diff diffmap[ctx.node()] = diff
newrevid = int(revision[r'object'][r'id']) newrevid = int(revision[r'object'][r'id'])
if revid: if revid:
action = _('updated') action = 'updated'
else: else:
action = _('created') action = 'created'
# Create a local tag to note the association, if commit message # Create a local tag to note the association, if commit message
# does not have it already # does not have it already
m = _differentialrevisiondescre.search(ctx.description()) m = _differentialrevisiondescre.search(ctx.description())
if not m or int(m.group(1)) != newrevid: if not m or int(m.group(1)) != newrevid:
tagname = 'D%d' % newrevid tagname = 'D%d' % newrevid
tags.tag(repo, tagname, ctx.node(), message=None, user=None, tags.tag(repo, tagname, ctx.node(), message=None, user=None,
date=None, local=True) date=None, local=True)
else: else:
# Nothing changed. But still set "newrevid" so the next revision # Nothing changed. But still set "newrevid" so the next revision
# could depend on this one. # could depend on this one.
newrevid = revid newrevid = revid
action = _('skipped') action = 'skipped'
ui.write(_('D%s: %s - %s: %s\n') % (newrevid, action, ctx, drevdesc = ui.label('D%s' % newrevid, 'phabricator.drev')
ctx.description().split('\n')[0])) actiondesc = ui.label(_(action), 'phabricator.action.%s' % action)
yujaUnsubmitted
Not Done

You'll need a mapping from action to _('...'). gettext isn't smart
to capture all possible action values.

yuja: You'll need a mapping from action to _('...'). gettext isn't smart to capture all possible…
nodedesc = ui.label(bytes(ctx), 'phabricator.node')
indygregUnsubmitted
Done

I suspect Python 3 won't be happy with this. You probably want bytes().

indygreg: I suspect Python 3 won't be happy with this. You probably want `bytes()`.
quarkAuthorUnsubmitted
Not Done

Good to know bytes could be used here!

quark: Good to know `bytes` could be used here!
desc = ui.label(ctx.description().split('\n')[0], 'phabricator.desc')
ui.write(_('%s - %s - %s: %s\n') % (drevdesc, actiondesc, nodedesc,
desc))
drevids.append(newrevid) drevids.append(newrevid)
lastrevid = newrevid lastrevid = newrevid
# Update commit messages and remove tags # Update commit messages and remove tags
if opts.get('amend'): if opts.get('amend'):
unfi = repo.unfiltered() unfi = repo.unfiltered()
drevs = callconduit(repo, 'differential.query', {'ids': drevids}) drevs = callconduit(repo, 'differential.query', {'ids': drevids})
with repo.wlock(), repo.lock(), repo.transaction('phabsend'): with repo.wlock(), repo.lock(), repo.transaction('phabsend'):