This is an archive of the discontinued Mercurial Phabricator instance.

hgext/phabricator.py
926	I didn't use `get` here because "dateCreated" is set by conduit, not the submitted data, so should always be present and valid (but will make it `get` if requested).

martinvonz added a subscriber: martinvonz.Apr 24 2019, 3:09 PM

martinvonz added inline comments.

hgext/phabricator.py
926	I'm not very good at using the phabricator interface, but it seems like this has been addressed since this line doesn't have a `get`. Can someone confirm?
926	Oh, sorry, Kwan is the author is this series :P So nothing needs to be done then.

Closed by commit rHGa4f7dceb07bf: phabricator: fallback to reading metadata from diff for phabread (authored by Kwan). · Explain WhyMay 6 2019, 12:22 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/phabricator.py (42 lines)
M			tests/test-phabricator.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14889		Apr 22 2019, 11:52 AM	★	★
Diff 2	14890		Apr 22 2019, 1:31 PM	★	★
Diff 3	14894		Apr 22 2019, 1:57 PM	★	★
Diff 4	15028	rHGa4f7dceb07bf0fb533a540c78240d751bf297ccc	Apr 22 2019, 1:55 PM	★	★

Commit	Parents	Author	Summary	Date
da9e6f35b0d1	be02a61657ee	Ian Moody		Apr 20 2019, 1:55 PM

Status	Author	Revision
Closed	Kwan	D6347 phabricator: add custom vcr matcher to match request bodies
Closed	Kwan	D6302 phabricator: include branch in the phabread output
Closed	Kwan	D6301 phabricator: fallback to reading metadata from diff for phabread
Closed	Kwan	D6300 phabricator: read more metadata from local:commits
Closed	Kwan	D6299 phabricator: don't assume the existence of properties of local:commits
Closed	Kwan	D6298 phabricator: include commit (node) and parent in the local:commits metadata
Closed	Kwan	D6297 phabricator: include branch in the diffproperty metadata
Closed	Kwan	D6296 phabricator: set local:commits time metadata as an int, not a string
Closed	Kwan	D6295 phabricator: use templatefilters.json in writediffproperties

Diff 14890

hgext/phabricator.py

	}			}
	}			}

	Note: metadata extracted from "local:commits" will lose time zone			Note: metadata extracted from "local:commits" will lose time zone
	information.			information.
	"""			"""
	props = diff.get(b'properties') or {}			props = diff.get(b'properties') or {}
	meta = props.get(b'hg:meta')			meta = props.get(b'hg:meta')
	if not meta and props.get(b'local:commits'):			if not meta:
				if props.get(b'local:commits'):
	commit = sorted(props[b'local:commits'].values())[0]			commit = sorted(props[b'local:commits'].values())[0]
	meta = {}			meta = {}
	if b'author' in commit and b'authorEmail' in commit:			if b'author' in commit and b'authorEmail' in commit:
	meta[b'user'] = b'%s <%s>' % (commit[b'author'],			meta[b'user'] = b'%s <%s>' % (commit[b'author'],
	commit[b'authorEmail'])			commit[b'authorEmail'])
	if b'time' in commit:			if b'time' in commit:
	meta[b'date'] = b'%d 0' % commit[b'time']			meta[b'date'] = b'%d 0' % commit[b'time']
	if b'branch' in commit:			if b'branch' in commit:
	meta[b'branch'] = commit[b'branch']			meta[b'branch'] = commit[b'branch']
	node = commit.get(b'commit', commit.get(b'rev'))			node = commit.get(b'commit', commit.get(b'rev'))
	if node:			if node:
	meta[b'node'] = node			meta[b'node'] = node
	if len(commit.get(b'parents', ())) >= 1:			if len(commit.get(b'parents', ())) >= 1:
	meta[b'parent'] = commit[b'parents'][0]			meta[b'parent'] = commit[b'parents'][0]
	return meta or {}			else:
				meta = {}
				if b'date' not in meta and b'dateCreated' in diff:
				KwanAuthorUnsubmitted Not Done I didn't use `get` here because "dateCreated" is set by conduit, not the submitted data, so should always be present and valid (but will make it `get` if requested). Kwan: I didn't use `get` here because "dateCreated" is set by conduit, not the submitted data, so…
				martinvonzUnsubmitted Not Done I'm not very good at using the phabricator interface, but it seems like this has been addressed since this line doesn't have a `get`. Can someone confirm? martinvonz: I'm not very good at using the phabricator interface, but it seems like this has been addressed…
				martinvonzUnsubmitted Not Done Oh, sorry, Kwan is the author is this series :P So nothing needs to be done then. martinvonz: Oh, sorry, Kwan is the author is this series :P So nothing needs to be done then.
				meta[b'date'] = b'%s 0' % diff[b'dateCreated']
				if (b'branch' not in meta and b'branch' in diff and
				diff[b'branch'] is not None):
				meta[b'branch'] = diff[b'branch']
				if b'parent' not in meta and b'sourceControlBaseRevision' in diff:
				meta[b'parent'] = diff[b'sourceControlBaseRevision']
				return meta

	def readpatch(repo, drevs, write):			def readpatch(repo, drevs, write):
	"""generate plain-text patch readable by 'hg import'			"""generate plain-text patch readable by 'hg import'

	write is usually ui.write. drevs is what "querydrev" returns, results of			write is usually ui.write. drevs is what "querydrev" returns, results of
	"differential.query".			"differential.query".
	"""			"""
	# Prefetch hg:meta property for all diffs			# Prefetch hg:meta property for all diffs

