This is an archive of the discontinued Mercurial Phabricator instance.

Differential D689

fbconduit: properly pass through params on local hit
ClosedPublic

Authored by ryanmce on Sep 12 2017, 9:04 AM.
Tags
None
Subscribers
None

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGXa306dfcf14a5: fbconduit: properly pass through params on local hit
Summary

Previously, we didn't pass through additional parameters, which resulted in
errors complaining about insufficient arguments.

Test Plan

Added a new test that previously crashed

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ryanmce created this revision.Sep 12 2017, 9:04 AM
ryanmce updated this revision to Diff 1748.

fix test

simonfar accepted this revision.Sep 12 2017, 10:46 AM
This revision is now accepted and ready to land.Sep 12 2017, 10:46 AM
Closed by commit rFBHGXa306dfcf14a5: fbconduit: properly pass through params on local hit (authored by ryanmce). · Explain WhySep 12 2017, 11:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbconduit.py (2 lines)
Mtests/test-fbconduit.t (22 lines)

Diff 1761

hgext3rd/fbconduit.py

if phabmatch: if phabmatch:
phabrepo = phabmatch.group(1) phabrepo = phabmatch.group(1)
phabhash = phabmatch.group(2) phabhash = phabmatch.group(2)
# The hash may be a git hash # The hash may be a git hash
if phabrepo in repo.ui.configlist('fbconduit', 'gitcallsigns', []): if phabrepo in repo.ui.configlist('fbconduit', 'gitcallsigns', []):
return overridestringset(orig, repo, subset, 'g%s' % phabhash) return overridestringset(orig, repo, subset, 'g%s' % phabhash)
if phabhash in repo: if phabhash in repo:
return orig(repo, subset, phabhash) return orig(repo, subset, phabhash, *args, **kwargs)
# Is the given revset a phabricator svn revision (rO11223232323232)? # Is the given revset a phabricator svn revision (rO11223232323232)?
svnrev = fbsvnhash.match(x) svnrev = fbsvnhash.match(x)
if svnrev and not x in repo: if svnrev and not x in repo:
try: try:
extensions.find('hgsubversion') extensions.find('hgsubversion')
meta = repo.svnmeta() meta = repo.svnmeta()

tests/test-fbconduit.t

Start up translation service. Start up translation service.
$ $PYTHON "$TESTDIR/conduithttp.py" --port-file conduit.port --pid conduit.pid $ $PYTHON "$TESTDIR/conduithttp.py" --port-file conduit.port --pid conduit.pid
$ cat conduit.pid >> $DAEMON_PIDS $ cat conduit.pid >> $DAEMON_PIDS
$ CONDUIT_PORT=`cat conduit.port` $ CONDUIT_PORT=`cat conduit.port`
Basic functionality. Basic functionality.
$ hg init basic $ hg init basic
$ cd basic $ cd basic
$ echo "[extensions]" >> .hg/hgrc $ cat >> .hg/hgrc <<EOF
$ echo "fbconduit = $TESTDIR/../hgext3rd/fbconduit.py" >> .hg/hgrc > [extensions]
$ echo "[fbconduit]" >> .hg/hgrc > fbconduit = $TESTDIR/../hgext3rd/fbconduit.py
$ echo "reponame = basic" >> .hg/hgrc > [fbconduit]
$ echo "host = localhost:$CONDUIT_PORT" >> .hg/hgrc > reponame = basic
$ echo "path = /intern/conduit/" >> .hg/hgrc > host = localhost:$CONDUIT_PORT
$ echo "protocol = http" >> .hg/hgrc > path = /intern/conduit/
> protocol = http
> EOF
$ touch file $ touch file
$ hg add file $ hg add file
$ hg ci -m "initial commit" $ hg ci -m "initial commit"
$ commitid=`hg log -T "{label('custom.fullrev',node)}"` $ commitid=`hg log -T "{label('custom.fullrev',node)}"`
$ hg phase -p $commitid $ hg phase -p $commitid
$ curl -s -X PUT http://localhost:$CONDUIT_PORT/basic/hg/basic/git/$commitid/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa $ curl -s -X PUT http://localhost:$CONDUIT_PORT/basic/hg/basic/git/$commitid/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
$ hg log -T '{gitnode}\n' $ hg log -T '{gitnode}\n'
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
$ cd .. $ cd ..
Make sure the template keywords are documented correctly Make sure the template keywords are documented correctly
$ cd basic $ cd basic
$ hg help templates | grep gitnode $ hg help templates | grep gitnode
gitnode Return the git revision corresponding to a given hg rev gitnode Return the git revision corresponding to a given hg rev
$ cd .. $ cd ..
Make sure that locally found commits actually work
$ cd basic
$ hg up rFBS4772e01e369e598da6a916e3f4fc83dd8944bf23
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..