This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8389

phabricator: add debug logging to show previous node values in `phabsend`
ClosedPublic

Authored by mharbison72 on Apr 8 2020, 5:52 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG38f7b2f02f6d: phabricator: add debug logging to show previous node values in `phabsend`
Summary

This isn't real useful here, but was very useful showing how phabsend --fold
handles commits created by hg fold and hg split. It introduces a new debug
function and flag instead of using ui.debug(), because --debug prints out
all of the API chatter.

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

mharbison72 created this revision.Apr 8 2020, 5:52 PM
Alphare accepted this revision.Apr 16 2020, 9:42 AM
mharbison72 added a commit: rHG38f7b2f02f6d: phabricator: add debug logging to show previous node values in `phabsend`.Apr 16 2020, 12:42 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG38f7b2f02f6d: phabricator: add debug logging to show previous node values in `phabsend` (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (38 lines)
Mtests/test-phabricator.t (21 lines)

Diff 21132

hgext/phabricator.py

import contextlib import contextlib
import hashlib import hashlib
import itertools import itertools
import json import json
import mimetypes import mimetypes
import operator import operator
import re import re
from mercurial.node import bin, nullid from mercurial.node import bin, nullid, short
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.pycompat import getattr from mercurial.pycompat import getattr
from mercurial.thirdparty import attr from mercurial.thirdparty import attr
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
context, context,
copies, copies,
encoding, encoding,
b'phabricator', b'batchsize', default=12, b'phabricator', b'batchsize', default=12,
) )
eh.configitem( eh.configitem(
b'phabricator', b'callsign', default=None, b'phabricator', b'callsign', default=None,
) )
eh.configitem( eh.configitem(
b'phabricator', b'curlcmd', default=None, b'phabricator', b'curlcmd', default=None,
) )
# developer config: phabricator.debug
eh.configitem(
b'phabricator', b'debug', default=False,
)
# developer config: phabricator.repophid # developer config: phabricator.repophid
eh.configitem( eh.configitem(
b'phabricator', b'repophid', default=None, b'phabricator', b'repophid', default=None,
) )
eh.configitem( eh.configitem(
b'phabricator', b'url', default=None, b'phabricator', b'url', default=None,
) )
eh.configitem( eh.configitem(
spec, spec,
helpcategory=helpcategory, helpcategory=helpcategory,
optionalrepo=optionalrepo, optionalrepo=optionalrepo,
)(cmd) )(cmd)
return decorate return decorate
def _debug(ui, *msg, **opts):
"""write debug output for Phabricator if ``phabricator.debug`` is set
Specifically, this avoids dumping Conduit and HTTP auth chatter that is
printed with the --debug argument.
"""
if ui.configbool(b"phabricator", b"debug"):
flag = ui.debugflag
try:
ui.debugflag = True
ui.write(*msg, **opts)
finally:
ui.debugflag = flag
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()
The ``old node``, if not None, is guaranteed to be the last diff of The ``old node``, if not None, is guaranteed to be the last diff of
corresponding Differential Revision, and exist in the repo. corresponding Differential Revision, and exist in the repo.
""" """
unfi = repo.unfiltered() unfi = repo.unfiltered()
has_node = unfi.changelog.index.has_node has_node = unfi.changelog.index.has_node
result = {} # {node: (oldnode?, lastdiff?, drev)} result = {} # {node: (oldnode?, lastdiff?, drev)}
toconfirm = {} # {node: (force, {precnode}, drev)} # ordered for test stability when printing new -> old mapping below
toconfirm = util.sortdict() # {node: (force, {precnode}, drev)}
for node in nodelist: for node in nodelist:
ctx = unfi[node] ctx = unfi[node]
# For tags like "D123", put them into "toconfirm" to verify later # For tags like "D123", put them into "toconfirm" to verify later
precnodes = list(obsutil.allpredecessors(unfi.obsstore, [node])) precnodes = list(obsutil.allpredecessors(unfi.obsstore, [node]))
for n in precnodes: for n in precnodes:
if has_node(n): if has_node(n):
for tag in unfi.nodetags(n): for tag in unfi.nodetags(n):
m = _differentialrevisiontagre.match(tag) m = _differentialrevisiontagre.match(tag)
# Find the last node using Phabricator metadata, and make sure it # Find the last node using Phabricator metadata, and make sure it
# exists in the repo # exists in the repo
oldnode = lastdiff = None oldnode = lastdiff = None
if diffs: if diffs:
lastdiff = max(diffs, key=lambda d: int(d[b'id'])) lastdiff = max(diffs, key=lambda d: int(d[b'id']))
oldnodes = getnodes(lastdiff, precset) oldnodes = getnodes(lastdiff, precset)
_debug(
unfi.ui,
b"%s mapped to old nodes %s\n"
% (
short(newnode),
stringutil.pprint([short(n) for n in sorted(oldnodes)]),
),
)
# If this commit was the result of `hg fold` after submission, # If this commit was the result of `hg fold` after submission,
# and now resubmitted with --fold, the easiest thing to do is # and now resubmitted with --fold, the easiest thing to do is
# to leave the node clear. This only results in creating a new # to leave the node clear. This only results in creating a new
# diff for the _same_ Differential Revision if this commit is # diff for the _same_ Differential Revision if this commit is
# the first or last in the selected range. # the first or last in the selected range.
# If this commit is the result of `hg split` in the same # If this commit is the result of `hg split` in the same
# scenario, there is a single oldnode here (and multiple # scenario, there is a single oldnode here (and multiple
# newnodes mapped to it). That makes it the same as the normal # newnodes mapped to it). That makes it the same as the normal
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.
""" """
_debug(
unfi.ui,
b"new commits: %s\n" % stringutil.pprint([short(n) for n in newnodes]),
)
try: try:
writediffproperties([unfi[newnode] for newnode in newnodes], diff) writediffproperties([unfi[newnode] for newnode in newnodes], diff)
except util.urlerr.urlerror: except util.urlerr.urlerror:
# If it fails just warn and keep going, otherwise the DREV # If it fails just warn and keep going, otherwise the DREV
# associations will be lost # associations will be lost
unfi.ui.warnnoi18n(b'Failed to update metadata for D%d\n' % drevid) unfi.ui.warnnoi18n(b'Failed to update metadata for D%d\n' % drevid)

