From: <sk...@us...> - 2003-12-11 04:00:06
|
Update of /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Console/SharpCvsLib/Console/Commands In directory sc8-pr-cvs1:/tmp/cvs-serv6737/src/ICSharpCode.Console/SharpCvsLib/Console/Commands Modified Files: UpdateCommand.cs Log Message: Corrected the Update command object to add file(s) at the current repository. Index: UpdateCommand.cs =================================================================== RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Console/SharpCvsLib/Console/Commands/UpdateCommand.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UpdateCommand.cs 5 Dec 2003 05:27:49 -0000 1.5 --- UpdateCommand.cs 11 Dec 2003 04:00:03 -0000 1.6 *************** *** 51,55 **** private WorkingDirectory currentWorkingDirectory; private CvsRoot cvsRoot; ! private string repository; private string revision; private string localDirectory; --- 51,55 ---- private WorkingDirectory currentWorkingDirectory; private CvsRoot cvsRoot; ! private string fileNames; private string revision; private string localDirectory; *************** *** 69,76 **** /// </summary> /// <param name="cvsroot">User information</param> ! /// <param name="repositoryName">Repository</param> /// <param name="upOptions">Options</param> ! public UpdateCommand(string cvsroot, string repositoryName, string upOptions) : ! this(new CvsRoot(cvsroot), repositoryName, upOptions){ } --- 69,76 ---- /// </summary> /// <param name="cvsroot">User information</param> ! /// <param name="fileNames">Files</param> /// <param name="upOptions">Options</param> ! public UpdateCommand(string cvsroot, string fileNames, string upOptions) : ! this(new CvsRoot(cvsroot), fileNames, upOptions){ } *************** *** 79,87 **** /// </summary> /// <param name="cvsroot">User Information</param> ! /// <param name="repositoryName">Repository</param> /// <param name="upOptions">Options</param> ! public UpdateCommand(CvsRoot cvsroot, string repositoryName, string upOptions) { this.cvsRoot = cvsroot; ! repository = repositoryName; this.unparsedOptions = upOptions; } --- 79,87 ---- /// </summary> /// <param name="cvsroot">User Information</param> ! /// <param name="fileNames">Files</param> /// <param name="upOptions">Options</param> ! public UpdateCommand(CvsRoot cvsroot, string fileNames, string upOptions) { this.cvsRoot = cvsroot; ! this.fileNames = fileNames; this.unparsedOptions = upOptions; } *************** *** 101,109 **** try { if (localDirectory == null) { localDirectory = Environment.CurrentDirectory; } currentWorkingDirectory = new WorkingDirectory( this.cvsRoot, ! localDirectory, repository); if (revision != null) { currentWorkingDirectory.Revision = revision; --- 101,114 ---- try { + // Open the Repository file in the CVS directory + Manager manager = new Manager(Environment.CurrentDirectory); + Repository repository = manager.FetchRepository(Environment.CurrentDirectory); + // If this fails error out and state the user + // is not in a CVS repository directory tree. if (localDirectory == null) { localDirectory = Environment.CurrentDirectory; } currentWorkingDirectory = new WorkingDirectory( this.cvsRoot, ! localDirectory, repository.FileContents); if (revision != null) { currentWorkingDirectory.Revision = revision; *************** *** 112,118 **** currentWorkingDirectory.Date = date; } - Manager manager = new Manager(currentWorkingDirectory.WorkingPath); currentWorkingDirectory.FoldersToUpdate = ! manager.FetchFilesToUpdate (Path.Combine (localDirectory, repository)); // Create new UpdateCommand2 object updateCommand = new UpdateCommand2(currentWorkingDirectory); --- 117,122 ---- currentWorkingDirectory.Date = date; } currentWorkingDirectory.FoldersToUpdate = ! manager.FetchFilesToUpdate (Path.Combine(Environment.CurrentDirectory, fileNames)); // Create new UpdateCommand2 object updateCommand = new UpdateCommand2(currentWorkingDirectory); *************** *** 131,134 **** --- 135,140 ---- /// <param name="upOptions">A string value that holds the command /// line options the user has selected.</param> + /// <exception cref="NotImplementedException">If the command argument + /// is not implemented currently. TODO: Implement the argument.</exception> private void ParseOptions (String upOptions) { int endofOptions = 0; |