Guilt v0.32

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: fix path filtering on f10

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Guilt v0.32-rc2

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: bug fix: patch names can contained commas

Fixes bug #47

The comma caused sed to interpret characters after it as a command. E.g.,

jeffpc@maat:~/bin/guilt$ guilt ser -v
  1229742777.15407_2984.josefsipek_2,FS
jeffpc@maat:~/bin/guilt$ guilt push
sed: -e expression #1, char 40: unknown command: `F'

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: removed cd "$TOP_DIR" in favor of cd_to_toplevel

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: fixed git invocation

The regression suite used 'git-foo' instead of the new 'git foo' syntax. The
actual guilt code used 'git foo' syntax for a while, but the regression
suite got neglected during the conversion.

Closes bug #49

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[PATCH] guilt: add option guilt.diffstat

Introduce option guilt.diffstat so that we don't have to type
"guilt refresh --diffstat" in its full form every time.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[PATCH] guilt doc: use literal paragraphs for example commands

Display example commands verbatim by indenting the paragraphs.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Guilt v0.32-rc1

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Merge branch 'experimental'

Conflicts:

guilt

push: fixed push pushing more than it should

The following commands show what the problem is:

$ guilt series -v
+ foo
= bar
  baz
$ guilt push bar
...
$ guilt series -v
+ foo
+ bar
= baz

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: anchor three dash divider to EOL.

The match on "^---" was too broad, and taking in things like
PGP sigs, and random ascii-art as a match for the divider between
the patch and patch header. This anchors the regex to the end of
the line.  It will still match on the 1st "^---$" encountered,
and not the last, so if you have multiple "^---$", then you loose.

Some patches don't have any sort of header, so you still need a match
on the "^--- " found in the oldfile/newfile stanza of the patch itself.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[GUILT] Use git_editor

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt-fold: merge headers of the 2 patches

fold likes to "lose" the header of the patch being folded. This changes
merges the 2 headers in a really simple way:

* if there are no headers, do nothing
* if there is only one header, use it
* if there are two headers, use the current patch's header, followed by a
  delimiting line, followed by the folded patch's header

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[GUILT PATCH 5/5] Guards test suite

The guards patches touch a lot of guilt, so make sure they don't muck
anything up.

[jeffpc: port to new regression suite]
Signed-off-by: Eric Lesh <eclesh@ucla.edu>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[GUILT PATCH 4/5] get_series: return guarded patches only

This renames get_guarded_series to get_series, and introduces
get_full_series for when the full series is needed.  Many guilt
scripts Just Work with that change.  Those that don't are fixed up.

With this patch, guards are respected everywhere in guilt.

Signed-off-by: Eric Lesh <eclesh@ucla.edu>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[GUILT PATCH 3/5] guilt-select: Select guards to apply when pushing patches

guilt-select chooses guards that alter which patches will be applied
with a guilt-push.  The selected guards are stored in
.git/patches/$branch/guards.

[jeffpc: small tweak of the usage string]
Signed-off-by: Eric Lesh <eclesh@ucla.edu>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[GUILT PATCH 2/5] guilt-guard: Assign guards to patches in series

guilt-guard will assign guards to a patch.  They work so that:

    * Patches with no guards are always pushed.

    * Patches with positive guards (i.e. +foo) are pushed *only if* the
      guard is selected.

    * Patches with negative guards (i.e. -foo) are pushed *unless* the
      guard is selected.

This also introduces a number of guard-related utility functions into
guilt.  get_guarded_series is used to get the list of patches that are
applicable given the current guard status.  It replaces get_series in
a later patch.

[jeffpc: small cleanups & bugfixes]
Signed-off-by: Eric Lesh <eclesh@ucla.edu>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[GUILT PATCH 1/5] get_series: Remove comments from end of series lines

Also make sure that series_remove_patch and series_rename_patch do the
right thing if there are comments on the line.

[jeffpc: few tiny bugfixes]
Signed-off-by: Eric Lesh <eclesh@ucla.edu>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Remove autotagging

NOTE: This is an experimental patch. It may or may not actually get merged.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: Don't touch working tree when writing commits

guilt-refresh and guilt-new -f don't affect the content of the working tree.
However the implementation would recreate all the files in the current patch.
This annoys my editor (kate).

[jeffpc: update autotags after guilt-new]
[jeffpc: the commit function must invoke a sub-shell to not polute namespace]
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

[PATCH] explicitly set LC_ALL to 'C' in for guilt run-tests

The output of guilt's run-tests is dependent on LC_COLLATE due to reliance
on a given sorting algorithm. Currently, the test '052' will fail if
LC_ALL/LC_COLLATE/LANG is set to 'en_US.UTF-8' (and likely others values).

Remove the assumption by explicitly setting this in run-tests.

[jeffpc: changed from LANG to LC_ALL & updated description]
Signed-off-by: Scott Moser <smoser@brickies.net>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

docs: spelling fixes

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Contributing: email address fix and subject suggestion

Signed-off-by: Scott Moser <smoser@brickies.net>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Merge branch 'master' of ldave2:/home/jeffpc/bin/guilt

patchbomb: added --git option

This way, one can send relatively terse patches when files are moved/copied.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Merge branch 'stable'

* stable:
  Guilt v0.31.2
  branch: fix a regression (refs not being copied)

