Re: [PATCH 2/4] fast-import: define a new option command

"Shawn O. Pearce" [off-list ref] writes:

Sverre Rabbelier [off-list ref] wrote:

quoted

On Thu, Aug 13, 2009 at 10:07, Johannes
Schindelin[off-list ref] wrote:

quoted

... and will import the marks twice?

Ah, you're right :(. What's the best way to do this? Should we dump
any previous marks when importing new ones?

Uh, well, yes.  We shouldn't define :5 if it was in the file that
appeared in the stream, but isn't in the file on the command line.

Worse, what happens if we do this:

  echo "option import-marks=/not/found" \
  | git fast-import --import-marks=my.marks

I want this to work, even though /not/found does not exist, but
my.marks does.  So that does complicate things...

How about making the option parser get and keep the _name_ of the file
until option parsing session (i.e. read the stream until initial run of
"option" command runs out and then parse the command line to override),
and then finally open the file and read it?

Heya,

On Thu, Aug 13, 2009 at 12:26, Junio C Hamano[off-list ref] wrote:

How about making the option parser get and keep the _name_ of the file
until option parsing session (i.e. read the stream until initial run of
"option" command runs out and then parse the command line to override),
and then finally open the file and read it?

On Thu, Aug 13, 2009 at 10:44, Sverre Rabbelier[off-list ref] wrote:

Ah, then how about in option_import_marks() we only store the name of
the file, like in option_export_marks, and at the end, when we reach
the first non-option command (and we've parsed argv), we read the
file. That way it's only read once, and it deals with the above
scenario.

Which is exactly what the latest version does :).

-- 
Cheers,

Sverre Rabbelier