diff -Nru guilt-0.34/debian/changelog guilt-0.35/debian/changelog --- guilt-0.34/debian/changelog 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/changelog 2011-08-05 21:39:36.000000000 +0000 @@ -1,3 +1,13 @@ +guilt (0.35-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.2; no changes required. + * Update copyright. + * Switch to dpkg-source 3.0 (quilt) format. + * Refresh patches. + + -- Iulian Udrea Fri, 05 Aug 2011 22:31:35 +0100 + guilt (0.34-2) unstable; urgency=low * Upload to unstable. diff -Nru guilt-0.34/debian/control guilt-0.35/debian/control --- guilt-0.34/debian/control 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/control 2011-08-05 21:39:23.000000000 +0000 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Iulian Udrea DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7), quilt +Build-Depends: debhelper (>= 7) Build-Depends-Indep: asciidoc (>> 7.0.2-3), xmlto, libexpat1-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ Vcs-Browser: http://git.debian.org/?p=collab-maint/guilt.git Vcs-Git: git://git.debian.org/git/collab-maint/guilt.git diff -Nru guilt-0.34/debian/copyright guilt-0.35/debian/copyright --- guilt-0.34/debian/copyright 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/copyright 2011-08-05 21:39:23.000000000 +0000 @@ -4,7 +4,7 @@ Upstream-Source: http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ Files: * -Copyright: Copyright (c) Josef "Jeff" Sipek, 2006-2009 +Copyright: Copyright (c) Josef "Jeff" Sipek, 2006-2011 License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as @@ -34,7 +34,7 @@ Files: debian/* Copyright: Copyright (c) Brandon Philips 2007 - Copyright (C) 2009-2010 Iulian Udrea + Copyright (C) 2009-2011 Iulian Udrea License: GPL-2 See above. diff -Nru guilt-0.34/debian/patches/DocMakefile.patch guilt-0.35/debian/patches/DocMakefile.patch --- guilt-0.34/debian/patches/DocMakefile.patch 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/patches/DocMakefile.patch 2011-08-05 21:39:23.000000000 +0000 @@ -1,9 +1,7 @@ # Description: Install docs to /usr/share/man instead of /usr/man. -Index: guilt/Documentation/Makefile -=================================================================== ---- guilt.orig/Documentation/Makefile 2009-03-11 18:49:56.469761459 +0000 -+++ guilt/Documentation/Makefile 2009-03-11 18:50:07.407543194 +0000 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile @@ -12,7 +12,7 @@ prefix?=$(PREFIX) bindir?=$(prefix)/bin diff -Nru guilt-0.34/debian/patches/Makefile.patch guilt-0.35/debian/patches/Makefile.patch --- guilt-0.34/debian/patches/Makefile.patch 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/patches/Makefile.patch 2011-08-05 21:39:23.000000000 +0000 @@ -1,13 +1,10 @@ -# Description: Use /usr instead of /usr/local. +# Description: Use /usr instead of /usr/local -Index: guilt/Makefile -=================================================================== ---- guilt.orig/Makefile 2009-03-11 18:48:24.929761670 +0000 -+++ guilt/Makefile 2009-03-11 18:49:00.638733257 +0000 -@@ -1,5 +1,4 @@ --PREFIX=/usr/local --DESTDIR= -+PREFIX=/usr +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-PREFIX?=/usr/local ++PREFIX?=/usr + DESTDIR?= + INSTALL?=install - SCRIPTS = guilt \ - $(filter-out $(wildcard *~),$(wildcard guilt-*)) diff -Nru guilt-0.34/debian/patches/series guilt-0.35/debian/patches/series --- guilt-0.34/debian/patches/series 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/patches/series 2011-08-05 21:39:23.000000000 +0000 @@ -1,2 +1,2 @@ -Makefile.patch DocMakefile.patch +Makefile.patch diff -Nru guilt-0.34/debian/README.source guilt-0.35/debian/README.source --- guilt-0.34/debian/README.source 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To configure quilt to use debian/patches instead of patches, you want -either to export QUILT_PATCHES=debian/patches in your environment -or use this snippet in your ~/.quiltrc: - - for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do - if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then - export QUILT_PATCHES=debian/patches - fi - done - -To get the fully patched source after unpacking the source package, cd to -the root level of the source package and run: - - quilt push -a - -The last patch listed in debian/patches/series will become the current -patch. - -To add a new set of changes, first run quilt push -a, and then run: - - quilt new - -where is a descriptive name for the patch, used as the filename in -debian/patches. Then, for every file that will be modified by this patch, -run: - - quilt add - -before editing those files. You must tell quilt with quilt add what files -will be part of the patch before making changes or quilt will not work -properly. After editing the files, run: - - quilt refresh - -to save the results as a patch. - -Alternately, if you already have an external patch and you just want to -add it to the build system, run quilt push -a and then: - - quilt import -P /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). as above is the filename to -use in debian/patches. The last quilt push -a will apply the patch to -make sure it works properly. - -To remove an existing patch from the list of patches that will be applied, -run: - - quilt delete - -You may need to run quilt pop -a to unapply patches first before running -this command. diff -Nru guilt-0.34/debian/rules guilt-0.35/debian/rules --- guilt-0.34/debian/rules 2011-10-17 12:03:23.000000000 +0000 +++ guilt-0.35/debian/rules 2011-08-05 21:39:23.000000000 +0000 @@ -1,18 +1,16 @@ #!/usr/bin/make -f # -*- makefile -*- -include /usr/share/quilt/quilt.make - build: build-stamp -build-stamp: patch +build-stamp: dh_testdir $(MAKE) touch $@ -clean: unpatch +clean: dh_testdir dh_testroot diff -Nru guilt-0.34/debian/source/format guilt-0.35/debian/source/format --- guilt-0.34/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/debian/source/format 2011-10-17 12:03:23.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru guilt-0.34/Documentation/cmd-list.sh guilt-0.35/Documentation/cmd-list.sh --- guilt-0.34/Documentation/cmd-list.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/Documentation/cmd-list.sh 2011-07-17 18:12:57.000000000 +0000 @@ -11,12 +11,12 @@ {print $0; exit} '` - len=`expr length "$cmd"` + len=`expr length "${cmd}"` if [ -z "$desc" ]; then echo "No description found in $cmd.txt" >&2 exit 1 - elif [ "`expr substr \"$desc\" 1 $len`" != "$cmd" ]; then + elif [ "`expr substr "$desc" 1 $len`" != "$cmd" ]; then echo "Description does not match $cmd: $desc" >&2 exit 1 fi diff -Nru guilt-0.34/Documentation/.gitignore guilt-0.35/Documentation/.gitignore --- guilt-0.34/Documentation/.gitignore 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/Documentation/.gitignore 2011-07-17 18:12:57.000000000 +0000 @@ -5,13 +5,6 @@ # Generated usage strings usage-*.txt -# Generated man pages -*.1 -*.7 - -# Generated html man pages -*.html - # Generated list of commands & version string cmds.txt version.txt diff -Nru guilt-0.34/Documentation/guilt.7 guilt-0.35/Documentation/guilt.7 --- guilt-0.34/Documentation/guilt.7 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt.7 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,235 @@ +'\" t +.\" Title: guilt +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT" "7" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt \- quilt on top of git +.SH "SYNOPSIS" +\fIguilt\fR COMMAND [ARGS] +.SH "DESCRIPTION" +Andrew Morton originally developed a set of scripts for maintaining kernel patches outside of any SCM tool\&. Others extended these into a suite called quilt\&. The basic idea behind quilt is to maintain patches instead of maintaining source files\&. Patches can be added, removed or reordered, and they can be refreshed as you fix bugs or update to a new base revision\&. quilt is very powerful, but it is not integrated with the underlying SCM tools\&. This makes it difficult to visualize your changes\&. + +Guilt allows one to use quilt functionality on top of a Git repository\&. Changes are maintained as patches which are committed into Git\&. Commits can be removed or reordered, and the underlying patch can be refreshed based on changes made in the working directory\&. The patch directory can also be placed under revision control, so you can have a separate history of changes made to your patches\&. +.SH "PATCHES DIRECTORY" +In Guilt, all the patches are stored in \&.git/patches/$branch/, where $branch is the name of the branch being worked on\&. This means that one can have a independent series of patches for each branch present in the repository\&. Each of these per\-branch directories contains 3 special files: + +guards: This file contains any guards that should be applied to the series when pushing\&. It is only present when guards are selected\&. + +series: This file contains a list of all the patch filenames relative to the per\-branch patch directory\&. Empty and commented out lines are ignored\&. + +status: This file contains the state of the stack\&. What patches are applied\&. +.SH "HOOKS" +Any guilt operation may execute zero or more hook scripts which can be used to run any housekeeping commands or even abort the execution of the command\&. +.SH "HOOKS DIRECTORY" +Guilt follows the same basic design of hooks in Git itself\&. All Guilt hooks are executable files (generally shell scripts, but they can be anything the operating system can execute) in \&.git/hooks/guilt/\&. + +The following hooks are supported: +.PP +delete +.RS 4 +Executed when a patch is deleted from the patch series via \fBguilt-delete\fR(1)\&. +.RE +.SH "GUILT COMMANDS" +All commands can be called with or without a dash\&. e\&.g\&. \fIguilt add\fR or \fIguilt\-add\fR +.PP +\fBguilt-add\fR(1) +.RS 4 +guilt\-add \- Add a file to git and guilt\&. +.RE +.PP +\fBguilt-applied\fR(1) +.RS 4 +guilt\-applied \- List applied patches\&. +.RE +.PP +\fBguilt-branch\fR(1) +.RS 4 +guilt\-branch \- Branch the entire patch series\&. +.RE +.PP +\fBguilt-commit\fR(1) +.RS 4 +guilt\-commit \- Commit specified number of patches\&. +.RE +.PP +\fBguilt-delete\fR(1) +.RS 4 +guilt\-delete \- Delete a patch\&. +.RE +.PP +\fBguilt-diff\fR(1) +.RS 4 +guilt\-diff \- Outputs various diffs\&. +.RE +.PP +\fBguilt-export\fR(1) +.RS 4 +guilt\-export \- Export a patch series (to be used by quilt)\&. +.RE +.PP +\fBguilt-files\fR(1) +.RS 4 +guilt\-files \- Print the list of files that the topmost patch changes\&. +.RE +.PP +\fBguilt-fold\fR(1) +.RS 4 +guilt\-fold \- Fold a specified patch into the topmost applied patch\&. +.RE +.PP +\fBguilt-fork\fR(1) +.RS 4 +guilt\-fork \- Fork the topmost applied patch\&. +.RE +.PP +\fBguilt-graph\fR(1) +.RS 4 +guilt\-graph \- Create a patch dependency graph\&. +.RE +.PP +\fBguilt-guard\fR(1) +.RS 4 +guilt\-guard \- Assign guards to patches\&. +.RE +.PP +\fBguilt-header\fR(1) +.RS 4 +guilt\-header \- Print a patch header\&. +.RE +.PP +\fBguilt-help\fR(1) +.RS 4 +guilt\-help \- open man page of a guilt command\&. +.RE +.PP +\fBguilt-import-commit\fR(1) +.RS 4 +guilt\-import\-commit \- Import one or more commits as patches\&. +.RE +.PP +\fBguilt-import\fR(1) +.RS 4 +guilt\-import \- Import specified patch file\&. +.RE +.PP +\fBguilt-init\fR(1) +.RS 4 +guilt\-init \- Initialize guilt for use in a git repository\&. +.RE +.PP +\fBguilt-new\fR(1) +.RS 4 +guilt\-new \- Create a new patch\&. +.RE +.PP +\fBguilt-next\fR(1) +.RS 4 +guilt\-next \- Output the name of next patch to be pushed\&. +.RE +.PP +\fBguilt-patchbomb\fR(1) +.RS 4 +guilt\-patchbomb \- Email a series of commits interactively\&. +.RE +.PP +\fBguilt-pop\fR(1) +.RS 4 +guilt\-pop \- Pop patches from the tree\&. +.RE +.PP +\fBguilt-prev\fR(1) +.RS 4 +guilt\-prev \- Output name of second topmost applied patch\&. +.RE +.PP +\fBguilt-push\fR(1) +.RS 4 +guilt\-push \- Push patches onto the tree\&. +.RE +.PP +\fBguilt-rebase\fR(1) +.RS 4 +guilt\-rebase \- Rebase pushed patches\&. +.RE +.PP +\fBguilt-refresh\fR(1) +.RS 4 +guilt\-refresh \- Refresh topmost applied patch\&. +.RE +.PP +\fBguilt-repair\fR(1) +.RS 4 +guilt\-repair \- Repair the repository state\&. +.RE +.PP +\fBguilt-rm\fR(1) +.RS 4 +guilt\-rm \- Remove a file from the git tree and guilt\&. +.RE +.PP +\fBguilt-select\fR(1) +.RS 4 +guilt\-select \- Select guards to apply when pushing patches\&. +.RE +.PP +\fBguilt-series\fR(1) +.RS 4 +guilt\-series \- Print the stack of patches\&. +.RE +.PP +\fBguilt-status\fR(1) +.RS 4 +guilt\-status \- Print the status of files since the last refresh\&. +.RE +.PP +\fBguilt-top\fR(1) +.RS 4 +guilt\-top \- Output name of topmost applied patch\&. +.RE +.PP +\fBguilt-unapplied\fR(1) +.RS 4 +guilt\-unapplied \- List all unapplied patches\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> and Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-add.1 guilt-0.35/Documentation/guilt-add.1 --- guilt-0.34/Documentation/guilt-add.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-add.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,72 @@ +'\" t +.\" Title: guilt-add +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-ADD" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-add \- Add a file to git and guilt +.SH "SYNOPSIS" +\fIguilt\-add\fR \&... +.SH "DESCRIPTION" +Adds the files specified to git using git\-add making it available to guilt\&. +.SH "OPTIONS" +.PP + +.RS 4 +Files to add +.RE +.SH "EXAMPLES" +Create and add a new file example\&.c + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ touch example\&.c +$ guilt\-add example\&.c +.fi +.if n \{\ +.RE +.\} +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-add.html guilt-0.35/Documentation/guilt-add.html --- guilt-0.34/Documentation/guilt-add.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-add.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,664 @@ + + + + + +guilt-add(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-add <file>…

+
+
+
+

DESCRIPTION

+
+

Adds the files specified to git using git-add making it available to guilt.

+
+
+
+

OPTIONS

+
+
+
+<files> +
+
+

+ Files to add +

+
+
+
+
+
+

EXAMPLES

+
+

Create and add a new file example.c

+
+
+
$ touch example.c
+$ guilt-add example.c
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-applied.1 guilt-0.35/Documentation/guilt-applied.1 --- guilt-0.34/Documentation/guilt-applied.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-applied.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,52 @@ +'\" t +.\" Title: guilt-applied +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-APPLIED" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-applied \- List applied patches +.SH "SYNOPSIS" +\fIguilt\-applied\fR [\-c] +.SH "DESCRIPTION" +Prints a list of all applied patches\&. +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-applied.html guilt-0.35/Documentation/guilt-applied.html --- guilt-0.34/Documentation/guilt-applied.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-applied.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,638 @@ + + + + + +guilt-applied(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-applied [-c]

+
+
+
+

DESCRIPTION

+
+

Prints a list of all applied patches.

+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-branch.1 guilt-0.35/Documentation/guilt-branch.1 --- guilt-0.34/Documentation/guilt-branch.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-branch.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,53 @@ +'\" t +.\" Title: guilt-branch +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-BRANCH" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-branch \- Branch the entire patch series +.SH "SYNOPSIS" +\fIguilt\-branch\fR [] +.SH "DESCRIPTION" +Create a copy of the entire branch patch directory (\&.git/patches/) to (\&.git/patches/), create a new git branch and check it out\&. +.SH "OPTIONS" +.PP + +.RS 4 +The name of the new branch to create\&. If not specified, the current branch name is appended with the current year, month and day\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-branch.html guilt-0.35/Documentation/guilt-branch.html --- guilt-0.34/Documentation/guilt-branch.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-branch.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,656 @@ + + + + + +guilt-branch(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-branch [<new_name>]

+
+
+
+

DESCRIPTION

+
+

Create a copy of the entire branch patch directory (.git/patches/<branch>) +to (.git/patches/<new_name>), create a new git branch <new_name> and check +it out.

+
+
+
+

OPTIONS

+
+
+
+<new_name> +
+
+

+ The name of the new branch to create. If not specified, the current + branch name is appended with the current year, month and day. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-commit.1 guilt-0.35/Documentation/guilt-commit.1 --- guilt-0.34/Documentation/guilt-commit.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-commit.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,58 @@ +'\" t +.\" Title: guilt-commit +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-COMMIT" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-commit \- Commit specified number of patches +.SH "SYNOPSIS" +\fIguilt\-commit\fR \-n | \-a | \-\-all + +Turn specified number of bottom most patches into Git commits\&. This removes the the patches from the series, and status file\&. +.SH "OPTIONS" +.PP +\-\-all, \-a +.RS 4 +Commit all applied patches +.RE +.PP +\-n +.RS 4 +Commit bottom most patches +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-commit.html guilt-0.35/Documentation/guilt-commit.html --- guilt-0.34/Documentation/guilt-commit.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-commit.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,660 @@ + + + + + +guilt-commit(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-commit -n <num> | -a | --all

+

Turn specified number of bottom most patches into Git commits. This removes +the the patches from the series, and status file.

+
+
+
+

OPTIONS

+
+
+
+--all +
+
+-a +
+
+

+ Commit all applied patches +

+
+
+-n <num> +
+
+

+ Commit <num> bottom most patches +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-delete.1 guilt-0.35/Documentation/guilt-delete.1 --- guilt-0.34/Documentation/guilt-delete.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-delete.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,76 @@ +'\" t +.\" Title: guilt-delete +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-DELETE" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-delete \- Delete a patch +.SH "SYNOPSIS" +\fIguilt\-delete\fR [\-f] +.SH "DESCRIPTION" +Delete an unapplied patch from the series\&. +.SH "OPTIONS" +.PP +\-f +.RS 4 +Remove the patch from the series and disk +.RE +.PP + +.RS 4 +Name of the patch to delete\&. +.RE +.SH "EXAMPLES" +Delete a patch called \fIfoobar\fR: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ guilt\-delete foobar +.fi +.if n \{\ +.RE +.\} +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-delete.html guilt-0.35/Documentation/guilt-delete.html --- guilt-0.34/Documentation/guilt-delete.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-delete.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,671 @@ + + + + + +guilt-delete(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-delete [-f] <patchname>

+
+
+
+

DESCRIPTION

+
+

Delete an unapplied patch from the series.

+
+
+
+

OPTIONS

+
+
+
+-f +
+
+

+ Remove the patch from the series and disk +

+
+
+<patchname> +
+
+

+ Name of the patch to delete. +

+
+
+
+
+
+

EXAMPLES

+
+

Delete a patch called foobar:

+
+
+
$ guilt-delete foobar
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-diff.1 guilt-0.35/Documentation/guilt-diff.1 --- guilt-0.34/Documentation/guilt-diff.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-diff.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,58 @@ +'\" t +.\" Title: guilt-diff +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-DIFF" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-diff \- Outputs various diffs +.SH "SYNOPSIS" +\fIguilt\-diff\fR [\-z] [\&...] +.SH "DESCRIPTION" +Outputs top\-most applied diff and any additional changes in the working directory to standard output\&. +.SH "OPTIONS" +.PP +\-z +.RS 4 +Output a interdiff against the top\-most applied patch\&. This should produce the same diff as "guilt\-new \-f foo"\&. +.RE +.PP +\&... +.RS 4 +Restrict diff output to a given set of files\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-diff.html guilt-0.35/Documentation/guilt-diff.html --- guilt-0.34/Documentation/guilt-diff.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-diff.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,663 @@ + + + + + +guilt-diff(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-diff [-z] [<path>…]

