Re: cogito-0.10 broken for cg-commit < logmessagefile

6 messages, 3 authors, 2016-06-15 · open the first message on its own page

Re: cogito-0.10 broken for cg-commit < logmessagefile

From: Catalin Marinas <catalin.marinas@arm.com>
Date: 2016-06-15 22:41:59

Russell King [off-list ref] wrote:
The command in the subject prepends the log message with a blank line.
This ain't good because it messes up commit messages as per Linus'
requirements (the first line must be a summary.)
The patch below should fix the problem. There is no point in writing
the status information in a file which is read from stdin.

-- 
Catalin

Re: cogito-0.10 broken for cg-commit < logmessagefile

From: Petr Baudis <hidden>
Date: 2016-06-15 22:41:59

Dear diary, on Wed, Jun 08, 2005 at 06:28:22PM CEST, I got a letter
where Catalin Marinas [off-list ref] told me that...
Russell King [off-list ref] wrote:
quoted
The command in the subject prepends the log message with a blank line.
This ain't good because it messes up commit messages as per Linus'
requirements (the first line must be a summary.)
The patch below should fix the problem. There is no point in writing
the status information in a file which is read from stdin.
Oh, yes. Thanks, applied.

FYI, I plan to release 0.11.2 this evening. I'll try to go through some
more queued patches before and update cg-log to fully use git-rev-list.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: [PATCH] Many new features for cg-diff and cg-log

From: Petr Baudis <hidden>
Date: 2016-06-15 22:41:59

Dear diary, on Wed, Jun 08, 2005 at 10:28:05PM CEST, I got a letter
where Dan Holmsand [off-list ref] told me that...
Petr Baudis wrote:
quoted
FYI, I plan to release 0.11.2 this evening. I'll try to go through some
more queued patches before and update cg-log to fully use git-rev-list.
In that case, you might want to have a look at this patch. I've been 
tinkering with cg-log and cg-diff for some time, and just about got 
ready to send you a patch.

Sorry about the monster patch, but I wanted to get it to you quickly...
Well, it can always go to 0.11.3 or something.  I probably wouldn't take
it to the tree just before release anyway even if you sent it split up,
since due to the size of the changes, it's bound to have some hidden
bugs. ;-)
[PATCH] Many new features for cg-diff and cg-log
Ok, this is really too big. Could you please split it up some? Also,
I've been hacking on cg-log too (and will make it use git-diff-tree -v
yet this evening), so you'll need to update it to apply to the latest
version.

I like what's inside (at least from the description), though! (Well,
mostly. But I'll comment on specific patches. No major objections.)
- Selection of ranges by date or maximum number of commits to show.
Ad date, isn't that already supported now? The -r arguments can be a
date. Ad maximum number of commits, what'd be its use?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

[PATCH] Many new features for cg-diff and cg-log

From: Dan Holmsand <hidden>
Date: 2016-06-15 22:41:59

Petr Baudis wrote:
FYI, I plan to release 0.11.2 this evening. I'll try to go through some
more queued patches before and update cg-log to fully use git-rev-list.
In that case, you might want to have a look at this patch. I've been 
tinkering with cg-log and cg-diff for some time, and just about got 
ready to send you a patch.

Sorry about the monster patch, but I wanted to get it to you quickly...

...

[PATCH] Many new features for cg-diff and cg-log

Both cg-diff and cg-log get:

- A common infrastructure for option parsing, that allows for 
combinations of options like all getopt-using programs. So you can say:

cg-log -cfm
cg-diff foo --color
cg-log -sfrlinus foobar

At the same time, you get decent error reporting on illegal options.

- A common infrastructure for colorization. cg-log and cg-diff share 
setup, and sed scripts for colorization.

- diffstat (or rather, git-apply --stat) support.

- Support for the new -M, -C and -B switches to the git-diff-* brothers.

- Automatic search in less, so you can jump to the next commit/diff 
chunk by "n".

- Automatic color if the COGITO_AUTO_COLOR environment variable is set.

- "Smart pager" support - less isn't invoked unless there's actually 
some output. This is useful is COGITO_AUTO_COLOR is set.

cg-log also gets:

- Vast speedup. It uses git-rev-list and git-diff-tree to do most of the 
heavy lifting.

- A new default "-f" format, that allows deletions, renames etc. to be 
shown (the old format is still available as -F). Deletions and new files 
are color-coded.

- Diff output. cg-log -p shows diff output between commits. Colorized as 
in cg-diff.

- New, more compact summary, that's readable on 80-column terminals. By
default, sha1's are hidden, and the date is more compact (and readable). 
It can also be combined with the other options: for example "cg-log -sf" 
gives a nice overview of commits and the files they touch.

- Slightly new behaviour, thanks to use of git-diff-tree: when you use 
any of the options that shows differences between revisions, or that 
gives a subset of revisions, merge commits are hidden by default. They 
are visible if the "-a/--all" option is given.

- The default log format is also shorter. The full version is available 
with "-v". An even shorter format is available with "-q".

- Selection of ranges by date or maximum number of commits to show.

Re: [PATCH] Many new features for cg-diff and cg-log

From: Petr Baudis <hidden>
Date: 2016-06-15 22:41:59

Dear diary, on Wed, Jun 08, 2005 at 10:40:13PM CEST, I got a letter
where Petr Baudis [off-list ref] told me that...
will make [cg-log] use git-diff-tree -v yet this evening
Ok, it turns out I won't. Feel free to hack on that. :-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..

Re: [PATCH] Many new features for cg-diff and cg-log

From: Dan Holmsand <hidden>
Date: 2016-06-15 22:41:59

Petr Baudis wrote:
Dear diary, on Wed, Jun 08, 2005 at 10:28:05PM CEST, I got a letter
where Dan Holmsand [off-list ref] told me that...
quoted
Sorry about the monster patch, but I wanted to get it to you quickly...

Well, it can always go to 0.11.3 or something.  I probably wouldn't take
it to the tree just before release anyway even if you sent it split up,
since due to the size of the changes, it's bound to have some hidden
bugs. ;-)
Nah... Seriously, that's a wise decision. I just saw that you we're 
working on cg-log, and wanted to save you some potential doublework by 
sending what I've got in a hurry.

I have, however, been using this myself for quite some time, so it's 
reasonably well tested.
quoted
[PATCH] Many new features for cg-diff and cg-log

Ok, this is really too big. Could you please split it up some? Also,
I've been hacking on cg-log too (and will make it use git-diff-tree -v
yet this evening), so you'll need to update it to apply to the latest
version.
Sure. I'll try to split it up, somewhat (but the changes *are* pretty 
inter-related...).
I like what's inside (at least from the description), though! (Well,
mostly. But I'll comment on specific patches. No major objections.)

quoted
- Selection of ranges by date or maximum number of commits to show.

Ad date, isn't that already supported now? The -r arguments can be a
date. Ad maximum number of commits, what'd be its use?
The new date thing doesn't work very well for cg-log: it's hardcoded to 
HEAD. That means that attempts to do, say, "cg-log -rorigin:-1day" will 
not at all do what you want. Not to mention "cg-log -m -r-1day". And I 
think it's a little clearer to separate the two: "cg-log -rorigin 
--max-age=-1day" (there's a short option too).

Max number of commits is perhaps not all that useful, unless you want to 
save cg-log output to file, for example. But it's easy to do :-)

Oh, and I forgot to mention the "pickaxe" support. "cg-log -S foobar" 
uses git-diff-tree -S to "search in diffs". Really very, very useful.

/dan
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help