Re: [PATCH v3] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-23 Thread Paul Mackerras
On Wed, Sep 19, 2012 at 08:17:27PM +0200, Stefan Haller wrote: Here's one way how to address your concern. When pressing the search button it will highlight the file that contains the current search hit; if you then scroll from there though, the normal mechanism kicks in again and might

Re: [PATCH 0/2] gitk: Better highlighting of search results

2012-09-23 Thread Paul Mackerras
On Sat, Sep 22, 2012 at 09:40:23AM +0200, Stefan Haller wrote: Here's something that has been bugging me for a long time: when using the incremental search feature, it's hard to tell what happens when clicking the Search button (or type Ctrl-S) repeatedly. It does have the concept of a current

Re: [PATCH] gitk: Work around empty back and forward images when buttons are disabled

2012-09-23 Thread Paul Mackerras
On Sat, Sep 22, 2012 at 09:46:48AM +0200, Stefan Haller wrote: On Mac, the back and forward buttons show an empty rectange instead of a grayed-out arrow when they are disabled. The reason is a Tk bug on Mac that causes disabled images not to draw correctly (not to draw at all, that is); see

[PATCH] commit: configure submodules

2012-09-23 Thread Orgad Shaneh
As reported on the mailing list[1], ignore submodule config is not respected on commit. [1] http://git.661346.n2.nabble.com/submodule-ignore-is-not-respected-on-commit-td7539238.html Signed-off-by: Orgad Shaneh org...@gmail.com --- builtin/commit.c |1 + 1 file changed, 1 insertion(+)

Re: [PATCH 3/2] pretty: support right alignment

2012-09-23 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: ... On the other hand, I don't really wish to turn pretty format machinery into a full feature text layout engine (by ripping of links/lynx?). That is very true. We should restrain ourselves and avoid going overboard piling shiny new toys on a

Re: [PATCH] commit: configure submodules

2012-09-23 Thread Junio C Hamano
Orgad Shaneh org...@gmail.com writes: As reported on the mailing list[1], ignore submodule config is not respected on commit. [1] http://git.661346.n2.nabble.com/submodule-ignore-is-not-respected-on-commit-td7539238.html Signed-off-by: Orgad Shaneh org...@gmail.com --- Thanks. Please

[PATCH v2 0/9] Advanced --oneline layout

2012-09-23 Thread Nguyễn Thái Ngọc Duy
The series is now feature complete from my usage pov. The syntax may change though. No tests yet until we agree on the syntax and semantics. Summary: - %C(auto) turns on coloring for the next placeholder - %C(auto,N) the same on the next N placeholders - %(W) makes sure the next placeholder

[PATCH 1/9] pretty: share code between format_decoration and show_decorations

2012-09-23 Thread Nguyễn Thái Ngọc Duy
This also adds color support to format_decoration() Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- log-tree.c | 60 +--- log-tree.h | 3 ++ pretty.c | 19 +

[PATCH 2/9] pretty: split parsing %C into a separate function

2012-09-23 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- pretty.c | 60 +++- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/pretty.c b/pretty.c index e910679..93c96c2 100644 --- a/pretty.c +++ b/pretty.c @@ -863,6 +863,40

[PATCH 3/9] pretty: support %C(auto[,N]) to turn on coloring on next placeholder(s)

2012-09-23 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/pretty-formats.txt | 1 + pretty.c | 28 +++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Documentation/pretty-formats.txt

[PATCH 4/9] utf8.c: move display_mode_esc_sequence_len() for use by other functions

2012-09-23 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- utf8.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/utf8.c b/utf8.c index a544f15..18a4d9c 100644 --- a/utf8.c +++ b/utf8.c @@ -9,6 +9,20 @@ struct interval { int last; };

[PATCH 5/9] utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences

