[PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-11 Thread Tejun Heo
Hello, Some trailers refer to other commits. Let's call them xrefs (cross-references). For example, a cherry pick trailer points to the source commit. It is sometimes useful to build a reverse map of these xrefs - ie. source -> cherry-pick instead of cherry-pick -> source. This, e.g, can answe

[PATCH 3/5] notes: Implement git-reverse-trailer-xrefs

2018-12-11 Thread Tejun Heo
From: Tejun Heo Some trailers refer to other commits. Let's call them xrefs (cross-references). For example, a cherry pick trailer points to the source commit. It is sometimes useful to build a reverse map of these xrefs - ie. source -> cherry-pick instead of cherry-pick -> so

[PATCH 1/5] trailer: Implement a helper to reverse-map trailer xrefs

2018-12-11 Thread Tejun Heo
From: Tejun Heo Some trailers refer to other commits. Let's call them xrefs (cross-references). For example, a cherry pick trailer points to the source commit. It is sometimes useful to build a reverse map of these xrefs - ie. source -> cherry-pick instead of cherry-pick -> so

[PATCH 5/5] notes: Implement xref-cherry-picks hooks and tests

2018-12-11 Thread Tejun Heo
From: Tejun Heo Add post-cherry-pick.sample and post-fetch.sample which, when enabled, will keep refs/notes/xref-cherry-picks up-to-date as new cherry-picks are created and fetched. Also, add tests to verify xref-cherry-picks. Signed-off-by: Tejun Heo --- Documentation/git-reverse-trailer

[PATCH 2/5] notes: Implement special handlings for refs/notes/xref-

2018-12-11 Thread Tejun Heo
From: Tejun Heo Some trailers refer to other commits. Let's call them xrefs (cross-references). For example, a cherry pick trailer points to the source commit. It is sometimes useful to build a reverse map of these xrefs - ie. source -> cherry-pick instead of cherry-pick -> sou

[PATCH 4/5] githooks: Add post-cherry-pick and post-fetch hooks

2018-12-11 Thread Tejun Heo
From: Tejun Heo * post-cherry-pick: Called after a cherry-pick and given parameters so that it can tell which are the new cherry-picks. * post-fetch: Called after a fetch. Each updated ref and sha1 are fed on stdin. These two hooks will be used to keep refs/notes/xref-cherry-picks up-to

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-12 Thread Tejun Heo
Hello, Junio. On Wed, Dec 12, 2018 at 04:26:57PM +0900, Junio C Hamano wrote: > It also is not immediately obvious to me what your general strategy > to maintain this reverse mapping is, when new ways and codepaths to > cause new commits with "cherry-picked-from" trailer appear. Do we > keep pili

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-12 Thread Tejun Heo
Hello, Junio. On Thu, Dec 13, 2018 at 12:01:25PM +0900, Junio C Hamano wrote: > > Wouldn't it be more useful to have repo-updated-with-these-commits > > hook instead rather than putting more logic on note handling? > > > >> and scan the commits, just like you scan what you fetched. And when > >>

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-12 Thread Tejun Heo
Hello, Junio, Stefan. On Thu, Dec 13, 2018 at 12:09:39PM +0900, Junio C Hamano wrote: > Please do not take the above as "don't do notes/xref-; instead read > from the 'meta commits'". I do not have a preference between the > two proposed implementations. The important thing is that we won't > en

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-13 Thread Tejun Heo
Hello, Junio. On Thu, Dec 13, 2018 at 02:47:36PM +0900, Junio C Hamano wrote: > Tejun Heo writes: > > > Hmmm... I see. I still have a bit of trouble seeing why doing it that > > way is better tho. Wouldn't new-object-hook be simpler? They'll > > achieve

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-18 Thread Tejun Heo
Hey, guys. On Tue, Dec 18, 2018 at 08:48:35AM -0800, Stefan Xenos wrote: > I've just uploaded a new evolve proposal that includes a spec for the > "hiddenmetas" namespace, where we can store historical cherry-pick > information. Total noob question - where can I read that? Also, as long as I can

Re: [RFC] cherry-pick notes to find out cherry-picks from the origin

2018-10-24 Thread Tejun Heo
Ping, thanks. -- tejun

Re: [RFC] cherry-pick notes to find out cherry-picks from the origin

2018-11-13 Thread Tejun Heo
On Wed, Oct 24, 2018 at 05:24:01AM -0700, Tejun Heo wrote: > Ping, thanks. Ping again. Any comments? Wasn't this the direction you guys were suggesting? Thanks. -- tejun

Re: [RFC] cherry-pick notes to find out cherry-picks from the origin

2018-12-05 Thread Tejun Heo
Hello, Jeff. On Thu, Nov 15, 2018 at 09:40:44AM -0500, Jeff King wrote: > Sorry for the slow reply. This was on my to-look-at pile, but for > some reason I accidentally put in my done pile. No worries and sorry about my late reply too. Things were a bit hectic. > > * A new built-in command note

Re: [RFC] cherry-pick notes to find out cherry-picks from the origin

2018-12-06 Thread Tejun Heo
Hello, Jeff. So, this is what I currently have. It still does the same thing but a lot more generic in terms of both interface and implementation. * All core logics are implemented as core helpers / features. * Trailer parsing and reverse-mapping in trailer_rev_xrefs_*(). * Note refs which

[RFC] cherry-pick notes to find out cherry-picks from the origin

2018-10-17 Thread Tejun Heo
tting a cherry-picks note for display, nested cherry-picks are followed from each Cherry-picked-to tag and printed out with matching indentations. Combined with name-rev --stdin, it can produce outputs like the following. commit 82cddd79f962de0bb1e7cdd95d48b4865816 (branch2) Author:

[PATCH] name_rev: add support for --cherry-picks

2018-07-26 Thread Tejun Heo
>From aefa07bc66bb4a116eb84eb46d7f070f9632c990 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 26 Jul 2018 04:14:52 -0700 It's often useful to track cherry-picks of a given commit. Add --cherry-picks support to git-name-rev. When specified, name_rev also shows the commits cherr

[PATCH v2] name_rev: add support for --cherry-picks

2018-07-26 Thread Tejun Heo
>From a6a88c3da252d69547ac8b463098fc4f4c03f322 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 26 Jul 2018 04:14:52 -0700 Subject: [PATCH] name_rev: add support for --cherry-picks It's often useful to track cherry-picks of a given commit. Add --cherry-picks support to git-name-re

Re: [PATCH v2] name_rev: add support for --cherry-picks

2018-07-26 Thread Tejun Heo
Hello, Junio. On Thu, Jul 26, 2018 at 08:12:45AM -0700, Junio C Hamano wrote: > Tejun Heo writes: > > > From a6a88c3da252d69547ac8b463098fc4f4c03f322 Mon Sep 17 00:00:00 2001 > > From: Tejun Heo > > Date: Thu, 26 Jul 2018 04:14:52 -0700 > > Subject: [PATCH] name

Re: [PATCH v2] name_rev: add support for --cherry-picks

2018-07-27 Thread Tejun Heo
Hello, Jeff. On Fri, Jul 27, 2018 at 4:47 AM Jeff King wrote: > - the set of names might be distinct from the set of commits you'd want >to traverse. For instance, you might want to use "name-rev --tags", >but find cherry-picks even on untagged branches (e.g., "--all"). Hmm... maybe bu

[ANNOUNCE] mtkdiff-20050801 (with patchkdiff, quiltkdiff, gitkdiff and modified gitk)

2005-08-01 Thread Tejun Heo
Hello, guys. New version of mtkdiff package is available. Changes since last release (20050514) are. * patchkdiff added. Idea is from patchview of Randy Dunlap (Hi!). patchkdiff can show multiple diff files. * quiltkdiff rewritten in perl. It's faster and doesn't push/pop quilt reposit