From owner-freebsd-cvsweb@FreeBSD.ORG Mon Jan 5 12:40:05 2004 Return-Path: Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1353A16A4D0 for ; Mon, 5 Jan 2004 12:40:05 -0800 (PST) Received: from idiom.com (idiom.com [216.240.32.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1AA443D2F for ; Mon, 5 Jan 2004 12:40:03 -0800 (PST) (envelope-from bryce1@obviously.com) Received: from obviously.com (h0010a4e2603c.ne.client2.attbi.com [24.61.43.4]) by idiom.com (8.12.9p2/8.12.9) with ESMTP id i05Ke2IM037833 for ; Mon, 5 Jan 2004 12:40:03 -0800 (PST) (envelope-from bryce1@obviously.com) Message-ID: <3FF9CB74.5000707@obviously.com> Date: Mon, 05 Jan 2004 15:39:16 -0500 From: Bryce W Nesbitt User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-cvsweb@freebsd.org References: <3FB23C1F.6040502@obviously.com> <3FB28082.6070707@obviously.com><3FBCEA3F.4050106@obviously.com> <3FD3547A.5010400@obviously.com><3FDF6F74.4070307@obviously.com> <3FEB7626.2030606@obviously.com><3FEF5E93.8020600@obviously.com> <3FF8DD46.5090501@obviously.com> <1073333659.9121.229.camel@bobcat.mine.nu> In-Reply-To: <1073333659.9121.229.camel@bobcat.mine.nu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: MIME types, links, diff tools X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: bryce1@obviously.com List-Id: CVS Web maintenance mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2004 20:40:05 -0000 My guess is that diffing archives is a relatively rare operation, and not worth too much work. My patch took a pragmatic approach: Unpack the archive Check if any constituent files have a special diff associated with them If no, then "diff -r". Before this patch, archives were completely undiffable. So "diff -r" is better than nothing. I use archives as a method of grouping related files, since CVS can't do this itself. Perhaps more common than archives are compressed files. "file.doc.bz2" probably is best handled by unpacking it first, then applying the mime type detection to the result. -Bryce Ville Skyttä wrote: >Diffing archive contents adds another level of complexity, whether to >use plain "diff -r" or dedicated tools for diffing each file in the >arcive separately, and how to sanely combine the results of different >diff tools if the latter way is chosen. > >Thoughts? >