From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#26066: 26.0.50; vc-git-status gives wrong result Date: Sun, 23 Apr 2017 18:28:04 -0400 Message-ID: References: <9bf82bf1-fefa-ab84-bac1-cf748ae5ccfb@gmail.com> <87efxy59wx.fsf@users.sourceforge.net> <0d87686b-c7d2-deab-ebe4-ab1c8aa4faca@yandex.ru> <29d4a5ae-0ca0-3a86-6b9a-ab616803f39e@gmail.com> <4741bddf-9765-0d94-d0cd-b94e3e4914e1@yandex.ru> <8530cd03-0158-f198-9b14-ade983e1c7f4@gmail.com> <022c0e0a-e039-24ef-66ff-82bcedbacd93@yandex.ru> <505388da-e642-8c98-35c0-261d09ff13e1@yandex.ru> <1a23269d-1ead-1771-1afd-e2c9c5840cb4@gmail.com> <30d8b181-d869-de24-9c86-cc1dc6ec461b@gmail.com> <6ea0d89d-1a24-30fe-dd9a-26a0157a4eae@yandex.ru> <01922284-4265-6510-feee-dcc7301787ad@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1492986556 27730 195.159.176.226 (23 Apr 2017 22:29:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 23 Apr 2017 22:29:16 +0000 (UTC) Cc: 26066@debbugs.gnu.org, Stefan Monnier , Dmitry Gutov To: Jonathan Ganc Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 24 00:29:10 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1d2Q0C-00070h-KD for geb-bug-gnu-emacs@m.gmane.org; Mon, 24 Apr 2017 00:29:08 +0200 Original-Received: from localhost ([::1]:40793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Q0E-0005r1-Rf for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Apr 2017 18:29:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Q09-0005qu-Qv for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 18:29:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Q06-0003eo-N1 for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 18:29:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:38681) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d2Q06-0003ej-In for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 18:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d2Q06-0008KE-9q for bug-gnu-emacs@gnu.org; Sun, 23 Apr 2017 18:29:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Apr 2017 22:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26066 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 26066-submit@debbugs.gnu.org id=B26066.149298649331918 (code B ref 26066); Sun, 23 Apr 2017 22:29:02 +0000 Original-Received: (at 26066) by debbugs.gnu.org; 23 Apr 2017 22:28:13 +0000 Original-Received: from localhost ([127.0.0.1]:36880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2PzJ-0008Ik-82 for submit@debbugs.gnu.org; Sun, 23 Apr 2017 18:28:13 -0400 Original-Received: from mail-io0-f171.google.com ([209.85.223.171]:34132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2PzH-0008IS-4v for 26066@debbugs.gnu.org; Sun, 23 Apr 2017 18:28:11 -0400 Original-Received: by mail-io0-f171.google.com with SMTP id a103so167415241ioj.1 for <26066@debbugs.gnu.org>; Sun, 23 Apr 2017 15:28:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=eYT/mLbIULr/WbCWG0DMoLv/4F4d/gP45vQtpmDO9IE=; b=ZXYfc0svV6AdnaA9WGQt06mKv0FU9mbW3JSC3XgXtcPKr3cjTNvHgRAzj9VKFkTt1p MEVzss9rv0xtQ16oZHrjhsZWHKMoYSC5o5r+S+B3wek8JK+gzS9y1x+6OnXRHvRDHWoL 1tKjYKbtFvIQ3T8Em/YETeMK/T3Y0NfmbuUsQ0vNgs+/BMItxcf3MeZ7kCJ/uiWp+6km DrIchD7MHtqgc3Ybe89Rnrc+34tFA7QVX57fMqgyxsqRthVRR2a6zxn+lYRSEuGh6zb/ b+zZFvOGvzFVi9DorulZSHZqIxiViXStPNITT6DfaEEr1UOxm4sDLL8eH4Qd9bcq+sDY msKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=eYT/mLbIULr/WbCWG0DMoLv/4F4d/gP45vQtpmDO9IE=; b=U7XhLn231YEB+29BB6lLn1ru5r+zq2ovUg30f8hlW9mAykgoVwP5EbgH6wFzwa6Wta 3V8NuG09/KwH5FffAQ3bEhgN5HnfNvqJ7Ljk3CVWIsAID+hbf0gsFAoMmM2EO5Zminr5 ynconGSKzrMs0Xxn2q9wfQnuqmBjZaRayOr8r0H7cG2yeWshOWyD8XLhLGeW+/7J4nch DRmpqQ9dhxX/krgDr0WgSiTy4d4vz/gazIhpDKIqT1KVrofz4+/NNLlu8PFcUCs7aZ9C qJPrWt499HfGfewzQ0ZNVUlCq3bs+DDiMMNSZWb63zqBndQlqrLVRb8NhaLtBQhWh4a/ QvWQ== X-Gm-Message-State: AN3rC/6mYYX2souDG6MssNZWpZLj6ozi+jvukVYIDfkwTQ5WdXDodA3r F4N5UxMyv4ojdULUI7NpModwpDN3qg== X-Received: by 10.157.48.120 with SMTP id w53mr10632243otd.55.1492986485441; Sun, 23 Apr 2017 15:28:05 -0700 (PDT) Original-Received: by 10.157.9.178 with HTTP; Sun, 23 Apr 2017 15:28:04 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: jkkCn7X3ISGfcB-tkVz6xzTeS0M X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:131918 Archived-At: > Subject: [PATCH] update vc-git > > --- Could you add a meaningful commit message please? See CONTRIBUTE (under "Commit messages") for details of Emacs' standard format. I think the patch is basically okay now, just a few minor nitpicks below. > +(defun vc-git--git-status-to-vc-state (code-list) > + "Convert a list CODE-LIST of two-letter git status strings to a vc status. This line is too long, I think it should be fine to shorten to just "Convert CODE-LIST to a vc status". You explain the format of CODE-LIST in the next paragraph anyway. > +Each element of CODE-LIST comes from the first two characters of > +a line returned by 'git status' and should be passed in the order given by 'git status'. This paragraph looks unfilled, hit M-q on it. > + ;; I have only seen this with a file that is only present in the > + ;; index. Let us call this `removed' Missing period. > + (setq code-list > + (mapcar (lambda (s) > + (substring s 0 2)) > + (delete "" (split-string status "\0")))) If you pass a non-nil OMIT-NULLS parameter to split-string, the (delete ""...) should become unnecessary. > + (vc-git--git-status-to-vc-state code-list)))) I would suggest dropping the temporary code-list variable here, and just do (vc-git--git-status-to-vc-state (mapcar (lambda (s) (substring s 0 2)) (split-string status "\0" t)))