kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Ryan Anderson	7c49cb2881	annotate: Fix bug when parsing merges with differing real and logical parents. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Jeff King	d4ad9b0484	git-annotate: remove extraneous debugging line Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	3f492ba1fc	annotate: Correct most merge following to annotate correctly. There is still a bug involving octopus merges, somewhere, but this gets normal merges correct, so it's still an improvement over the existing version. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Matthias Kestenholz	fe77bb1a02	annotate: display usage information if no filename was given Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>	19 years ago
Matthias Kestenholz	d0ad165366	annotate: fix warning about uninitialized scalar Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>	19 years ago
sean	be767c9172	annotate.perl triggers rpm bug RPM, at least on Fedora boxes, automatically creates a dependency for any perl "use" lines, and one of the help text lines unfortunately begins like this: -S, --rev-file revs-file use revs from revs-file instead of calling git-rev-list RPM gets confused and creates a false dependecy for the nonexistent perl package "revs". Obviously this creates a problem when someone goes to install the git-core rpm. Since other help sentences all start with capital letter, make this one match them by upcasing "Use". As a side effect, RPM stops getting confused. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	5fcab3d7db	annotate: Support annotation of files on other revisions. This is a bug fix, and cleans up one or two other things spotted during the course of tracking down the main bug here. [jc: the part that updates test-suite is split out to the next one. Also I dropped "use Data::Dumper;" which seemed leftover from debugging session.] Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	cfea8e077b	blame and annotate: show localtime with timezone. Earlier they showed gmtime and timezone, which was inconsistent with the way our commits and tags are pretty-printed. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Luck, Tony	c6d4217ebc	annotate should number lines starting with 1 C programmers are well used to counting from zero, but every other text file tool starts counting from 1. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	d920e18f53	annotate: resurrect raw timestamps. For scripted use this is quite useful. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Martin Langhoff	009315499e	annotate: fix -S parameter to take a string In the conversion to Getopt::Long, the -S / --rev-list parameter stopped working. We need to tell Getopt::Long that it is a string. As a bonus, the open() now does some useful error handling. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	e5971d7d13	annotate: handle \No newline at end of file. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	f60d46911d	annotate: Use qx{} for pipes on activestate. Note: This needs someone to tell me what the value of $^O is on ActiveState. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	6b3e21d603	annotate: Convert all -\| calls to use a helper open_pipe(). When we settle on a solution for ActiveState's forking issues, all compatibility checks can be handled inside this one function. Also, fixed an abuse of global variables in the process of cleaning this up. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	87475f4dfc	annotate: Handle dirty state and arbitrary revisions. Also, use Getopt::Long and only process each rev once. (Thanks to Morten Welinder for spotting the performance problems.) Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Johannes Schindelin	4788d11a0d	Use Ryan's git-annotate instead of jsannotate Since Ryan's git-annotate is much faster, and has support for renames, it is likely it goes into the mainstream git soon. Adapt it a little to work with gitcvs, and actually use it. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ryan Anderson	c65e898754	Add git-annotate, a tool for assigning blame. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago

17 Commits (71c87795c3f724a88c2f1f95aa21f212efc69b66)