+
+
+
+

DESCRIPTION

+
+

Outputs top-most applied diff and any additional changes in the working +directory to standard output.

+
+
+
+

OPTIONS

+
+
+
+-z +
+
+

+ Output a interdiff against the top-most applied patch. This should + produce the same diff as "guilt-new -f foo". +

+
+
+<path>… +
+
+

+ Restrict diff output to a given set of files. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-export.1 guilt-0.35/Documentation/guilt-export.1 --- guilt-0.34/Documentation/guilt-export.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-export.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,53 @@ +'\" t +.\" Title: guilt-export +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-EXPORT" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-export \- Export a patch series (to be used by quilt) +.SH "SYNOPSIS" +\fIguilt\-export\fR [] +.SH "DESCRIPTION" +Export a guilt series to be used by quilt\&. +.SH "OPTIONS" +.PP + +.RS 4 +Name of the directory to export the patch series to\&. (defaults to patches)\&. +.RE +.SH "AUTHOR" +Written by Pierre Habouzit <\m[blue]\fBmadcoder@debian\&.org\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Pierre Habouzit <\m[blue]\fBmadcoder@debian\&.org\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +madcoder@debian.org +.RS 4 +\%mailto:madcoder@debian.org +.RE diff -Nru guilt-0.34/Documentation/guilt-export.html guilt-0.35/Documentation/guilt-export.html --- guilt-0.34/Documentation/guilt-export.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-export.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,654 @@ + + + + + +guilt-export(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-export [<target_dir>]

+
+
+
+

DESCRIPTION

+
+

Export a guilt series to be used by quilt.

+
+
+
+

OPTIONS

+
+
+
+<target_dir> +
+
+

+ Name of the directory to export the patch series to. + (defaults to patches). +

+
+
+
+
+
+

Author

+
+

Written by Pierre Habouzit <madcoder@debian.org>

+
+
+
+

Documentation

+
+

Documentation by Pierre Habouzit <madcoder@debian.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-files.1 guilt-0.35/Documentation/guilt-files.1 --- guilt-0.34/Documentation/guilt-files.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-files.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,63 @@ +'\" t +.\" Title: guilt-files +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-FILES" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-files \- Print the list of files that the topmost patch changes +.SH "SYNOPSIS" +\fIguilt\-files\fR [\-v] [\-a] [\-l] +.SH "DESCRIPTION" +Print the list of files that the topmost patch changes\&. +.SH "OPTIONS" +.PP +\-v +.RS 4 +Verbose output +.RE +.PP +\-a +.RS 4 +List all files in all applied patches +.RE +.PP +\-l +.RS 4 +Add patch name to the output +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-files.html guilt-0.35/Documentation/guilt-files.html --- guilt-0.34/Documentation/guilt-files.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-files.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,669 @@ + + + + + +guilt-files(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-files [-v] [-a] [-l]

+
+
+
+

DESCRIPTION

+
+

Print the list of files that the topmost patch changes.

+
+
+
+

OPTIONS

+
+
+
+-v +
+
+

+ Verbose output +

+
+
+-a +
+
+

+ List all files in all applied patches +

+
+
+-l +
+
+

+ Add patch name to the output +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-fold.1 guilt-0.35/Documentation/guilt-fold.1 --- guilt-0.34/Documentation/guilt-fold.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-fold.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,56 @@ +'\" t +.\" Title: guilt-fold +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-FOLD" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-fold \- Fold a specified patch into the topmost applied patch +.SH "SYNOPSIS" +\fIguilt\-fold\fR [\-k] +.SH "OPTIONS" +.PP +\-k +.RS 4 +Do not remove the patch file\&. +.RE +.PP + +.RS 4 +Fold this patch into the topmost applied patch\&. \fIpatchname\fR is removed from the series, as well as from the patches directory\&. (A backup file is created\&.) +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-fold.html guilt-0.35/Documentation/guilt-fold.html --- guilt-0.34/Documentation/guilt-fold.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-fold.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,657 @@ + + + + + +guilt-fold(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-fold [-k] <patchname>

+
+
+
+

OPTIONS

+
+
+
+-k +
+
+

+ Do not remove the patch file. +

+
+
+<patchname> +
+
+

+ Fold this patch into the topmost applied patch. patchname is + removed from the series, as well as from the patches directory. (A + backup file is created.) +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-fork.1 guilt-0.35/Documentation/guilt-fork.1 --- guilt-0.34/Documentation/guilt-fork.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-fork.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,53 @@ +'\" t +.\" Title: guilt-fork +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-FORK" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-fork \- Fork the topmost applied patch +.SH "SYNOPSIS" +\fIguilt\-fork\fR [] +.SH "DESCRIPTION" +Create a copy of the top most patch, and replace the entry in the series file to use this new patch file\&. +.SH "OPTIONS" +.PP + +.RS 4 +The name of the new patch to create\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-fork.html guilt-0.35/Documentation/guilt-fork.html --- guilt-0.34/Documentation/guilt-fork.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-fork.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,654 @@ + + + + + +guilt-fork(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-fork [<new_name>]

+
+
+
+

DESCRIPTION

+
+

Create a copy of the top most patch, and replace the entry in the series +file to use this new patch file.

+
+
+
+

OPTIONS

+
+
+
+<new_name> +
+
+

+ The name of the new patch to create. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-graph.1 guilt-0.35/Documentation/guilt-graph.1 --- guilt-0.34/Documentation/guilt-graph.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-graph.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,53 @@ +'\" t +.\" Title: guilt-graph +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-GRAPH" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-graph \- Create a patch dependency graph +.SH "SYNOPSIS" +\fIguilt\-graph\fR [] +.SH "DESCRIPTION" +Create a dot(1) directed graph showing the dependencies between applied patches\&. +.SH "OPTIONS" +.PP + +.RS 4 +Instead of starting with the topmost applied patch, start with \&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-graph.html guilt-0.35/Documentation/guilt-graph.html --- guilt-0.34/Documentation/guilt-graph.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-graph.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,655 @@ + + + + + +guilt-graph(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-graph [<patchname>]

+
+
+
+

DESCRIPTION

+
+

Create a dot(1) directed graph showing the dependencies between applied +patches.

+
+
+
+

OPTIONS

+
+
+
+<patchname> +
+
+

+ Instead of starting with the topmost applied patch, start with + <patchname>. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-guard.1 guilt-0.35/Documentation/guilt-guard.1 --- guilt-0.34/Documentation/guilt-guard.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-guard.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,64 @@ +'\" t +.\" Title: guilt-guard +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-GUARD" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-guard \- Assign guards to patches +.SH "SYNOPSIS" +\fIguilt\-guard\fR [\-l | \-\-list | \-n | \-\-none | [] [(+|\-)\&...]] +.SH "DESCRIPTION" +Assign guards to the specified patch, or to the patch on top of the stack if no patch is given on the command line\&. + +An unguarded patch is always pushed\&. + +A positive guard begins with a +\&. A patch with a positive guard is pushed \fBonly if\fR the guard is selected\&. + +A negative guard begins with a \-\&. A patch with a negative guard is always pushed, \fBunless\fR the guard is selected\&. +.SH "OPTIONS" +.PP +\-l|\-\-list +.RS 4 +List all patches and their guards +.RE +.PP +\-n|\-\-none +.RS 4 +Remove all guards from a patch +.RE +.SH "AUTHOR" +Written by Eric Lesh <\m[blue]\fBeclesh@ucla\&.edu\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Eric Lesh <\m[blue]\fBeclesh@ucla\&.edu\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +eclesh@ucla.edu +.RS 4 +\%mailto:eclesh@ucla.edu +.RE diff -Nru guilt-0.34/Documentation/guilt-guard.html guilt-0.35/Documentation/guilt-guard.html --- guilt-0.34/Documentation/guilt-guard.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-guard.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,667 @@ + + + + + +guilt-guard(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-guard [-l | --list | -n | --none | [<patchname>] [(+|-)<guard>…]]

+
+
+
+

DESCRIPTION

+
+

Assign guards to the specified patch, or to the patch on top of the +stack if no patch is given on the command line.

+

An unguarded patch is always pushed.

+

A positive guard begins with a +. A patch with a positive guard is +pushed only if the guard is selected.

+

A negative guard begins with a -. A patch with a negative guard is +always pushed, unless the guard is selected.

+
+
+
+

OPTIONS

+
+
+
+-l|--list +
+
+

+ List all patches and their guards +

+
+
+-n|--none +
+
+

+ Remove all guards from a patch +

+
+
+
+
+
+

Author

+
+

Written by Eric Lesh <eclesh@ucla.edu>

+
+
+
+

Documentation

+
+

Documentation by Eric Lesh <eclesh@ucla.edu>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-header.1 guilt-0.35/Documentation/guilt-header.1 --- guilt-0.34/Documentation/guilt-header.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-header.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,67 @@ +'\" t +.\" Title: guilt-header +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-HEADER" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-header \- Print a patch header +.SH "SYNOPSIS" +\fIguilt\-header\fR [\-eE] [] +.SH "DESCRIPTION" +Prints either the topmost patch\(cqs header or the header of a specified patch\&. +.PP +\-e +.RS 4 +Open the header in an editor, instead of printing it\&. +.RE +.PP +\-E +.RS 4 +Open the raw patch in an editor, instead of printing it\&. +.RE +.PP + +.RS 4 +Name of the patch\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-header.html guilt-0.35/Documentation/guilt-header.html --- guilt-0.34/Documentation/guilt-header.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-header.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,664 @@ + + + + + +guilt-header(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-header [-eE] [<patchname>]

+
+
+
+

DESCRIPTION

+
+

Prints either the topmost patch’s header or the header of a specified patch.

+
+
+-e +
+
+

+ Open the header in an editor, instead of printing it. +

+
+
+-E +
+
+

+ Open the raw patch in an editor, instead of printing it. +

+
+
+<patchname> +
+
+

+ Name of the patch. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-help.1 guilt-0.35/Documentation/guilt-help.1 --- guilt-0.34/Documentation/guilt-help.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-help.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,78 @@ +'\" t +.\" Title: guilt-help +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-HELP" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-help \- open man page of a guilt command +.SH "SYNOPSIS" +\fIguilt\-help\fR [ | ] +.SH "DESCRIPTION" +Open up the man page for a guilt command\&. +.SH "EXAMPLES" +Open the guilt\-status man page + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ guilt\-help status +.fi +.if n \{\ +.RE +.\} +.sp +Open the guilt man page + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ guilt\-help +.fi +.if n \{\ +.RE +.\} +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-help.html guilt-0.35/Documentation/guilt-help.html --- guilt-0.34/Documentation/guilt-help.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-help.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,653 @@ + + + + + +guilt-help(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-help [<command> | <topic>]

+
+
+
+

DESCRIPTION

+
+

Open up the man page for a guilt command.

+
+
+
+

EXAMPLES

+
+

Open the guilt-status man page

+
+
+
$ guilt-help status
+
+

Open the guilt man page

+
+
+
$ guilt-help
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt.html guilt-0.35/Documentation/guilt.html --- guilt-0.34/Documentation/guilt.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,957 @@ + + + + + +guilt(7) + + + + + +
+
+

SYNOPSIS

+
+

guilt COMMAND [ARGS]

+
+
+
+

DESCRIPTION

+
+

Andrew Morton originally developed a set of scripts for maintaining kernel +patches outside of any SCM tool. Others extended these into a suite called +quilt. The basic idea behind quilt is to maintain patches instead of +maintaining source files. Patches can be added, removed or reordered, and +they can be refreshed as you fix bugs or update to a new base revision. +quilt is very powerful, but it is not integrated with the underlying SCM +tools. This makes it difficult to visualize your changes.

+

Guilt allows one to use quilt functionality on top of a Git repository. +Changes are maintained as patches which are committed into Git. Commits can +be removed or reordered, and the underlying patch can be refreshed based on +changes made in the working directory. The patch directory can also be +placed under revision control, so you can have a separate history of changes +made to your patches.

+
+
+
+

PATCHES DIRECTORY

+
+

In Guilt, all the patches are stored in .git/patches/$branch/, where $branch +is the name of the branch being worked on. This means that one can have a +independent series of patches for each branch present in the repository. +Each of these per-branch directories contains 3 special files:

+

guards: This file contains any guards that should be applied to the +series when pushing. It is only present when guards are selected.

+

series: This file contains a list of all the patch filenames relative to the +per-branch patch directory. Empty and commented out lines are ignored.

+

status: This file contains the state of the stack. What patches are applied.

+
+
+
+

HOOKS

+
+

Any guilt operation may execute zero or more hook scripts which can be used +to run any housekeeping commands or even abort the execution of the command.

+
+
+
+

HOOKS DIRECTORY

+
+

Guilt follows the same basic design of hooks in Git itself. All Guilt hooks +are executable files (generally shell scripts, but they can be anything the +operating system can execute) in .git/hooks/guilt/.

+

The following hooks are supported:

+
+
+delete <patch name> +
+
+

+ Executed when a patch is deleted from the patch series via + guilt-delete(1). +

+
+
+
+
+
+

GUILT COMMANDS

+
+

All commands can be called with or without a dash. e.g. guilt add or +guilt-add

+
+
+guilt-add(1) +
+
+

+ guilt-add - Add a file to git and guilt. +

+
+
+guilt-applied(1) +
+
+

+ guilt-applied - List applied patches. +

+
+
+guilt-branch(1) +
+
+

+ guilt-branch - Branch the entire patch series. +

+
+
+guilt-commit(1) +
+
+

+ guilt-commit - Commit specified number of patches. +

+
+
+guilt-delete(1) +
+
+

+ guilt-delete - Delete a patch. +

+
+
+guilt-diff(1) +
+
+

+ guilt-diff - Outputs various diffs. +

+
+
+guilt-export(1) +
+
+

+ guilt-export - Export a patch series (to be used by quilt). +

+
+
+guilt-files(1) +
+
+

+ guilt-files - Print the list of files that the topmost patch changes. +

+
+
+guilt-fold(1) +
+
+

+ guilt-fold - Fold a specified patch into the topmost applied patch. +

+
+
+guilt-fork(1) +
+
+

+ guilt-fork - Fork the topmost applied patch. +

+
+
+guilt-graph(1) +
+
+

+ guilt-graph - Create a patch dependency graph. +

+
+
+guilt-guard(1) +
+
+

+ guilt-guard - Assign guards to patches. +

+
+
+guilt-header(1) +
+
+

+ guilt-header - Print a patch header. +

+
+
+guilt-help(1) +
+
+

+ guilt-help - open man page of a guilt command. +

+
+
+guilt-import-commit(1) +
+
+

+ guilt-import-commit - Import one or more commits as patches. +

+
+
+guilt-import(1) +
+
+

+ guilt-import - Import specified patch file. +

+
+
+guilt-init(1) +
+
+

+ guilt-init - Initialize guilt for use in a git repository. +

+
+
+guilt-new(1) +
+
+

+ guilt-new - Create a new patch. +

+
+
+guilt-next(1) +
+
+

+ guilt-next - Output the name of next patch to be pushed. +

+
+
+guilt-patchbomb(1) +
+
+

+ guilt-patchbomb - Email a series of commits interactively. +

+
+
+guilt-pop(1) +
+
+

+ guilt-pop - Pop patches from the tree. +

+
+
+guilt-prev(1) +
+
+

+ guilt-prev - Output name of second topmost applied patch. +

+
+
+guilt-push(1) +
+
+

+ guilt-push - Push patches onto the tree. +

+
+
+guilt-rebase(1) +
+
+

+ guilt-rebase - Rebase pushed patches. +

+
+
+guilt-refresh(1) +
+
+

+ guilt-refresh - Refresh topmost applied patch. +

+
+
+guilt-repair(1) +
+
+

+ guilt-repair - Repair the repository state. +

+
+
+guilt-rm(1) +
+
+

+ guilt-rm - Remove a file from the git tree and guilt. +

+
+
+guilt-select(1) +
+
+

+ guilt-select - Select guards to apply when pushing patches. +

+
+
+guilt-series(1) +
+
+

+ guilt-series - Print the stack of patches. +

+
+
+guilt-status(1) +
+
+

+ guilt-status - Print the status of files since the last refresh. +

+
+
+guilt-top(1) +
+
+

+ guilt-top - Output name of topmost applied patch. +

+
+
+guilt-unapplied(1) +
+
+