Guilt v0.31.2

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

branch: fix a regression (refs not being copied)

When the status file format changes to not include the hashes of the patch
commits, branch was not updated to copy the refs/patches/$branch/* to
refs/patches/$newbranch/. This meant that after a guilt-branch, guilt got
very unhappy.

Also includes a regression test for guilt-branch.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: abort if working with a detached head

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test guilt-new's behavior when index isn't clean

The working dir may be clean, but the index doesn't have to be. Make sure
guilt-new aborts properly.  This tests the code in the previous commit.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

must_commit_first needs to check the index, not just the working dir

This fixes a bug, where a number of commands (i.e., new) ignored the
uncommitted changes:

$ echo abc >> def
$ git update-index def
$ guilt new foo # creates a new empty patch, instead of aborting

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: expand t-025 to test guilt-new's -f argument

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

docs: handle `git describe` failing

If `git describe` fails, fall back to grabbing the version from
GUILT_VERSION in the guilt file. This allows the docs to be built from the
tarball.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Guilt v0.31.1

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Git 1.6.x is fine (not just 1.5.x)

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Guilt v0.31

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

patchbomb: fix bashism

$RANDOM is a bashism. Use mktemp wrapper to create a temp directory instead.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Documentation: add proper 'linkguilt's

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: Fix git version detection on Debian

Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

guilt-diff: behave sanely if no patch applied

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

guilt-diff: allow paths

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

Better "patch does not exist" checks

* Add check for guilt-delete
* Improve error message for guilt-fold

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

Make guilt work even after git-sh-setup is moved out of the user's path

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

must_commit_first: Make sure the index is up to date

git diff-files can be confused if the index is not up to date, so make
sure it is updated first.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

regression: fix failure with Git 1.5.5

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

Documentation: customized the manpage headers to include version info

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

Documentation: improve AsciiDoc formatting of lists in guilt(7)

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

Documentation: rename guiltlink macro to linkguilt

Between AsciiDoc 8.2.2 and 8.2.3, the regex for the link: macro was
changed so that it now matches explicit values, and unfortunately in
this case guiltlink was being matched by just 'link', causing the wrong
inline macro template to be applied.

Commit message based on patch by Dan McGee to git.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Shawn Starr <shawn.starr@rogers.com>

Guilt v0.30

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test that supplied test numbers are valid

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test guilt-files -v

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test guilt-files reading the index for the top-most applied patch

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

files: use the diff-index for top-most patch

This way, added/removed files show up in the listing.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

patchbomb: do not include "1/1" in the subject if there's only 1 patch

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

graph: display patch names instead of hashes

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

import-commit: replace be careful about * and ? in filenames

The simples solution is to replace them with '-'.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

autotagging: fix a tiny quirk, and document autotagging properly

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test the new init options

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

init: honor a global/system guilt.autotag config option

If autotag is already set in any of the 3 config files (system, global,
repo), do NOT reset the config variable.  If not set, use a value passed via
the -a or -n options. If no command line options are supplied, use the
default value.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: 011 should test guilt-commit as well

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test for guilt-fork

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: ref_rename_patch takes patch names, not ref names

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: try to be more portable

Mac OS X uses BSD variants of many commands -- the BSD variants tend to be
more picky about options, and syntax. Since OSX is supported by Git, it
makes sense for Guilt to run on it as well.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: simplify command logging

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Replace all display related `echo` calls with a custom function

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: try to be more portable

Mac OS X uses BSD variants of many commands -- the BSD variants tend to be
more picky about options, and syntax. Since OSX is supported by Git, it
makes sense for Guilt to run on it as well.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

fork: fix regression caused by status format change

The ref needs to be renamed as well in addition to the records in the status
and series files.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: simple makefile

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Add support for DESTDIR in guilt/Makefile.

This patch adds support for DESTDIR in guilt/Makefile, making
packagers' life a little bit easier.

Signed-off-by: Adam Golebiowski <adamg@pld-linux.org>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: wrap `git-update-ref -d` to make ref removal cleaner

Every time `git-update-ref -d` was run...

1) the expected rev was obtained by running git-rev-parse on the ref being
   removed

2) if the ref did not exist to begin with, ugly errors were being displayed

This commit addresses both of these points.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

repair: added --autotag repair mode

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: replace "echo && return 1" with die

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: check status file for being old format

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

repair: allow status file upgrade

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Update my email address

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: fix up test 028 expected output

The new status format broke the test.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Merge branch 'new-status-format'

Guilt v0.29

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: guilt-commit test

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

commit: new command to permanently commit patches

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test guilt-repair

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

repair: remove patch refs

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: add tests for guilt-header

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Merge branch 'master' of s390x:bin/guilt

header: fix patch name existence in the series

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Remove old status format

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: setup/teardown refs/patches/$branch/$patch on push/pop

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Patch names cannot contain whitespace

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

guilt: Use 'git update-ref' instead of echo

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Use 'git <cmd>' instead of 'git-cmd'

The only remaining user of the dash version is the '. git-sh-setup' line.

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

Merge branch 'regression-rewrite'

push: output current patch name, not cmd-line argument

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 027: test refresh code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 026: test delete code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 025: test new code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 024: test unapplied code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 022: test applied code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 060: test files code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>

regression: test 021: test pop code

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>