Jeff King <peff@xxxxxxxx> wrote: > On Sat, Oct 11, 2008 at 11:41:18PM -0700, Junio C Hamano wrote: > > > And just make it mimic whatever folks accustomed to "svn st" would expect, > > modulo we would need two status letters to signal difference between > > (HEAD, index), and (index, worktree). Perhaps three if you want to show > > difference between (HEAD, worktree) while at it. > > I remember a long time ago you started on a parallel diff walker that > could diff the working tree, the index, and a tree at once. Do you > remember the issues with it? > > I think that would be the right tool here to show each file only once, > but with multiple status flags. Something like: > > A M foo I have a tool that I'll be open-sourcing later this year, but it does something like that: project foo/ branch master Am foo M- bar R- orig => dest ( 95%) Line coloring is red on lines with unstaged stuff in the working directory (3rd column, lower case letters) and green on lines that are fully staged (3rd column is a '-'). The tool is in Python, but I'm just scraping the output of `diff-index -M --cached HEAD` and diff-files to get that display. The status letters are exactly those given out by diff-index/diff-files, but the diff-files output is lowercased. Scott Chacon has seen the tool output and likes it; there's a tech talk that will be posted on YouTube soon where he and I are sort of talking about it. Sorry I can't say too much more about it yet. But I'm trying to say that both Scott and I like a denser display like this. -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html