From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS) Date: Wed, 25 May 2016 03:09:27 +0300 Message-ID: <66e22098-3368-775f-73f0-20a01f424acb@yandex.ru> References: <87bn3z4l9i.fsf@mat.ucm.es> <1444321464004323@web25h.yandex.ru> <83h9do67pp.fsf@gnu.org> <21f6198c-a2fc-365f-caf7-79fad5027f1c@yandex.ru> <83twho41xd.fsf@gnu.org> <1f8cf525-c138-03f6-7f17-65015dc5cdfa@yandex.ru> <83iny34g7l.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1464135028 25767 80.91.229.3 (25 May 2016 00:10:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 May 2016 00:10:28 +0000 (UTC) Cc: oub@mat.ucm.es, eggert@cs.ucla.edu, 23595@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed May 25 02:10:17 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1b5MOu-0001tC-Re for geb-bug-gnu-emacs@m.gmane.org; Wed, 25 May 2016 02:10:17 +0200 Original-Received: from localhost ([::1]:55983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5MOt-0006pi-QK for geb-bug-gnu-emacs@m.gmane.org; Tue, 24 May 2016 20:10:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5MOl-0006lp-TN for bug-gnu-emacs@gnu.org; Tue, 24 May 2016 20:10:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5MOf-000109-SZ for bug-gnu-emacs@gnu.org; Tue, 24 May 2016 20:10:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:52755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5MOf-0000zw-Ou for bug-gnu-emacs@gnu.org; Tue, 24 May 2016 20:10:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1b5MOf-0000kI-Ks for bug-gnu-emacs@gnu.org; Tue, 24 May 2016 20:10:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 25 May 2016 00:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23595 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23595-submit@debbugs.gnu.org id=B23595.14641349762827 (code B ref 23595); Wed, 25 May 2016 00:10:01 +0000 Original-Received: (at 23595) by debbugs.gnu.org; 25 May 2016 00:09:36 +0000 Original-Received: from localhost ([127.0.0.1]:36859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5MOG-0000jX-CJ for submit@debbugs.gnu.org; Tue, 24 May 2016 20:09:36 -0400 Original-Received: from mail-wm0-f48.google.com ([74.125.82.48]:37104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5MOF-0000jK-Hq for 23595@debbugs.gnu.org; Tue, 24 May 2016 20:09:35 -0400 Original-Received: by mail-wm0-f48.google.com with SMTP id z87so42702681wmh.0 for <23595@debbugs.gnu.org>; Tue, 24 May 2016 17:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=h1SJpSQacK3tmlU96437eBRHHDVgcn9W1QNJI0kGw1o=; b=L89pm6FNO7BxoH5/MgODBzTBTQB5g0tuXTjgn5Zm34dG08S0Uhov1/pRKQ7IDw5D1T t/N6hn36hU2zMV4lTHq5RR9mg99S63XPk0YWKfU7WICKaPm8XVboSS3ZDOsmfcEfxk5P Lfs8F/reC0ytn5FrZ7/ktyQcLDyoaQSIII3ZDYUKU+oAg5082JfBe3k4wNCH2ojEmIVL utuY2EMn67TmwHEDGHE4eQtXYeBHiM5YNRUDDtS2SPbSKe59mNyc758rKydu2yQpFbj+ eJ44OMKkFB17Btc+d/kk+mNxPhVNlzFWINwsVpNK7hlAcd4nYZ9omPgPInkFXfHvYpYG hBcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=h1SJpSQacK3tmlU96437eBRHHDVgcn9W1QNJI0kGw1o=; b=lAP8W64xgMlKP+zhJRPBPi6treL4GnhDnJgjQxV0kjsCjpZtwLtNpsTpOKN0Fc2r0A PPgOzXLyCpmtEkB5Cmot0ZA31etZltiNv6NnccsvP+lhvH59bdUq9KiKPr1Ce7/hQtpb SBjoGmRCuN+shSvzEDZ9canTlfE/FV/6RFNXrICz7+oBE8i0Z0tV9fOqKMKyK1nTY0Ng Z7zP/LSwTfUo3Z/BmpD62AL7E8ah1wAl6YhwdqT0gSFi+6/AhqDhf0tdanv1M4n8W5pI lvCCQBx6t+SZ4tucoPl8fhox/A/quiDqB8VA4lWcCKzl/8T+v+4V2nUhUe8nnUD89V27 Gzkw== X-Gm-Message-State: ALyK8tL87vnP58EwF+cWlFREApsYTi+zQs8SEAlnZY7Ixv0iS7m2lZn3QtuHI10jZ4gSew== X-Received: by 10.194.95.40 with SMTP id dh8mr785522wjb.146.1464134969892; Tue, 24 May 2016 17:09:29 -0700 (PDT) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id a128sm12787724wme.16.2016.05.24.17.09.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 May 2016 17:09:29 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1 In-Reply-To: <83iny34g7l.fsf@gnu.org> 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:118644 Archived-At: On 05/24/2016 06:40 PM, Eli Zaretskii wrote: > Not sure it's a good idea: the solution we found is only known to work > with Git, whereas vc-coding-system-for-diff is for any VCS. Mercurial > seems to have a similar encode/decode filter feature, but I'm not sure > using it means the diff results will be in UTF-8. Do we actually know that we'll need this behavior to be VCS-specific? So far, we've seem some pretty similar results with vc-diff using Git, Hg and RCS. > I think we should have a git-specific function that implements the > above idea, and then we should use it in vc-coding-system-for-diff. Git-specific or backend-specific? I suppose we could add some new encoding-handling logic at the beginning of vc-git-diff instead. > (I prefer a separate function because my gut feeling is that we will > need something like that in other Git operations, when UTF-16 files > are involved.) We can always extract a new function when it's needed, though.