From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?Jostein_Kj=c3=b8nigsen?= Newsgroups: gmane.emacs.devel Subject: Re: Status of tree-sitter branch Date: Sat, 27 Aug 2022 14:08:39 +0200 Message-ID: References: <-0DpnbDnWAkHYgJA71DBaIu6vYUGNGwtfV_WvKsTyL7MXmE-SoCTwtlYbEVDsX50mXzUUhievA2d_rqVuy37Z02wSD-z8G59TPv79vVRaK4=@pm.me> <7DE2A6E0-FB41-4672-943D-69B44949E84E@gmail.com> Reply-To: jostein@kjonigsen.net Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="------------j1RfQV5JF0yZzZyT0f7kLd2x" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24671"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Cc: emacs-devel To: Fu Yuan , "lkg.ch@pm.me" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Aug 27 14:10:47 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oRueE-0006D0-61 for ged-emacs-devel@m.gmane-mx.org; Sat, 27 Aug 2022 14:10:47 +0200 Original-Received: from localhost ([::1]:47150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRueB-0001KY-54 for ged-emacs-devel@m.gmane-mx.org; Sat, 27 Aug 2022 08:10:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRucJ-0000cg-He for emacs-devel@gnu.org; Sat, 27 Aug 2022 08:08:47 -0400 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:45219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRucH-00089I-Bh for emacs-devel@gnu.org; Sat, 27 Aug 2022 08:08:47 -0400 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id BD5A85C0101; Sat, 27 Aug 2022 08:08:42 -0400 (EDT) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 27 Aug 2022 08:08:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= secure.kjonigsen.net; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm3; t= 1661602122; x=1661688522; bh=oJmTrXU74cYP9Cxb8xQPmN2te/YVZJUFTF2 3YuhQSsI=; b=HJxFIaEGhb26+Vkm8kEtertaL8zEKpBTFpCZmnAnilHjA9JfcOk aNNpkLDBXX+jJyRmLfzhwKcIbfQm0uHatNX4seDIPyMBYSNgdmUcFhZI0hNER3CT +QP35EItPImfYjjX2pb9OEwrFowhRXpzmw3Q3T01JSgg5lHUuHxr7bD9f4LfO0qL Fv9H7hJdyAPANmoqVWiFM2SHCEwhbzqgfcZtyzHLbF+2OK8rQmvXClA3LpBmwg5F ukpvs6iXWzk5BlYUSUGg46NHRTLyEqjUuTubA5FF8K94wArKwFbhJVH4Vsjc/iwk Kx98Gu3lSlMTWmgQlixwCku1S+vG43B2K7g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1661602122; x=1661688522; bh=oJmTrXU74cYP9 Cxb8xQPmN2te/YVZJUFTF23YuhQSsI=; b=3vEU9HUIa8dO5+lT8to06BeIRTxP5 dgfIFA5nmuOvShGgWEHSRQD0weDOKgsQOfkjjCo5cqW1ESiWazw+yQawvPCrjcn+ HfN78gViWuJysAsJ+DZn4g1kF7Vuk6RUgEC2h9vqMxEqVyBhZuO4eTTyTR+pMdml BF+JdAC40tvhXmxjK52Lx1nGjgDdgcXagbX/lb037kDKi+cjFGTkAx6OFbB9irjk XsS078/oOihIpLUMp6V2hPJqnK0Xmjt/C97ZO3Bi9KsCwxruRIp7dXRvDb+e5mBi LZuOv5wcuc2Fk8z178VwQdQu7s3M6fySgc1okox7MC0p/w3ju2QZi8h0A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdejjedghedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfrhfuvfevfhfhjgesrg dtreertdefjeenucfhrhhomheplfhoshhtvghinhgpmfhjpphnihhgshgvnhcuoehjohhs thgvihhnsehsvggtuhhrvgdrkhhjohhnihhgshgvnhdrnhgvtheqnecuggftrfgrthhtvg hrnhepheffteffjefgtefglefhgedtjeehieekjeffjefgheejheeffefgvdevteetveeh necuffhomhgrihhnpehkjhhnihhgshgvnhdrnhhonecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepjhhoshhtvghinhesshgvtghurhgvrdhkjhho nhhighhsvghnrdhnvght X-ME-Proxy: Feedback-ID: ib2f84088:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 27 Aug 2022 08:08:41 -0400 (EDT) Content-Language: nb-NO In-Reply-To: <7DE2A6E0-FB41-4672-943D-69B44949E84E@gmail.com> Received-SPF: pass client-ip=66.111.4.27; envelope-from=jostein@secure.kjonigsen.net; helo=out3-smtp.messagingengine.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=0.001, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:294187 Archived-At: This is a multi-part message in MIME format. --------------j1RfQV5JF0yZzZyT0f7kLd2x Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 27.08.2022 01:33, Fu Yuan wrote: >> the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews? > Oh, I can pull master and resolve conflicts. It definitely need more time as we discuss and improve the api. The core features are totally well functional, though. > > Yuan Just out of curiosity, I tried to do this locally a few days ago. The conflicts are very small, and just related to Makefiles and external dependencies. No actual C or Elisp files had conflicts. Even as someone not regularly contributing to Emacs not tree-sitter, I could easily resolve those and get a working build. -- Vennlig hilsen *Jostein Kjønigsen* jostein@kjonigsen.net 🍵 jostein@gmail.com https://jostein.kjønigsen.no --------------j1RfQV5JF0yZzZyT0f7kLd2x Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit On 27.08.2022 01:33, Fu Yuan wrote:

      

        
the feature/tree-sihter branch hasn't gotten any updates in nearly two months and it seems having some conflicts with the master branch that require manual resolve. Is this branch ready to be merged into master branch or it needs more time and rounds of reviews?


      

      
Oh, I can pull master and resolve conflicts. It definitely need more time as we discuss and improve the api. The core features are totally well functional, though.

Yuan


    

    

      
Just out of curiosity, I tried to do this locally a few days
        ago. The conflicts are very small, and just related to Makefiles
        and external dependencies. No actual C or Elisp files had
        conflicts.

      
Even as someone not regularly contributing to Emacs not
        tree-sitter, I could easily resolve those and get a working
        build.

    

    


    

    
-- 

      Vennlig hilsen

      Jostein Kjønigsen

      

      jostein@kjonigsen.net 🍵 jostein@gmail.com

      https://jostein.kjønigsen.no

  


--------------j1RfQV5JF0yZzZyT0f7kLd2x--