sapling/hgext3rd/phrevset.py

302 lines
9.7 KiB
Python
Raw Normal View History

[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
# phrevset.py - support for Phabricator revsets
#
# Copyright 2013 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""provides support for Phabricator revsets
Allows for queries such as `hg log -r D1234567` to find the commit which
corresponds to a specific Differential revision.
Automatically handles commits already in subversion, or whose hash has
changed since submitting to Differential (due to amends or rebasing).
Requires arcanist to be installed and properly configured.
Repositories should include a callsign in their hgrc.
Example for www:
[phrevset]
callsign = E
"""
from mercurial import (
error,
extensions,
hg,
registrar,
revset,
smartset,
)
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
from mercurial.i18n import _
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
try:
from hgsubversion import util as svnutil
except ImportError:
svnutil = None
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
import os
import signal
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
import json
import re
import subprocess
configtable = {}
configitem = registrar.configitem(configtable)
configitem('phrevset', 'callsign', default=None)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
DIFFERENTIAL_REGEX = re.compile(
'Differential Revision: http.+?/' # Line start, URL
'D(?P<id>[0-9]+)', # Differential ID, just numeric part
flags = re.LOCALE
)
DESCRIPTION_REGEX = re.compile(
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
'Commit r' # Prefix
'(?P<callsign>[A-Z]{1,})' # Callsign
'(?P<id>[a-f0-9]+)', # rev
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
flags = re.LOCALE
)
def getdiff(repo, diffid):
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
"""Perform a Conduit API call by shelling out to `arc`
Returns a subprocess.Popen instance"""
try:
proc = subprocess.Popen(['arc', 'call-conduit', 'differential.getdiff'],
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
preexec_fn=os.setsid)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
input = json.dumps({'revision_id': diffid})
repo.ui.debug("[diffrev] echo '%s' | "
"arc call-conduit differential.getdiff\n" % input)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
proc.stdin.write(input)
proc.stdin.close()
return proc
except Exception as e:
raise error.Abort('Could not not call "arc call-conduit": %s' % e)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
def finddiff(repo, diffid, proc=None):
"""Scans the changelog for commit lines mentioning the Differential ID
2016-04-04 22:48:01 +03:00
If the optional proc parameter is provided, it must be a subprocess.Popen
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
instance. It will be polled during the iteration and if it indicates that
the process has returned, the function will raise StopIteration"""
repo.ui.debug('[diffrev] Traversing log for %s\n' % diffid)
# traverse the changelog backwards
for rev in repo.changelog.revs(start=len(repo.changelog), stop=0):
if rev % 100 == 0 and proc and proc.poll() is not None:
raise StopIteration("Parallel proc call completed")
changectx = repo[rev]
desc = changectx.description()
match = DIFFERENTIAL_REGEX.search(desc)
if match and match.group('id') == diffid:
return changectx.rev()
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
return None
def forksearch(repo, diffid):
"""Perform a log traversal and Conduit call in parallel
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
Returns a (revisions, arc_response) tuple, where one of the items will be
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
None, depending on which process terminated first"""
repo.ui.debug('[diffrev] Starting Conduit call\n')
proc = getdiff(repo, diffid)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
try:
repo.ui.debug('[diffrev] Starting log walk\n')
rev = finddiff(repo, diffid, proc)
repo.ui.debug('[diffrev] Parallel log walk completed with %s\n' % rev)
os.killpg(proc.pid, signal.SIGTERM)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
if rev is None:
# walked the entire repo and couldn't find the diff
raise error.Abort('Could not find diff D%s in changelog' % diffid)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
return ([rev], None)
except StopIteration:
# search terminated because arc returned
# if returncode == 0, return arc's output
repo.ui.debug('[diffrev] Conduit call returned %i\n' % proc.returncode)
if proc.returncode != 0:
raise error.Abort('arc call returned status %i' % proc.returncode)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
resp = proc.stdout.read()
return (None, resp)
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
def parsedesc(repo, resp, ignoreparsefailure):
desc = resp['description']
if desc is None:
if ignoreparsefailure:
return None
else:
raise error.Abort("No Conduit description")
match = DESCRIPTION_REGEX.match(desc)
if not match:
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
if ignoreparsefailure:
return None
else:
raise error.Abort("Cannot parse Conduit description '%s'"
% desc)
callsign = match.group('callsign')
repo_callsign = repo.ui.config('phrevset', 'callsign')
if callsign != repo_callsign:
raise error.Abort("Diff callsign '%s' is different from repo"
" callsign '%s'" % (callsign, repo_callsign))
return match.group('id')
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
def revsetdiff(repo, subset, diffid):
"""Return a set of revisions corresponding to a given Differential ID """
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
repo_callsign = repo.ui.config('phrevset', 'callsign')
if repo_callsign is None:
msg = _('phrevset.callsign is not set - doing a linear search\n')
hint = _('This will be slow if the diff was not committed recently\n')
repo.ui.warn(msg)
repo.ui.warn(hint)
rev = finddiff(repo, diffid)
if rev is None:
raise error.Abort('Could not find diff D%s in changelog' % diffid)
else:
return [rev]
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
revs, resp = forksearch(repo, diffid)
if revs is not None:
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
# The log walk found the diff, nothing more to do
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
return revs
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
jsresp = json.loads(resp)
if not jsresp:
raise error.Abort('Could not decode Conduit response')
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
resp = jsresp.get('response')
if not resp:
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
e = jsresp.get('errorMessage', 'unknown error')
2016-04-04 22:48:01 +03:00
raise error.Abort('Conduit error: %s' % e)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
vcs = resp.get('sourceControlSystem')
repo.ui.debug('[diffrev] VCS is %s\n' % vcs)
if vcs == 'svn' and svnutil:
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
# commit has landed in svn, parse the description to get the SVN
# revision and delegate to hgsubversion for the rest
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
svnrev = parsedesc(repo, resp, ignoreparsefailure=False)
repo.ui.debug("[diffrev] SVN rev is r%s\n" % svnrev)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
args = ('string', svnrev)
return svnutil.revset_svnrev(repo, subset, args)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
elif vcs == 'git':
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
gitrev = parsedesc(repo, resp, ignoreparsefailure=False)
repo.ui.debug("[diffrev] GIT rev is %s\n" % gitrev)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
peerpath = repo.ui.expandpath('default')
remoterepo = hg.peer(repo, {}, peerpath)
remoterev = remoterepo.lookup('_gitlookup_git_%s' % gitrev)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
repo.ui.debug("[diffrev] HG rev is %s\n" % remoterev.encode('hex'))
if not remoterev:
repo.ui.debug('[diffrev] Falling back to linear search\n')
linear_search_result = finddiff(repo, diffid)
if linear_search_result is None:
# walked the entire repo and couldn't find the diff
raise error.Abort(
'Could not find diff D%s in changelog' % diffid)
return [linear_search_result]
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
return [repo[remoterev].rev()]
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
elif vcs == 'hg':
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
rev = parsedesc(repo, resp, ignoreparsefailure=True)
if rev:
# The response from phabricator contains a changeset ID.
# Convert it back to a rev number.
try:
node = repo[rev.encode('utf-8')]
except error.RepoLookupError:
raise error.Abort('Landed commit for diff D%s not available '
'in current repository: run "hg pull" '
'to retrieve it' % diffid)
return [node.rev()]
Don't crash in phrevset if Conduit replies before linear search completes Summary: When converting a Diff number to a revset, phrevset would do a linear scan of the repo history for the most recent appearance of that Diff number (slow if it's an older commit or not present in this repo) and in parallel, query Phabricator Conduit to try and shortcut the process. Unfortunately, if Conduit was quicker than the linear scan, we would crash because we can't handle a Conduit response for hg commits made when a Diff lands, or for any repo that doesn't have a callsign in hgrc. Fix the crashes; don't bother calling Conduit if we can't handle any reasonable answer, and teach the hg branch to handle all reasonable answers. Test Plan: Check that the new extension does linear search unconditionally when it lacks a callsign: ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 phrevset.callsign is not set - doing a linear search changeset: 3c0e6756bed4d7330391719bcde52e7490499e53 D2750128 user: Yuhan Guo <yhguo@fb.com> date: Thu, 07 Jan 2016 00:19:23 -0800 ``` Check that it doesn't do a linear search in a repo with a callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ echo -e '[phrevset]\ncallsign=E' >> .hg/hgrc : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 changeset: 4b24ee6737b7e36523eb24c6406d689cc54aadf9 D2704940 user: xifanyan@2c7ba8d8-a2f7-0310-a573-de162e16dcc7 date: Mon, 30 Nov 2015 23:38:18 -0800 ``` Check that it aborts cleanly if you give it a Diff from a different repo in a repo with a known callsign: ``` : /data/users/simonfar/www-hg (hg) [webacademy-graphql] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2750128 abort: Diff callsign 'FBS' is different from repo callsign 'E' ``` Check that linear scan eventually aborts cleanly if you give it a Diff from a different repo (note: this step is slow - over a minute on my devvm): ``` : /data/users/simonfar/fbsource (hg) [90234606e65a2a04d042caba7cf5ee85a7a5466e] : simonfar@devvm631 $ hg --config extensions.phrevset=/data/users/simonfar/fb-hgext/phrevset.py log -r D2704940 phrevset.callsign is not set - doing a linear search abort: Could not find diff D2704940 in changelog ``` Reviewers: #sourcecontrol, rmcelroy, ttung, lcharignon Reviewed By: lcharignon Subscribers: lcharignon, kanishkparihar Differential Revision: https://phabricator.fb.com/D2844832 Tasks: 9723813, 9714886 Signature: t1:2844832:1453321767:f445447d8187b4be22db3065ba316e6aa461f757
2016-01-21 19:11:13 +03:00
# commit is still local, get its hash
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
props = resp['properties']
commits = props['local:commits']
# the JSON parser returns Unicode strings, convert to `str` in UTF-8
revs = [c['commit'].encode('utf-8') for c in commits.values()]
# verify all revisions exist in the current repo; if not, try to
# find their counterpart by parsing the log
results = set()
for rev in revs:
# TODO: This really should be searching in repo.unfiltered(),
# and then resolving successors if the commit was hidden.
try:
node = repo[rev.encode('utf-8')]
results.add(node.rev())
except error.RepoLookupError:
repo.ui.warn(_('Commit not found - doing a linear search\n'))
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
parsed_rev = finddiff(repo, diffid)
if not parsed_rev:
raise error.Abort('Could not find diff '
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
'D%s in changelog' % diffid)
results.add(parsed_rev)
if not results:
raise error.Abort('Could not find local commit for D%s' % diffid)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
return set(results)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
else:
if not vcs:
msg = "D%s does not have an associated version control system\n" \
"You can view the diff at http://phabricator.fb.com/D%s\n\n"
repo.ui.warn(msg % (diffid, diffid))
return []
else:
raise error.Abort('Conduit returned unknown '
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
'sourceControlSystem "%s"' % vcs)
def revsetstringset(orig, repo, subset, revstr, *args, **kwargs):
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
"""Wrapper that recognizes revisions starting with 'D'"""
if revstr.startswith('D') and revstr[1:].isdigit():
return smartset.baseset(revsetdiff(repo, subset, revstr[1:]))
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
return orig(repo, subset, revstr, *args, **kwargs)
[hg] Add support for Differential revsets Summary: Add the ability to issue commands like hg log -r D12345 Supports already shipped commits (by parsing the SVN rev number and delegating to hgsubversion), as well as mercurial commits in various states Test Plan: Easier to show than tell: [delyank@dev1436 ~/www] arc feature test_diff_revset [delyank@dev1436 ~/www] echo "Don't commit me" > dontcommit.test [delyank@dev1436 ~/www] hg add dontcommit.test [delyank@dev1436 ~/www] hg commit -m "[test] Test commit" [delyank@dev1436 ~/www] arc diff [...] Created a new Differential revision: Revision URI: https://phabricator.fb.com/D1055569 [...] [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg changeset: 587735:82d4de66e17bb3b92fe15df4eda8b8420b7ed074 bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] echo "No, really, don't" >> dontcommit.test [delyank@dev1436 ~/www] hg amend # change local hash [delyank@dev1436 ~/www] hg log --debug -r D1055569 [diffrev] Getting diff from Conduit..done [diffrev] VCS is hg [diffrev] Traversing log for 1055569 changeset: 587735:48565d21a43f730aa3b9cebccbb47fa406df557b bookmark: test_diff_revset tag: tip phase: draft [...] description: [test] Playing with conduit, don't commit [...] Differential Revision: https://phabricator.fb.com/D1055569 [delyank@dev1436 ~/www] hg log --debug -r D1053132 # a diff that's already been shipped [diffrev] Getting diff from Conduit..done [diffrev] VCS is svn changeset: 586857:61a4036e89bafefaba4de2ebe1190db999a8915d [...] description: [hashtagbot] Add the #filetask hashtag to Task Creeper [...] Differential Revision: https://phabricator.fb.com/D1053132 Reviewers: sid0, davidsp Reviewed By: davidsp CC: jhunt, davidsp Differential Revision: https://phabricator.fb.com/D1055637 Task ID: 3159944
2013-11-16 02:55:42 +04:00
def extsetup(ui):
extensions.wrapfunction(revset, 'stringset', revsetstringset)
revset.methods['string'] = revset.stringset
revset.methods['symbol'] = revset.stringset