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:47:29 +0300 Message-ID: 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> <144beaa1-0989-b8f3-126a-6a6525d1b219@yandex.ru> <83fu17oy0n.fsf@gnu.org> <08db66ab-d61b-bf70-9ee9-ca8245c7d11a@yandex.ru> <838t6zowu8.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 1530193621 17065 195.159.176.226 (28 Jun 2018 13:47:01 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 28 Jun 2018 13:47:01 +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:46:57 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 1fYXGD-0004KH-1n for ged-emacs-devel@m.gmane.org; Thu, 28 Jun 2018 15:46:57 +0200 Original-Received: from localhost ([::1]:36791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYXIK-0007L0-38 for ged-emacs-devel@m.gmane.org; Thu, 28 Jun 2018 09:49:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYXGs-0006ir-Gt for emacs-devel@gnu.org; Thu, 28 Jun 2018 09:47:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYXGo-0000TJ-8q for emacs-devel@gnu.org; Thu, 28 Jun 2018 09:47:38 -0400 Original-Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:37147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYXGo-0000Qu-0P; Thu, 28 Jun 2018 09:47:34 -0400 Original-Received: by mail-ed1-x52c.google.com with SMTP id v22-v6so5212612edq.4; Thu, 28 Jun 2018 06:47:33 -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=oTLX49+OgpYm/anrDaH9KpO7mzljKrU5orDEZaEgw8U=; b=sHBdOZF/Gn7GLKmWdWlarssQDqK459DeHCuLLgLOiTSgnyseK2dQhJTFxrTGRdBDlj WPV/tcfnYS4dm2Go5o+jWuyzPscwrvZjL/+g8UvTHaUbemCviz/3kV0l6K+KoTOOqV7A asMAGNvFnxoj43QSpHbCOxAoMNUeqBvWiR9QQtDdV8WwtYX0Sr9Sg7kCEAUfiBc/eYjt 07bB6r6gn2pG1VbIVfvXf1oAlb7BoUWw9Mj7pNg4agHg9Og3LH0rQ8E29dr09MVq27Xh to8uhq5YMXHLaYqH2fK+UDtLi7ZN4bubmB3sB6cCyWXVyjkNC63k+nJLdi/za91cjeYe U7sg== 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=oTLX49+OgpYm/anrDaH9KpO7mzljKrU5orDEZaEgw8U=; b=Y2xS+mKxZspK9x+i3iD74JKt/UO9CPLPcdBGDrU/vMp7yGRMLmzWcJlFxGHR8+nU+7 mgbHMvf4Blc3/w+t6Ik0t3VzDUbtYMD8PVR0Ry8Ms96Ag4ekb0sU5/VYT6/vq8rV7D9e CK453VxBaHlsAu1CsFXaCpSjw0DrbmGxe0dOXOpM66DAsPyMsZdb1idXyOl3h0OwdlTP uczBfugF/SO+jF4+uI7EJJwMLXX1rK8VrFjFv9Ma/kq+aWE3lUz5KRj1zlS/+5Yb23EA +SKXVjbSnrl3pOpdkFUfdfAF134X6AP42ebud4uWmXTaY91CIiMyZpsDSViPieaj4Vsx guyA== X-Gm-Message-State: APt69E3GZrOZt5QsUBbN5FolWBsIiWEL80xRxB0wYgKzHDmb+NL0tqNM u3tpvIK4gBU09IHKMXPkt3JvHAHt X-Google-Smtp-Source: AAOMgpcs5vibspFsuOA4qvFBpXQ2G+ZtnLB6zo5wARkQCzd8Ub80m7/fq7IwVMkRQ8MTlKqsno33/Q== X-Received: by 2002:a50:b0c2:: with SMTP id j60-v6mr9739224edd.188.1530193652378; Thu, 28 Jun 2018 06:47:32 -0700 (PDT) Original-Received: from [192.168.0.200] ([109.110.245.170]) by smtp.googlemail.com with ESMTPSA id d11-v6sm3482189edo.63.2018.06.28.06.47.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 06:47:31 -0700 (PDT) In-Reply-To: <838t6zowu8.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:4864:20::52c 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:226814 Archived-At: On 6/28/18 4:38 PM, Eli Zaretskii wrote: > You are saying that "unmerged" alludes to files that failed to merge, > i.e. "in conflict" in our parlance? If so, fine with me. I just > wonder why didn't Git documentation say so. That's their terminology, and it's also used in the command line UI: $ git status On branch master You have unmerged paths. (fix conflicts and run "git commit") ...