tests/test-phabricator.t

	this test.			this test.
	$ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \			$ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \
	> --test-vcr "$VCR/phabread-conduit-error.json" D4480 \| head			> --test-vcr "$VCR/phabread-conduit-error.json" D4480 \| head
	abort: Conduit Error (ERR-INVALID-AUTH): API token "cli-notavalidtoken" has the wrong length. API tokens should be 32 characters long.			abort: Conduit Error (ERR-INVALID-AUTH): API token "cli-notavalidtoken" has the wrong length. API tokens should be 32 characters long.

	Basic phabread:			Basic phabread:
	$ hg phabread --test-vcr "$VCR/phabread-4480.json" D4480 \| head			$ hg phabread --test-vcr "$VCR/phabread-4480.json" D4480 \| head
	# HG changeset patch			# HG changeset patch
				# Date 1536771503 0
				# Parent a5de21c9e3703f8e8eb064bd7d893ff2f703c66a
	exchangev2: start to implement pull with wire protocol v2			exchangev2: start to implement pull with wire protocol v2

	Wire protocol version 2 will take a substantially different			Wire protocol version 2 will take a substantially different
	approach to exchange than version 1 (at least as far as pulling			approach to exchange than version 1 (at least as far as pulling
	is concerned).			is concerned).

	This commit establishes a new exchangev2 module for holding			This commit establishes a new exchangev2 module for holding
	code related to exchange using wire protocol v2. I could have
	added things to the existing exchange module. But it is already

	phabupdate with an accept:			phabupdate with an accept:
	$ hg phabupdate --accept D4564 \			$ hg phabupdate --accept D4564 \
	> -m 'I think I like where this is headed. Will read rest of series later.'\			> -m 'I think I like where this is headed. Will read rest of series later.'\
	> --test-vcr "$VCR/accept-4564.json"			> --test-vcr "$VCR/accept-4564.json"

	Create a differential diff:			Create a differential diff:
	$ HGENCODING=utf-8; export HGENCODING			$ HGENCODING=utf-8; export HGENCODING

This is an archive of the discontinued Mercurial Phabricator instance.

phabricator: fallback to reading metadata from diff for phabreadClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 14890

hgext/phabricator.py

tests/test-phabricator.t

phabricator: fallback to reading metadata from diff for phabread
ClosedPublic

Revision Contents
Changeset List