git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Lesh <eclesh@ucla.edu>
To: jsipek@cs.sunysb.edu
Cc: git@vger.kernel.org
Subject: [GUILT PATCH v2 0/5] Add guards to guilt
Date: Mon, 30 Jul 2007 20:11:16 -0700	[thread overview]
Message-ID: <1185851481190-git-send-email-eclesh@ucla.edu> (raw)


Changes in v2
        - get_series returns guarded series, get_full_series gives
          full series.  Most commands want the guarded series anyway.
        - more options for guilt-select (better hg compatability)
        - rename guilt-guards to guilt-guard (better hg compatability)
        - a couple bug fixes
        - an extra patch that adds a test suite

This series adds Mercurial Queues-like guards to guilt.  It allows you
to assign guards to related patches in the series file to selectively
push patches.

See Chapter 13 of the HG Book for more info.
(http://hgbook.red-bean.com/hgbookch13.html)

Guards are appended as "#+foo" or "#-foo" to the end of the patch name
in the series file, so they are compatible with quilt. The
guard setting and unsetting functions also respect comments on the
patch line, so they aren't mangled when you use guards.

This changes `get_series` to return the guarded series of patches that
will be actually be applied.  `get_full_series` returns the full
series file.

If you change guards on a patch or select a different guard while
patches are applied, some commands might get confused.  See
`guilt-select --pop` and `guilt-select --reapply` to avoid having to
`guilt-pop -a` yourself.

I did everything (maybe?) you suggested except implement a
safe_sed wrapper and a validate_guards function.  The sed stuff is
maybe better for a later patch that covers most sed usage in guilt,
and the validate_guards isn't really necessary given the small number
of times it's called.  If you would prefer either of those to get
done, let me know.

[PATCH 1/5] get_series: Remove comments from end of series lines
       This just strips everything but the patch name from get_series,
       to hide comments or guards on the line.

[PATCH 2/5] guilt-guard: Assign guards to patches in series
       This adds the guilt-guard command and utility functions to
       guilt.  Introduces get_guarded_series, which is removed in
       patch 4.

[PATCH 3/5] guilt-select: Select guards to apply when pushing patches
       This puts selected guards in .git/patch/$branch/guards, and
       adds a $guards_file variable to guilt.

[PATCH 4/5] get_series: return guarded patches only
       Actually distinguish between guarded and non-guarded patches in
       a number of commands by making get_series return the guarded
       series, and introducing get_full_series to return the unguarded
       series.  Lots of changes.
       If anything breaks, it's in this patch.  Hopefully.

[PATCH 5/5] Guards test suite
       Test stuff that uses get_series or get_full_series.

             reply	other threads:[~2007-07-31  3:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-31  3:11 Eric Lesh [this message]
2007-07-31  3:11 ` [GUILT PATCH 1/5] get_series: Remove comments from end of series lines Eric Lesh
2007-07-31  3:50   ` Josef Sipek
2007-07-31  3:11 ` [GUILT PATCH 2/5] guilt-guard: Assign guards to patches in series Eric Lesh
2007-07-31  4:05   ` Josef Sipek
2007-08-09  7:34     ` Eric Lesh
2007-08-09  8:17       ` David Kastrup
2007-08-09  8:22         ` Thomas Adam
2007-08-09  8:43           ` David Kastrup
2007-08-09  8:53           ` Eric Lesh
2007-08-09  9:01         ` Eric Lesh
2007-08-09 13:47       ` Josef Sipek
2007-07-31  3:11 ` [GUILT PATCH 3/5] guilt-select: Select guards to apply when pushing patches Eric Lesh
2007-07-31  3:11 ` [GUILT PATCH 4/5] get_series: return guarded patches only Eric Lesh
2007-07-31  3:11 ` [GUILT PATCH 5/5] Guards test suite Eric Lesh
2007-07-31  3:42 ` [GUILT PATCH v2 0/5] Add guards to guilt Josef Sipek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1185851481190-git-send-email-eclesh@ucla.edu \
    --to=eclesh@ucla.edu \
    --cc=git@vger.kernel.org \
    --cc=jsipek@cs.sunysb.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).