Re: GSOC remote-svn: branch detection

2012-08-03 Thread Dmitry Ivankov
Hi, On Sat, Aug 4, 2012 at 12:17 AM, Jonathan Nieder wrote: > Hi, > > Florian Achleitner wrote: > >> Two approaches: >> 1. Import linearly and split later: >> One idea is to import from svn linearly, i.e. one revision on top of it's >> predecessor, like now, and detect and split branches afterwar

Re: [PATCHv2 5/5] t3910: use the UTF8_NFD_TO_NFC test prereq

2012-08-03 Thread Torsten Bögershausen
Am 2012-07-30 11:57, schrieb Michael J Gruber: (Sorry being late) That line: skip_all="filesystem does not convert utf-8 nfd to nfc" shouldn't it be the other way around? skip_all="filesystem does not convert utf-8 nfc to nfd" (and may be the following may be more easy to read:) skip_all="fil

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Junio C Hamano
Tentatively I'll queue this one on top, but I am tempted to squash this in before merging the topic down. -- >8 -- Subject: [PATCH] fixup! tests: Introduce test_seq Complex chains of && and || are harder to read when used as replacement for if/else statements, but it is easy to rewrite it with a

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 03:48:19PM -0700, Junio C Hamano wrote: > Michał Kiedrowicz writes: > > > Jeff King wrote: > > > > The seq command is GNU-ism, and is missing at least in older BSD > > releases and their derivatives, not to mention antique > > commercial Unixes. > > > > We

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Junio C Hamano
Michał Kiedrowicz writes: > Jeff King wrote: > > The seq command is GNU-ism, and is missing at least in older BSD > releases and their derivatives, not to mention antique > commercial Unixes. > > We already purged it in b3431bc (Don't use seq in tests, not > everyone

[PATCH] tests: Introduce test_seq

2012-08-03 Thread Michał Kiedrowicz
Jeff King wrote: The seq command is GNU-ism, and is missing at least in older BSD releases and their derivatives, not to mention antique commercial Unixes. We already purged it in b3431bc (Don't use seq in tests, not everyone has it, 2007-05-02), but a few

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Michał Kiedrowicz
Junio C Hamano wrote: > Jeff King writes: > > > On Fri, Aug 03, 2012 at 09:57:15PM +0200, Michał Kiedrowicz wrote: > > > >> Jeff King wrote: > >> > >>The seq command is GNU-ism, and is missing at least in older BSD > >>releases and their derivatives, not to mention antique > >>comm

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 01:53:15PM -0700, Junio C Hamano wrote: > Wouldn't it be cleaner and readable to write it like this > > "$PERL_PATH" -le 'print for $ARGV[0]..$ARGV[1]' "$1" "$2" > > by the way? Yeah, that would be more robust (it's longer to type, which is why I avoided it in the

Re: need help with syncing two bare repos

2012-08-03 Thread Junio C Hamano
Eugene Sajine writes: > On Fri, Aug 3, 2012 at 4:00 PM, Junio C Hamano wrote: >> Eugene Sajine writes: >> >>> I think the best variant would be to do something like: >>> >>> $ git pull --rebase /refs/heads/*:/refs/heads/* >>> $ git push origin /refs/heads/*:/refs/heads/* >> >> You perhaps meant

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Junio C Hamano
Jeff King writes: > On Fri, Aug 03, 2012 at 09:57:15PM +0200, Michał Kiedrowicz wrote: > >> Jeff King wrote: >> >> The seq command is GNU-ism, and is missing at least in older BSD >> releases and their derivatives, not to mention antique >> commercial Unixes. >> >> We alread

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 10:38:24PM +0200, Michał Kiedrowicz wrote: > Changes since previous patch: > > * Added quotes around arguments, allowing `test_seq a z` > * Improved test_seq comments > > t/perf/perf-lib.sh | 2 +- > t/t5551-http-fetch.sh | 2 +- > t/test-lib-functio

Re: [PATCH] completion: resolve svn remote upstream refs

2012-08-03 Thread Junio C Hamano
Administrivia: - "Content-Type: text/plain; charset=ISO-8859-1; format=flowed" in the header tells us that the patch is corrupted and will not apply cleanly, but we still can discuss the contents of the patch. - "git shortlog --since=6.months -n --no-merges contrib/completion" tell

[PATCH] tests: Introduce test_seq

2012-08-03 Thread Michał Kiedrowicz
Jeff King wrote: The seq command is GNU-ism, and is missing at least in older BSD releases and their derivatives, not to mention antique commercial Unixes. We already purged it in b3431bc (Don't use seq in tests, not everyone has it, 2007-05-02), but a few

Re: need help with syncing two bare repos

2012-08-03 Thread Eugene Sajine
On Fri, Aug 3, 2012 at 4:00 PM, Junio C Hamano wrote: > Eugene Sajine writes: > >> I think the best variant would be to do something like: >> >> $ git pull --rebase /refs/heads/*:/refs/heads/* >> $ git push origin /refs/heads/*:/refs/heads/* > > You perhaps meant "worst" not "best" here. From th

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Michał Kiedrowicz
Jeff King wrote: > On Fri, Aug 03, 2012 at 10:04:50PM +0200, Michał Kiedrowicz wrote: > > > Previous patch didn't support `test_seq 1 50` (I removed it accidentally). > > Our emails just crossed paths. :) Yeah :) > > > +# test_seq is a portable replacement for seq(1). > > +# It may be used l

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 10:04:50PM +0200, Michał Kiedrowicz wrote: > Previous patch didn't support `test_seq 1 50` (I removed it accidentally). Our emails just crossed paths. :) > +# test_seq is a portable replacement for seq(1). > +# It may be used like: > +# > +#for i in `test_seq 100`; do

[PATCH] tests: Introduce test_seq

2012-08-03 Thread Michał Kiedrowicz
Jeff King wrote: The seq command is GNU-ism, and is missing at least in older BSD releases and their derivatives, not to mention antique commercial Unixes. We already purged it in b3431bc (Don't use seq in tests, not everyone has it, 2007-05-02), but a few

Re: [PATCH] tests: Introduce test_seq

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 09:57:15PM +0200, Michał Kiedrowicz wrote: > Jeff King wrote: > > The seq command is GNU-ism, and is missing at least in older BSD > releases and their derivatives, not to mention antique > commercial Unixes. > > We already purged it in b3431bc (Do

Re: need help with syncing two bare repos

2012-08-03 Thread Junio C Hamano
Eugene Sajine writes: > I think the best variant would be to do something like: > > $ git pull --rebase /refs/heads/*:/refs/heads/* > $ git push origin /refs/heads/*:/refs/heads/* You perhaps meant "worst" not "best" here. From the point of view of people who have pushed into the "origin" repos

[PATCH] tests: Introduce test_seq

2012-08-03 Thread Michał Kiedrowicz
Jeff King wrote: The seq command is GNU-ism, and is missing at least in older BSD releases and their derivatives, not to mention antique commercial Unixes. We already purged it in b3431bc (Don't use seq in tests, not everyone has it, 2007-05-02), but a few

Re: [ANNOUNCE] Git v1.7.12-rc1

2012-08-03 Thread Junio C Hamano
Jeff King writes: > On Fri, Aug 03, 2012 at 12:14:57PM -0700, Junio C Hamano wrote: > >> >> Here's a repost for convenience. >> > >> > And here's an update to the release notes. >> >> Thanks. Both are signed-off (I expect regulars to lead newbies by >> example, so...). > > [s/are/are not/, I as

Re: [ANNOUNCE] Git v1.7.12-rc1

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 12:14:57PM -0700, Junio C Hamano wrote: > >> Here's a repost for convenience. > > > > And here's an update to the release notes. > > Thanks. Both are signed-off (I expect regulars to lead newbies by > example, so...). [s/are/are not/, I assume you mean] Oops. I recently

Re: [ANNOUNCE] Git v1.7.12-rc1

2012-08-03 Thread Junio C Hamano
Jeff King writes: > On Fri, Aug 03, 2012 at 12:19:16PM -0400, Jeff King wrote: > >> On Mon, Jul 30, 2012 at 03:06:13PM -0700, Junio C Hamano wrote: >> >> > * git native protocol agents learned to show software version over >> >the wire, so that the server log can be examined to see the vint

Re: need help with syncing two bare repos

2012-08-03 Thread Sitaram Chamarty
On Fri, Aug 3, 2012 at 11:59 PM, Eugene Sajine wrote: > Hi, > > Could somebody please advise about how to address the following: > > I have a bare repo (bareA) on one server in network1 and i have a > mirror of it on another server (bareB) in network2 > BareB is updated periodically - no problem h

Re: [PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-03 Thread J Smith
On Fri, Aug 3, 2012 at 12:39 PM, Junio C Hamano wrote: > > Much nicer than the drafts in earlier discussion. One micronit is > that probably it is preferrable to do '!=' instead of '>', as we are > only trying to see if it is unspecified on the command line (hence > need to pay attention to confi

Re: GSOC remote-svn: branch detection

2012-08-03 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: > Two approaches: > 1. Import linearly and split later: > One idea is to import from svn linearly, i.e. one revision on top of it's > predecessor, like now, and detect and split branches afterwards. The svn > metadata is stored in git notes, so the required informa

Re: [ANNOUNCE] Git v1.7.12-rc1

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 12:19:16PM -0400, Jeff King wrote: > On Mon, Jul 30, 2012 at 03:06:13PM -0700, Junio C Hamano wrote: > > > * git native protocol agents learned to show software version over > >the wire, so that the server log can be examined to see the vintage > >distribution of

Re: [PATCH] Fix 'No newline...' annotation in rewrite diffs.

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 09:46:22AM -0700, Junio C Hamano wrote: > >> Maybe you could introduce "test_seq" instead. > > > > I don't have a strong preference, as there are only two callsites. Do > > you want to make a patch? > > If you run "for . in . . ." in t/, we see quite a many hits, so > "onl

Re: [PATCH] Fix 'No newline...' annotation in rewrite diffs.

2012-08-03 Thread Junio C Hamano
Jeff King writes: > On Fri, Aug 03, 2012 at 07:49:47AM +, Michał Kiedrowicz wrote: > >> Jeff King peff.net> writes: >> >> > - for i in $(seq 1 $GIT_PERF_REPEAT_COUNT); do >> > + for i in $("$PERL_PATH" -le "print for >> > 1..$GIT_PERF_REPEAT_COUNT"); do >> >> Maybe you c

Re: [PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-03 Thread Junio C Hamano
J Smith writes: > The grep.extendedRegexp configuration setting enables the -E flag on grep > by default but there are no equivalents for the -G, -F and -P flags. > > Rather than adding an additional setting for grep.fooRegexp for current > and future pattern matching options, add a grep.patternT

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Ralf Thielow
On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast wrote: >> #: merge-recursive.c:1918 >> #, c-format >> msgid "found %u common ancestor(s):" >> -msgstr "" >> +msgstr "%u gemeinsame Vorgänger gefunden" > Another TODO is to make two different messages in case that %u is one and bigger than one as it'

Re: [ANNOUNCE] Git v1.7.12-rc1

2012-08-03 Thread Jeff King
On Mon, Jul 30, 2012 at 03:06:13PM -0700, Junio C Hamano wrote: > * git native protocol agents learned to show software version over >the wire, so that the server log can be examined to see the vintage >distribution of clients. Hmm. Is this true? I was just flipping through some old top

Re: [PATCH 05/16] t2104: Don't fail when index version is 5

2012-08-03 Thread Junio C Hamano
Thomas Rast writes: > Thomas Gummerer writes: > >> The test t2104 currently checks if the index version is correctly >> reduced to 2/increased to 3, when an entry need extended flags, >> or doesn't use them anymore. Since index-v5 doesn't have extended >> flags (the extended flags are part of th

Re: [PATCH] Fix 'No newline...' annotation in rewrite diffs.

2012-08-03 Thread Jeff King
On Fri, Aug 03, 2012 at 07:49:47AM +, Michał Kiedrowicz wrote: > Jeff King peff.net> writes: > > > - for i in $(seq 1 $GIT_PERF_REPEAT_COUNT); do > > + for i in $("$PERL_PATH" -le "print for > > 1..$GIT_PERF_REPEAT_COUNT"); do > > Maybe you could introduce "test_seq" in

[PATCH/RFC] grep: add a grep.patternType configuration setting

2012-08-03 Thread J Smith
The grep.extendedRegexp configuration setting enables the -E flag on grep by default but there are no equivalents for the -G, -F and -P flags. Rather than adding an additional setting for grep.fooRegexp for current and future pattern matching options, add a grep.patternType setting that can accept

Re: [RFC 0/16] Introduce index file format version 5

2012-08-03 Thread Thomas Gummerer
On 08/03, Nguyen Thai Ngoc Duy wrote: > On Thu, Aug 2, 2012 at 6:01 PM, Thomas Gummerer wrote: > > Series of patches to introduce the index version 5 file format. This > > series does not include any fancy stuff like partial loading or partial > > writing yet, though it's possible to do that with

Re: [PATCH 05/16] t2104: Don't fail when index version is 5

2012-08-03 Thread Thomas Gummerer
On 08/03, Thomas Rast wrote: > Thomas Gummerer writes: > > > The test t2104 currently checks if the index version is correctly > > reduced to 2/increased to 3, when an entry need extended flags, > > or doesn't use them anymore. Since index-v5 doesn't have extended > > flags (the extended flags ar

Re: [PATCH 11/16] Read cache-tree in index-v5

2012-08-03 Thread Thomas Gummerer
On 08/03, Thomas Rast wrote: > Thomas Gummerer writes: > > > Since the cache-tree data is saved as part of the directory data, > > we have already read it, when we want to read the cache-tree. The > > cache-tree then only has to be converted from the directory data. > > I think the first sentenc

Re: [RFC 0/16] Introduce index file format version 5

2012-08-03 Thread Thomas Gummerer
On 08/03, Thomas Rast wrote: > Thomas Gummerer writes: > > > [PATCH 01/16] Modify cache_header to prepare for other index formats > > [PATCH 02/16] Modify read functions to prepare for other index > > [PATCH 03/16] Modify match_stat_basic to prepare for other index > > [PATCH 04/16] Modify write

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Ralf Thielow
On Fri, Aug 3, 2012 at 2:16 PM, Thomas Rast wrote: >>> >>> KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand >>> ... >> >> Gah, I misunderstood the values of the placeholders. The reason why I haven't >> translate "delete" or "rename" is because they're part of the >> "KO

Re: [PATCH 1/2] diff_setup_done(): return void

2012-08-03 Thread Thomas Rast
Thomas Rast writes: > diff --git a/line.c b/line.c > index a008c2c..fe7ace7 100644 > --- a/line.c > +++ b/line.c > @@ -1177,6 +1177,9 @@ static int process_diff_filepair(struct rev_info *rev, > return 0; > if (rg->ranges.nr == 0) > return 0; > + if (rg->range

[PATCH 1/2] diff_setup_done(): return void

2012-08-03 Thread Thomas Rast
diff_setup_done() has historically returned an error code, but lost the last nonzero return in 943d5b7 (allow diff.renamelimit to be set regardless of -M/-C, 2006-08-09). The callers were in a pretty confused state: some actually checked for the return code, and some did not. Let it return void,

[PATCH 2/2] merge-recursive: eliminate flush_buffer() in favor of write_in_full()

2012-08-03 Thread Thomas Rast
flush_buffer() is a thin wrapper around write_in_full() with two very confusing properties: * It runs a loop to handle short reads, ensuring that we write everything. But that is precisely what write_in_full() does! * It checks for a return value of 0 from write_in_full(), which cannot happe

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Thomas Rast
Ralf Thielow writes: > >>> msgid ": perhaps a D/F conflict?" >>> -msgstr "" >>> +msgstr ": vielleicht ein D/F-Konflikt?" >> >> What's the terminology for conflicts in German? For D/F, the user needs >> to know the English terms. Not that V/D would be much better. Maybe >> just spell it out. >>

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Ralf Thielow
Hi Thomas, thanks for your review. On Fri, Aug 3, 2012 at 10:59 AM, Thomas Rast wrote: > > Ralf Thielow writes: > >> #: merge-recursive.c:497 >> -#, fuzzy >> msgid "diff setup failed" >> -msgstr "diff_setup_done fehlgeschlagen" >> +msgstr "Einrichtung der Optionen zur Bestimmung der Unterschi

[PATCH] completion: resolve svn remote upstream refs

2012-08-03 Thread Yves Blusseau
Updated version of my previous patch This fix is used to return the svn reference of the remote svn upstream branch when the git repository is a clone of a svn repository that was created with the --stdlayout and --prefix options of git svn command. * completion/git-prompt.sh: add function to re

GSOC remote-svn: branch detection

2012-08-03 Thread Florian Achleitner
Hi! I'm playing around in vcs-svn/ to start a framework for detecting and processing branches in svndumps. So I wanted to let you know about my ideas. Two approaches: 1. Import linearly and split later: One idea is to import from svn linearly, i.e. one revision on top of it's predecessor, like

Re: [RFC 0/16] Introduce index file format version 5

2012-08-03 Thread Thomas Rast
Thomas Gummerer writes: > [PATCH 01/16] Modify cache_header to prepare for other index formats > [PATCH 02/16] Modify read functions to prepare for other index > [PATCH 03/16] Modify match_stat_basic to prepare for other index > [PATCH 04/16] Modify write functions to prepare for other index > [P

git cvsexportcommit: error patch does not apply

2012-08-03 Thread Ilya Basin
Hi. Here's what I'm trying to do: In gitcvs: [il@basin documentation]$ git mv SIC_SAP1_0_ADM_dv1_1.doc SIC_SAP1_0_ADM_dv1_2.doc (edit the file) [il@basin documentation]$ git commit ... SIC_SAP1_0_ADM_dv1_2.doc ... $ git log --stat -n 1 commit b04fa43c9f1374cf0ea5f9bf880242

Re: [RFC] l10n: de.po: translate 76 new messages

2012-08-03 Thread Thomas Rast
Hi Ralf Thanks a lot for your work. Below I am pointing out several items that actually need to be fixed in code (mostly lego messages), so it's a bit of a TODO list and I don't mean to imply that you should fix those before your patch goes in. Ralf Thielow writes: > #: merge-recursive.c:497

[PATCH] git-remote-mediawiki: replace TODO-list in comment by appropriate link

2012-08-03 Thread Matthieu Moy
My account on Github is now used as wiki and issue tracking. This will be more flexible than in-tree management of a TODO-list. Signed-off-by: Matthieu Moy --- contrib/mw-to-git/git-remote-mediawiki | 15 +-- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/contrib/mw-to

Re: [PATCH 11/16] Read cache-tree in index-v5

2012-08-03 Thread Thomas Rast
Thomas Gummerer writes: > Since the cache-tree data is saved as part of the directory data, > we have already read it, when we want to read the cache-tree. The > cache-tree then only has to be converted from the directory data. I think the first sentence is wrong. You have already read it at th

Re: [PATCH 05/16] t2104: Don't fail when index version is 5

2012-08-03 Thread Thomas Rast
Thomas Gummerer writes: > The test t2104 currently checks if the index version is correctly > reduced to 2/increased to 3, when an entry need extended flags, > or doesn't use them anymore. Since index-v5 doesn't have extended > flags (the extended flags are part of the normal flags), we simply >

[PATCH] setup: clarify error messages for file/revisions ambiguity

2012-08-03 Thread Matthieu Moy
The previous "Use '--' to separate filenames from revisions" may sound obvious for an old-time Unix user, but does not make it clear how to use this '--'. In addition to mentionning this '--', give an idea of what the new command should look like. Ideally, we could provide cut-and-paste ready comm

Re: [PATCH] Fix 'No newline...' annotation in rewrite diffs.

2012-08-03 Thread Michał Kiedrowicz
Jeff King peff.net> writes: > - for i in $(seq 1 $GIT_PERF_REPEAT_COUNT); do > + for i in $("$PERL_PATH" -le "print for > 1..$GIT_PERF_REPEAT_COUNT"); do Maybe you could introduce "test_seq" instead. -- To unsubscribe from this list: send the line "unsubscribe git" in