From: Clayton H. <dr...@us...> - 2005-09-13 08:11:17
|
Update of /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Console/SharpCvsLib/Console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14798/src/ICSharpCode.Console/SharpCvsLib/Console Modified Files: ConsoleMain.cs Log Message: Added readonly option. Index: ConsoleMain.cs =================================================================== RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/ICSharpCode.Console/SharpCvsLib/Console/ConsoleMain.cs,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ConsoleMain.cs 28 Jun 2005 06:17:08 -0000 1.35 --- ConsoleMain.cs 13 Sep 2005 08:11:08 -0000 1.36 *************** *** 192,199 **** this.DoExecute(); } catch (Exception e) { ! string msg = ! String.Format("Something very bad has happened ( {0} ).", e.Message); - ExitProgram(msg, e); } } --- 192,197 ---- this.DoExecute(); } catch (Exception e) { ! ExitError(e, "Fatal Error ( {0} ), rerun using -verbose to get more information.", e.Message); } } *************** *** 207,216 **** command = parser.Execute (); } catch (CommandLineParseException e) { ! Writer.WriteLine( ! String.Format("{0}{1}{2}", ! Usage.General, Environment.NewLine, e.Message)); return; } catch (Exception e) { ! ExitProgram(string.Format("Exception parsing command: {0}", e.Message)); } --- 205,212 ---- command = parser.Execute (); } catch (CommandLineParseException e) { ! ExitError(e, "{0}{1}{2}", Usage.General, Environment.NewLine, e.Message); return; } catch (Exception e) { ! ExitError(e, "Exception parsing command: {0}", e.Message); } *************** *** 249,253 **** if (null == serverConn) { string msg = "Unable to connect to server."; ! ExitProgram(msg); } --- 245,249 ---- if (null == serverConn) { string msg = "Unable to connect to server."; ! ExitError(msg); } *************** *** 256,266 **** serverConn.Connect(workingDirectory, password); } catch (AuthenticationException e){ ! string msg = String.Format("Fatal error, aborting. cvs [login aborted]: {0}: unknown user or bad password.", workingDirectory.CvsRoot.User); - ExitProgram(msg, e); } catch (Exception ex) { ! string msg = String.Format("Fatal cvs error ( {0} ).", ! ex.Message); ! ExitProgram(msg, ex); } --- 252,259 ---- serverConn.Connect(workingDirectory, password); } catch (AuthenticationException e){ ! ExitError(e, "Fatal error, aborting. cvs [login aborted]: {0}: unknown user or bad password.", workingDirectory.CvsRoot.User); } catch (Exception ex) { ! ExitError(ex, "Fatal cvs error ( {0} ).", ex.Message); } *************** *** 271,288 **** } ! public static void ExitProgram (string msg, Exception exception) { ! try { ! if (CommandLineParser.IsVerbose) { ! ConsoleWriter.Instance.WriteLine(exception.ToString()); ! } ! using (StreamWriter fileWriter = new StreamWriter(System.IO.Path.Combine(AppDir.FullName, "Error.log"), true)) { ! fileWriter.WriteLine(string.Format("[{0}] - {1}\n{2}", ! DateTime.Now, msg, exception.ToString())); ! } ! } catch (Exception) { ! // make sure there isn't an exception when exiting the program } ! ExitProgram(string.Format("{0}", msg)); } --- 264,276 ---- } ! public static void ExitError (Exception exception, string msg) { ! if (CommandLineParser.IsVerbose) { ! ConsoleWriter.Instance.WriteLine(exception.ToString()); } + ExitError(msg); + } ! public static void ExitError (Exception exception, string msg, params object[] format) { ! ExitError(exception, string.Format(msg, format)); } *************** *** 291,295 **** /// </summary> /// <param name="msg"></param> ! public static void ExitProgram (string msg) { ConsoleWriter writer = new ConsoleWriter(); writer.WriteLine(msg); --- 279,294 ---- /// </summary> /// <param name="msg"></param> ! public static void Exit (string msg) { ! ConsoleWriter writer = new ConsoleWriter(); ! writer.WriteLine(msg); ! Environment.Exit(0); ! } ! ! public static void Exit(string msg, params object[] format) { ! string message = string.Format(msg, format); ! Exit(message); ! } ! ! public static void ExitError(string msg) { ConsoleWriter writer = new ConsoleWriter(); writer.WriteLine(msg); *************** *** 297,300 **** --- 296,304 ---- } + public static void ExitError(string msg, params object[] format) { + string message = string.Format(msg, format); + ExitError(message); + } + private string GetPassword(CommandLineParser parser, WorkingDirectory workingDir) { string pwd = null; |