From: Eric Lesh <eclesh@ucla.edu>
To: jsipek@cs.sunysb.edu
Cc: git@vger.kernel.org
Subject: [GUILT PATCH 0/4] Add guards to guilt
Date: Sun, 29 Jul 2007 00:50:14 -0700 [thread overview]
Message-ID: <118569541814-git-send-email-eclesh@ucla.edu> (raw)
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 introduces the command `get_guarded_series`, which just lists
patches that are to be applied based on the guards. It also makes
eidx=`wc -l < $applied`
inaccurate if you're using it as an index into get_series.
If you change guards on a patch or select a different guard while
patches are applied, some commands might get confused. guilt pop -a will fix
everything though. Usually, it's best to pop -a before fiddling with
guards anyway.
This is an RFC, but I have tested it and things seem to be working
well.
[PATCH 1/4] 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/4] guilt-guard: Assign guards to patches in series
This adds the guilt-guard command and utility functions to
guilt.
[PATCH 3/4] 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/4] Use guards information and functions
This changes guilt-header, guilt-next, guilt-push and guilt-unapplied to
use the guards information properly.
After the guilt-push change, header, next, and unapplied get
confused and break, so I rolled their fixes into this patch
instead of separate ones.
Documentation/guilt-guards.txt | 40 +++++++++++++++++++++++++
Documentation/guilt-select.txt | 42 ++++++++++++++++++++++++++
guilt | 62 ++++++++++++++++++++++++++++++++++++++-
guilt-guards | 63 ++++++++++++++++++++++++++++++++++++++++
guilt-header | 7 ++--
guilt-next | 2 +-
guilt-push | 8 ++--
guilt-select | 36 +++++++++++++++++++++++
guilt-unapplied | 2 +-
9 files changed, 252 insertions(+), 10 deletions(-)
create mode 100644 Documentation/guilt-guards.txt
create mode 100644 Documentation/guilt-select.txt
create mode 100755 guilt-guards
create mode 100755 guilt-select
next reply other threads:[~2007-07-29 8:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-29 7:50 Eric Lesh [this message]
2007-07-29 7:50 ` [GUILT PATCH 1/4] get_series: Remove comments from end of series lines Eric Lesh
2007-07-30 3:54 ` Josef Sipek
2007-07-30 5:15 ` Eric Lesh
2007-07-30 5:26 ` Josef Sipek
2007-07-30 7:07 ` Eric Lesh
2007-07-29 7:50 ` [GUILT PATCH 2/4] guilt-guard: Assign guards to patches in series Eric Lesh
2007-07-30 4:06 ` Josef Sipek
2007-07-30 6:41 ` Eric Lesh
2007-07-30 19:28 ` Josef Sipek
2007-07-29 7:50 ` [GUILT PATCH 3/4] guilt-select: Select guards to apply when pushing patches Eric Lesh
2007-07-30 4:12 ` Josef Sipek
2007-07-30 7:02 ` Eric Lesh
2007-07-30 19:34 ` Josef Sipek
2007-07-29 7:50 ` [GUILT PATCH 4/4] Use guards information and functions Eric Lesh
2007-07-30 4:15 ` Josef Sipek
2007-07-30 7:06 ` Eric Lesh
2007-07-30 3:54 ` [GUILT PATCH 0/4] Add guards to guilt Josef Sipek
2007-07-30 8:32 ` Eric Lesh
2007-07-30 19:20 ` 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=118569541814-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).