[Vcs-fast-import-devs] [PATCH v6 0/6] fast-import: add new feature and mark command

2009-09-02 Thread Sverre Rabbelier
Incorperated comments and changed 'option foo' to 'option git foo'. I think this is ready to be merged to next if there are no objections. Sverre Rabbelier (6): fast-import: put option parsing code in separate functions fast-import: put marks reading in it's own function fast-imp

[Vcs-fast-import-devs] [PATCH v6 1/6] fast-import: put option parsing code in separate functions

2009-09-02 Thread Sverre Rabbelier
Putting the options in their own functions increases readability of the option parsing block and makes it easier to reuse the option parsing code later on. Signed-off-by: Sverre Rabbelier --- No change since v5. fast-import.c | 115 +

[Vcs-fast-import-devs] [PATCH v6 2/6] fast-import: put marks reading in it's own function

2009-09-02 Thread Sverre Rabbelier
All options do nothing but set settings, with the exception of the --input-marks option. Delay the reading of the marks file till after all options have been parsed. Signed-off-by: Sverre Rabbelier --- No change since v5. fast-import.c | 73 -

[Vcs-fast-import-devs] [PATCH v6 3/6] fast-import: add feature command

2009-09-02 Thread Sverre Rabbelier
This allows the fronted to require a specific feature to be supported by the frontend, or abort. Also add support for the first feature, date-format=. Signed-off-by: Sverre Rabbelier --- No longer RFC. Documentation/git-fast-import.txt | 16 fast-import.c

[Vcs-fast-import-devs] [PATCH v6 4/6] fast-import: test the new feature command

2009-09-02 Thread Sverre Rabbelier
Test that an unknown feature causes fast-import to abort, and that a known feature is accepted. Signed-off-by: Sverre Rabbelier --- t/t9300-fast-import.sh | 20 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh

[Vcs-fast-import-devs] [PATCH v6 5/6] fast-import: add option command

2009-09-02 Thread Sverre Rabbelier
This allows the frontend to specify any of the supported options as long as no non-option command has been given. This way the user does not have to include any frontend-specific options, but instead she can rely on the frontend to tell fast-import what it needs. Also factor out parsing of argv an

[Vcs-fast-import-devs] [PATCH v6 6/6] fast-import: test the new option command

2009-09-02 Thread Sverre Rabbelier
Test three options (quiet and import/export-marks) and verify that the commandline options override these. Also make sure that a option command without a preceeding feature git-options command is rejected and that non-git options are ignored. Signed-off-by: Sverre Rabbelier --- Tests updated

Re: [Vcs-fast-import-devs] [PATCH v6 5/6] fast-import: add option command

2009-09-02 Thread Sverre Rabbelier
Heya, On Thu, Sep 3, 2009 at 04:41, Junio C Hamano wrote: > If "option git something-unknown" is given, it is clear that the tool that > generated the stream assumed that such an option exists in the importer; > it might appear prudent to abort the operation. > > But what about "option hg somethin