From mboxrd@z Thu Jan 1 00:00:00 1970 From: Per Cederqvist Subject: Re: [GUILT 07/28] Added test cases for "guilt fold". Date: Thu, 8 May 2014 21:41:22 +0200 Message-ID: References: <1395387126-13681-1-git-send-email-cederp@opera.com> <1395387126-13681-8-git-send-email-cederp@opera.com> <20140506194026.GK1655@meili.valhalla.31bits.net> <20140507210601.GA1459@meili.valhalla.31bits.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: git@vger.kernel.org To: Jeff Sipek X-From: git-owner@vger.kernel.org Thu May 08 21:41:28 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WiUC7-0006WJ-G7 for gcvg-git-2@plane.gmane.org; Thu, 08 May 2014 21:41:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754959AbaEHTlY (ORCPT ); Thu, 8 May 2014 15:41:24 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:47509 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754871AbaEHTlX (ORCPT ); Thu, 8 May 2014 15:41:23 -0400 Received: by mail-ig0-f176.google.com with SMTP id hl10so227129igb.3 for ; Thu, 08 May 2014 12:41:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=4TnZuQRYdcIb01JZ6W2qh7xbm5zMvABW3kjDuuNjHfo=; b=Yozfye1XvzwmdRTz7WfMeXMELgmdiUR1JQaJHpbGnl1aDWOUyViMxhUB3FhKXs/q8E 9BTHQ77mWEfZKRdQtNCTA2fxkYrvEOTperLXAVqHXRRM6drjswGi2JnYhP9BuCPzrZIP FnUEwwmPGbns3VMy2PRXvxMXEFRWam/XVd1tDw+HQj/5o1WWIWIuvBtWscg9aK5psf5P kNB/vBgoL/dN3vtOkXJDbuTq/KPXEmTZKCPDWQt9oNZj5NtgY3SkaoOPWOESuJCum9ty MoNhm8F/y597pPF0qXe7TGIbLPJ/LXzvM9JSXLyNCklj0QMExVjLTg3utBjBzCHldPtz SwgA== X-Gm-Message-State: ALoCoQm7q6xpShzc00HhpNJqKU6Q0LQNhWuvhBYBEjMIzXLGUcUbSlFXxMjUyDtV5l/twRdGjd1G X-Received: by 10.50.147.9 with SMTP id tg9mr59690132igb.31.1399578082954; Thu, 08 May 2014 12:41:22 -0700 (PDT) Received: by 10.43.89.66 with HTTP; Thu, 8 May 2014 12:41:22 -0700 (PDT) In-Reply-To: <20140507210601.GA1459@meili.valhalla.31bits.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, May 7, 2014 at 11:06 PM, Jeff Sipek wrote: > On Wed, May 07, 2014 at 10:59:56PM +0200, Per Cederqvist wrote: >> On Tue, May 6, 2014 at 9:40 PM, Jeff Sipek wrote: >> > On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote: >> >> Test that we can combine any combination of patches with empty and >> >> non-empty messages, both with and without guilt.diffstat. (All >> >> patches are empty.) >> > >> > I feel like we should have *some* content there - most of the time, I care >> > more about the diffs getting folded than the commit message :) >> >> I added these tests for a reason: the reproduce a bug in guilt that I found. >> >> I'm afraid that having some content might hide the bug I found. (I'm also >> equally afraid that it might uncover other bugs in guilt, which would delay >> integration of this patch series. So adding more test cases with content >> is a good thing to do, but maybe not in this patch series.) > > Fair enough. I use guilt-fold all the time and it hasn't lost any of my > diffs, so I'm happy to defer this until some point in the future. > > ... >> > for using_diffstat in true false ; do >> > for patcha in empty nonempty ; do >> > for patchb in empty nonempty ; do >> > echo "%% $patcha + $patchb (diffstat=$using_diffstat)" >> > ${patcha}_patch $patcha >> > ${patchb}_patch $patchb >> > cmd guilt pop $patchb >> > cmd guilt fold $patchb >> > fixup_time_info $patcha >> > cmd list_files >> > cleanup $patcha >> > cmd list_files >> > done >> > done >> > done >> > >> > Aha! That's better, IMO. >> >> I'll try that and post a version 2 of the series. It might take a few >> days, though. > > No problem. I'm still the slower one of the two of us. :/ > > Jeff. There were a few details that made it a bit more complex than that, but I think the end result was still an improvement. The most obvious detail is that if you add two empty patches, you cannot name them both "empty", so when $patcha and $patchb is the same you have to add suffixes. The other detail is that my tests used different commit messages when both commits contained a message. I want to retain that behaviour, so that added a few lines of complexity. I'll post an updated patch series once I've gone through all your comments. In the meantime, you can see my new implementation here: http://repo.or.cz/w/guilt/ceder.git/commitdiff/3107dc73eaff020da18024c3b5f5f92b94d17852?hp=6df110c95133d6e557ce3dbcb6fd39bc797f877b#patch2 /ceder