+ guilt-unapplied - List all unapplied patches. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org> and Josef "Jeff" Sipek +<jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-import.1 guilt-0.35/Documentation/guilt-import.1 --- guilt-0.34/Documentation/guilt-import.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-import.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,58 @@ +'\" t +.\" Title: guilt-import +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-IMPORT" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-import \- Import specified patch file +.SH "SYNOPSIS" +\fIguilt\-import\fR [\-P ] +.SH "DESCRIPTION" +Import a specified patch file into the series, placing it after the current topmost patch\&. +.SH "OPTIONS" +.PP +\-P +.RS 4 +Name of the patch within Guilt\&. +.RE +.PP + +.RS 4 +Name of the file to be imported into the series\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-import-commit.1 guilt-0.35/Documentation/guilt-import-commit.1 --- guilt-0.34/Documentation/guilt-import-commit.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-import-commit.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,63 @@ +'\" t +.\" Title: guilt-import-commit +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-IMPORT\-COMMI" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-import-commit \- Import one or more commits as patches +.SH "SYNOPSIS" +\fIguilt\-import\-commit\fR [ | \&.\&.[] | \&.\&.] +.SH "DESCRIPTION" +Import one or more commits as individual patches\&. +.SH "OPTIONS" +.PP + +.RS 4 +Only the specified revision\&. +.RE +.PP +\&.\&.[] +.RS 4 +Revisions starting from \fI\fR until \fI\fR\&. The \fI\fR revision it self is NOT included, while \fI\fR is\&. If \fI\fR is not specified, it is assumed to be HEAD\&. +.RE +.PP +\&.\&. +.RS 4 +All revisions until the \fI\fR revision (inclusive)\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-import-commit.html guilt-0.35/Documentation/guilt-import-commit.html --- guilt-0.34/Documentation/guilt-import-commit.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-import-commit.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,671 @@ + + + + + +guilt-import-commit(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-import-commit [<hash> | <since>..[<until>] | ..<until>]

+
+
+
+

DESCRIPTION

+
+

Import one or more commits as individual patches.

+
+
+
+

OPTIONS

+
+
+
+<hash> +
+
+

+ Only the specified revision. +

+
+
+<since>..[<until>] +
+
+

+ Revisions starting from <since> until <until>. The <since> + revision it self is NOT included, while <until> is. If <until> + is not specified, it is assumed to be HEAD. +

+
+
+..<until> +
+
+

+ All revisions until the <until> revision (inclusive). +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-import.html guilt-0.35/Documentation/guilt-import.html --- guilt-0.34/Documentation/guilt-import.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-import.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,662 @@ + + + + + +guilt-import(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-import [-P <patch> ] <patch_file>

+
+
+
+

DESCRIPTION

+
+

Import a specified patch file into the series, placing it after the +current topmost patch.

+
+
+
+

OPTIONS

+
+
+
+-P <patch> +
+
+

+ Name of the patch within Guilt. +

+
+
+<patch_file> +
+
+

+ Name of the file to be imported into the series. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-init.1 guilt-0.35/Documentation/guilt-init.1 --- guilt-0.34/Documentation/guilt-init.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-init.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,79 @@ +'\" t +.\" Title: guilt-init +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-INIT" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-init \- Initialize guilt for use in a git repository +.SH "SYNOPSIS" +\fIguilt\-init\fR +.SH "DESCRIPTION" +Initialize a git repository for use with guilt +.SH "EXAMPLES" +First, get a repository to work on\&. Here\(cqs one that we\(cqll use as an example: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ git\-clone git://git\&.kernel\&.org/pub/scm/linux/kernel/jsipek/guilt\-hello\&.git +.fi +.if n \{\ +.RE +.\} +.sp +Now, it initialize the patches directory using guilt\(cqs init command: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ cd hello +$ guilt\-init +.fi +.if n \{\ +.RE +.\} +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-init.html guilt-0.35/Documentation/guilt-init.html --- guilt-0.34/Documentation/guilt-init.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-init.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,654 @@ + + + + + +guilt-init(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-init

+
+
+
+

DESCRIPTION

+
+

Initialize a git repository for use with guilt

+
+
+
+

EXAMPLES

+
+

First, get a repository to work on. Here’s one that we’ll use as an example:

+
+
+
$ git-clone git://git.kernel.org/pub/scm/linux/kernel/jsipek/guilt-hello.git
+
+

Now, it initialize the patches directory using guilt’s init command:

+
+
+
$ cd hello
+$ guilt-init
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-new.1 guilt-0.35/Documentation/guilt-new.1 --- guilt-0.34/Documentation/guilt-new.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-new.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,112 @@ +'\" t +.\" Title: guilt-new +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-NEW" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-new \- Create a new patch +.SH "SYNOPSIS" +\fIguilt\-new\fR [\-f] [\-s] [\-e|\-m message] +.SH "DESCRIPTION" +Create a new patch and push it on top of the stack\&. An optional patch description can be supplied either interactively on via the command line\&. +.SH "OPTIONS" +.PP +\-f +.RS 4 +Force patch creation if there are unrefreshed changes\&. These changes will get automatically imported into the new patch\&. +.RE +.PP +\-s +.RS 4 +Add a Signed\-off\-by with your committer identifier string to the patch message\&. +.RE +.PP +\-e +.RS 4 +Edit the patch message interactively\&. This option can be combined with \-s to easily sign off on the patch\&. +.RE +.PP +\-m +.RS 4 +The "" string will used as the commit message\&. This option can be combined with \-s to easily sign off on the patch\&. +.RE +.PP + +.RS 4 +Name of the patch to create\&. This must be a legal relative pathname string\&. For example, "foo", "foo/bar", and "foo/bar/foobar" are all valid\&. +.RE +.SH "EXAMPLES" +Create a new patch called \fIfoobar\fR: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ guilt\-new foobar +.fi +.if n \{\ +.RE +.\} +.sp +Create a patch called \fIfoo\fR and supply a patch description interactively: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ guilt\-new \-e foo +.fi +.if n \{\ +.RE +.\} +.sp +Create a patch called \fIbar\fR with a provided patch description and sign off on the patch: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ guilt\-new \-s \-m patch\-fu bar +.fi +.if n \{\ +.RE +.\} +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-new.html guilt-0.35/Documentation/guilt-new.html --- guilt-0.34/Documentation/guilt-new.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-new.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,713 @@ + + + + + +guilt-new(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-new [-f] [-s] [-e|-m message] <patchname>

+
+
+
+

DESCRIPTION

+
+

Create a new patch and push it on top of the stack. An optional patch +description can be supplied either interactively on via the command line.

+
+
+
+

OPTIONS

+
+
+
+-f +
+
+

+ Force patch creation if there are unrefreshed changes. These changes + will get automatically imported into the new patch. +

+
+
+-s +
+
+

+ Add a Signed-off-by with your committer identifier string to the + patch message. +

+
+
+-e +
+
+

+ Edit the patch message interactively. This option can be combined + with -s to easily sign off on the patch. +

+
+
+-m <message> +
+
+

+ The "<message>" string will used as the commit message. This option + can be combined with -s to easily sign off on the patch. +

+
+
+<patchname> +
+
+

+ Name of the patch to create. This must be a legal relative pathname + string. For example, "foo", "foo/bar", and "foo/bar/foobar" are all + valid. +

+
+
+
+
+
+

EXAMPLES

+
+

Create a new patch called foobar:

+
+
+
$ guilt-new foobar
+
+

Create a patch called foo and supply a patch description interactively:

+
+
+
$ guilt-new -e foo
+
+

Create a patch called bar with a provided patch description and sign off +on the patch:

+
+
+
$ guilt-new -s -m patch-fu bar
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-next.1 guilt-0.35/Documentation/guilt-next.1 --- guilt-0.34/Documentation/guilt-next.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-next.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,53 @@ +'\" t +.\" Title: guilt-next +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-NEXT" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-next \- Output the name of next patch to be pushed +.SH "SYNOPSIS" +\fIguilt\-next\fR [\-p|\-\-path] +.SH "DESCRIPTION" +Output the name of next patch to be pushed\&. If \fBguilt-push\fR(1) is issued, this patch would be the topmost patch\&. +.SH "OPTIONS" +.PP +\-p, \-\-path +.RS 4 +Output full path instead of just patch name\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-next.html guilt-0.35/Documentation/guilt-next.html --- guilt-0.34/Documentation/guilt-next.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-next.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,657 @@ + + + + + +guilt-next(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-next [-p|--path]

+
+
+
+

DESCRIPTION

+
+

Output the name of next patch to be pushed. If guilt-push(1) is +issued, this patch would be the topmost patch.

+
+
+
+

OPTIONS

+
+
+
+-p +
+
+--path +
+
+

+ Output full path instead of just patch name. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-patchbomb.1 guilt-0.35/Documentation/guilt-patchbomb.1 --- guilt-0.34/Documentation/guilt-patchbomb.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-patchbomb.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,93 @@ +'\" t +.\" Title: guilt-patchbomb +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-PATCHBOMB" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-patchbomb \- Email a series of commits interactively +.SH "SYNOPSIS" +\fIguilt\-patchbomb\fR [\-n] [\-s] [\-\-in\-reply\-to ] [\-\-git] [\-\-subject\-prefix ] [ | \&.\&.[] | \&.\&.] +.SH "DESCRIPTION" +Send a series of commits via email asking for To, CC and other information interactively\&. +.SH "OPTIONS" +.PP +\-n +.RS 4 +Don\(cqt send +.RE +.PP +\-s +.RS 4 +Don\(cqt add additional repository committer sign\-offs to the patch\&. This allows the sign\-off chain to be fully expressed in the commit messages and not changed by the act of sending a patchbomb\&. +.RE +.PP +\-\-in\-reply\-to +.RS 4 +Set the In\-reply\-to header to the specified message id\&. This allows the patches to be sent as replies to an arbitrary message\&. +.RE +.PP +\-\-git +.RS 4 +Generate a patch which uses all the features offered by the git diff format (e\&.g\&., rename and copy detection)\&. +.RE +.PP +\-\-subject\-prefix +.RS 4 +Rather than using the standard [PATCH] prefix in the subject line, use [] instead\&. +.RE +.PP + +.RS 4 +Only the specified revision\&. +.RE +.PP +\&.\&.[] +.RS 4 +Revisions starting from \fI\fR until \fI\fR\&. The \fI\fR revision it self is NOT included, while \fI\fR is\&. If \fI\fR is not specified, it is assumed to be HEAD\&. +.RE +.PP +\&.\&. +.RS 4 +All revisions until the \fI\fR revision (inclusive)\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-patchbomb.html guilt-0.35/Documentation/guilt-patchbomb.html --- guilt-0.34/Documentation/guilt-patchbomb.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-patchbomb.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,717 @@ + + + + + +guilt-patchbomb(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-patchbomb [-n] [-s] [--in-reply-to <msgid>] [--git] [--subject-prefix <prefix>] [<hash> | <since>..[<until>] | ..<until>]

+
+
+
+

DESCRIPTION

+
+

Send a series of commits via email asking for To, CC and other information +interactively.

+
+
+
+

OPTIONS

+
+
+
+-n +
+
+

+ Don’t send +

+
+
+-s +
+
+

+ Don’t add additional repository committer sign-offs to the patch. + This allows the sign-off chain to be fully expressed in the commit + messages and not changed by the act of sending a patchbomb. +

+
+
+--in-reply-to <msgid> +
+
+

+ Set the In-reply-to header to the specified message id. This allows + the patches to be sent as replies to an arbitrary message. +

+
+
+--git +
+
+

+ Generate a patch which uses all the features offered by the git diff + format (e.g., rename and copy detection). +

+
+
+--subject-prefix <prefix> +
+
+

+ Rather than using the standard [PATCH] prefix in the subject line, + use [<prefix>] instead. +

+
+
+<hash> +
+
+

+ Only the specified revision. +

+
+
+<since>..[<until>] +
+
+

+ Revisions starting from <since> until <until>. The <since> + revision it self is NOT included, while <until> is. If <until> + is not specified, it is assumed to be HEAD. +

+
+
+..<until> +
+
+

+ All revisions until the <until> revision (inclusive). +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-pop.1 guilt-0.35/Documentation/guilt-pop.1 --- guilt-0.34/Documentation/guilt-pop.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-pop.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,72 @@ +'\" t +.\" Title: guilt-pop +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-POP" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-pop \- Pop patches from the tree +.SH "SYNOPSIS" +\fIguilt\-pop\fR [\-f] [\-a | \-\-all | \-n | ] +.SH "OPTIONS" +.PP +\-\-all, \-a +.RS 4 +Pop all patches off the tree +.RE +.PP +\-f +.RS 4 +Force; discards any unrefreshed changes +.RE +.PP +\-n +.RS 4 +Push specified number of patches +.RE +.PP + +.RS 4 +Pop all patches up to and including this patch off the tree +.RE +If no patchname is given, pop the top\-most patch\&. +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-pop.html guilt-0.35/Documentation/guilt-pop.html --- guilt-0.34/Documentation/guilt-pop.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-pop.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,675 @@ + + + + + +guilt-pop(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-pop [-f] [-a | --all | -n <num> | <patchname>]

+
+
+
+

OPTIONS

+
+
+
+--all +
+
+-a +
+
+

+ Pop all patches off the tree +

+
+
+-f +
+
+

+ Force; discards any unrefreshed changes +

+
+
+-n <num> +
+
+

+ Push specified number of patches +

+
+
+<patchname> +
+
+

+ Pop all patches up to and including this patch off the tree +

+
+
+

If no patchname is given, pop the top-most patch.

+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-prev.1 guilt-0.35/Documentation/guilt-prev.1 --- guilt-0.34/Documentation/guilt-prev.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-prev.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,53 @@ +'\" t +.\" Title: guilt-prev +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-PREV" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-prev \- Output name of second topmost applied patch +.SH "SYNOPSIS" +\fIguilt\-prev\fR [\-p|\-\-path] +.SH "DESCRIPTION" +Output name of second topmost applied patch\&. If \fBguilt-pop\fR(1) is used, this patch will become the topmost patch\&. +.SH "OPTIONS" +.PP +\-p, \-\-path +.RS 4 +Output full path instead of just patch name\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-prev.html guilt-0.35/Documentation/guilt-prev.html --- guilt-0.34/Documentation/guilt-prev.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-prev.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,657 @@ + + + + + +guilt-prev(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-prev [-p|--path]

+
+
+
+

DESCRIPTION

+
+

Output name of second topmost applied patch. If guilt-pop(1) is used, this +patch will become the topmost patch.

+
+
+
+

OPTIONS

+
+
+
+-p +
+
+--path +
+
+

+ Output full path instead of just patch name. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-push.1 guilt-0.35/Documentation/guilt-push.1 --- guilt-0.34/Documentation/guilt-push.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-push.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,72 @@ +'\" t +.\" Title: guilt-push +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-PUSH" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-push \- Push patches onto the tree +.SH "SYNOPSIS" +\fIguilt\-push\fR [ \-f ] [\-a | \-\-all | \-n | ] +.SH "OPTIONS" +.PP +\-f +.RS 4 +Force the push if the patch doesn\(cqt apply cleanly +.RE +.PP +\-\-all, \-a +.RS 4 +Push all patches on the tree +.RE +.PP +\-n +.RS 4 +Push specified number of patches +.RE +.PP + +.RS 4 +Push all patches up to and including this patch on the tree +.RE +If no patchname is given, push the next patch in the series onto the tree\&. +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-push.html guilt-0.35/Documentation/guilt-push.html --- guilt-0.34/Documentation/guilt-push.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-push.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,675 @@ + + + + + +guilt-push(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-push [ -f ] [-a | --all | -n <num> | <patchname>]

+
+
+
+

OPTIONS

+
+
+
+-f +
+
+

+ Force the push if the patch doesn’t apply cleanly +

+
+
+--all +
+
+-a +
+
+

+ Push all patches on the tree +

+
+
+-n <num> +
+
+

+ Push specified number of patches +

+
+
+<patchname> +
+
+

+ Push all patches up to and including this patch on the tree +

+
+
+

If no patchname is given, push the next patch in the series onto the tree.

+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-rebase.1 guilt-0.35/Documentation/guilt-rebase.1 --- guilt-0.34/Documentation/guilt-rebase.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-rebase.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,67 @@ +'\" t +.\" Title: guilt-rebase +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-REBASE" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-rebase \- Rebase pushed patches +.SH "SYNOPSIS" +\fIguilt\-rebase\fR +.SH "DESCRIPTION" +Rebase pushed patches against an upstream branch\&. +.SH "OPTIONS" +.PP + +.RS 4 +Branch, tag, or a commit hash identifying upstream repository history\&. +.RE +.SH "EXAMPLES" +Rebase current tree against Linus\(cqs 2\&.6 tree + +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ git\-fetch git://git\&.kernel\&.org/pub/scm/linux/kernel/git/tovalds/linux\-2\&.6\&.git +$ guilt\-rebase FETCH_HEAD +.fi +.if n \{\ +.RE +.\} +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-rebase.html guilt-0.35/Documentation/guilt-rebase.html --- guilt-0.34/Documentation/guilt-rebase.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-rebase.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,665 @@ + + + + + +guilt-rebase(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-rebase <upstream>

+
+
+
+

DESCRIPTION

+
+

Rebase pushed patches against an upstream branch.

+
+
+
+

OPTIONS

+
+
+
+<upstream> +
+
+

+ Branch, tag, or a commit hash identifying upstream repository + history. +

+
+
+
+
+
+

EXAMPLES

+
+

Rebase current tree against Linus’s 2.6 tree

+
+
+
$ git-fetch git://git.kernel.org/pub/scm/linux/kernel/git/tovalds/linux-2.6.git
+$ guilt-rebase FETCH_HEAD
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-refresh.1 guilt-0.35/Documentation/guilt-refresh.1 --- guilt-0.34/Documentation/guilt-refresh.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-refresh.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,71 @@ +'\" t +.\" Title: guilt-refresh +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-REFRESH" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-refresh \- Refresh topmost applied patch +.SH "SYNOPSIS" +\fIguilt\-refresh\fR [\-\-git] [\-\-diffstat] +.SH "DESCRIPTION" +Refresh topmost applied patch with changes in the working copy\&. +.SH "OPTIONS" +.PP +\-\-git +.RS 4 +Generate a patch which uses all the features offered by the git diff format (e\&.g\&., rename and copy detection)\&. +.RE +.PP +\-\-diffstat +.RS 4 +Include a diffstat output in the patch file\&. Useful for cases where patches will be submitted with other tools\&. + +If the command line option is omitted, the corresponding git\-config option "guilt\&.diffstat" will be queried\&. So this would enable diffstat output by default: + +.sp +.if n \{\ +.RS 4 +.\} +.nf +git config \-\-global guilt\&.diffstat true +.fi +.if n \{\ +.RE +.\} +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-refresh.html guilt-0.35/Documentation/guilt-refresh.html --- guilt-0.34/Documentation/guilt-refresh.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-refresh.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,670 @@ + + + + + +guilt-refresh(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-refresh [--git] [--diffstat]

+
+
+
+

DESCRIPTION

+
+

Refresh topmost applied patch with changes in the working copy.

+
+
+
+

OPTIONS

+
+
+
+--git +
+
+

+ Generate a patch which uses all the features offered by the git diff + format (e.g., rename and copy detection). +

+
+
+--diffstat +
+
+

+Include a diffstat output in the patch file. Useful for cases where +patches will be submitted with other tools. +

+

If the command line option is omitted, the corresponding git-config +option "guilt.diffstat" will be queried. So this would enable diffstat +output by default:

+
+
+
git config --global guilt.diffstat true
+
+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-repair.1 guilt-0.35/Documentation/guilt-repair.1 --- guilt-0.34/Documentation/guilt-repair.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-repair.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,71 @@ +'\" t +.\" Title: guilt-repair +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-REPAIR" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-repair \- Repair the repository state +.SH "SYNOPSIS" +\fIguilt\-repair\fR \-\-full | \-\-status +.SH "DESCRIPTION" +Perform various repository repairs\&. You must specify one mode of repair: +.PP +\-\-full +.RS 4 +Tries to repair everything possible\&. Additionally, it resets the repository state by reseting the HEAD to what\(cqs believed to be the proper commit, and reseting the applied stack\&. The end result should be a repository with no patches applied\&. + +.sp +.if n \{\ +.RS 4 +.\} +.nf +WARNING: Running this command may result in commits and working +directory changes being lost\&. You may want to create a new reference +(e\&.g\&., branch, or reflog) to the original HEAD before using +guilt\-repair\&. +.fi +.if n \{\ +.RE +.\} +.RE +.PP +\-\-status +.RS 4 +Upgrade the status file from old format to new\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-repair.html guilt-0.35/Documentation/guilt-repair.html --- guilt-0.34/Documentation/guilt-repair.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-repair.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,666 @@ + + + + + +guilt-repair(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-repair --full | --status

+
+
+
+

DESCRIPTION

+
+

Perform various repository repairs. You must specify one mode of repair:

+
+
+--full +
+
+

+ Tries to repair everything possible. Additionally, it resets the + repository state by reseting the HEAD to what’s believed to be the + proper commit, and reseting the applied stack. The end result should + be a repository with no patches applied. +

+
+
+
WARNING: Running this command may result in commits and working
+directory changes being lost. You may want to create a new reference
+(e.g., branch, or reflog) to the original HEAD before using
+guilt-repair.
+
+
+
+--status +
+
+

+ Upgrade the status file from old format to new. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-rm.1 guilt-0.35/Documentation/guilt-rm.1 --- guilt-0.34/Documentation/guilt-rm.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-rm.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,58 @@ +'\" t +.\" Title: guilt-rm +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-RM" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-rm \- Remove a file from the git tree and guilt +.SH "SYNOPSIS" +\fIguilt\-rm\fR \&... +.SH "DESCRIPTION" +Removes the files specified from git using git\-rm +.SH "OPTIONS" +.PP + +.RS 4 +Files to add +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-rm.html guilt-0.35/Documentation/guilt-rm.html --- guilt-0.34/Documentation/guilt-rm.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-rm.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,653 @@ + + + + + +guilt-rm(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-rm <file>…

+
+
+
+

DESCRIPTION

+
+

Removes the files specified from git using git-rm

+
+
+
+

OPTIONS

+
+
+
+<files> +
+
+

+ Files to add +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-select.1 guilt-0.35/Documentation/guilt-select.1 --- guilt-0.34/Documentation/guilt-select.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-select.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,104 @@ +'\" t +.\" Title: guilt-select +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-SELECT" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-select \- Select guards to apply when pushing patches +.SH "SYNOPSIS" +\fIguilt\-select\fR [ \-n | \-\-none | \-s | \-\-series | [\-\-pop|\-\-reapply] ] +.SH "DESCRIPTION" +Select guards to apply when pushing patches\&. + +Guards are selected without the + or \- prefix\&. Patches are applied in the following way: + +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +An unguarded patch is always applied\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +A patch with a positive guard is applied \fBonly\fR if the guard is selected with guilt\-select\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +A patch with a negative guard is applied \fBunless\fR the guard is selected with guilt\-select\&. +.RE +.SH "OPTIONS" +.PP +\-n|\-\-none +.RS 4 +Remove all selected guards +.RE +.PP +\-\-pop +.RS 4 +Pop back to the first guarded patch +.RE +.PP +\-\-reapply +.RS 4 +Pop back to first guarded patch, select a new guard, and push +.RE +.PP +\-s|\-\-series +.RS 4 +List all guards listed in the series file +.RE +.SH "AUTHOR" +Written by Eric Lesh <\m[blue]\fBeclesh@ucla\&.edu\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Eric Lesh <\m[blue]\fBeclesh@ucla\&.edu\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +eclesh@ucla.edu +.RS 4 +\%mailto:eclesh@ucla.edu +.RE diff -Nru guilt-0.34/Documentation/guilt-select.html guilt-0.35/Documentation/guilt-select.html --- guilt-0.34/Documentation/guilt-select.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-select.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,699 @@ + + + + + +guilt-select(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-select [ -n | --none | -s | --series | [--pop|--reapply] <guards…> ]

+
+
+
+

DESCRIPTION

+
+

Select guards to apply when pushing patches.

+

Guards are selected without the + or - prefix. Patches are applied in +the following way:

+
    +
  • +

    +An unguarded patch is always applied. +

    +
  • +
  • +

    +A patch with a positive guard is applied only if the guard is +selected with guilt-select. +

    +
  • +
  • +

    +A patch with a negative guard is applied unless the guard is +selected with guilt-select. +

    +
  • +
+
+
+
+

OPTIONS

+
+
+
+-n|--none +
+
+

+ Remove all selected guards +

+
+
+--pop +
+
+

+ Pop back to the first guarded patch +

+
+
+--reapply +
+
+

+ Pop back to first guarded patch, select a new guard, and + push +

+
+
+-s|--series +
+
+

+ List all guards listed in the series file +

+
+
+
+
+
+

Author

+
+

Written by Eric Lesh <eclesh@ucla.edu>

+
+
+
+

Documentation

+
+

Documentation by Eric Lesh <eclesh@ucla.edu>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-series.1 guilt-0.35/Documentation/guilt-series.1 --- guilt-0.34/Documentation/guilt-series.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-series.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,63 @@ +'\" t +.\" Title: guilt-series +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-SERIES" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-series \- Print the stack of patches +.SH "SYNOPSIS" +\fIguilt\-series\fR [\-v | \-g | \-e] +.SH "DESCRIPTION" +Print the stack of patches on this branch\&. +.SH "OPTIONS" +.PP +\-e +.RS 4 +Edit the series file\&. +.RE +.PP +\-g +.RS 4 +Instead of outputting the series, start gitk and display the applied patches\&. Ignores the verbose flag\&. +.RE +.PP +\-v +.RS 4 +Verbose output; adds an = next to the top most applied patch, and a + to all other applied patches +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-series.html guilt-0.35/Documentation/guilt-series.html --- guilt-0.34/Documentation/guilt-series.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-series.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,671 @@ + + + + + +guilt-series(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-series [-v | -g | -e]

+
+
+
+

DESCRIPTION

+
+

Print the stack of patches on this branch.

+
+
+
+

OPTIONS

+
+
+
+-e +
+
+

+ Edit the series file. +

+
+
+-g +
+
+

+ Instead of outputting the series, start gitk and display the applied + patches. Ignores the verbose flag. +

+
+
+-v +
+
+

+ Verbose output; adds an = next to the top most applied patch, and a + + to all other applied patches +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-status.1 guilt-0.35/Documentation/guilt-status.1 --- guilt-0.34/Documentation/guilt-status.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-status.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,116 @@ +'\" t +.\" Title: guilt-status +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-STATUS" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-status \- Print the status of files since the last refresh +.SH "SYNOPSIS" +\fIguilt\-status\fR [\-a|\-A] [\-c|\-C] [\-d|\-D] [\-m|\-M] [\-r|\-R] [\-t|\-T] [\-u|\-U] [\-x|\-X] [\-n] +.SH "DESCRIPTION" +Each file is printed with a prefix that describes it\(cqs status\&. + +.sp +.if n \{\ +.RS 4 +.\} +.nf +A added +C copied +D deleted +M modified +R renamed +T type change (e\&.g\&., mode) +U unmerged +? untracked +.fi +.if n \{\ +.RE +.\} +.SH "OPTIONS" +.PP +\-n +.RS 4 +Hide status prefix in the output +.RE +.PP +\-a, \-A +.RS 4 +Display only added files +.RE +.PP +\-c, \-C +.RS 4 +Display only copied files +.RE +.PP +\-d, \-D +.RS 4 +Display only deleted files +.RE +.PP +\-m, \-M +.RS 4 +Display only modified files +.RE +.PP +\-r, \-R +.RS 4 +Display only renamed files +.RE +.PP +\-t, \-T +.RS 4 +Display only files with a status change (e\&.g\&., mode) +.RE +.PP +\-u, \-U +.RS 4 +Display only unmerged files +.RE +.PP +\-x, \-X +.RS 4 +Display only unknown files +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Brandon Philips <\m[blue]\fBbrandon@ifup\&.org\fR\m[]\&\s-2\u[2]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE +.IP " 2." 4 +brandon@ifup.org +.RS 4 +\%mailto:brandon@ifup.org +.RE diff -Nru guilt-0.34/Documentation/guilt-status.html guilt-0.35/Documentation/guilt-status.html --- guilt-0.34/Documentation/guilt-status.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-status.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,752 @@ + + + + + +guilt-status(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-status [-a|-A] [-c|-C] [-d|-D] [-m|-M] [-r|-R] [-t|-T] [-u|-U] [-x|-X] [-n]

+
+
+
+

DESCRIPTION

+
+

Each file is printed with a prefix that describes it’s status.

+
+
+
A   added
+C   copied
+D   deleted
+M   modified
+R   renamed
+T   type change (e.g., mode)
+U   unmerged
+?   untracked
+
+
+
+
+

OPTIONS

+
+
+
+-n +
+
+

+ Hide status prefix in the output +

+
+
+-a +
+
+-A +
+
+

+ Display only added files +

+
+
+-c +
+
+-C +
+
+

+ Display only copied files +

+
+
+-d +
+
+-D +
+
+

+ Display only deleted files +

+
+
+-m +
+
+-M +
+
+

+ Display only modified files +

+
+
+-r +
+
+-R +
+
+

+ Display only renamed files +

+
+
+-t +
+
+-T +
+
+

+ Display only files with a status change (e.g., mode) +

+
+
+-u +
+
+-U +
+
+

+ Display only unmerged files +

+
+
+-x +
+
+-X +
+
+

+ Display only unknown files +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Brandon Philips <brandon@ifup.org>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-top.1 guilt-0.35/Documentation/guilt-top.1 --- guilt-0.34/Documentation/guilt-top.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-top.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,51 @@ +'\" t +.\" Title: guilt-top +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-TOP" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-top \- Output name of topmost applied patch +.SH "SYNOPSIS" +\fIguilt\-top\fR [\-p|\-\-path] +.SH "OPTIONS" +.PP +\-p, \-\-path +.RS 4 +Output full path instead of just patch name\&. +.RE +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-top.html guilt-0.35/Documentation/guilt-top.html --- guilt-0.34/Documentation/guilt-top.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-top.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,650 @@ + + + + + +guilt-top(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-top [-p|--path]

+
+
+
+

OPTIONS

+
+
+
+-p +
+
+--path +
+
+

+ Output full path instead of just patch name. +

+
+
+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/Documentation/guilt-unapplied.1 guilt-0.35/Documentation/guilt-unapplied.1 --- guilt-0.34/Documentation/guilt-unapplied.1 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-unapplied.1 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,47 @@ +'\" t +.\" Title: guilt-unapplied +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.75.2 +.\" Date: 07/17/2011 +.\" Manual: Guilt Manual +.\" Source: Guilt v0.35 +.\" Language: English +.\" +.TH "GUILT\-UNAPPLIED" "1" "07/17/2011" "Guilt v0\&.35" "Guilt Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +guilt-unapplied \- List all unapplied patches +.SH "SYNOPSIS" +\fIguilt\-unapplied\fR +.SH "DESCRIPTION" +List all unapplied patches\&. +.SH "AUTHOR" +Written by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "DOCUMENTATION" +Documentation by Josef "Jeff" Sipek <\m[blue]\fBjeffpc@josefsipek\&.net\fR\m[]\&\s-2\u[1]\d\s+2> +.SH "GUILT" +Part of the \fBguilt\fR(7) suite (Generated for Guilt v0\&.35) +.SH "NOTES" +.IP " 1." 4 +jeffpc@josefsipek.net +.RS 4 +\%mailto:jeffpc@josefsipek.net +.RE diff -Nru guilt-0.34/Documentation/guilt-unapplied.html guilt-0.35/Documentation/guilt-unapplied.html --- guilt-0.34/Documentation/guilt-unapplied.html 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/Documentation/guilt-unapplied.html 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,638 @@ + + + + + +guilt-unapplied(1) + + + + + +
+
+

SYNOPSIS

+
+

guilt-unapplied

+
+
+
+

DESCRIPTION

+
+

List all unapplied patches.

+
+
+
+

Author

+
+

Written by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

Documentation

+
+

Documentation by Josef "Jeff" Sipek <jeffpc@josefsipek.net>

+
+
+
+

GUILT

+
+

Part of the guilt(7) suite +(Generated for Guilt v0.35)

+
+
+
+

+ + + diff -Nru guilt-0.34/guilt guilt-0.35/guilt --- guilt-0.34/guilt 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt 2011-07-17 18:12:57.000000000 +0000 @@ -1,17 +1,17 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006-2010 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # -GUILT_VERSION="0.34" -GUILT_NAME="Runaway" +GUILT_VERSION="0.35" +GUILT_NAME="Gloria" # If the first argument is one of the below, display the man page instead of # the rather silly and mostly useless usage string case $1 in -h|--h|--he|--hel|--help) shift - exec "guilt-help" "`basename $0`" + exec "guilt help" "`basename $0`" exit ;; -V|--ver|--versi|--versio|--version) @@ -39,6 +39,11 @@ # # Shell library # +usage() +{ + echo "Usage: guilt $CMDNAME $USAGE" >&2 + exit 1 +} # echo -n is a bashism, use printf instead _disp() @@ -66,47 +71,50 @@ guilt_commands() { + find "`dirname $0`/../lib/guilt" -maxdepth 1 -name "guilt-*" -type f -perm +111 2> /dev/null | sed -e "s/.*\\/`basename $0`-//" find "`dirname $0`" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/`basename $0`-//" } -if [ "`basename $0`" = "guilt" ]; then - # being run as standalone - - # by default, we shouldn't fail - cmd= - - if [ $# -ne 0 ]; then - # take first arg, and try to execute it +# by default, we shouldn't fail +cmd= - arg="$1" - dir=`dirname $0` - - if [ -x "$dir/guilt-$arg" ]; then - cmd=$arg - else - # might be a short handed - for command in $(guilt_commands); do - case $command in - $arg*) - if [ -x "$dir/guilt-$command" ]; then - cmd=$command - fi - ;; - esac - done - fi - if [ -n "$cmd" ]; then - shift - exec "$dir/guilt-$cmd" "$@" +if [ $# -ne 0 ]; then + # take first arg, and try to execute it - # this is not reached because of the exec - die "Exec failed! Something is terribly wrong!" - else - disp "Command $arg not found" >&2 - disp "" >&2 - fi + arg="$1" + dir=`dirname $0` + libdir="`dirname $0`/../lib/guilt" + + if [ -x "$dir/guilt-$arg" ]; then + cmd="$dir/guilt-$arg" + CMDNAME=$arg + elif [ -x "$libdir/guilt-$arg" ]; then + cmd="$libdir/guilt-$arg" + CMDNAME=$arg + else + # might be a short handed + for command in $(guilt_commands); do + case $command in + $arg*) + if [ -x "$dir/guilt-$command" ]; then + cmd="$dir/guilt-$command" + CMDNAME=$command + elif [ -x "$libdir/guilt-$command" ]; then + cmd="$libdir/guilt-$command" + CMDNAME=$command + fi + ;; + esac + done + fi + if [ -z "$cmd" ]; then + disp "Command $arg not found" >&2 + disp "" >&2 + exit 1 fi + shift +else # no args passed or invalid command entered, just output help summary disp "Guilt v$GUILT_VERSION" @@ -116,8 +124,6 @@ disp "" disp "Example:" - disp "\tguilt-push" - disp "or" disp "\tguilt push" # now, let's exit @@ -154,9 +160,9 @@ verify_branch() { [ ! -d "$GIT_DIR/patches" ] && - die "Patches directory doesn't exist, try guilt-init" + die "Patches directory doesn't exist, try guilt init" [ ! -d "$GIT_DIR/patches/$branch" ] && - die "Branch $branch is not initialized, try guilt-init" + die "Branch $branch is not initialized, try guilt init" [ ! -f "$GIT_DIR/patches/$branch/series" ] && die "Branch $branch does not have a series file" [ ! -f "$GIT_DIR/patches/$branch/status" ] && @@ -167,13 +173,13 @@ get_top() { - tail -1 "$GUILT_DIR/$branch/status" + tail -n 1 "$GUILT_DIR/$branch/status" } get_prev() { if [ `wc -l < "$GUILT_DIR/$branch/status"` -gt 1 ]; then - tail -n 2 "$GUILT_DIR/$branch/status" | head -n 1 + tail -n 2 "$GUILT_DIR/$branch/status" | head_n 1 fi } @@ -342,17 +348,24 @@ # usage: do_get_header patchfile do_get_header() { - # The complexity arises from the fact that we want to ignore the - # From line and the empty line after it if it exists - - # 2nd line skips the From line - # 3rd line skips the empty line right after a From line - # 4th line terminates execution when we encounter the diff + # The complexity arises from the fact that we want to ignore all + # but the Subject line of the header, and any empty lines after it, + # if these exist, and inject only the Subject line as the first + # line of the commit message. + + # 1st line prints first encountered Subject line plus empty line. + # 2nd line skips standard email/git patch header lines. + # 3rd line skips tip's additional header lines. + # 4th line skips any empty lines thereafter. + # 5th line turns off empty line skip upon seeing a non-empty line. + # 6th line terminates execution when we encounter the diff cat "$1" | awk ' -BEGIN{skip=0} -/^Subject:/ && (NR==1){print substr($0, 10); next} -/^From:/{skip=1; next} -/^[ \t\f\n\r\v]*$/ && (skip==1){skip=0; next} +BEGIN{body=0; subj=0} +/^Subject:/ && (body == 0 && subj == 0){subj=1; print substr($0, 10) "\n"; next} +/^(Subject:|From:|Author:|Date:|commit)/ && (body == 0){next} +/^(Commit-ID:|Gitweb:|AuthorDate:|Committer:CommitDate:)/ && (body == 0){next} +/^[ \t\f\n\r\v]*$/ && (body==0){next} +/^.*$/ && (body==0){body=1} /^(diff |---$|--- )/{exit} {print $0} END{} @@ -479,10 +492,13 @@ cd_to_toplevel # remove the patches refs - tail -$2 < "$applied" | remove_patch_refs + tail -n $2 < "$applied" | remove_patch_refs git reset --hard "$1" > /dev/null - head -n "-$2" < "$applied" > "$applied.tmp" + + n=`wc -l < "$applied"` + n=`expr $n - $2` + head_n "$n" < "$applied" > "$applied.tmp" mv "$applied.tmp" "$applied" ) } @@ -491,7 +507,7 @@ pop_all_patches() { pop_many_patches \ - `git rev-parse refs/patches/$branch/$(head -1 "$applied")^` \ + `git rev-parse refs/patches/$branch/$(head_n 1 "$applied")^` \ `wc -l < "$applied"` } @@ -526,32 +542,45 @@ # make a default commit message if patch doesn't contain one [ ! -s "$TMP_MSG" ] && echo "patch $pname" > "$TMP_MSG" - # extract a From line from the patch header, and set - # GIT_AUTHOR_{NAME,EMAIL} - author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---$|--- )/ q' "$p"` + # extract author and date lines from the patch header, and set + # GIT_AUTHOR_{NAME,EMAIL,DATE} + # prefering Author/AuthorDate lines if available. + author_str=`sed -n -e '/^Author:/ { s/^Author: //; p; q; }; /^(diff |---$|--- )/ q' "$p"` + if [ -z "$author_str" ]; then + author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---$|--- )/ q' "$p"` + fi + if [ ! -z "$author_str" ]; then GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'` export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}" export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`" + + author_date_str=`sed -n -e '/^AuthorDate:/ { s/^AuthorDate: //; p; q; }; /^(diff |---$|--- )/ q' "$p"` + if [ -z "$author_date_str" ]; then + author_date_str=`sed -n -e '/^Date:/ { s/^Date: //; p; q; }; /^(diff |---$|--- )/ q' "$p"` + fi + if [ ! -z "$author_date_str" ]; then + export GIT_AUTHOR_DATE=`echo $author_date_str` + fi fi - ct=`git log -1 --pretty=%ct` - if [ $ct -gt `stat -c %Y "$p"` ]; then + # `git log -1 --pretty=%ct` doesn't work on Git 1.5.x + ct=`git cat-file commit HEAD | awk '/^committer /{ print $(NF-1); exit; }'` + if [ $ct -gt `last_modified "$p"` ]; then ct=`expr $ct + 60` if [ $ct -gt `date +%s` ]; then touch "$p" else - touch -d @$ct "$p" + touch_date $ct "$p" fi fi - # must strip nano-second part otherwise git gets very - # confused, and makes up strange timestamps from the past - # (chances are it decides to interpret it as a unix - # timestamp). - export GIT_AUTHOR_DATE="`stat -c %y "$p" | sed -e ' -s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\([0-9]\{2\}\)\.[0-9]* \(.*\)$/\1-\2-\3 \4:\5:\6 \7/'`" - export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" + export GIT_COMMITTER_DATE="`format_last_modified "$p"`" + + # export GIT_AUTHOR_DATE only if a Date line was unavailable + if [ -z "$author_date_str" ]; then + export GIT_AUTHOR_DATE="$GIT_COMMITTER_DATE" + fi # commit treeish=`git write-tree` @@ -717,9 +746,11 @@ N=`expr "$3" - 1` # remove the patches refs - tail -$N < "$applied" | remove_patch_refs + tail -n $N < "$applied" | remove_patch_refs - head -n "-$N" < "$applied" > "$applied.tmp" + n=`wc -l < "$applied"` + n=`expr $n - $N` + head_n "$n" < "$applied" > "$applied.tmp" mv "$applied.tmp" "$applied" ) } @@ -780,6 +811,11 @@ } # +# source the command +# +. "$cmd" + +# # Some constants # @@ -806,18 +842,18 @@ branch=`get_branch` # most of the time we want to verify that the repo's branch has been -# initialized, but every once in a blue moon (e.g., we want to run guilt-init), +# initialized, but every once in a blue moon (e.g., we want to run guilt init), # we must avoid the checks if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then verify_branch - # do not check the status file format (guilt-repair needs this, + # do not check the status file format (guilt repair needs this, # otherwise nothing can do what's necessary to bring the repo into a # useable state) if [ -z "$DO_NOT_CHECK_STATUS_FILE_FORMAT" ]; then [ -s "$GIT_DIR/patches/$branch/status" ] && grep "^[0-9a-f]\{40\}:" "$GIT_DIR/patches/$branch/status" > /dev/null && - die "Status file appears to use old format, try guilt-repair --status" + die "Status file appears to use old format, try guilt repair --status" fi fi @@ -829,3 +865,15 @@ # determine a pager to use for anything interactive (fall back to more) pager="more" [ ! -z "$PAGER" ] && pager="$PAGER" + +UNAME_S=`uname -s` + +if [ -r "`dirname $0`/os.$UNAME_S" ]; then + . "`dirname $0`/os.$UNAME_S" +elif [ -r "`dirname $0`/../lib/guilt/os.$UNAME_S" ]; then + . "`dirname $0`/../lib/guilt/os.$UNAME_S" +else + die "Unsupported operating system: $UNAME_S" +fi + +_main "$@" diff -Nru guilt-0.34/guilt-add guilt-0.35/guilt-add --- guilt-0.34/guilt-add 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-add 2011-07-17 18:12:57.000000000 +0000 @@ -1,13 +1,20 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="..." -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -lt 1 ]; then usage fi exec git add -- "$@" + +} diff -Nru guilt-0.34/guilt-applied guilt-0.35/guilt-applied --- guilt-0.34/guilt-applied 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-applied 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-c]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { case $# in 0) @@ -26,3 +31,5 @@ usage ;; esac + +} diff -Nru guilt-0.34/guilt-branch guilt-0.35/guilt-branch --- guilt-0.34/guilt-branch 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-branch 2011-07-17 18:12:57.000000000 +0000 @@ -1,15 +1,20 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007-2008 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # USAGE="[]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi if [ $# -gt 1 ]; then usage fi +_main() { + # make sure that there are no unapplied changes if ! must_commit_first; then die "Uncommited changes detected. Refresh first." @@ -36,8 +41,8 @@ mkdir -p "$GUILT_DIR/`dirname $newbranch`" # copy the patch dir -cp -a "$GUILT_DIR/$branch" "$GUILT_DIR/$newbranch" +cp_a "$GUILT_DIR/$branch" "$GUILT_DIR/$newbranch" # copy the refs - +} diff -Nru guilt-0.34/guilt-commit guilt-0.35/guilt-commit --- guilt-0.34/guilt-commit 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-commit 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2008 +# Copyright (c) Josef "Jeff" Sipek, 2008-2011 # USAGE="-n | -a | --all" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { case "$1" in -a|--all) @@ -37,3 +42,5 @@ # update $applied to include only the patches we're keeping sed -n -e "${pat_keep}" "$applied" > "$applied.tmp" mv "$applied.tmp" "$applied" + +} diff -Nru guilt-0.34/guilt-delete guilt-0.35/guilt-delete --- guilt-0.34/guilt-delete 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-delete 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-f] " -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { case $# in 1) @@ -47,3 +52,5 @@ [ ! -z "$force" ] && rm -f $GUILT_DIR/$branch/$patch exit 0 + +} diff -Nru guilt-0.34/guilt-diff guilt-0.35/guilt-diff --- guilt-0.34/guilt-diff 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-diff 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (C) 2007 Josef 'Jeff' Sipek +# Copyright (C) Josef 'Jeff' Sipek, 2007-2011 # USAGE="[-z] [...]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while [ $# -ne 0 ]; do case "$1" in @@ -24,3 +29,5 @@ [ ! -z "$working_tree" ] && PREV= git diff --binary $PREV -- "$@" + +} diff -Nru guilt-0.34/guilt-export guilt-0.35/guilt-export --- guilt-0.34/guilt-export 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-export 2011-07-17 18:12:57.000000000 +0000 @@ -4,7 +4,12 @@ # USAGE="[]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -gt 1 ]; then usage @@ -25,3 +30,5 @@ trap - 0 disp "Series exported to \"$target_dir\" sucessfully." + +} diff -Nru guilt-0.34/guilt-files guilt-0.35/guilt-files --- guilt-0.34/guilt-files 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-files 2011-07-17 18:12:57.000000000 +0000 @@ -4,7 +4,12 @@ # USAGE="[-v] [-a] [-l]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { opt_verbose= opt_all= @@ -31,7 +36,7 @@ if [ -n "$opt_all" ]; then cat $applied else - tail -1 $applied + tail -n 1 $applied fi | while read patch; do obj=`git rev-parse refs/patches/$branch/$patch` @@ -78,3 +83,4 @@ IFS=: done +} diff -Nru guilt-0.34/guilt-fold guilt-0.35/guilt-fold --- guilt-0.34/guilt-fold 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-fold 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-k] " -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ "$1" = "-k" ]; then keep=t @@ -40,3 +45,5 @@ # back it up just in case :) [ -z "$keep" ] && mv "$GUILT_DIR/$branch/$patch" "$GUILT_DIR/$branch/$patch~" + +} diff -Nru guilt-0.34/guilt-fork guilt-0.35/guilt-fork --- guilt-0.34/guilt-fork 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-fork 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # USAGE="[]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -gt 1 ]; then usage @@ -46,3 +51,5 @@ series_rename_patch "$patch" "$newpatch" applied_rename_patch "$patch" "$newpatch" ref_rename_patch "$patch" "$newpatch" + +} diff -Nru guilt-0.34/guilt-graph guilt-0.35/guilt-graph --- guilt-0.34/guilt-graph 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-graph 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # USAGE="[]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -gt 1 ]; then usage @@ -12,7 +17,7 @@ patchname="$1" -bottom=`git rev-parse refs/patches/$branch/$(head -1 < "$applied")` +bottom=`git rev-parse refs/patches/$branch/$(head_n 1 < "$applied")` base=`git rev-parse $bottom^` if [ -z "$patchname" ]; then @@ -55,7 +60,7 @@ getfiles $current | while read f; do # hash the filename - fh=`echo "$f" | sha1sum | cut -d' ' -f1` + fh=`echo "$f" | sha1 | cut -d' ' -f1` if [ -e "$cache/$fh" ]; then # ok, something already touched this file before us cat "$cache/$fh" >> "$cache/dep" @@ -71,3 +76,5 @@ done disp "}" + +} diff -Nru guilt-0.34/guilt-guard guilt-0.35/guilt-guard --- guilt-0.34/guilt-guard 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-guard 2011-07-17 18:12:57.000000000 +0000 @@ -4,7 +4,10 @@ # USAGE="[-l | --list | -n | --none | [] [(+|-)...]]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi print_guards() { @@ -12,6 +15,8 @@ echo "$1: $guards" } +_main() { + if [ "$1" = "-l" -o "$1" = "--list" ]; then get_full_series | while read patch; do print_guards "$patch" @@ -67,3 +72,5 @@ set_guards "$patch" "$@" ;; esac + +} diff -Nru guilt-0.34/guilt-header guilt-0.35/guilt-header --- guilt-0.34/guilt-header 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-header 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006-2010 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-eE] []" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { case $# in 0) @@ -69,3 +74,5 @@ fi rm -f "$TMP_MSG" "$TMP_DIFF" + +} diff -Nru guilt-0.34/guilt-help guilt-0.35/guilt-help --- guilt-0.34/guilt-help 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-help 2011-07-17 18:12:57.000000000 +0000 @@ -1,12 +1,17 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # DO_NOT_CHECK_BRANCH_EXISTENCE=1 USAGE="[ | ]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { case $# in 0) @@ -29,4 +34,8 @@ ;; esac -exec man "$page" +MANDIR=`dirname $0`/../man +MANDIR=`(cd "$MANDIR"; pwd)` +exec man -M "$MANDIR" "$page" + +} diff -Nru guilt-0.34/guilt-import guilt-0.35/guilt-import --- guilt-0.34/guilt-import 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-import 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # USAGE="[-P ] " -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { case "$1" in -P) @@ -46,3 +51,5 @@ # insert the patch into the series file series_insert_patch "$newname" + +} diff -Nru guilt-0.34/guilt-import-commit guilt-0.35/guilt-import-commit --- guilt-0.34/guilt-import-commit 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-import-commit 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # USAGE="[ | ..[] | ..]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -ne 1 ] || [ -z "$1" ]; then die "You must specify a range of commits" @@ -65,3 +70,4 @@ disp "Done." >&2 disp "Current head: `cat $GIT_DIR/refs/heads/$branch`" >&2 +} diff -Nru guilt-0.34/guilt-init guilt-0.35/guilt-init --- guilt-0.34/guilt-init 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-init 2011-07-17 18:12:57.000000000 +0000 @@ -1,12 +1,17 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # DO_NOT_CHECK_BRANCH_EXISTENCE=1 USAGE="" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while case $# in 0) break ;; esac; do case $1 in @@ -36,3 +41,5 @@ echo "Removing patch '\$1'..." EOF + +} diff -Nru guilt-0.34/guilt-new guilt-0.35/guilt-new --- guilt-0.34/guilt-new 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-new 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-f] [-s] [-e|-m message] " -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -lt 1 ] || [ $# -gt 4 ]; then usage @@ -92,3 +97,5 @@ # apply the patch echo "$patch" >> $applied commit "$patch" HEAD + +} diff -Nru guilt-0.34/guilt-next guilt-0.35/guilt-next --- guilt-0.34/guilt-next 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-next 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-p|--path]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while [ $# -ne 0 ]; do case "$1" in @@ -24,3 +29,5 @@ if [ -n "$p" ]; then disp $path$p fi + +} diff -Nru guilt-0.34/guilt-patchbomb guilt-0.35/guilt-patchbomb --- guilt-0.34/guilt-patchbomb 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-patchbomb 2011-07-17 18:12:57.000000000 +0000 @@ -1,12 +1,17 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # DO_NOT_CHECK_BRANCH_EXISTENCE=1 USAGE="[-n] [-s] [--in-reply-to ] [--git] [--subject-prefix ] [ | ..[] | ..]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { TMP_FILE=`get_tmp_file file` @@ -111,3 +116,5 @@ [ "$n" = "n" ] || [ "$n" = "N" ] && exit 0 rm -rf $dir + +} diff -Nru guilt-0.34/guilt-pop guilt-0.35/guilt-pop --- guilt-0.34/guilt-pop 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-pop 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-f] [-a | --all | -n | ]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while [ $# -gt 0 ]; do case "$1" in @@ -96,3 +101,4 @@ p=`get_top` [ ! -z "$p" ] && disp "Now at $p." || disp "All patches popped." +} diff -Nru guilt-0.34/guilt-prev guilt-0.35/guilt-prev --- guilt-0.34/guilt-prev 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-prev 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-p|--path]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while [ $# -ne 0 ]; do case "$1" in @@ -21,3 +26,5 @@ if [ -n "$p" ]; then disp $path$p fi + +} diff -Nru guilt-0.34/guilt-push guilt-0.35/guilt-push --- guilt-0.34/guilt-push 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-push 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[ -f ] [-a | --all | -n | ]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { abort_flag="abort" @@ -102,7 +107,7 @@ if [ "$sidx" -le "`get_series | wc -l`" ]; then disp "Patch is already applied." else - disp "File series fully applied, ends at patch `get_series | tail -1`" + disp "File series fully applied, ends at patch `get_series | tail -n 1`" fi exit 0 fi @@ -126,3 +131,4 @@ fi done +} diff -Nru guilt-0.34/guilt-rebase guilt-0.35/guilt-rebase --- guilt-0.34/guilt-rebase 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-rebase 2011-07-17 18:12:57.000000000 +0000 @@ -1,12 +1,17 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2007-2011 # # Heavily based on the long removed sh version of git-cherry # USAGE="" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { disp "Beware, rebase is currently EXPERIMENTAL." disp "In other words, it might eat your patches." @@ -80,7 +85,7 @@ while read patchid commitid ; do disp "Applying '$name'" if [ -f "$rebase_dir/$patchid" ]; then - realcommit=`head -1 "$rebase_dir/$patchid"` + realcommit=`head_n 1 "$rebase_dir/$patchid"` disp "Matches upstream commit $realcommit" series_rename_patch "$name" "###rebased###$name" disp "Patch removed from series." @@ -97,3 +102,5 @@ disp "" disp "Done." + +} diff -Nru guilt-0.34/guilt-refresh guilt-0.35/guilt-refresh --- guilt-0.34/guilt-refresh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-refresh 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[--git] [--diffstat]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while [ $# -gt 0 ]; do case "$1" in @@ -21,8 +26,10 @@ TOP=`get_top` if [ -z "$TOP" ]; then - die "No patches applied; try guilt-push first" + die "No patches applied; try guilt push first" fi refresh_patch "$TOP" "$gdiff" "$dstat" echo "Patch $TOP refreshed" + +} diff -Nru guilt-0.34/guilt-repair guilt-0.35/guilt-repair --- guilt-0.34/guilt-repair 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-repair 2011-07-17 18:12:57.000000000 +0000 @@ -1,37 +1,21 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2008 +# Copyright (c) Josef "Jeff" Sipek, 2008-2011 # DO_NOT_CHECK_STATUS_FILE_FORMAT=1 USAGE="--full | --status" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi safety_abort() { die "Please read the man page first. (you need to specify repair mode to proceed)." } -[ $# -ne 1 ] && safety_abort - -case "$1" in - --full) - repair="full" - ;; - --status) - repair="status" - ;; - --autotag) - echo "Autotagging is no longer supported" >&2 - ;; - *) - usage - ;; -esac - -oldrev=`git show-ref -s "refs/heads/$branch"` - # # Check whether status file needs fixing/upgrading. If not, just return, # otherwise proceed to rewrite the status file and set up proper refs @@ -82,7 +66,7 @@ { if [ -s "$applied" ]; then # there were some patches applied - newrev=`git rev-parse refs/patches/$branch/$(head -1 < "$applied")^` + newrev=`git rev-parse refs/patches/$branch/$(head_n 1 < "$applied")^` else # no patches were applied, but let's do all the work anyway newrev="$oldrev" @@ -109,6 +93,27 @@ return 0 } +_main() { + +[ $# -ne 1 ] && safety_abort + +case "$1" in + --full) + repair="full" + ;; + --status) + repair="status" + ;; + --autotag) + echo "Autotagging is no longer supported" >&2 + ;; + *) + usage + ;; +esac + +oldrev=`git show-ref -s "refs/heads/$branch"` + case "$repair" in full) repair_status @@ -124,3 +129,5 @@ disp "Repair complete." exit 0 + +} diff -Nru guilt-0.34/guilt-rm guilt-0.35/guilt-rm --- guilt-0.34/guilt-rm 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-rm 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="..." -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -lt 1 ]; then usage @@ -12,3 +17,4 @@ git rm -- "$@" +} diff -Nru guilt-0.34/guilt-select guilt-0.35/guilt-select --- guilt-0.34/guilt-select 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-select 2011-07-17 18:12:57.000000000 +0000 @@ -4,7 +4,10 @@ # USAGE="[ -n | --none | -s | --series | [--pop|--reapply] ]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi select_guards() { @@ -16,6 +19,8 @@ echo "$@" | sed -e 's/ /\n/g' | sort | uniq > "$guards_file" } +_main() { + if [ $# -eq 0 ]; then if [ -s "$guards_file" ]; then cat "$guards_file" @@ -50,3 +55,5 @@ select_guards "$@" ;; esac + +} diff -Nru guilt-0.34/guilt-series guilt-0.35/guilt-series --- guilt-0.34/guilt-series 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-series 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-v | -g | -e]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while case "$#" in 0) break ;; esac do @@ -25,8 +30,8 @@ git_editor "$series" elif [ ! -z "$gui" ]; then [ -z "`get_top`" ] && die "No patches applied." - bottom=`git rev-parse refs/patches/$branch/$(head -1 $applied)` - top=`git rev-parse refs/patches/$branch/$(tail -1 $applied)` + bottom=`git rev-parse refs/patches/$branch/$(head_n 1 $applied)` + top=`git rev-parse refs/patches/$branch/$(tail -n 1 $applied)` range="$bottom..$top" # FIXME, this doesn't quite work - it's perfectly fine with @@ -57,3 +62,5 @@ fi done fi + +} diff -Nru guilt-0.34/guilt-status guilt-0.35/guilt-status --- guilt-0.34/guilt-status 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-status 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,43 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-a|-A] [-c|-C] [-d|-D] [-m|-M] [-r|-R] [-t|-T] [-u|-U] [-x|-X] [-n]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +print_status() +{ + if [ -z "$no_prefix" ] ; then + Apfx="A " + Cpfx="C " + Dpfx="D " + Mpfx="M " + Rpfx="R " + Tpfx="T " + Upfx="U " + Xpfx="? " + fi + + while read status name newname + do + case "$status" in + A*) disp "$Apfx$name";; + C*) disp "$Cpfx$name -> $newname";; + D*) disp "$Dpfx$name";; + M ) disp "$Mpfx$name";; + R*) disp "$Rpfx$name -> $newname";; + T ) disp "$Tpfx$name";; + U ) disp "$Upfx$name";; + ? ) disp "$Xpfx$name";; + esac + done +} + +_main() { untracked="" DIFF_FILTER="" @@ -53,34 +86,6 @@ git rev-parse --verify HEAD >/dev/null 2>&1 || IS_INITIAL=t -print_status() -{ - if [ -z "$no_prefix" ] ; then - Apfx="A " - Cpfx="C " - Dpfx="D " - Mpfx="M " - Rpfx="R " - Tpfx="T " - Upfx="U " - Xpfx="? " - fi - - while read status name newname - do - case "$status" in - A*) disp "$Apfx$name";; - C*) disp "$Cpfx$name -> $newname";; - D*) disp "$Dpfx$name";; - M ) disp "$Mpfx$name";; - R*) disp "$Rpfx$name -> $newname";; - T ) disp "$Tpfx$name";; - U ) disp "$Upfx$name";; - ? ) disp "$Xpfx$name";; - esac - done -} - ( cd_to_toplevel # untracked; FIXME: there's got to be a better way @@ -110,3 +115,4 @@ ' ) | print_status +} diff -Nru guilt-0.34/guilt-top guilt-0.35/guilt-top --- guilt-0.34/guilt-top 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-top 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="[-p|--path]" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { while [ $# -ne 0 ]; do case "$1" in @@ -21,3 +26,5 @@ if [ -n "$p" ]; then disp "$path$p" fi + +} diff -Nru guilt-0.34/guilt-unapplied guilt-0.35/guilt-unapplied --- guilt-0.34/guilt-unapplied 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/guilt-unapplied 2011-07-17 18:12:57.000000000 +0000 @@ -1,10 +1,15 @@ #!/bin/sh # -# Copyright (c) Josef "Jeff" Sipek, 2006, 2007 +# Copyright (c) Josef "Jeff" Sipek, 2006-2011 # USAGE="" -. `dirname $0`/guilt +if [ -z "$GUILT_VERSION" ]; then + echo "Invoking `basename $0` directly is no longer supported." >&2 + exit 1 +fi + +_main() { if [ $# -ne 0 ]; then usage @@ -14,3 +19,5 @@ n=`expr $n + 1` get_series | sed -n -e "$n,\$p" + +} diff -Nru guilt-0.34/Makefile guilt-0.35/Makefile --- guilt-0.34/Makefile 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/Makefile 2011-07-17 18:12:57.000000000 +0000 @@ -1,18 +1,22 @@ -PREFIX=/usr/local -DESTDIR= +PREFIX?=/usr/local +DESTDIR?= +INSTALL?=install -SCRIPTS = guilt \ - $(filter-out $(wildcard *~),$(wildcard guilt-*)) +OSFILES = $(filter-out $(wildcard *~),$(wildcard os.*)) +SCRIPTS = $(filter-out $(wildcard *~),$(wildcard guilt-*)) .PHONY: all -all: doc +all: @echo "Nothing to build, it is all bash :)" @echo "Try make install" .PHONY: install install: - install -d $(DESTDIR)$(PREFIX)/bin/ - install -m 755 $(SCRIPTS) $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 755 guilt $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/guilt/ + $(INSTALL) -m 755 $(SCRIPTS) $(DESTDIR)$(PREFIX)/lib/guilt/ + $(INSTALL) -m 644 $(OSFILES) $(DESTDIR)$(PREFIX)/lib/guilt/ .PHONY: uninstall uninstall: @@ -24,7 +28,7 @@ .PHONY: install-doc install-doc: - $(MAKE) -C Documentation install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) + $(MAKE) -C Documentation install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) INSTALL=$(INSTALL) .PHONY: test test: diff -Nru guilt-0.34/os.Darwin guilt-0.35/os.Darwin --- guilt-0.34/os.Darwin 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/os.Darwin 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,65 @@ +# usage: touch_date +touch_date() +{ + touch -t `date -r $1 +%Y%m%d%H%M.%S` "$2" +} + +# usage: last_modified +last_modified() +{ + stat -f "%m" "$1" +} + +# usage: format_last_modified +format_last_modified() +{ + stat -f "%Sm" -t "%Y-%m-%d %H:%M:%S %z" "$1" +} + +# usage: head_n [count] +head_n() +{ + if [ "$1" -gt 0 ]; then + head -n "$1" + fi +} + +# usage: sha1 [file] +sha1() +{ + openssl dgst -sha1 "$1" | sed "s,SHA1.\(.*\).= \(.*\),\2 \1," +} + +# usage: cp_a +cp_a() +{ + cp -pR "$1" "$2" +} + +# usage: _tac +_tac() +{ + sed -e '1!G;h;$!d' +} + +_seq() +{ + ( + if [ $# -eq 1 ] + then + /usr/bin/jot $1 + elif [ $# -eq 2 ] + then + n1=$((${2} - ${1} + 1)) + n2=$1 + /usr/bin/jot $n1 $n2 + elif [ $# -eq 3 ] + then + num1=$1 + incr=$2 + num2=$3 + /usr/bin/awk -v n1=$num1 -v n2=$num2 -v add=$incr 'BEGIN{ for(i=n1; i<=n2; i+=add) print i;}' | /usr/bin/sed -E '/e/s/^.+e.+$/0/' + fi + ) + return 0 +} diff -Nru guilt-0.34/os.Linux guilt-0.35/os.Linux --- guilt-0.34/os.Linux 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/os.Linux 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,52 @@ +# usage: touch_date +touch_date() +{ + touch -d @$1 "$2" +} + +# usage: last_modified +last_modified() +{ + stat -c "%Y" "$1" +} + +# usage: format_last_modified +format_last_modified() +{ + # must strip nano-second part otherwise git gets very + # confused, and makes up strange timestamps from the past + # (chances are it decides to interpret it as a unix + # timestamp). + stat -c "%y" "$1" | sed -e ' +s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\([0-9]\{2\}\)\.[0-9]* \(.*\)$/\1-\2-\3 \4:\5:\6 \7/' +} + +# usage: head_n [count] +head_n() +{ + head -n "$1" +} + +# usage: sha1 [file] +sha1() +{ + sha1sum "$1" +} + +# usage: cp_a +cp_a() +{ + cp -a "$1" "$2" +} + +# usage: _tac +_tac() +{ + tac +} + +_seq() +{ + seq "$@" + return $? +} diff -Nru guilt-0.34/os.SunOS guilt-0.35/os.SunOS --- guilt-0.34/os.SunOS 1970-01-01 00:00:00.000000000 +0000 +++ guilt-0.35/os.SunOS 2011-07-17 18:12:57.000000000 +0000 @@ -0,0 +1,52 @@ +# usage: touch_date +touch_date() +{ + touch -d @$1 "$2" +} + +# usage: last_modified +last_modified() +{ + stat -c "%Y" "$1" +} + +# usage: format_last_modified +format_last_modified() +{ + # must strip nano-second part otherwise git gets very + # confused, and makes up strange timestamps from the past + # (chances are it decides to interpret it as a unix + # timestamp). + stat -c "%y" "$1" | sed -e ' +s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\([0-9]\{2\}\)\.[0-9]* \(.*\)$/\1-\2-\3 \4:\5:\6 \7/' +} + +# usage: head_n [count] +head_n() +{ + head -n "$1" +} + +# usage: sha1 [file] +sha1() +{ + sha1sum "$1" +} + +# usage: cp_a +cp_a() +{ + cp -a "$1" "$2" +} + +# usage: _tac +_tac() +{ + tac +} + +_seq() +{ + seq "$@" + return $? +} diff -Nru guilt-0.34/regression/bin/dump_reg guilt-0.35/regression/bin/dump_reg --- guilt-0.34/regression/bin/dump_reg 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/bin/dump_reg 2011-07-17 18:12:57.000000000 +0000 @@ -5,10 +5,18 @@ exit 1 fi +UNAME_S=`uname -s` + +if [ -r "$REG_DIR/../os.$UNAME_S" ]; then + . "$REG_DIR/../os.$UNAME_S" +else + die "Unsupported operating system: $UNAME_S" +fi + if [ -d "$1" ]; then echo "d $1" elif [ -f "$1" ]; then - echo "f `sha1sum "$1"`" + echo "f `sha1 "$1"`" else echo "? $1" fi diff -Nru guilt-0.34/regression/scaffold guilt-0.35/regression/scaffold --- guilt-0.34/regression/scaffold 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/scaffold 2011-07-17 18:12:57.000000000 +0000 @@ -23,6 +23,14 @@ exit 1 } +UNAME_S=`uname -s` + +if [ -r "$REG_DIR/../os.$UNAME_S" ]; then + . "$REG_DIR/../os.$UNAME_S" +else + die "Unsupported operating system: $UNAME_S" +fi + function replace_path { sed -e "s,$PWD,PATH,g" \ @@ -121,4 +129,3 @@ setup_git_repo setup_guilt_repo } - diff -Nru guilt-0.34/regression/t-010.out guilt-0.35/regression/t-010.out --- guilt-0.34/regression/t-010.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-010.out 2011-07-17 18:12:57.000000000 +0000 @@ -2,13 +2,13 @@ % reset_git_repo Already on "master" HEAD is now at d485041 initial -% guilt-init +% guilt init % list_files d .git/patches d .git/patches/master f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-init +% guilt init Branch master appears to be already initialized (GIT_DIR=PATH/.git) % list_files d .git/patches @@ -18,14 +18,14 @@ % reset_git_repo Already on "master" HEAD is now at d485041 initial -% guilt-init -a +% guilt init -a Autotagging is no longer supported % list_files d .git/patches d .git/patches/master f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-init -a +% guilt init -a Autotagging is no longer supported Branch master appears to be already initialized (GIT_DIR=PATH/.git) % list_files @@ -36,14 +36,14 @@ % reset_git_repo Already on "master" HEAD is now at d485041 initial -% guilt-init -n +% guilt init -n Autotagging is no longer supported % list_files d .git/patches d .git/patches/master f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-init -n +% guilt init -n Autotagging is no longer supported Branch master appears to be already initialized (GIT_DIR=PATH/.git) % list_files @@ -54,7 +54,7 @@ % git branch other % git checkout other Switched to branch "other" -% guilt-init +% guilt init % list_files d .git/patches d .git/patches/master @@ -63,7 +63,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/other/series f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/other/status -% guilt-init +% guilt init Branch other appears to be already initialized (GIT_DIR=PATH/.git) % list_files d .git/patches diff -Nru guilt-0.34/regression/t-010.sh guilt-0.35/regression/t-010.sh --- guilt-0.34/regression/t-010.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-010.sh 2011-07-17 18:12:57.000000000 +0000 @@ -19,16 +19,16 @@ opts | while read opt ; do cmd reset_git_repo - cmd guilt-init $opt + cmd guilt init $opt cmd list_files - shouldfail guilt-init $opt + shouldfail guilt init $opt cmd list_files done cmd git branch other cmd git checkout other -cmd guilt-init +cmd guilt init cmd list_files -shouldfail guilt-init +shouldfail guilt init cmd list_files diff -Nru guilt-0.34/regression/t-011.out guilt-0.35/regression/t-011.out --- guilt-0.34/regression/t-011.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-011.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,53 +1,53 @@ % setup_git_repo -% guilt-add -Patches directory doesn't exist, try guilt-init -% guilt-applied -Patches directory doesn't exist, try guilt-init -% guilt-branch -Patches directory doesn't exist, try guilt-init -% guilt-commit -Patches directory doesn't exist, try guilt-init -% guilt-delete -Patches directory doesn't exist, try guilt-init -% guilt-diff -Patches directory doesn't exist, try guilt-init -% guilt-export -Patches directory doesn't exist, try guilt-init -% guilt-files -Patches directory doesn't exist, try guilt-init -% guilt-fold -Patches directory doesn't exist, try guilt-init -% guilt-fork -Patches directory doesn't exist, try guilt-init -% guilt-graph -Patches directory doesn't exist, try guilt-init -% guilt-header -Patches directory doesn't exist, try guilt-init -% guilt-import -Patches directory doesn't exist, try guilt-init -% guilt-import-commit -Patches directory doesn't exist, try guilt-init -% guilt-new -Patches directory doesn't exist, try guilt-init -% guilt-next -Patches directory doesn't exist, try guilt-init -% guilt-pop -Patches directory doesn't exist, try guilt-init -% guilt-prev -Patches directory doesn't exist, try guilt-init -% guilt-push -Patches directory doesn't exist, try guilt-init -% guilt-rebase -Patches directory doesn't exist, try guilt-init -% guilt-refresh -Patches directory doesn't exist, try guilt-init -% guilt-rm -Patches directory doesn't exist, try guilt-init -% guilt-series -Patches directory doesn't exist, try guilt-init -% guilt-status -Patches directory doesn't exist, try guilt-init -% guilt-top -Patches directory doesn't exist, try guilt-init -% guilt-unapplied -Patches directory doesn't exist, try guilt-init +% guilt add +Patches directory doesn't exist, try guilt init +% guilt applied +Patches directory doesn't exist, try guilt init +% guilt branch +Patches directory doesn't exist, try guilt init +% guilt commit +Patches directory doesn't exist, try guilt init +% guilt delete +Patches directory doesn't exist, try guilt init +% guilt diff +Patches directory doesn't exist, try guilt init +% guilt export +Patches directory doesn't exist, try guilt init +% guilt files +Patches directory doesn't exist, try guilt init +% guilt fold +Patches directory doesn't exist, try guilt init +% guilt fork +Patches directory doesn't exist, try guilt init +% guilt graph +Patches directory doesn't exist, try guilt init +% guilt header +Patches directory doesn't exist, try guilt init +% guilt import +Patches directory doesn't exist, try guilt init +% guilt import-commit +Patches directory doesn't exist, try guilt init +% guilt new +Patches directory doesn't exist, try guilt init +% guilt next +Patches directory doesn't exist, try guilt init +% guilt pop +Patches directory doesn't exist, try guilt init +% guilt prev +Patches directory doesn't exist, try guilt init +% guilt push +Patches directory doesn't exist, try guilt init +% guilt rebase +Patches directory doesn't exist, try guilt init +% guilt refresh +Patches directory doesn't exist, try guilt init +% guilt rm +Patches directory doesn't exist, try guilt init +% guilt series +Patches directory doesn't exist, try guilt init +% guilt status +Patches directory doesn't exist, try guilt init +% guilt top +Patches directory doesn't exist, try guilt init +% guilt unapplied +Patches directory doesn't exist, try guilt init diff -Nru guilt-0.34/regression/t-011.sh guilt-0.35/regression/t-011.sh --- guilt-0.34/regression/t-011.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-011.sh 2011-07-17 18:12:57.000000000 +0000 @@ -1,14 +1,14 @@ #!/bin/bash # # Test that all commands that should fail do indeed fail if the branch was -# not guilt-init'ed +# not guilt init'ed # source $REG_DIR/scaffold cmd setup_git_repo -tests="guilt-add guilt-applied guilt-branch guilt-commit guilt-delete guilt-diff guilt-export guilt-files guilt-fold guilt-fork guilt-graph guilt-header guilt-import guilt-import-commit guilt-new guilt-next guilt-pop guilt-prev guilt-push guilt-rebase guilt-refresh guilt-rm guilt-series guilt-status guilt-top guilt-unapplied" +tests="add applied branch commit delete diff export files fold fork graph header import import-commit new next pop prev push rebase refresh rm series status top unapplied" for t in $tests; do - shouldfail $t + shouldfail guilt $t done diff -Nru guilt-0.34/regression/t-020.out guilt-0.35/regression/t-020.out --- guilt-0.34/regression/t-020.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-020.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -44,7 +44,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push +% guilt push Applying patch..add Patch applied. % list_files @@ -105,7 +105,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push +% guilt push Applying patch..remove Patch applied. % list_files @@ -182,7 +182,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push +% guilt push Applying patch..mode Patch applied. % list_files @@ -270,9 +270,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -317,9 +317,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -364,9 +364,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -411,9 +411,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -458,9 +458,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -505,7 +505,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push +% guilt push Applying patch..add Patch applied. % list_files @@ -566,7 +566,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push +% guilt push Applying patch..remove Patch applied. % list_files @@ -643,7 +643,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push +% guilt push Applying patch..mode Patch applied. % list_files @@ -731,9 +731,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push -n -2 +% guilt push -n -2 Invalid number of patches to push. % list_files d .git/patches @@ -762,9 +762,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all No patches applied. -% guilt-push -n -1 +% guilt push -n -1 Invalid number of patches to push. % list_files d .git/patches @@ -793,9 +793,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all No patches applied. -% guilt-push -n 0 +% guilt push -n 0 Patch is already applied. % list_files d .git/patches @@ -824,9 +824,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all No patches applied. -% guilt-push -n 1 +% guilt push -n 1 Applying patch..modify Patch applied. % list_files @@ -871,9 +871,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push -n 2 +% guilt push -n 2 Applying patch..modify Patch applied. Applying patch..add @@ -936,9 +936,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push -n 3 +% guilt push -n 3 Applying patch..modify Patch applied. Applying patch..add @@ -1019,9 +1019,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-push -n 4 +% guilt push -n 4 Applying patch..modify Patch applied. Applying patch..add @@ -1115,7 +1115,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop --all +% guilt pop --all All patches popped. % list_files d .git/patches diff -Nru guilt-0.34/regression/t-020.sh guilt-0.35/regression/t-020.sh --- guilt-0.34/regression/t-020.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-020.sh 2011-07-17 18:12:57.000000000 +0000 @@ -10,8 +10,8 @@ # # incremental push by 1 # -guilt-series | while read n ; do - cmd guilt-push +guilt series | while read n ; do + cmd guilt push cmd list_files @@ -21,26 +21,26 @@ # # pop all # -cmd guilt-pop --all +cmd guilt pop --all # # push by name (initially nothing applied) # -guilt-series | while read n ; do - cmd guilt-push $t +guilt series | while read n ; do + cmd guilt push $t cmd list_files cmd git log -p - cmd guilt-pop --all + cmd guilt pop --all done # # push by name (incrementally) # -guilt-series | while read n ; do - cmd guilt-push $t +guilt series | while read n ; do + cmd guilt push $t cmd list_files @@ -50,21 +50,21 @@ # # pop all # -cmd guilt-pop --all +cmd guilt pop --all -npatches=`guilt-series | wc -l` -for n in `seq -2 $npatches`; do +npatches=`guilt series | wc -l` +for n in `_seq -2 $npatches`; do if [ $n -ge 0 ]; then - cmd guilt-push -n $n + cmd guilt push -n $n else - shouldfail guilt-push -n $n + shouldfail guilt push -n $n fi cmd list_files cmd git log -p - cmd guilt-pop --all + cmd guilt pop --all done cmd list_files diff -Nru guilt-0.34/regression/t-021.out guilt-0.35/regression/t-021.out --- guilt-0.34/regression/t-021.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-021.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-push --all +% guilt push --all Applying patch..modify Patch applied. Applying patch..add @@ -78,7 +78,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop Now at remove. % list_files d .git/patches @@ -154,7 +154,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop Now at add. % list_files d .git/patches @@ -214,7 +214,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop Now at modify. % list_files d .git/patches @@ -258,7 +258,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop All patches popped. % list_files d .git/patches @@ -287,7 +287,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..modify Patch applied. Applying patch..add @@ -296,7 +296,7 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-pop mode +% guilt pop mode Now at remove. % list_files d .git/patches @@ -372,10 +372,10 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..mode Patch applied. -% guilt-pop remove +% guilt pop remove Now at add. % list_files d .git/patches @@ -435,12 +435,12 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..remove Patch applied. Applying patch..mode Patch applied. -% guilt-pop add +% guilt pop add Now at modify. % list_files d .git/patches @@ -484,14 +484,14 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..add Patch applied. Applying patch..remove Patch applied. Applying patch..mode Patch applied. -% guilt-pop modify +% guilt pop modify All patches popped. % list_files d .git/patches @@ -520,7 +520,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..modify Patch applied. Applying patch..add @@ -529,7 +529,7 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-pop +% guilt pop Now at remove. % list_files d .git/patches @@ -605,7 +605,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop Now at add. % list_files d .git/patches @@ -665,7 +665,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop Now at modify. % list_files d .git/patches @@ -709,7 +709,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-pop +% guilt pop All patches popped. % list_files d .git/patches @@ -738,7 +738,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..modify Patch applied. Applying patch..add @@ -747,7 +747,7 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-pop -n -2 +% guilt pop -n -2 Invalid number of patches to pop. % list_files d .git/patches @@ -834,9 +834,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all File series fully applied, ends at patch mode -% guilt-pop -n -1 +% guilt pop -n -1 Invalid number of patches to pop. % list_files d .git/patches @@ -923,9 +923,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all File series fully applied, ends at patch mode -% guilt-pop -n 0 +% guilt pop -n 0 No patches requested to be removed. % list_files d .git/patches @@ -1012,9 +1012,9 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all File series fully applied, ends at patch mode -% guilt-pop -n 1 +% guilt pop -n 1 Now at remove. % list_files d .git/patches @@ -1090,10 +1090,10 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..mode Patch applied. -% guilt-pop -n 2 +% guilt pop -n 2 Now at add. % list_files d .git/patches @@ -1153,12 +1153,12 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..remove Patch applied. Applying patch..mode Patch applied. -% guilt-pop -n 3 +% guilt pop -n 3 Now at modify. % list_files d .git/patches @@ -1202,14 +1202,14 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..add Patch applied. Applying patch..remove Patch applied. Applying patch..mode Patch applied. -% guilt-pop -n 4 +% guilt pop -n 4 All patches popped. % list_files d .git/patches @@ -1238,7 +1238,7 @@ +++ b/def @@ -0,0 +1 @@ +abc -% guilt-push --all +% guilt push --all Applying patch..modify Patch applied. Applying patch..add diff -Nru guilt-0.34/regression/t-021.sh guilt-0.35/regression/t-021.sh --- guilt-0.34/regression/t-021.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-021.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,15 +7,15 @@ cmd setup_repo -cmd guilt-push --all +cmd guilt push --all cmd git log -p # # incremental pop by 1 # -guilt-series | tac | while read n ; do - cmd guilt-pop +guilt series | _tac | while read n ; do + cmd guilt pop cmd list_files @@ -25,26 +25,26 @@ # # push all # -cmd guilt-push --all +cmd guilt push --all # # pop by name (initially all applied) # -guilt-series | tac | while read n ; do - cmd guilt-pop $n +guilt series | _tac | while read n ; do + cmd guilt pop $n cmd list_files cmd git log -p - cmd guilt-push --all + cmd guilt push --all done # # pop by name (incrementally) # -guilt-series | tac | while read n ; do - cmd guilt-pop $t +guilt series | _tac | while read n ; do + cmd guilt pop $t cmd list_files @@ -54,21 +54,21 @@ # # push all # -cmd guilt-push --all +cmd guilt push --all -npatches=`guilt-series | wc -l` -for n in `seq -2 $npatches`; do +npatches=`guilt series | wc -l` +for n in `_seq -2 $npatches`; do if [ $n -gt 0 ]; then - cmd guilt-pop -n $n + cmd guilt pop -n $n else - shouldfail guilt-pop -n $n 2>&1 + shouldfail guilt pop -n $n 2>&1 fi cmd list_files cmd git log -p - cmd guilt-push --all + cmd guilt push --all done cmd list_files diff -Nru guilt-0.34/regression/t-022.out guilt-0.35/regression/t-022.out --- guilt-0.34/regression/t-022.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-022.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,11 +1,11 @@ % setup_repo -% guilt-applied -% guilt-push +% guilt applied +% guilt push Applying patch..modify Patch applied. -% guilt-applied +% guilt applied modify -% guilt-applied -c +% guilt applied -c 33633e7a1aa31972f125878baf7807be57b1672d modify % list_files d .git/patches @@ -19,13 +19,13 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify -% guilt-push +% guilt push Applying patch..add Patch applied. -% guilt-applied +% guilt applied modify add -% guilt-applied -c +% guilt applied -c 33633e7a1aa31972f125878baf7807be57b1672d modify 37d588cc39848368810e88332bd03b083f2ce3ac add % list_files @@ -41,14 +41,14 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add -% guilt-push +% guilt push Applying patch..remove Patch applied. -% guilt-applied +% guilt applied modify add remove -% guilt-applied -c +% guilt applied -c 33633e7a1aa31972f125878baf7807be57b1672d modify 37d588cc39848368810e88332bd03b083f2ce3ac add ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 remove @@ -66,15 +66,15 @@ r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-push +% guilt push Applying patch..mode Patch applied. -% guilt-applied +% guilt applied modify add remove mode -% guilt-applied -c +% guilt applied -c 33633e7a1aa31972f125878baf7807be57b1672d modify 37d588cc39848368810e88332bd03b083f2ce3ac add ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 remove diff -Nru guilt-0.34/regression/t-022.sh guilt-0.35/regression/t-022.sh --- guilt-0.34/regression/t-022.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-022.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,14 +7,14 @@ cmd setup_repo -cmd guilt-applied +cmd guilt applied -guilt-series | while read n; do - cmd guilt-push +guilt series | while read n; do + cmd guilt push - cmd guilt-applied + cmd guilt applied - cmd guilt-applied -c + cmd guilt applied -c cmd list_files done diff -Nru guilt-0.34/regression/t-023.out guilt-0.35/regression/t-023.out --- guilt-0.34/regression/t-023.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-023.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-top +% guilt top % list_files d .git/patches d .git/patches/master @@ -9,7 +9,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-push +% guilt push Applying patch..modify Patch applied. % list_files @@ -24,7 +24,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify -% guilt-top +% guilt top modify % list_files d .git/patches @@ -38,7 +38,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify -% guilt-push +% guilt push Applying patch..add Patch applied. % list_files @@ -54,7 +54,7 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add -% guilt-top +% guilt top add % list_files d .git/patches @@ -69,7 +69,7 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add -% guilt-push +% guilt push Applying patch..remove Patch applied. % list_files @@ -86,7 +86,7 @@ r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-top +% guilt top remove % list_files d .git/patches @@ -102,7 +102,7 @@ r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-push +% guilt push Applying patch..mode Patch applied. % list_files @@ -120,7 +120,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-top +% guilt top mode % list_files d .git/patches diff -Nru guilt-0.34/regression/t-023.sh guilt-0.35/regression/t-023.sh --- guilt-0.34/regression/t-023.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-023.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,16 +7,16 @@ cmd setup_repo -guilt-series | while read n ; do - cmd guilt-top +guilt series | while read n ; do + cmd guilt top cmd list_files - cmd guilt-push + cmd guilt push cmd list_files done -cmd guilt-top +cmd guilt top cmd list_files diff -Nru guilt-0.34/regression/t-024.out guilt-0.35/regression/t-024.out --- guilt-0.34/regression/t-024.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-024.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,13 +1,13 @@ % setup_repo -% guilt-unapplied +% guilt unapplied modify add remove mode -% guilt-push +% guilt push Applying patch..modify Patch applied. -% guilt-unapplied +% guilt unapplied add remove mode @@ -23,10 +23,10 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify -% guilt-push +% guilt push Applying patch..add Patch applied. -% guilt-unapplied +% guilt unapplied remove mode % list_files @@ -42,10 +42,10 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add -% guilt-push +% guilt push Applying patch..remove Patch applied. -% guilt-unapplied +% guilt unapplied mode % list_files d .git/patches @@ -61,10 +61,10 @@ r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-push +% guilt push Applying patch..mode Patch applied. -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master diff -Nru guilt-0.34/regression/t-024.sh guilt-0.35/regression/t-024.sh --- guilt-0.34/regression/t-024.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-024.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,12 +7,12 @@ cmd setup_repo -cmd guilt-unapplied +cmd guilt unapplied -guilt-series | while read n; do - cmd guilt-push +guilt series | while read n; do + cmd guilt push - cmd guilt-unapplied + cmd guilt unapplied cmd list_files done diff -Nru guilt-0.34/regression/t-025.out guilt-0.35/regression/t-025.out --- guilt-0.34/regression/t-025.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-025.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,8 +1,8 @@ % setup_repo -% guilt-new file -% guilt-pop +% guilt new file +% guilt pop All patches popped. -% guilt-push +% guilt push Applying patch..file Patch applied. % list_files @@ -18,10 +18,10 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file r f14ef0cd369e82820fbb0785c45614aee25c922c .git/refs/patches/master/file -% guilt-new dir/file -% guilt-pop +% guilt new dir/file +% guilt pop Now at file. -% guilt-push +% guilt push Applying patch..dir/file Patch applied. % list_files @@ -41,10 +41,10 @@ f fcf45f1999fb2acade0249842191ec584d70b1b3 .git/patches/master/status r bead5908ff96e4b5719fe714c3e50c183152ae57 .git/refs/patches/master/dir/file r f14ef0cd369e82820fbb0785c45614aee25c922c .git/refs/patches/master/file -% guilt-new dir/subdir/file -% guilt-pop +% guilt new dir/subdir/file +% guilt pop Now at dir/file. -% guilt-push +% guilt push Applying patch..dir/subdir/file Patch applied. % list_files @@ -68,7 +68,7 @@ r adc76eb117d58d48b5d0de7f81ab45849f538a5b .git/refs/patches/master/dir/subdir/file r bead5908ff96e4b5719fe714c3e50c183152ae57 .git/refs/patches/master/dir/file r f14ef0cd369e82820fbb0785c45614aee25c922c .git/refs/patches/master/file -% guilt-push --all +% guilt push --all Applying patch..modify Patch applied. Applying patch..add @@ -77,10 +77,10 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-new append -% guilt-pop +% guilt new append +% guilt pop Now at mode. -% guilt-push +% guilt push Applying patch..append Patch applied. % list_files @@ -110,12 +110,12 @@ r bead5908ff96e4b5719fe714c3e50c183152ae57 .git/refs/patches/master/dir/file r f14ef0cd369e82820fbb0785c45614aee25c922c .git/refs/patches/master/file r f8cf938e4d5c1936cf570eb2d7edd6dd18d3335f .git/refs/patches/master/mode -% guilt-pop --all +% guilt pop --all All patches popped. -% guilt-new prepend -% guilt-pop +% guilt new prepend +% guilt pop All patches popped. -% guilt-push +% guilt push Applying patch..prepend Patch applied. % list_files @@ -139,7 +139,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new white space +% guilt new white space Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -163,7 +163,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new prepend +% guilt new prepend patch 'prepend' already exist % list_files d .git/patches @@ -186,7 +186,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new mode +% guilt new mode patch 'mode' already exist % list_files d .git/patches @@ -209,7 +209,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new /abc +% guilt new /abc Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -233,7 +233,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new ./blah +% guilt new ./blah Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -257,7 +257,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new ../blah +% guilt new ../blah Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -281,7 +281,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new abc/./blah +% guilt new abc/./blah Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -305,7 +305,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new abc/../blah +% guilt new abc/../blah Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -329,7 +329,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new abc/. +% guilt new abc/. Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -353,7 +353,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new abc/.. +% guilt new abc/.. Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files @@ -377,7 +377,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend -% guilt-new abc/ +% guilt new abc/ Patchname is invalid. it cannot begin with '/', './' or '../', or contain /./, /../, or whitespace % list_files diff -Nru guilt-0.34/regression/t-025.sh guilt-0.35/regression/t-025.sh --- guilt-0.34/regression/t-025.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-025.sh 2011-07-17 18:12:57.000000000 +0000 @@ -9,42 +9,42 @@ function fixup_time_info { - touch -d "$GIT_COMMITTER_DATE" ".git/patches/master/$1" + touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1" } for pname in file dir/file dir/subdir/file ; do - cmd guilt-new "$pname" - cmd guilt-pop + cmd guilt new "$pname" + cmd guilt pop fixup_time_info "$pname" - cmd guilt-push + cmd guilt push cmd list_files done -cmd guilt-push --all +cmd guilt push --all -cmd guilt-new append -cmd guilt-pop +cmd guilt new append +cmd guilt pop fixup_time_info append -cmd guilt-push +cmd guilt push cmd list_files -cmd guilt-pop --all +cmd guilt pop --all -cmd guilt-new prepend -cmd guilt-pop +cmd guilt new prepend +cmd guilt pop fixup_time_info prepend -cmd guilt-push +cmd guilt push cmd list_files -shouldfail guilt-new "white space" +shouldfail guilt new "white space" cmd list_files for pname in prepend mode /abc ./blah ../blah abc/./blah abc/../blah abc/. abc/.. abc/ ; do - shouldfail guilt-new "$pname" 2>&1 + shouldfail guilt new "$pname" 2>&1 cmd list_files done diff -Nru guilt-0.34/regression/t-026.out guilt-0.35/regression/t-026.out --- guilt-0.34/regression/t-026.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-026.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-delete mode +% guilt delete mode % list_files d .git/patches d .git/patches/master @@ -9,7 +9,7 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f f819c9abb712af6e42af30044bc5388d454ab0cb .git/patches/master/series -% guilt-delete mode +% guilt delete mode % list_files d .git/patches d .git/patches/master @@ -19,7 +19,7 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f f819c9abb712af6e42af30044bc5388d454ab0cb .git/patches/master/series -% guilt-delete add +% guilt delete add % list_files d .git/patches d .git/patches/master diff -Nru guilt-0.34/regression/t-026.sh guilt-0.35/regression/t-026.sh --- guilt-0.34/regression/t-026.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-026.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,16 +7,16 @@ cmd setup_repo -cmd guilt-delete mode +cmd guilt delete mode cmd list_files -cmd guilt-delete mode +cmd guilt delete mode # FIXME: this should return a non-zero status, no? cmd list_files -cmd guilt-delete add +cmd guilt delete add cmd list_files diff -Nru guilt-0.34/regression/t-027.out guilt-0.35/regression/t-027.out --- guilt-0.34/regression/t-027.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-027.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,6 +1,6 @@ % setup_repo -% guilt-refresh -No patches applied; try guilt-push first +% guilt refresh +No patches applied; try guilt push first % list_files d .git/patches d .git/patches/master @@ -12,14 +12,14 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status % git reset --hard HEAD HEAD is now at d485041 initial -% guilt-push modify +% guilt push modify Applying patch..modify Patch applied. -% guilt-refresh +% guilt refresh Patch modify refreshed -% guilt-pop +% guilt pop All patches popped. -% guilt-push modify +% guilt push modify Applying patch..modify Patch applied. % list_files diff -Nru guilt-0.34/regression/t-027.sh guilt-0.35/regression/t-027.sh --- guilt-0.34/regression/t-027.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-027.sh 2011-07-17 18:12:57.000000000 +0000 @@ -9,23 +9,23 @@ function fixup_time_info { - touch -d "$GIT_COMMITTER_DATE" ".git/patches/master/$1" + touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1" } echo abcdef >> def -shouldfail guilt-refresh +shouldfail guilt refresh cmd list_files cmd git reset --hard HEAD -cmd guilt-push modify +cmd guilt push modify echo abcdef >> def -cmd guilt-refresh -cmd guilt-pop +cmd guilt refresh +cmd guilt pop fixup_time_info modify -cmd guilt-push modify +cmd guilt push modify cmd list_files diff -Nru guilt-0.34/regression/t-028.out guilt-0.35/regression/t-028.out --- guilt-0.34/regression/t-028.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-028.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,7 +1,7 @@ % setup_repo -% guilt-header +% guilt header No patches applied. -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..add @@ -10,10 +10,10 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-new -s -m blah blah blah patch-with-some-desc -% guilt-pop +% guilt new -s -m blah blah blah patch-with-some-desc +% guilt pop Now at mode. -% guilt-push +% guilt push Applying patch..patch-with-some-desc Patch applied. % list_files @@ -33,19 +33,19 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-header +% guilt header blah blah blah Signed-off-by: Commiter Name -% guilt-header modify -% guilt-header add -% guilt-header remove -% guilt-header mode -% guilt-header patch-with-some-desc +% guilt header modify +% guilt header add +% guilt header remove +% guilt header mode +% guilt header patch-with-some-desc blah blah blah Signed-off-by: Commiter Name -% guilt-header non-existant +% guilt header non-existant Patch non-existant is not in the series diff -Nru guilt-0.34/regression/t-028.sh guilt-0.35/regression/t-028.sh --- guilt-0.34/regression/t-028.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-028.sh 2011-07-17 18:12:57.000000000 +0000 @@ -9,26 +9,26 @@ function fixup_time_info { - touch -d "$GIT_COMMITTER_DATE" ".git/patches/master/$1" + touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1" } -shouldfail guilt-header +shouldfail guilt header -cmd guilt-push -a +cmd guilt push -a -cmd guilt-new -s -m "blah blah blah" patch-with-some-desc -cmd guilt-pop +cmd guilt new -s -m "blah blah blah" patch-with-some-desc +cmd guilt pop fixup_time_info patch-with-some-desc -cmd guilt-push +cmd guilt push cmd list_files -cmd guilt-header +cmd guilt header -guilt-series | while read n; do - cmd guilt-header $n +guilt series | while read n; do + cmd guilt header $n done -shouldfail guilt-header non-existant 2>&1 +shouldfail guilt header non-existant 2>&1 # FIXME: how do we check that -e works? diff -Nru guilt-0.34/regression/t-029.out guilt-0.35/regression/t-029.out --- guilt-0.34/regression/t-029.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-029.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..add @@ -23,7 +23,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-repair +% guilt repair Please read the man page first. (you need to specify repair mode to proceed). % list_files d .git/patches @@ -40,7 +40,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-repair --full +% guilt repair --full Checking status file format...ok; no upgrade necessary. Current HEAD commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba New HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0 @@ -61,7 +61,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-repair --full +% guilt repair --full Checking status file format...ok; no upgrade necessary. Current HEAD commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba New HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0 @@ -82,7 +82,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-repair --full +% guilt repair --full Checking status file format...ok; no upgrade necessary. Current HEAD commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba New HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0 @@ -100,7 +100,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..add @@ -124,7 +124,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-repair --full +% guilt repair --full Checking status file format...ok; no upgrade necessary. Current HEAD commit ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba New HEAD commit d4850419ccc1146c7169f500725ce504b9774ed0 diff -Nru guilt-0.34/regression/t-029.sh guilt-0.35/regression/t-029.sh --- guilt-0.34/regression/t-029.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-029.sh 2011-07-17 18:12:57.000000000 +0000 @@ -9,30 +9,30 @@ cmd setup_repo -cmd guilt-push -a +cmd guilt push -a cmd list_files -shouldfail guilt-repair +shouldfail guilt repair cmd list_files -echo | shouldfail guilt-repair --full +echo | shouldfail guilt repair --full cmd list_files -yes n | shouldfail guilt-repair --full +yes n | shouldfail guilt repair --full cmd list_files -yes y | cmd guilt-repair --full +yes y | cmd guilt repair --full cmd list_files -cmd guilt-push -a +cmd guilt push -a cmd list_files -yes Y | cmd guilt-repair --full +yes Y | cmd guilt repair --full cmd list_files diff -Nru guilt-0.34/regression/t-030.out guilt-0.35/regression/t-030.out --- guilt-0.34/regression/t-030.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-030.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-commit +% guilt commit Usage: guilt commit -n | -a | --all % list_files d .git/patches @@ -10,7 +10,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-commit -n 0 +% guilt commit -n 0 % list_files d .git/patches d .git/patches/master @@ -20,7 +20,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-commit -n 1 +% guilt commit -n 1 % list_files d .git/patches d .git/patches/master @@ -30,7 +30,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-commit -a +% guilt commit -a % list_files d .git/patches d .git/patches/master @@ -40,7 +40,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-commit --all +% guilt commit --all % list_files d .git/patches d .git/patches/master @@ -50,7 +50,7 @@ f bacb4aad8a55fe4e7aa58a9ae169990bb764069f .git/patches/master/series f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..add @@ -59,7 +59,7 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-commit +% guilt commit Usage: guilt commit -n | -a | --all % list_files d .git/patches @@ -76,7 +76,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-commit -n 0 +% guilt commit -n 0 % list_files d .git/patches d .git/patches/master @@ -92,7 +92,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-commit -n 1 +% guilt commit -n 1 % list_files d .git/patches d .git/patches/master @@ -107,7 +107,7 @@ r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add r ccd56089d1b5305a9d35617cb7f6f4b06ffa68ba .git/refs/patches/master/mode r ffb7faa126a6d91bcdd44a494f76b96dd860b8b9 .git/refs/patches/master/remove -% guilt-commit -a +% guilt commit -a % list_files d .git/patches d .git/patches/master @@ -119,7 +119,7 @@ f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status -% guilt-commit --all +% guilt commit --all % list_files d .git/patches d .git/patches/master diff -Nru guilt-0.34/regression/t-030.sh guilt-0.35/regression/t-030.sh --- guilt-0.34/regression/t-030.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-030.sh 2011-07-17 18:12:57.000000000 +0000 @@ -17,25 +17,25 @@ DONE } -shouldfail guilt-commit +shouldfail guilt commit cmd list_files opts_to_try | while read opt; do - cmd guilt-commit $opt + cmd guilt commit $opt cmd list_files done -cmd guilt-push -a +cmd guilt push -a -shouldfail guilt-commit +shouldfail guilt commit cmd list_files opts_to_try | while read opt; do - cmd guilt-commit $opt + cmd guilt commit $opt cmd list_files done diff -Nru guilt-0.34/regression/t-031.out guilt-0.35/regression/t-031.out --- guilt-0.34/regression/t-031.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-031.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,5 +1,5 @@ % setup_repo -% guilt-push -n 2 +% guilt push -n 2 Applying patch..modify Patch applied. Applying patch..add @@ -17,7 +17,7 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add -% guilt-fork mode +% guilt fork mode Patch "mode" already exists. Choose another name. % list_files d .git/patches @@ -32,7 +32,7 @@ f bc9ab2e0f5db99d483961e956e814d963f0309f8 .git/patches/master/modify r 33633e7a1aa31972f125878baf7807be57b1672d .git/refs/patches/master/modify r 37d588cc39848368810e88332bd03b083f2ce3ac .git/refs/patches/master/add -% guilt-fork foobar +% guilt fork foobar % list_files d .git/patches d .git/patches/master diff -Nru guilt-0.34/regression/t-031.sh guilt-0.35/regression/t-031.sh --- guilt-0.34/regression/t-031.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-031.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,14 +7,14 @@ cmd setup_repo -cmd guilt-push -n 2 +cmd guilt push -n 2 cmd list_files -shouldfail guilt-fork mode +shouldfail guilt fork mode cmd list_files -cmd guilt-fork foobar +cmd guilt fork foobar cmd list_files diff -Nru guilt-0.34/regression/t-032.out guilt-0.35/regression/t-032.out --- guilt-0.34/regression/t-032.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-032.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,18 +1,18 @@ % setup_repo % touch foo foo:baz -% guilt-import -P foo:bar foo +% guilt import -P foo:bar foo The specified patch name contains invalid characters (:). -% guilt-import -P foo:bar foo2 +% guilt import -P foo:bar foo2 Specified file does not exist. -% guilt-import -P foo foo2 +% guilt import -P foo foo2 Specified file does not exist. -% guilt-import -P foo3 foo -% guilt-import -P foo3 foo +% guilt import -P foo3 foo +% guilt import -P foo3 foo Already tracking a patch under that name. -% guilt-import -P foo2 foo -% guilt-import foo -% guilt-import foo +% guilt import -P foo2 foo +% guilt import foo +% guilt import foo Already tracking a patch under that name. -% guilt-import -P foo,bar foo -% guilt-import foo:baz +% guilt import -P foo,bar foo +% guilt import foo:baz The specified patch name contains invalid characters (:). diff -Nru guilt-0.34/regression/t-032.sh guilt-0.35/regression/t-032.sh --- guilt-0.34/regression/t-032.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-032.sh 2011-07-17 18:12:57.000000000 +0000 @@ -10,31 +10,31 @@ cmd touch foo foo:baz # invalid character -shouldfail guilt-import -P foo:bar foo +shouldfail guilt import -P foo:bar foo # non-existant file & invalid character -shouldfail guilt-import -P foo:bar foo2 +shouldfail guilt import -P foo:bar foo2 # non-existant file -shouldfail guilt-import -P foo foo2 +shouldfail guilt import -P foo foo2 # ok -cmd guilt-import -P foo3 foo +cmd guilt import -P foo3 foo # duplicate patch name -shouldfail guilt-import -P foo3 foo +shouldfail guilt import -P foo3 foo # ok -cmd guilt-import -P foo2 foo +cmd guilt import -P foo2 foo # ok -shouldfail guilt-import foo +shouldfail guilt import foo # duplicate patch name (implicit) -shouldfail guilt-import foo +shouldfail guilt import foo # check that bug 47 doesn't come back -cmd guilt-import -P foo,bar foo +cmd guilt import -P foo,bar foo # implicitly bad patch name - invalid char -shouldfail guilt-import foo:baz +shouldfail guilt import foo:baz diff -Nru guilt-0.34/regression/t-050.out guilt-0.35/regression/t-050.out --- guilt-0.34/regression/t-050.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-050.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,42 +1,42 @@ % setup_repo -% guilt-series +% guilt series modify add remove mode -% guilt-series -v +% guilt series -v modify add remove mode -% guilt-push +% guilt push Applying patch..modify Patch applied. -% guilt-series -v +% guilt series -v = modify add remove mode -% guilt-push +% guilt push Applying patch..add Patch applied. -% guilt-series -v +% guilt series -v + modify = add remove mode -% guilt-push +% guilt push Applying patch..remove Patch applied. -% guilt-series -v +% guilt series -v + modify + add = remove mode -% guilt-push +% guilt push Applying patch..mode Patch applied. -% guilt-series -v +% guilt series -v + modify + add + remove diff -Nru guilt-0.34/regression/t-050.sh guilt-0.35/regression/t-050.sh --- guilt-0.34/regression/t-050.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-050.sh 2011-07-17 18:12:57.000000000 +0000 @@ -7,14 +7,14 @@ cmd setup_repo -cmd guilt-series +cmd guilt series -cmd guilt-series -v +cmd guilt series -v -guilt-series | while read n ; do - cmd guilt-push +guilt series | while read n ; do + cmd guilt push - cmd guilt-series -v + cmd guilt series -v done cmd list_files diff -Nru guilt-0.34/regression/t-051.out guilt-0.35/regression/t-051.out --- guilt-0.34/regression/t-051.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-051.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,24 +1,24 @@ % setup_repo -% guilt-new first -% guilt-push modify +% guilt new first +% guilt push modify Applying patch..modify Patch applied. -% guilt-new second -% guilt-push add +% guilt new second +% guilt push add Applying patch..add Patch applied. -% guilt-new third -% guilt-push remove +% guilt new third +% guilt push remove Applying patch..remove Patch applied. -% guilt-new fourth -% guilt-push mode +% guilt new fourth +% guilt push mode Applying patch..mode Patch applied. -% guilt-new fifth -% guilt-pop -a +% guilt new fifth +% guilt pop -a All patches popped. -% guilt-guard -l +% guilt guard -l first: modify: second: @@ -28,7 +28,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..first Patch applied. Applying patch..modify @@ -72,10 +72,10 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied first modify second @@ -85,7 +85,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -111,7 +111,7 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -129,8 +129,8 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/second f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third -% guilt-select foo -% guilt-guard -l +% guilt select foo +% guilt guard -l first: modify: second: @@ -140,7 +140,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..first Patch applied. Applying patch..modify @@ -185,10 +185,10 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied first modify second @@ -198,7 +198,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -225,7 +225,7 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -244,9 +244,9 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third f f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 .git/patches/master/guards -% guilt-select -n -% guilt-guard first +foo -% guilt-guard -l +% guilt select -n +% guilt guard first +foo +% guilt guard -l first: +foo modify: second: @@ -256,7 +256,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..second @@ -297,10 +297,10 @@ r 5fe77d7acc8ba70ea6ec7e99ff56ea1ecd31485d .git/refs/patches/master/fourth r a396f79d32fb896c65a1fe0a21cc7fedfc4bca5d .git/refs/patches/master/mode r d6f4e09af372958f1b5989dde565f0f16237f741 .git/refs/patches/master/remove -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied modify second add @@ -309,7 +309,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -334,7 +334,7 @@ r 5fe77d7acc8ba70ea6ec7e99ff56ea1ecd31485d .git/refs/patches/master/fourth r a396f79d32fb896c65a1fe0a21cc7fedfc4bca5d .git/refs/patches/master/mode r d6f4e09af372958f1b5989dde565f0f16237f741 .git/refs/patches/master/remove -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -352,8 +352,8 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/second f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third -% guilt-select foo -% guilt-guard -l +% guilt select foo +% guilt guard -l first: +foo modify: second: @@ -363,7 +363,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..first Patch applied. Applying patch..modify @@ -408,10 +408,10 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied first modify second @@ -421,7 +421,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -448,7 +448,7 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -467,9 +467,9 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third f f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 .git/patches/master/guards -% guilt-select -n -% guilt-select bar -% guilt-guard -l +% guilt select -n +% guilt select bar +% guilt guard -l first: +foo modify: second: @@ -479,7 +479,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..second @@ -521,10 +521,10 @@ r 5fe77d7acc8ba70ea6ec7e99ff56ea1ecd31485d .git/refs/patches/master/fourth r a396f79d32fb896c65a1fe0a21cc7fedfc4bca5d .git/refs/patches/master/mode r d6f4e09af372958f1b5989dde565f0f16237f741 .git/refs/patches/master/remove -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied modify second add @@ -533,7 +533,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -559,7 +559,7 @@ r 5fe77d7acc8ba70ea6ec7e99ff56ea1ecd31485d .git/refs/patches/master/fourth r a396f79d32fb896c65a1fe0a21cc7fedfc4bca5d .git/refs/patches/master/mode r d6f4e09af372958f1b5989dde565f0f16237f741 .git/refs/patches/master/remove -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -578,8 +578,8 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third f e242ed3bffccdf271b7fbaf34ed72d089537b42f .git/patches/master/guards -% guilt-select -n -% guilt-guard -l +% guilt select -n +% guilt guard -l first: +foo modify: second: @@ -589,8 +589,8 @@ fourth: mode: fifth: -% guilt-guard first -foo -% guilt-guard -l +% guilt guard first -foo +% guilt guard -l first: -foo modify: second: @@ -600,7 +600,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..first Patch applied. Applying patch..modify @@ -644,10 +644,10 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied first modify second @@ -657,7 +657,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -683,7 +683,7 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -701,8 +701,8 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/second f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third -% guilt-select foo -% guilt-guard -l +% guilt select foo +% guilt guard -l first: -foo modify: second: @@ -712,7 +712,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..second @@ -754,10 +754,10 @@ r 5fe77d7acc8ba70ea6ec7e99ff56ea1ecd31485d .git/refs/patches/master/fourth r a396f79d32fb896c65a1fe0a21cc7fedfc4bca5d .git/refs/patches/master/mode r d6f4e09af372958f1b5989dde565f0f16237f741 .git/refs/patches/master/remove -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied modify second add @@ -766,7 +766,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -792,7 +792,7 @@ r 5fe77d7acc8ba70ea6ec7e99ff56ea1ecd31485d .git/refs/patches/master/fourth r a396f79d32fb896c65a1fe0a21cc7fedfc4bca5d .git/refs/patches/master/mode r d6f4e09af372958f1b5989dde565f0f16237f741 .git/refs/patches/master/remove -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches @@ -811,9 +811,9 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/status f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/third f f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 .git/patches/master/guards -% guilt-select -n -% guilt-select bar -% guilt-guard -l +% guilt select -n +% guilt select bar +% guilt guard -l first: -foo modify: second: @@ -823,7 +823,7 @@ fourth: mode: fifth: -% guilt-push -a +% guilt push -a Applying patch..first Patch applied. Applying patch..modify @@ -868,10 +868,10 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-prev +% guilt prev mode -% guilt-next -% guilt-applied +% guilt next +% guilt applied first modify second @@ -881,7 +881,7 @@ fourth mode fifth -% guilt-unapplied +% guilt unapplied % list_files d .git/patches d .git/patches/master @@ -908,7 +908,7 @@ r a275c97cdbfa8f77b3326ec9ce8a6ac261ec0b8f .git/refs/patches/master/mode r b9f029c3ce91252944780ceb518385acfd83380e .git/refs/patches/master/third r e879a6edd53fd85ed29fff06f11e0ee091dab94e .git/refs/patches/master/first -% guilt-pop -a +% guilt pop -a All patches popped. % list_files d .git/patches diff -Nru guilt-0.34/regression/t-051.sh guilt-0.35/regression/t-051.sh --- guilt-0.34/regression/t-051.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-051.sh 2011-07-17 18:12:57.000000000 +0000 @@ -9,31 +9,31 @@ function fixup_time_info { - touch -d "$GIT_COMMITTER_DATE" ".git/patches/master/$1" + touch -a -m -t "$TOUCH_DATE" ".git/patches/master/$1" } function std_tests { cmd list_files - cmd guilt-prev - cmd guilt-next - cmd guilt-applied - cmd guilt-unapplied + cmd guilt prev + cmd guilt next + cmd guilt applied + cmd guilt unapplied cmd list_files } # create a couple of dummy (empty) patches strategically placed thoughout # the series -cmd guilt-new first -cmd guilt-push modify -cmd guilt-new second -cmd guilt-push add -cmd guilt-new third -cmd guilt-push remove -cmd guilt-new fourth -cmd guilt-push mode -cmd guilt-new fifth -cmd guilt-pop -a +cmd guilt new first +cmd guilt push modify +cmd guilt new second +cmd guilt push add +cmd guilt new third +cmd guilt push remove +cmd guilt new fourth +cmd guilt push mode +cmd guilt new fifth +cmd guilt pop -a fixup_time_info first fixup_time_info second fixup_time_info third @@ -47,69 +47,69 @@ p=first # no guarded patches; no guards selected -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # no guarded patches; one guard selected -cmd guilt-select foo -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select foo +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # one positive guarded patch; no guards selected -cmd guilt-select -n -cmd guilt-guard $p +foo -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select -n +cmd guilt guard $p +foo +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # one positive guarded patch; that guard selected -cmd guilt-select foo -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select foo +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # one positive guarded patch; different guard selected -cmd guilt-select -n -cmd guilt-select bar -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select -n +cmd guilt select bar +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # one negative guarded patch; no guards selected -cmd guilt-select -n -cmd guilt-guard -l -cmd guilt-guard $p -foo -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select -n +cmd guilt guard -l +cmd guilt guard $p -foo +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # one negative guarded patch; that guard selected -cmd guilt-select foo -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select foo +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files # one negative guarded patch; different guard selected -cmd guilt-select -n -cmd guilt-select bar -cmd guilt-guard -l -cmd guilt-push -a +cmd guilt select -n +cmd guilt select bar +cmd guilt guard -l +cmd guilt push -a std_tests -cmd guilt-pop -a +cmd guilt pop -a cmd list_files diff -Nru guilt-0.34/regression/t-060.out guilt-0.35/regression/t-060.out --- guilt-0.34/regression/t-060.out 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-060.out 2011-07-17 18:12:57.000000000 +0000 @@ -1,11 +1,11 @@ % setup_repo -% guilt-new subdir +% guilt new subdir % mkdir blah % touch blah/sub -% guilt-add blah/sub -% guilt-refresh +% guilt add blah/sub +% guilt refresh Patch subdir refreshed -% guilt-push -a +% guilt push -a Applying patch..modify Patch applied. Applying patch..add @@ -14,27 +14,27 @@ Patch applied. Applying patch..mode Patch applied. -% guilt-files +% guilt files def -% guilt-files -v +% guilt files -v def -% guilt-files -l +% guilt files -l mode def -% guilt-files -v -l +% guilt files -v -l [mode] def -% guilt-files -a +% guilt files -a blah/sub def abd abd def -% guilt-files -l -a +% guilt files -l -a subdir blah/sub modify def add abd remove abd mode def -% guilt-files -v -a +% guilt files -v -a subdir + blah/sub modify @@ -45,7 +45,7 @@ - abd mode def -% guilt-files -v -l -a +% guilt files -v -l -a [subdir] blah/sub [modify] def [add] abd @@ -55,27 +55,27 @@ 1024+0 records in 1024+0 records out 1024 bytes (1.0 kB) copied -% guilt-files +% guilt files def -% guilt-files -v +% guilt files -v def -% guilt-files -l +% guilt files -l mode def -% guilt-files -v -l +% guilt files -v -l [mode] def -% guilt-files -a +% guilt files -a blah/sub def abd abd def -% guilt-files -l -a +% guilt files -l -a subdir blah/sub modify def add abd remove abd mode def -% guilt-files -v -a +% guilt files -v -a subdir + blah/sub modify @@ -86,40 +86,40 @@ - abd mode def -% guilt-files -v -l -a +% guilt files -v -l -a [subdir] blah/sub [modify] def [add] abd [remove] abd [mode] def % git add file.bin -% guilt-files +% guilt files def file.bin -% guilt-files -v +% guilt files -v def + file.bin -% guilt-files -l +% guilt files -l mode def mode file.bin -% guilt-files -v -l +% guilt files -v -l [mode] def [mode] file.bin -% guilt-files -a +% guilt files -a blah/sub def abd abd def file.bin -% guilt-files -l -a +% guilt files -l -a subdir blah/sub modify def add abd remove abd mode def mode file.bin -% guilt-files -v -a +% guilt files -v -a subdir + blah/sub modify @@ -131,7 +131,7 @@ mode def + file.bin -% guilt-files -v -l -a +% guilt files -v -l -a [subdir] blah/sub [modify] def [add] abd @@ -140,33 +140,33 @@ [mode] file.bin % git rm def rm 'def' -% guilt-files +% guilt files def file.bin -% guilt-files -v +% guilt files -v - def + file.bin -% guilt-files -l +% guilt files -l mode def mode file.bin -% guilt-files -v -l +% guilt files -v -l [mode] def [mode] file.bin -% guilt-files -a +% guilt files -a blah/sub def abd abd def file.bin -% guilt-files -l -a +% guilt files -l -a subdir blah/sub modify def add abd remove abd mode def mode file.bin -% guilt-files -v -a +% guilt files -v -a subdir + blah/sub modify @@ -178,7 +178,7 @@ mode - def + file.bin -% guilt-files -v -l -a +% guilt files -v -l -a [subdir] blah/sub [modify] def [add] abd diff -Nru guilt-0.34/regression/t-060.sh guilt-0.35/regression/t-060.sh --- guilt-0.34/regression/t-060.sh 2010-09-18 20:34:32.000000000 +0000 +++ guilt-0.35/regression/t-060.sh 2011-07-17 18:12:57.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# Test the guilt-files code +# Test the guilt files code # source $REG_DIR/scaffold @@ -22,25 +22,25 @@ } # create a patch that contains a file in a subdirectory -cmd guilt-new subdir +cmd guilt new subdir cmd mkdir blah cmd touch blah/sub -cmd guilt-add blah/sub +cmd guilt add blah/sub -cmd guilt-refresh +cmd guilt refresh # push em all for tesing -cmd guilt-push -a +cmd guilt push -a # # actual tests # guiltfiles_args | while read args; do - cmd guilt-files $args + cmd guilt files $args done # @@ -50,17 +50,17 @@ cmd dd if=/dev/zero of=file.bin bs=1 count=1024 | filter_dd guiltfiles_args | while read args; do - cmd guilt-files $args + cmd guilt files $args done cmd git add file.bin guiltfiles_args | while read args; do - cmd guilt-files $args + cmd guilt files $args done cmd git rm def guiltfiles_args | while read args; do - cmd guilt-files $args + cmd guilt files $args done