2012-09-23 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- utf8.c | 20 ++-- utf8.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/utf8.c b/utf8.c index 18a4d9c..791499e 100644 --- a/utf8.c +++ b/utf8.c @@ -266,18 +266,26 @@ int utf8_width(const char

[PATCH 6/9] pretty: two phase conversion for non utf-8 commits

2012-09-23 Thread Nguyễn Thái Ngọc Duy
Always assume format_commit_item() takes an utf-8 string for simplicity. If commit message is in non-utf8, or output encoding is not, then the commit is first converted to utf-8, processed, then output converted to output encoding. This of course only works with encodings that are compatible with

[PATCH 7/9] pretty: support padding placeholders, % % and %

2012-09-23 Thread Nguyễn Thái Ngọc Duy
Either %, % or % standing before a placeholder specifies how many columns (at least as the placeholder can exceed it) it takes. Each differs on how spaces are padded: % pads on the right (aka left alignment) % pads on the left (aka right alignment) % pads both ways equally (aka centered)

[PATCH 8/9] pretty: support truncating in %, % and %

2012-09-23 Thread Nguyễn Thái Ngọc Duy
%(N,trunc) truncates the righ part after N columns and replace the last two letters with ... ltrunc does the same on the left. mtrunc cuts the middle out. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- Documentation/pretty-formats.txt | 2 +- pretty.c | 51

[PATCH 9/9] pretty: support % that steal trailing spaces

2012-09-23 Thread Nguyễn Thái Ngọc Duy
This is pretty useful in `%(100)%s%Cred%(20)% an' where %s does not use up all 100 columns and %an needs more than 20 columns. By replacing %(20) with %(20), %an can steal spaces from %s. % understands escape sequences, so %Cred does not stop it from stealing spaces in %(100). Signed-off-by:

Re: [RFC] Questions for Git User's Survey 2011

2012-09-23 Thread Jakub Narębski
On Sun, Sep 23, 2012 at 10:09 AM, Junio C Hamano gits...@pobox.com wrote: Jakub Narębski jna...@gmail.com writes: I have created short (well, at least shorter than previous ones) Git User's Survey 2012 on Survs.com. The test channel is https://www.survs.com/survey/J87I3PDBU4 Note that

Re: How to create the [PATCH 0/5] first email?

2012-09-23 Thread Jan Engelhardt
On Saturday 2012-09-15 19:08, Junio C Hamano wrote: If you plan to use git send-email to send the final results out, you should consider git send-email as your MUA in the quoted paragraph. And that will be very platform independent viewpoint to see things from. git format-patch -o my-series/

Re: [PATCH] graph: avoid infinite loop in graph_show_commit()

2012-09-23 Thread Nguyen Thai Ngoc Duy
On Sun, Sep 23, 2012 at 6:55 PM, Michal Kiedrowicz michal.kiedrow...@gmail.com wrote: Nguyễn Thái Ngọc Duy pclouds at gmail.com writes: The loop can be triggered with git diff-tree --graph commit where the commit is a non-merge. It goes like this Isn't this the same issue as in

Re: [PATCH 6/9] pretty: two phase conversion for non utf-8 commits

2012-09-23 Thread Robin Rosenberg
A few nitpicks - Ursprungligt meddelande - Always assume format_commit_item() takes an utf-8 string for simplicity. If commit message is in non-utf8, or output encoding is not, then the commit is first converted to utf-8, processed, then output converted to output encoding. This

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Ralf Thielow
On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz sascha...@babbelbox.org wrote: As I know how hard translations can be, esp. with that much technical terms inside, I'm usually expecting _not_ to yield the same result when translating a software's translation back to English. Yeah, I think the

Re: Quickly searching for a note

2012-09-23 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 22.09.2012 22:23: Michael J Gruber g...@drmicha.warpmail.net writes: On my mental scratch pad (yeah, that's where the bald spots are) I have the following more general idea to enhance the revision parser: --limit-run=script:: --run=script::: These

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread knittl
Sharing my thoughts on this one, … On Sun, Sep 23, 2012 at 5:04 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz sascha...@babbelbox.org wrote: However, git-rebase just threw these two sentences at me (And though i know their meaning, i couldn't get

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Sascha Cunz
Am Sonntag, 23. September 2012, 17:04:15 schrieb Ralf Thielow: On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz sascha...@babbelbox.org wrote: As I know how hard translations can be, esp. with that much technical terms inside, I'm usually expecting _not_ to yield the same result when

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Sascha Cunz
Am Sonntag, 23. September 2012, 17:36:08 schrieb knittl: Sharing my thoughts on this one, … [...] What about wichtig? I think that transfers the meaning pretty well. Es wird angehalten, um den Verlust wichtiger Infos zu vermeiden maybe? I hope the above spends some inspiration :) Thanks,

Re: git clone over http with basic auth bug?

2012-09-23 Thread Shawn Pearce
On Sat, Sep 22, 2012 at 1:43 PM, Paul J R m...@pjr.cc wrote: It hadnt occured to me that git-http-backend behaves differently to the dumb http protocol on read (though that was from reading the git source so i obviously missed what was going on there). Ultimately im writing a little webapp

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Ralf Thielow
On Sun, Sep 23, 2012 at 5:41 PM, Sascha Cunz sascha...@babbelbox.org wrote: Exactly. The meaning is more important then the exact wording. Please consider this: Es wurden Neuaufbau- / Zusammenführungs-Informationen gefunden. We can't change the ... Verzeichnis *rebase-merge* ... part

Re: submodule: if $command was not matched, don't parse other args

2012-09-23 Thread Jens Lehmann
Am 22.09.2012 22:31, schrieb Junio C Hamano: Ramkumar Ramachandra artag...@gmail.com writes: diff --git a/git-submodule.sh b/git-submodule.sh index a7e933e..dfec45d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -1108,7 +1108,15 @@ do done # No command word defaults to status

Re: Message from 'git-rebase'; German translation

2012-09-23 Thread Sascha Cunz
Am Sonntag, 23. September 2012, 19:34:23 schrieb Ralf Thielow: On Sun, Sep 23, 2012 at 5:41 PM, Sascha Cunz sascha...@babbelbox.org wrote: Exactly. The meaning is more important then the exact wording. Please consider this: Es wurden Neuaufbau- / Zusammenführungs-Informationen

Re: [PATCH] commit: configure submodules

2012-09-23 Thread Jens Lehmann
Am 23.09.2012 10:37, schrieb Junio C Hamano: I see Jens added with 302ad7a (Submodules: Use ignore settings from .gitmodules too for diff and status, 2010-08-06) the call to gitmodules_config() to git status and git diff family, but I suspect that was a huge mistake. Once a submodule is

Re: [PATCH 6/9] pretty: two phase conversion for non utf-8 commits

2012-09-23 Thread Nguyen Thai Ngoc Duy
On Sun, Sep 23, 2012 at 8:54 PM, Robin Rosenberg robin.rosenb...@dewire.com wrote: This of course only works with encodings that are compatible with Unicode. Such as? Unicode was defined to encompass all knows encodings. Just a precaution because I have never read Unicode standard (and it

[PATCH] silence git gc --auto --quiet output

2012-09-23 Thread Tobias Ulmer
When --quiet is requested, gc --auto should not display messages unless there is an error. Signed-off-by: Tobias Ulmer tobi...@tmux.org --- builtin/gc.c |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/builtin/gc.c b/builtin/gc.c index 6d46608..6be6c8d 100644 ---

Re: [PATCH v3] gitk: Synchronize highlighting in file view when scrolling diff

2012-09-23 Thread Stefan Haller
Paul Mackerras pau...@samba.org wrote: On Wed, Sep 19, 2012 at 08:17:27PM +0200, Stefan Haller wrote: Here's one way how to address your concern. When pressing the search button it will highlight the file that contains the current search hit; if you then scroll from there though, the

Re: [PATCH] commit: configure submodules

2012-09-23 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Jens, what do you think? I see no reason for anybody other than submodule init to call gitmodules_config() that reads from the in-tree .gitmodules file. I think the copying on init is not what we should do here because it sets the user's