Re: GSOC remote-svn: branch detection

2012-08-04 Thread Dmitry Ivankov
Hi, On Sat, Aug 4, 2012 at 12:17 AM, Jonathan Nieder jrnie...@gmail.com 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

Re: [PATCH] tests: Introduce test_seq

2012-08-04 Thread Michał Kiedrowicz
Junio C Hamano gits...@pobox.com wrote: 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

Re: git cvsexportcommit: error patch does not apply

2012-08-04 Thread Ilya Basin
IB $ git cvsexportcommit -w ../../cvs/SAP -u -p -k -c b04fa43c9f1374cf0ea5f9bf88024282414b0a0c IB Checking if patch will apply IB cvs update: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc' IB cvs status: nothing known about `documentation/SIC_SAP1_0_ADM_dv1_2.doc' IB

Re: git cvsimport: new tags not imported on second cvsimport

2012-08-04 Thread Andreas Schwab
Ilya Basin basini...@gmail.com writes: I made the initial import: git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP edited .git/config: [cvsimport] module = SAP r = cvs d =

Re[2]: git cvsimport: new tags not imported on second cvsimport

2012-08-04 Thread Ilya Basin
AS Ilya Basin basini...@gmail.com writes: I made the initial import: git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP edited .git/config: [cvsimport] module = SAP r = cvs d =

File path not escaped in warning message

2012-08-04 Thread Janusz Białobrzewski
Hi, I have enabled core.quotepath, but file path in warning isn't escaped: File name is 1ą.txt its content is encoded in windows-1250 Output of git diff after reencoding to windows1250 is: warning: LF will be replaced by CRLF in 1Ä….txt. The file will have its original line endings in your

Re: git cvsimport: new tags not imported on second cvsimport

2012-08-04 Thread Andreas Schwab
Ilya Basin basini...@gmail.com writes: AS Ilya Basin basini...@gmail.com writes: I made the initial import: git cvsimport -d :pserver:user@blackbird:10010/data/cvs/webgui -C SAP -r cvs -k SAP edited .git/config: [cvsimport] module = SAP r = cvs

[PATCH 1/8] implement generic key/value map

2012-08-04 Thread Jeff King
It is frequently useful to have a fast, generic data structure mapping keys to values. We already have something like this in the decorate API, but it has two downsides: 1. The key type must always be a struct object *. 2. The value type is a void pointer, which means it is inefficient

[PATCH 2/8] map: add helper functions for objects as keys

2012-08-04 Thread Jeff King
These functions can be used as HASH and KEY_EQUAL functions when defining new maps with struct object * as their key. Signed-off-by: Jeff King p...@peff.net --- Makefile | 1 + map-object.h | 19 +++ 2 files changed, 20 insertions(+) create mode 100644 map-object.h diff

[PATCH 3/8] fast-export: use object to uint32 map instead of decorate

2012-08-04 Thread Jeff King
Previously we encoded the mark mapping inside the void * field of a struct decorate. It's a little more natural for us to do so using a data structure made for holding actual values. Signed-off-by: Jeff King p...@peff.net --- builtin/fast-export.c | 46

[PATCH 5/8] map: implement persistent maps

2012-08-04 Thread Jeff King
It's sometimes useful to keep a mapping across program invocations (e.g., because a space/time tradeoff makes it worth keeping a cache of calculated metadata for some objects). This adds a persistent version of the map API which can be backed by a flat memory store (like an mmap'd file). By

[PATCH 6/8] implement metadata cache subsystem

2012-08-04 Thread Jeff King
There are some calculations that git makes repeatedly, even though the results are invariant for a certain input (e.g., the patch-id of a certain commit). We can make a space/time tradeoff by caching these on disk between runs. Even though these may be immutable for a certain commit, we don't

[PATCH 7/8] implement rename cache

2012-08-04 Thread Jeff King
This just stores pairs of sha1s mapped to their similarity scores. Signed-off-by: Jeff King p...@peff.net --- Makefile | 5 + cache.h | 5 + map-sha1pair-uint32-params.h | 12 map-sha1pair-uint32.c| 8

[PATCH 8/8] diff: optionally use rename cache

2012-08-04 Thread Jeff King
This speeds up estimate_similarity by caching the similarity score of pairs of blob sha1s. Signed-off-by: Jeff King p...@peff.net --- Some interesting things to time with this are: - git log --raw -M on a repo with a lot of paths or a lot of renames (I found on git.git, the speedup was not

Re: GSOC remote-svn: branch detection

2012-08-04 Thread Ramkumar Ramachandra
Hi, Florian Achleitner wrote: 1. Import linearly and split later: I think this approach will be a lot less messy if you can cleanly separate the fetching component from the mapper. Currently, svndump re-creates the layout of the SVN repository. And the series you posted last week contains a

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

2012-08-04 Thread Adam Butcher
When operating in --break-rewrites (-B) mode on a file with no newline terminator (and assuming --break-rewrites determines that the diff _is_ a rewrite), git diff previously concatenated the indicator comment '\ No newline at end of file' directly to the terminating line rather than on a line of

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

2012-08-04 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: 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

Re: git cvsimport: new tags not imported on second cvsimport

2012-08-04 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Reset the branch back to before the import. Does the resulting history created by cvsimport after resetting a branch back to an older point exactly match the history before resetting (obviously modulo the tag that has been added since the original

Re: git cvsimport: new tags not imported on second cvsimport

2012-08-04 Thread Andreas Schwab
Junio C Hamano gits...@pobox.com writes: Andreas Schwab sch...@linux-m68k.org writes: Reset the branch back to before the import. Does the resulting history created by cvsimport after resetting a branch back to an older point exactly match the history before resetting (obviously modulo the

Re: File path not escaped in warning message

2012-08-04 Thread Junio C Hamano
Janusz Białobrzewski jbial...@o2.pl writes: I have enabled core.quotepath, but file path in warning isn't escaped: File name is 1ą.txt its content is encoded in windows-1250 Output of git diff after reencoding to windows1250 is: warning: LF will be replaced by CRLF in 1Ä….txt. The file will

Re: [PATCH] tests: Introduce test_seq

2012-08-04 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: And the reason for this is that we always told people don't use seq and they submitted an updated patch. What would we have to do now? We have to tell them don't use seq, use test_seq. Therefore, the patch does not accomplish anything useful, IMO. The

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

2012-08-04 Thread Junio C Hamano
Adam Butcher dev.li...@jessamine.co.uk writes: When operating in --break-rewrites (-B) mode on a file with no newline terminator (and assuming --break-rewrites determines that the diff _is_ a rewrite), git diff previously concatenated the indicator comment '\ No newline at end of file'