From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Nz3iX-0004Mm-FG for garchives@archives.gentoo.org; Tue, 06 Apr 2010 08:01:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC3F8E0752; Tue, 6 Apr 2010 08:00:57 +0000 (UTC) Received: from mail-pz0-f181.google.com (mail-pz0-f181.google.com [209.85.222.181]) by pigeon.gentoo.org (Postfix) with ESMTP id EAFFBE070D for ; Tue, 6 Apr 2010 08:00:51 +0000 (UTC) Received: by pzk11 with SMTP id 11so1370586pzk.32 for ; Tue, 06 Apr 2010 01:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:received:message-id:subject :from:to:content-type:content-transfer-encoding; bh=fXGME8Bi+UjdW62QRaSyAT//WfMjk1+igLNbNeZARG0=; b=iVWdQFvPeiWDase3RfxQR0U5DjfCnGn6Tk2nwKmBq3cAx5IBQvbOFkhODNpCjBiwhM SsPAXCYY9jH8Jlxssx6dBR8oTdcYQVhXih3BSrEWdU+PBHP5u33TEjaUf8WV0GKTBuJD 96o97d+Y02/succKA9lbf0zkqSEhDiZYUNx+c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; b=Z7j692GjYM/ir+5P0cvNjGDzfShcLSx8xXMZGI5YZ3Rg1khdSVROlG9OIxy0aaMAlJ ZffjdECtTvekIN8Nms05+h0X1d/83N5ioZh5e1HGvsplecWSvg7vdniBUjLNGqqTpzmg u58YnseSCWQERThAiGaNpoJx2qdzwmYPnhuMk= Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Sender: nirbheek.chauhan@gmail.com Received: by 10.141.48.2 with HTTP; Tue, 6 Apr 2010 01:00:51 -0700 (PDT) In-Reply-To: <201004060928.50259.reavertm@gmail.com> References: <201004060928.50259.reavertm@gmail.com> Date: Tue, 6 Apr 2010 13:30:51 +0530 X-Google-Sender-Auth: 63bf194ce5eb1e6b Received: by 10.140.255.10 with SMTP id c10mr4796005rvi.289.1270540851476; Tue, 06 Apr 2010 01:00:51 -0700 (PDT) Message-ID: Subject: Re: [gentoo-dev] [git migration] Proposition for tags supported by git hooks From: Nirbheek Chauhan To: gentoo-dev@lists.gentoo.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cd61f62e-7533-40ae-9f2d-c9019674ec0f X-Archives-Hash: 607f81e0518a9b0f51ee588e8bdd525d On Tue, Apr 6, 2010 at 12:58 PM, Maciej Mrozowski wrot= e: >> =3D=3D=3D=3D=3D=3D=3D=3D >> Solutions: >> =3D=3D=3D=3D=3D=3D=3D=3D >> * Do not re-generate the existing ChangeLog; rather make the ChangeLog >> generation script smart enough to only append >> =C2=A0 - Solves the "messages not same" problem for existing commits > > I don't think its' good idea, changelog should reflect state of remote > repository, not the state of local clone. Besides storing Changelog is si= mply > redundant and would increase repository size unnecessarily. It already > increases rsync size considerably. > I think you've misunderstood this; ChangeLog appending would be done entirely on the rsync server side. ChangeLog would be irrelevant for the local clone. Also, the content of the old ChangeLog would anyway already be in the history; so it doesn't take much space locally. >> * Use a separator in the commit message like "=3D=3D \n" to denote that >> everything after this is dev-only information and should be skipped >> from the user ChangeLog >> =C2=A0 - Solves the problem for people who like to add extra dev-only in= fo >> in the CVS commit message >> * Ignore commits with "[$tag][trivial]" in the tag[2] from being added >> to ChangeLog >> =C2=A0 - Keeps the wishes of the developer and does not pollute ChangeLo= g >> with such info > > Both would work fine, maybe tag syntax could be improved - certainly we w= ant > it error prone and relatively simple to use - I've moved it to separate > subthread. > If you see the link "[2]" which was http://live.gnome.org/Git/CommitMessages you'll see that by that tag; I meant the one inside the subject itself. Tags in the commit message however are a good idea that I haven't thought about, and are used extensively in other projects :) > Maybe something like this: (modeled a bit after KDE tags allowed in svn > messages): > Each entry in its own line in commit message: > > BUG: > =C2=A0 =C2=A0 =C2=A0 =C2=A0Marks the bug as RESO/FIXED, as comment adding= full git commit message > =C2=A0 =C2=A0 =C2=A0 =C2=A0with tags removed and just below gitweb URL co= rresponding to this > =C2=A0 =C2=A0 =C2=A0 =C2=A0particular commit. For bugzilla, instead of fu= ll gitweb URL, maybe make > =C2=A0 =C2=A0 =C2=A0 =C2=A0bugzilla aware of hashes in comments and expan= d gitweb links > =C2=A0 =C2=A0 =C2=A0 =C2=A0automatically > > CCBUG: > =C2=A0 =C2=A0 =C2=A0 =C2=A0Adds comment to the bugreport containing full = git commit message with > =C2=A0 =C2=A0 =C2=A0 =C2=A0tags removed and just below gitweb URL corresp= onding to this particular > =C2=A0 =C2=A0 =C2=A0 =C2=A0commit. For bugzilla, instead of full gitweb U= RL, maybe make > =C2=A0 =C2=A0 =C2=A0 =C2=A0bugzilla aware of hashes in comments and expan= d gitweb links > =C2=A0 =C2=A0 =C2=A0 =C2=A0automatically > > CCMAIL: > =C2=A0 =C2=A0 =C2=A0 =C2=A0Sends email to given address containing full g= it commit message with > =C2=A0 =C2=A0 =C2=A0 =C2=A0tags removed and just below gitweb URL corresp= onding to this particular > =C2=A0 =C2=A0 =C2=A0 =C2=A0commit > > SILENT: > =C2=A0 =C2=A0 =C2=A0 =C2=A0Marks entire commit message as "silent" by add= ing "(silent)" to the > =C2=A0 =C2=A0 =C2=A0 =C2=A0subject of the mail or adding some mail header= to allow filtering out > =C2=A0 =C2=A0 =C2=A0 =C2=A0trivial commits. (like those containing typo f= ixes in comments and > =C2=A0 =C2=A0 =C2=A0 =C2=A0such). Such commits could also be skipped by C= hangeLog generator. > > I specifically don't like [tag][sth] format, because I'd suggest to impos= e > some guidelines to git commit messages: > - put [$CATEGORY/$PN] in first line of commit message for git commits > =C2=A0related to packages > - same with [$profile] for profiles or [package.mask] for p.mask, > [eclass/$ECLASS] etc > ++, we do something similar in the gnome overlay, and this change is *very* much required because commit messages in git are quite different from CVS. cat/pkg-ver: I changed foo because of bar eclass/gnome2: Fix stupid USE=3Ddoc behaviour What you're proposing is also covered in the same link: http://live.gnome.org/Git/CommitMessages On an offtopic note; I would love to see git bz[1] work with our bugzilla once the migration is done ;) 1. http://blog.fishsoup.net/2009/09/05/git-bz-push/ --=20 ~Nirbheek Chauhan Gentoo GNOME+Mozilla Team