From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: vc-dir operation is very slow on large git repositories in Emacs 26.1 Date: Thu, 28 Jun 2018 16:06:27 +0300 Message-ID: <144beaa1-0989-b8f3-126a-6a6525d1b219@yandex.ru> References: <83k1qtsbgi.fsf@gnu.org> <30712254-6225-c6a8-1457-698c64e37739@yandex.ru> <83zhzltyii.fsf@gnu.org> <5218794b-b9ef-3c0d-d3c1-bf40c42e64b2@yandex.ru> <83r2kxtk9w.fsf@gnu.org> <5095ed13-d4a8-1699-26f9-746afaee0248@yandex.ru> <83in66sxig.fsf@gnu.org> <87bmbxbmvz.fsf@javad.com> <132e0090-3e44-dacf-2926-63624b3bb718@yandex.ru> <87fu19rlir.fsf@tromey.com> <340e65ee-dd83-74e9-4531-e8422064536b@yandex.ru> <837emkqn5o.fsf@gnu.org> <40619f2d-1628-a9e7-7674-4d44789f2437@yandex.ru> <83muvfoyte.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1530191208 10620 195.159.176.226 (28 Jun 2018 13:06:48 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 28 Jun 2018 13:06:48 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 Cc: alexharsanyi@gmail.com, tom@tromey.com, sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 28 15:06:44 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fYWdD-0002ah-Ok for ged-emacs-devel@m.gmane.org; Thu, 28 Jun 2018 15:06:39 +0200 Original-Received: from localhost ([::1]:36588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYWfL-0001wj-5A for ged-emacs-devel@m.gmane.org; Thu, 28 Jun 2018 09:08:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYWdA-0000yw-Ch for emacs-devel@gnu.org; Thu, 28 Jun 2018 09:06:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYWd6-0003zQ-Dl for emacs-devel@gnu.org; Thu, 28 Jun 2018 09:06:36 -0400 Original-Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:37174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYWd6-0003yb-4V; Thu, 28 Jun 2018 09:06:32 -0400 Original-Received: by mail-wm0-x232.google.com with SMTP id n17-v6so8473549wmh.2; Thu, 28 Jun 2018 06:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=s4ofjhnvoWA6DpkX+Gfc4zX53c1CinOZBordwt1pzLU=; b=F4AkzF4CwlXzlsY7boU/lfSTScP7sX9RFAkCcYrCzBjZIArPKPwAhFZe3tZEoxm9Sj wuOJVWb5XDEMUIzTuNpmtwXppc1Wq48hWJHr+9XOjuWXA4YXyqslDF1YZjWzfKGL7scn gPHe1n7ixTiKFYXUOqbqO5B3XLoGeVlEB+KEAF4sU3VtcqlPB4yyc3oWpn+FECRFo6hd AmV/sWZanGLnabwp+Bc0tGoudPClSlhSzUDEwY+lxc/uC2zIOyt3bPLQ8QpUCXP4yH5d vaJbz1Lfg8UbMfMpuv1h/P8vVJLfpuAg+UTrFXSKoFemolbIUterQy7PIBUdFp0vHylT AE7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=s4ofjhnvoWA6DpkX+Gfc4zX53c1CinOZBordwt1pzLU=; b=OrCXpyqrj/Az5yECW40dL4VIaCgvtmKLN+QWtO0ZZX7Bg57OhzMsTVjAIdpuJ7JqYw eYF2OYt03aLCaINZmH1Oa6J/HMgXAjH7uA/Q+9+jnFSun8rW/Z16iIS1GNiXviTCjIin 13xeFJHP8A++hQosCI4P3IP8acmCRxCTYZW3U4bw2fyqJUWoPLZQcBHxZ6wksEiVLRqP H+qTjarPjHDteNcPRL2CN3QLOHSa1zRu1P9qfJ967O/45AKdToeOd8ui9Kyh1deyPj/d 8y7g2qtP75Ql3j9IWb6JOYwZHJpVYxANd+3gC2QM/ctTOj73yJHMRUX2iZXq8K5slUTB tMcw== X-Gm-Message-State: APt69E1eeyl9wI4JkR2N3sMZ12jtoVJvxfCeU3jYzvFtHH3WUc6EoiZm 2bzRjUsn2D1vYwNKsOLxAKIGP3qb X-Google-Smtp-Source: AAOMgpdbKXXMOLu46XljQZ4C+r4lVmyo59K63ssFALhPl1tX+ESMhgfb85Fs2ZRgPmF7hArzE/duPQ== X-Received: by 2002:a1c:ae8b:: with SMTP id x133-v6mr8559313wme.125.1530191190543; Thu, 28 Jun 2018 06:06:30 -0700 (PDT) Original-Received: from [192.168.0.200] ([109.110.245.170]) by smtp.googlemail.com with ESMTPSA id e13-v6sm9076780wrm.45.2018.06.28.06.06.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 06:06:29 -0700 (PDT) In-Reply-To: <83muvfoyte.fsf@gnu.org> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::232 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:226803 Archived-At: On 6/28/18 3:55 PM, Eli Zaretskii wrote: > That wasn't my concern. My concern was about "cached" vs "unmerged". > I think I understand the former (it's about the staged files, right?), > but what does the latter mean, and how does it affect what we need in > this case from Git. IOW, if -c is not necessary, why not just disable > it? Or is that not possible, and -u is the way to disable it? -c and -u are mutually exclusive options. "cached", here, means all registered (or simply staged) files. -u limits the output to unmerged files only. So the question here is whether "unmerged" covers all files we want to assign the "conflict" status to. I think it does.