From: <sk...@us...> - 2003-12-11 03:56:50
|
Update of /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Console/SharpCvsLib/Console/Parser In directory sc8-pr-cvs1:/tmp/cvs-serv6330/src/ICSharpCode.Console/SharpCvsLib/Console/Parser Modified Files: CommandLineParser.cs Log Message: Corrected the Add command parsing to create the Addcommand object instead of the CommitCommand object.. Index: CommandLineParser.cs =================================================================== RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Console/SharpCvsLib/Console/Parser/CommandLineParser.cs,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CommandLineParser.cs 6 Dec 2003 18:43:42 -0000 1.16 --- CommandLineParser.cs 11 Dec 2003 03:56:47 -0000 1.17 *************** *** 42,45 **** --- 42,46 ---- using ICSharpCode.SharpCvsLib.Commands; using ICSharpCode.SharpCvsLib.Misc; + using ICSharpCode.SharpCvsLib.FileSystem; using ICSharpCode.SharpCvsLib.Console.Commands; *************** *** 169,178 **** startIndex = 1; } else { - String tempRoot = Environment.GetEnvironmentVariable (ENV_CVS_ROOT); try { ! this.cvsRoot = new CvsRoot(tempRoot); ! } catch (CvsRootParseException e) { ! LOGGER.Error(e); ! return null; } } --- 170,187 ---- startIndex = 1; } else { try { ! // Get the cvsroot from the Root file in the CVS directory ! Manager manager = new Manager(Environment.CurrentDirectory); ! Root root = manager.FetchRoot(Environment.CurrentDirectory); ! this.cvsRoot = new CvsRoot(root.FileContents); ! } catch { ! // Should be using CVSROOT as last option ! String tempRoot = Environment.GetEnvironmentVariable (ENV_CVS_ROOT); ! try { ! this.cvsRoot = new CvsRoot(tempRoot); ! } catch (CvsRootParseException e) { ! LOGGER.Error(e); ! return null; ! } } } *************** *** 217,222 **** } try { ! CommitCommand addCommand = ! new CommitCommand(this.CvsRoot, repository, options); command = addCommand.CreateCommand (); this.currentWorkingDirectory = --- 226,231 ---- } try { ! ICSharpCode.SharpCvsLib.Console.Commands.AddCommand addCommand = ! new ICSharpCode.SharpCvsLib.Console.Commands.AddCommand(this.CvsRoot, repository, options); command = addCommand.CreateCommand (); this.currentWorkingDirectory = |