tests/test-phabricator.t

#require vcr #require vcr
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> phabricator = > phabricator =
>
> [phabricator]
> debug = True
> EOF > EOF
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [phabricator] > [phabricator]
> url = https://phab.mercurial-scm.org/ > url = https://phab.mercurial-scm.org/
> callsign = HG > callsign = HG
> >
Create a differential diff: Create a differential diff:
$ HGENCODING=utf-8; export HGENCODING $ HGENCODING=utf-8; export HGENCODING
$ echo alpha > alpha $ echo alpha > alpha
$ hg ci --addremove -m 'create alpha for phabricator test €' $ hg ci --addremove -m 'create alpha for phabricator test €'
adding alpha adding alpha
$ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json" $ hg phabsend -r . --test-vcr "$VCR/phabsend-create-alpha.json"
D7915 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc) D7915 - created - d386117f30e6: create alpha for phabricator test \xe2\x82\xac (esc)
new commits: ['347bf67801e5']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d386117f30e6-24ffe649-phabsend.hg
$ echo more >> alpha $ echo more >> alpha
$ HGEDITOR=true hg ci --amend $ HGEDITOR=true hg ci --amend
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/347bf67801e5-3bf313e4-amend.hg
$ echo beta > beta $ echo beta > beta
$ hg ci --addremove -m 'create beta for phabricator test' $ hg ci --addremove -m 'create beta for phabricator test'
adding beta adding beta
$ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json" $ hg phabsend -r ".^::" --test-vcr "$VCR/phabsend-update-alpha-create-beta.json"
c44b38f24a45 mapped to old nodes []
D7915 - updated - c44b38f24a45: create alpha for phabricator test \xe2\x82\xac (esc) D7915 - updated - c44b38f24a45: create alpha for phabricator test \xe2\x82\xac (esc)
D7916 - created - 9e6901f21d5b: create beta for phabricator test D7916 - created - 9e6901f21d5b: create beta for phabricator test
new commits: ['a692622e6937']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9e6901f21d5b-1fcd4f0e-phabsend.hg
$ unset HGENCODING $ unset HGENCODING
The amend won't explode after posting a public commit. The local tag is left The amend won't explode after posting a public commit. The local tag is left
behind to identify it. behind to identify it.
$ echo 'public change' > beta $ echo 'public change' > beta
$ hg ci -m 'create public change for phabricator testing' $ hg ci -m 'create public change for phabricator testing'
$ hg phase --public . $ hg phase --public .
$ echo 'draft change' > alpha $ echo 'draft change' > alpha
$ hg ci -m 'create draft change for phabricator testing' $ hg ci -m 'create draft change for phabricator testing'
$ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json" $ hg phabsend --amend -r '.^::' --test-vcr "$VCR/phabsend-create-public.json"
D7917 - created - 7b4185ab5d16: create public change for phabricator testing D7917 - created - 7b4185ab5d16: create public change for phabricator testing
D7918 - created - 251c1c333fc6: create draft change for phabricator testing D7918 - created - 251c1c333fc6: create draft change for phabricator testing
warning: not updating public commit 2:7b4185ab5d16 warning: not updating public commit 2:7b4185ab5d16
new commits: ['3244dc4a3334']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/251c1c333fc6-41cb7c3b-phabsend.hg
$ hg tags -v $ hg tags -v
tip 3:3244dc4a3334 tip 3:3244dc4a3334
D7917 2:7b4185ab5d16 local D7917 2:7b4185ab5d16 local
$ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF $ hg debugcallconduit user.search --test-vcr "$VCR/phab-conduit.json" <<EOF
> { > {
> "constraints": { > "constraints": {
0 https://phab.mercurial-scm.org/D7915 D7915 0 https://phab.mercurial-scm.org/D7915 D7915
Commenting when phabsending: Commenting when phabsending:
$ echo comment > comment $ echo comment > comment
$ hg ci --addremove -m "create comment for phabricator test" $ hg ci --addremove -m "create comment for phabricator test"
adding comment adding comment
$ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json" $ hg phabsend -r . -m "For default branch" --test-vcr "$VCR/phabsend-comment-created.json"
D7919 - created - d5dddca9023d: create comment for phabricator test D7919 - created - d5dddca9023d: create comment for phabricator test
new commits: ['f7db812bbe1d']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d5dddca9023d-adf673ba-phabsend.hg
$ echo comment2 >> comment $ echo comment2 >> comment
$ hg ci --amend $ hg ci --amend
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f7db812bbe1d-8fcded77-amend.hg
$ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json" $ hg phabsend -r . -m "Address review comments" --test-vcr "$VCR/phabsend-comment-updated.json"
1849d7828727 mapped to old nodes []
D7919 - updated - 1849d7828727: create comment for phabricator test D7919 - updated - 1849d7828727: create comment for phabricator test
Phabsending a skipped commit: Phabsending a skipped commit:
$ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json" $ hg phabsend --no-amend -r . --test-vcr "$VCR/phabsend-skipped.json"
1849d7828727 mapped to old nodes ['1849d7828727']
D7919 - skipped - 1849d7828727: create comment for phabricator test D7919 - skipped - 1849d7828727: create comment for phabricator test
Phabesending a new binary, a modified binary, and a removed binary Phabesending a new binary, a modified binary, and a removed binary
>>> open('bin', 'wb').write(b'\0a') and None >>> open('bin', 'wb').write(b'\0a') and None
$ hg ci -Am 'add binary' $ hg ci -Am 'add binary'
adding bin adding bin
>>> open('bin', 'wb').write(b'\0b') and None >>> open('bin', 'wb').write(b'\0b') and None
$ hg ci -m 'modify binary' $ hg ci -m 'modify binary'
$ hg rm bin $ hg rm bin
$ hg ci -m 'remove binary' $ hg ci -m 'remove binary'
$ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json" $ hg phabsend -r .~2:: --test-vcr "$VCR/phabsend-binary.json"
uploading bin@aa24a81f55de uploading bin@aa24a81f55de
D8007 - created - aa24a81f55de: add binary D8007 - created - aa24a81f55de: add binary
uploading bin@d8d62a881b54 uploading bin@d8d62a881b54
D8008 - created - d8d62a881b54: modify binary D8008 - created - d8d62a881b54: modify binary
D8009 - created - af55645b2e29: remove binary D8009 - created - af55645b2e29: remove binary
new commits: ['b8139fbb4a57']
new commits: ['c88ce4c2d2ad']
new commits: ['75dbbc901145']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/aa24a81f55de-a3a0cf24-phabsend.hg
Phabsend a renamed binary and a copied binary, with and without content changes Phabsend a renamed binary and a copied binary, with and without content changes
to src and dest to src and dest
>>> open('bin2', 'wb').write(b'\0c') and None >>> open('bin2', 'wb').write(b'\0c') and None
$ hg ci -Am 'add another binary' $ hg ci -Am 'add another binary'
adding bin2 adding bin2
D8128 - created - f42f9195e00c: add another binary D8128 - created - f42f9195e00c: add another binary
D8129 - created - 834ab31d80ae: moved binary D8129 - created - 834ab31d80ae: moved binary
D8130 - created - 494b750e5194: copied binary D8130 - created - 494b750e5194: copied binary
uploading bin2_moved_again@25f766b50cc2 uploading bin2_moved_again@25f766b50cc2
D8131 - created - 25f766b50cc2: move+mod copied binary D8131 - created - 25f766b50cc2: move+mod copied binary
uploading bin2_moved_copied@1b87b363a5e4 uploading bin2_moved_copied@1b87b363a5e4
uploading bin2_moved@1b87b363a5e4 uploading bin2_moved@1b87b363a5e4
D8132 - created - 1b87b363a5e4: copy+mod moved binary D8132 - created - 1b87b363a5e4: copy+mod moved binary
new commits: ['90437c20312a']
new commits: ['f391f4da4c61']
new commits: ['da86a9f3268c']
new commits: ['003ffc16ba66']
new commits: ['13bd750c36fa']
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f42f9195e00c-e82a0769-phabsend.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/f42f9195e00c-e82a0769-phabsend.hg
Phabreading a DREV with a local:commits time as a string: Phabreading a DREV with a local:commits time as a string:
$ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285 $ hg phabread --test-vcr "$VCR/phabread-str-time.json" D1285
# HG changeset patch # HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com> # User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1509404054 -19800 # Date 1509404054 -19800
# Node ID 44fc1c1f1774a76423b9c732af6938435099bcc5 # Node ID 44fc1c1f1774a76423b9c732af6938435099bcc5
extensions.loadall(self.ui) extensions.loadall(self.ui)
A bad .arcconfig doesn't error out A bad .arcconfig doesn't error out
$ echo 'garbage' > .arcconfig $ echo 'garbage' > .arcconfig
$ hg config phabricator --debug $ hg config phabricator --debug
invalid JSON in $TESTTMP/repo/.arcconfig invalid JSON in $TESTTMP/repo/.arcconfig
read config from: */.hgrc (glob) read config from: */.hgrc (glob)
*/.hgrc:*: phabricator.debug=True (glob)
$TESTTMP/repo/.hg/hgrc:*: phabricator.url=https://phab.mercurial-scm.org/ (glob) $TESTTMP/repo/.hg/hgrc:*: phabricator.url=https://phab.mercurial-scm.org/ (glob)
$TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=HG (glob) $TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=HG (glob)
The .arcconfig content overrides global config The .arcconfig content overrides global config
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [phabricator] > [phabricator]
> url = global > url = global
> callsign = global > callsign = global
> EOF > EOF
$ cp $TESTDIR/../.arcconfig . $ cp $TESTDIR/../.arcconfig .
$ mv .hg/hgrc .hg/hgrc.bak $ mv .hg/hgrc .hg/hgrc.bak
$ hg config phabricator --debug $ hg config phabricator --debug
read config from: */.hgrc (glob) read config from: */.hgrc (glob)
*/.hgrc:*: phabricator.debug=True (glob)
$TESTTMP/repo/.arcconfig: phabricator.callsign=HG $TESTTMP/repo/.arcconfig: phabricator.callsign=HG
$TESTTMP/repo/.arcconfig: phabricator.url=https://phab.mercurial-scm.org/ $TESTTMP/repo/.arcconfig: phabricator.url=https://phab.mercurial-scm.org/
But it doesn't override local config But it doesn't override local config
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [phabricator] > [phabricator]
> url = local > url = local
> callsign = local > callsign = local
> EOF > EOF
$ hg config phabricator --debug $ hg config phabricator --debug
read config from: */.hgrc (glob) read config from: */.hgrc (glob)
*/.hgrc:*: phabricator.debug=True (glob)
$TESTTMP/repo/.hg/hgrc:*: phabricator.url=local (glob) $TESTTMP/repo/.hg/hgrc:*: phabricator.url=local (glob)
$TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=local (glob) $TESTTMP/repo/.hg/hgrc:*: phabricator.callsign=local (glob)
$ mv .hg/hgrc.bak .hg/hgrc $ mv .hg/hgrc.bak .hg/hgrc
Phabimport works with a stack Phabimport works with a stack
$ cd .. $ cd ..
$ hg clone repo repo2 -qr 1 $ hg clone repo repo2 -qr 1