From: Johannes Schindelin Date: Thu, 13 Aug 2009 21:51:55 GMT Subject: Re: [PATCH 2/4] fast-import: define a new option command Message-ID: In-Reply-To: <20090813175211.GQ1033@spearce.org> Hi, On Thu, 13 Aug 2009, Shawn O. Pearce wrote: > Sverre Rabbelier wrote: > > On Thu, Aug 13, 2009 at 10:41, Shawn O. Pearce wrote: > > > Uh, no, if we have "option import-marks=..." and we can't find the > > > file "..." and we have no --import-marks command line flag that > > > would have overridden it, we need to abort with an error. > > > > 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. > > That's better. :-) Sorry if I spoil the party, but maybe if things get so complicated, it may be a sign that the original version (stream overrides command line, since it knows better) is to be preferred? After all, if hg fast-export says that the marks should be imported from a certain file, it may be for a _very good_ reason... Ciao, Dscho