s
> 78d9625 HEAD@{14}: guilt-push:
> respect-nobarrier-mount-option-in-nojournal-mode
> d08854f HEAD@{15}: guilt-pop: updating HEAD
> d08854f HEAD@{16}: guilt-pop: updating HEAD
> d08854f HEAD@{17}: guilt-push:
> optimize-ext4_should_retry_alloc-to-improve-ENOSPC-performance
&
ng with the topmost applied patch, start with
> .
> diff --git a/guilt-graph b/guilt-graph
> index d90c2f1..4d5fe46 100755
> --- a/guilt-graph
> +++ b/guilt-graph
> @@ -3,7 +3,7 @@
> # Copyright (c) Josef "Jeff" Sipek, 2007-2013
> #
>
> -USAGE=&qu
Neat.
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Jan 23, 2015 at 03:21:06PM +0100, Per Cederqvist wrote:
> git diff-tree by default emits TAB-separated fields. cut by defaults
> processes TAB-separated fields. Simplify getfiles() by using TAB as
> the separator.
>
On Fri, Jan 23, 2015 at 03:33:03PM +0100, Per Cederqvist wrote:
> On Fri, Jan 23, 2015 at 3:21 PM, Jeff Sipek wrote:
> > On Fri, Jan 23, 2015 at 02:24:55PM +0100, Per Cederqvist wrote:
> >> The old rule worked, most of the time, but had several issues:
> >>
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Jan 23, 2015 at 02:24:59PM +0100, Per Cederqvist wrote:
> Make them into reference to the man pages instead.
>
> Signed-off-by: Per Cederqvist
> ---
> Documentation/guilt-add.txt | 2 +-
> Documentation/guilt-refresh
t;$//')
> -echo "'$name' $u" > usage-$name.txt
> +echo "'`echo $name|sed -e 's/^guilt-/guilt /'`' $u" > usage-$name.txt
Tiny nitpick: spaces around the |, otherwise looks good.
Signed-off-by: Josef 'Jeff' Sipek
> --
icular spot (even
> though it works properly for "+guilt select+" in another file. I know
> too little docbook to be able to find the cause.
Yeah, a bit of a mystery to me too. Regardless,
Signed-off-by: Josef 'Jeff' Sipek
> Signed-off-by: Per Cederqvist
> --
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Jan 23, 2015 at 02:24:56PM +0100, Per Cederqvist wrote:
> Specify an explicit dependency, to stop make from trying to generate
> guilt.xml if cmds.txt could not be created. The asciidoc will fail
> and produce an error message
On Fri, Jan 23, 2015 at 02:24:55PM +0100, Per Cederqvist wrote:
> The old rule worked, most of the time, but had several issues:
>
> - It depended on the corresponding guilt-*.txt file, but the usage.sh
>script actually reads ../guilt-foo.
>
> - Actually, each usage-%.txt depended on all gu
v0.36. Yes, it's
been *way* too long since the last release, but hopefully that will change
going forward. By far, the most changes come from Per Cederqvist who
cleaned up some rather dark corners in the code. Thanks!
As always, patches, and other feedback is welcome.
Josef "J
Signed-off-by: Josef 'Jeff' Sipek
Ok, I think this is all of the patches. I'll wait for you to tell me if the
cmd() echo to printf change breaks anything for you. If not, I'll pull your
series (via git), tag a 0.36-rc1, and push the whole thing to repo.or.cz. :)
Sorry for
mand in a
> pipeline, not the first command.)
>
> Print an explicit error message if a command that should fail actually
> succeeds.
This is a god idea.
The patch still looks good.
Signed-off-by: Josef 'Jeff' Sipek
> Updated t-032.sh, which used "shouldfail" in
Signed-off-by: Josef 'Jeff' Sipek
On Sun, May 18, 2014 at 11:59:50PM +0200, Per Cederqvist wrote:
> The valid_patchname now lets "git check-ref-format" do its job instead
> of trying (and failing) to implement the same rules. See
> git-check-ref-format(1) for a lis
k-ref-format(1) when deriving a patch name from the commit
> message. Verify that the derived name using "git check-ref-format",
> and as a final fallback simply use the patch name "x" (to ensure that
> the code is future-proof in case new rules are added in the future)
Signed-off-by: Josef 'Jeff' Sipek
On Mon, May 19, 2014 at 12:00:08AM +0200, Per Cederqvist wrote:
> ---
> Documentation/guilt-header.txt | 5 -
> regression/t-028.out | 9 +
> regression/t-028.sh| 3 +++
> 3 files changed, 16
t; @@ -51,18 +51,23 @@ function filter_dd
> function cmd
> {
> echo "% $@"
> - "$@" 2>&1 | replace_path && return 0
> - return 1
> + (
> + exec 3>&1
> + rv=`(("$@&quo
name. Guilt always rejects that name, for increased
> compatibility.
>
> Signed-off-by: Per Cederqvist
> Signed-off-by: Josef 'Jeff' Sipek
> ---
> guilt| 21 ++-
> guilt-fork | 2 +-
> guilt
Signed-off-by: Josef 'Jeff' Sipek
On Fri, May 16, 2014 at 04:46:16PM +0200, Per Cederqvist wrote:
> When the option is true, Guilt does not create a new Git branch when
> patches are applied. This way, you can switch between Guilt 0.35 and
> the current version of Guilt with
Signed-off-by: Josef 'Jeff' Sipek
On Fri, May 16, 2014 at 04:46:15PM +0200, Per Cederqvist wrote:
> Signed-off-by: Per Cederqvist
> ---
> regression/t-061.sh | 6 ++
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/regression/t-061.sh b
Signed-off-by: Josef 'Jeff' Sipek
On Fri, May 16, 2014 at 04:45:59PM +0200, Per Cederqvist wrote:
> If you run something like "guilt header '.*'" the command would crash,
> because the grep comand that tries to ensure that the patch exist
> would detect a
Signed-off-by: Josef 'Jeff' Sipek
On Fri, May 16, 2014 at 04:45:55PM +0200, Per Cederqvist wrote:
> Test that empty patches are handled correctly, both with and without
> the guilt.diffstat configuration option.
>
> Signed-off-by: Per Cederqvist
> ---
>
On Fri, May 16, 2014 at 11:51:37AM +0200, Per Cederqvist wrote:
> On Fri, May 16, 2014 at 12:46 AM, Jeff Sipek wrote:
> > On Tue, May 13, 2014 at 10:30:48PM +0200, Per Cederqvist wrote:
> >> If you run something like "guilt header '.*'" the command would cr
nd as a final fallback simply use the patch name "x" (to ensure that
> the code is future-proof in case new rules are added in the future).
>
> Always append a ".patch" suffix to the patch name.
>
> Added test cases.
Also very nice.
Thanks,
Jeff.
Signed-off-by: J
name. Guilt always rejects that name, for increased
> compatibility.
Very nice.
Signed-off-by: Josef 'Jeff' Sipek
> Signed-off-by: Per Cederqvist
> ---
> guilt| 21 ++-
> guilt-fork | 2 +-
> guilt-impor
Signed-off-by: Josef 'Jeff' Sipek
On Tue, May 13, 2014 at 10:30:49PM +0200, Per Cederqvist wrote:
> Signed-off-by: Per Cederqvist
> ---
> regression/t-028.out | 7 +++
> regression/t-028.sh | 4
> 2 files changed, 11 insertions(+)
>
> diff --git a/regr
On Tue, May 13, 2014 at 10:30:48PM +0200, Per Cederqvist wrote:
> If you run something like "guilt header '.*'" the command would crash,
> because the grep comand that tries to ensure that the patch exist
> would detect a match, but the later code expected the match to be
> exact.
>
> Fixed by com
On Thu, May 15, 2014 at 09:37:05AM +0200, Per Cederqvist wrote:
> On Wed, May 14, 2014 at 5:53 PM, Jeff Sipek wrote:
> > On Tue, May 13, 2014 at 10:31:04PM +0200, Per Cederqvist wrote:
...
> >> +
> >> +for i in `seq 5`; do
> >> + if [ $i -ge 5 ]; then
>
On Tue, May 13, 2014 at 10:30:44PM +0200, Per Cederqvist wrote:
> Test that empty patches are handled correctly, both with and without
> the guilt.diffstat configuration option.
>
> Signed-off-by: Per Cederqvist
> ---
> regression/t-020.out | 250
> ++
On Tue, May 13, 2014 at 10:31:04PM +0200, Per Cederqvist wrote:
> When the option is true (the default), Guilt does not create a new Git
> branch when patches are applied. This way, you can switch between
> Guilt 0.35 and the current version of Guilt with no issues.
>
> At a future time, maybe a
On Wed, May 14, 2014 at 11:27:19AM +0200, Per Cederqvist wrote:
> On Tue, May 13, 2014 at 11:41 PM, Jeff Sipek wrote:
> > On Tue, May 13, 2014 at 10:31:01PM +0200, Per Cederqvist wrote:
> >> This makes it easier to script operations on the entire queue, for
> >> example
On Wed, May 14, 2014 at 10:56:18AM +0200, Per Cederqvist wrote:
> On Wed, May 14, 2014 at 12:09 AM, Jeff Sipek wrote:
> > On Tue, May 13, 2014 at 10:30:52PM +0200, Per Cederqvist wrote:
> >> The 'echo %s' construct sometimes processes escape sequences. (This
&g
Signed-off-by: Josef 'Jeff' Sipek
On Tue, May 13, 2014 at 10:31:02PM +0200, Per Cederqvist wrote:
> This is analogous to how "guilt push" now fails when there are no more
> patches to push. Like push, the "--all" argument still succeeds even
> if there wa
On Tue, May 13, 2014 at 10:30:52PM +0200, Per Cederqvist wrote:
> The 'echo %s' construct sometimes processes escape sequences. (This
%s? Should this be $s?
Otherwise, looks good.
> happens, for instance, under Ubuntu 14.04 when /bin/sh is actually
> dash.) We don't want that to happen when w
Signed-off-by: Josef 'Jeff' Sipek
On Tue, May 13, 2014 at 10:30:46PM +0200, Per Cederqvist wrote:
> There were two problems with the old code:
>
> - Since "set -e" is in effect (that is set in scaffold) the run-test
>script exited immediately if a t-
Signed-off-by: Josef 'Jeff' Sipek
On Tue, May 13, 2014 at 10:30:53PM +0200, Per Cederqvist wrote:
> Give an error message if no patches are applied. Added a test case
> that never terminates unless this fix is applied.
>
> Signed-off-by: Per Cederqvist
> ---
>
/guilt-graph
> @@ -57,6 +57,8 @@ while [ "$current" != "$base" ]; do
> }"`
> [ -z "$pname" ] && pname="?"
>
> + pname="`printf \"%s\" \"$pname\" | sed 's/\"/\"/g'`"
Signed-off-by
he user.
>
> Created the new function "disp_e" that should be used when backslash
> processing is required, and changed "disp" and "_disp" to use printf
> code %s instead of "%b".
Minor nit: "%s" (to match "%b")
Signed-off-by: J
ing when there is nothing to push
> +#
> +
> +shouldfail guilt push
> +cmd guilt push -a
> +
> +cmd list_files
> +
> +cmd git log -p
I don't particularly care for the git-log. Otherwise it looks good.
Signed-off-by: Josef 'Jeff' Sipek
> +
> +#
Signed-off-by: Josef 'Jeff' Sipek
On Tue, May 13, 2014 at 10:30:55PM +0200, Per Cederqvist wrote:
> git branch names can contain commas. Check that "guilt graph" works
> even in that case.
>
> Signed-off-by: Per Cederqvist
&g
Sorry, I accidentally replied to the v1 of this patch...
On Tue, May 13, 2014 at 05:33:21PM -0400, Jeff Sipek wrote:
> On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote:
> > git branch names can contain commas. Check that "guilt graph" works
> > even in t
On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote:
> git branch names can contain commas. Check that "guilt graph" works
> even in that case.
>
> Signed-off-by: Per Cederqvist
> ---
> regression/t-033.out | 62
>
> regression/t-
; "nonempty$1"
> + fixup_time_info "nonempty$1"
> +}
> +
> +for using_diffstat in true false; do
> + cmd git config guilt.diffstat $using_diffstat
> + for patcha in empty nonempty; do
> + for patchb in em
(using
patch names a & b):
$ guilt pop
Now at a.
$ guilt fold b
error: No changes
$ guilt pop
All patches popped.
$ guilt pu
Applying patch..a
error: No changes
To force apply this patch, use 'guilt push -f'
The diff itself is good.
Signed-off-by: Josef 'Jeff' Sipek
>
Signed-off-by: Josef 'Jeff' Sipek
On Tue, May 13, 2014 at 10:30:40PM +0200, Per Cederqvist wrote:
> Signed-off-by: Per Cederqvist
> ---
> guilt-import-commit | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/guilt-import-commit b
e guidlines.
> +
> + - If you change the code to conform to the style guide, please do so
> + in a separate commit that does not change anything else.
> +
> +Please check that you change does not break "make test". Please add
> +new testcases for any new functionality, and
On Tue, May 13, 2014 at 04:45:47PM -0400, Theodore Ts'o wrote:
> On Tue, May 13, 2014 at 10:30:36PM +0200, Per Cederqvist wrote:
...
> > - Changed behavior: by default, guilt no longer changes branch when
> >you push a patch. You need to do "git config guilt.reusebranch
> >false" to re-en
On Thu, May 08, 2014 at 09:41:22PM +0200, Per Cederqvist wrote:
> On Wed, May 7, 2014 at 11:06 PM, Jeff Sipek wrote:
> > On Wed, May 07, 2014 at 10:59:56PM +0200, Per Cederqvist wrote:
> >> On Tue, May 6, 2014 at 9:40 PM, Jeff Sipek wrote:
> >> > On Fri, Mar 21,
On Fri, Mar 21, 2014 at 08:32:03AM +0100, Per Cederqvist wrote:
> This makes it easier to script operations on the entire queue, for
> example run the test suite on each patch in the queue:
>
> guilt pop -a;while guilt push; do make test||break; done
>
> This brings "guilt push" in line with
On Fri, Mar 21, 2014 at 08:32:02AM +0100, Per Cederqvist wrote:
> Only one invocation of "disp" or "_disp" actually needed backslash
> processing. In quite a few instances, it was wrong to do backslash
> processing, as the message contained data derived from the user.
>
> Created the new function
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:32:05AM +0100, Per Cederqvist wrote:
> Fix remove_topic() in t-061.sh so that it doesn't print a git hash.
>
> Signed-off-by: Per Cederqvist
> ---
> regression/t-061.out | 1 -
> regression/t-061
On Wed, May 07, 2014 at 10:59:56PM +0200, Per Cederqvist wrote:
> On Tue, May 6, 2014 at 9:40 PM, Jeff Sipek wrote:
> > On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote:
> >> Test that we can combine any combination of patches with empty and
> >> non-em
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:32:01AM +0100, Per Cederqvist wrote:
> Signed-off-by: Per Cederqvist
> ---
> guilt-rebase | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/guilt-rebase b/guilt-rebase
> index
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:32:00AM +0100, Per Cederqvist wrote:
> Signed-off-by: Per Cederqvist
> ---
> guilt-patchbomb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/guilt-patchbomb b/guilt-patchbomb
>
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:31:59AM +0100, Per Cederqvist wrote:
> Use --no-decorate in the call to git log that tries to read the commit
> message to produce patch names. Otherwise, if the user has set
> log.decorate to short or full, the
On Fri, Mar 21, 2014 at 03:57:37AM -0400, Eric Sunshine wrote:
> On Fri, Mar 21, 2014 at 3:31 AM, Per Cederqvist wrote:
> > Quote quotes with a backslash in the "guitl graph" output. Otherwise,
>
> s/guitl/guilt/
Yep.
> > the "dot" file could contain syntax errors.
> >
> > Added a test case.
>
On Fri, Mar 21, 2014 at 08:31:57AM +0100, Per Cederqvist wrote:
> git branch names can contain commas. Check that "guilt graph" works
> even in that case.
>
> Signed-off-by: Per Cederqvist
> ---
> regression/t-033.out | 62
>
> regression/t-
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:31:56AM +0100, Per Cederqvist wrote:
> This fix relies on the fact that git branch names can not contain ":".
>
> Signed-off-by: Per Cederqvist
> ---
> guilt-graph | 2 +-
> 1 file changed, 1
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:31:55AM +0100, Per Cederqvist wrote:
> Give an error message if no patches are applied. Added a test case
> that never terminates unless this fix is applied.
>
> Signed-off-by: Per Cederqvist
> ---
>
Signed-off-by: Josef 'Jeff' Sipek
On Fri, Mar 21, 2014 at 08:31:49AM +0100, Per Cederqvist wrote:
> The shouldfail function already redirects stderr to stdout, so there
> is no need to do the same in t-028.sh and t-021.sh.
>
> Signed-off-by: Per Cederqvist
> ---
&
On Fri, Mar 21, 2014 at 08:31:48AM +0100, Per Cederqvist wrote:
> There were two problems with the old code:
>
> - Since "set -e" is in effect (that is set in scaffold) the run-test
>script exited immediately if a t-*.sh script failed. This is not
>nice, as we want the error report that
On Fri, Mar 21, 2014 at 08:31:45AM +0100, Per Cederqvist wrote:
> Test that we can combine any combination of patches with empty and
> non-empty messages, both with and without guilt.diffstat. (All
> patches are empty.)
I feel like we should have *some* content there - most of the time, I care
mo
On Sun, Mar 23, 2014 at 10:03:48PM +0100, Per Cederqvist wrote:
> On Sun, Mar 23, 2014 at 6:09 PM, Jeff Sipek wrote:
>
> > On Fri, Mar 21, 2014 at 08:31:44AM +0100, Per Cederqvist wrote:
> >> When extracting the patch, we only want the actual patches. We don't
>
On Sun, Mar 23, 2014 at 10:13:53PM +0100, Per Cederqvist wrote:
> On Sun, Mar 23, 2014 at 9:07 PM, Jeff Sipek wrote:
> > On Sun, Mar 23, 2014 at 08:57:08PM +0100, Per Cederqvist wrote:
> >> On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek wrote:
> >>
> >> > O
On Sun, Mar 23, 2014 at 08:57:08PM +0100, Per Cederqvist wrote:
> On Sun, Mar 23, 2014 at 6:04 PM, Jeff Sipek wrote:
>
> > On Fri, Mar 21, 2014 at 08:31:42AM +0100, Per Cederqvist wrote:
> >
> >> Signed-off-by: Per Cederqvist
> >> ---
> >> guilt-imp
On Fri, Mar 21, 2014 at 08:31:44AM +0100, Per Cederqvist wrote:
> When extracting the patch, we only want the actual patches. We don't
> want the "---" delimiter. Simplify the extraction by simply deleting
> everything before the first "diff " line. (Use sed instead of awk to
> simplify the code
On Fri, Mar 21, 2014 at 08:31:42AM +0100, Per Cederqvist wrote:
> Signed-off-by: Per Cederqvist
> ---
> guilt-import-commit | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/guilt-import-commit b/guilt-import-commit
> index 20dcee2..9488ded 100755
> --- a/guilt-impor
On Fri, Mar 21, 2014 at 08:31:38AM +0100, Per Cederqvist wrote:
> I recently found myself sitting on a train with a computer in front of
> me. I tried to use "guilt import-commit", which seemed to work, but
> when I tried to "guilt push" the commits I had just imported I got
> some errors. It tur
On Tue, Aug 20, 2013 at 03:44:16PM +0800, Zheng Liu wrote:
> Hi Josef,
>
> On Fri, Aug 09, 2013 at 11:20:46AM -0400, Josef 'Jeff' Sipek wrote:
> > On Fri, Aug 09, 2013 at 11:04:45PM +0800, gnehzuil.liu wrote:
> > > ?? 2013-8-9??10:46??Josef 'Jeff'
On Fri, Aug 09, 2013 at 11:04:45PM +0800, gnehzuil.liu wrote:
> �� 2013-8-9��10:46��Josef 'Jeff' Sipek д
>
> > On Fri, Aug 09, 2013 at 08:32:28PM +0800, Zheng Liu wrote:
> >> From: Zheng Liu
> >>
> >> Currently guilt doesn't support
On Fri, Aug 09, 2013 at 08:32:28PM +0800, Zheng Liu wrote:
> From: Zheng Liu
>
> Currently guilt doesn't support FreeBSD platform. This commit tries to
> add this support. The file called 'os.FreeBSD' is copied from os.Darwin
> due to these two platforms have almost the same command tools.
Out
On Wed, May 22, 2013 at 10:45:31AM -0400, Theodore Ts'o wrote:
> I just had another idea (although I haven't had a chance to code up
> anything yet). Perhaps instead of, or in addition to, a global
> setting (i.e., guilt.reusebranch), perhaps we should have a per-branch
> setting, such as branch..
On Wed, May 22, 2013 at 03:01:36PM +0200, Per Cederqvist wrote:
> When the option is true (the default), Guilt does not create a new Git
> branch when patches are applied. This way, you can switch between
> Guilt 0.35 and the current version of Guilt with no issues.
>
> At a future time, maybe a
On Wed, May 22, 2013 at 08:10:10AM -0400, Theodore Ts'o wrote:
> On Tue, May 21, 2013 at 11:39:21PM -0400, Josef 'Jeff' Sipek wrote:
> > I applied this one and the "guilt: skip empty line after..." patch.
>
> Thanks! BTW, it looks like you are not using &q
I applied this one and the "guilt: skip empty line after..." patch.
Jeff.
On Tue, May 21, 2013 at 11:13:31PM -0400, Theodore Ts'o wrote:
> If the date field has a space in it, such as:
>
>Date: Tue, 14 May 2013 18:37:15 +0200
>
> previously guilt would go belly up:
>
>+ export GIT_AUTH
On Tue, May 21, 2013 at 10:55:57PM -0400, Theodore Ts'o wrote:
> To make it harder to accidentally do "git push" with a guilt patch
> applied, "guilt push" changes branch from e.g. "master" to
> "guilt/master" starting with commit 67d3af63f422. This is a feature
> which I use for ext4 development;
On Tue, Jan 15, 2013 at 06:26:06PM -0800, Jonathan Nieder wrote:
> Hi Jeff and other guilty parties,
>
> I collected all the guilt patches I could find on-list and added one
> of my own. Completely untested, except for running the regression
> tests. These are also available via git protocol fro
On Sun, Jan 20, 2013 at 10:19:39PM +0100, Per Cederqvist wrote:
> On 01/16/13 03:26, Jonathan Nieder wrote:
> >Hi Jeff and other guilty parties,
> >
> >I collected all the guilt patches I could find on-list and added one
> >of my own. Completely untested, except for running the regression
> >tests
On Tue, Jan 15, 2013 at 10:26:06PM -0500, Theodore Ts'o wrote:
> On Tue, Jan 15, 2013 at 06:26:06PM -0800, Jonathan Nieder wrote:
> > Hi Jeff and other guilty parties,
> >
> > I collected all the guilt patches I could find on-list and added one
> > of my own. Completely untested, except for runni
78 matches
Mail list logo
