From d86904e4a561327c6909f16b4269bcd9e1b0d160 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Fri, 27 May 2011 03:04:55 +0000
Subject: [PATCH] Use generic functions to print messages and errors.
---
exec/load/cvslib.js | 64 +++++++++++++++++++++++++++++----------------
1 file changed, 42 insertions(+), 22 deletions(-)
diff --git a/exec/load/cvslib.js b/exec/load/cvslib.js
index 7aee8a273a..a8ca94464c 100644
--- a/exec/load/cvslib.js
+++ b/exec/load/cvslib.js
@@ -178,6 +178,39 @@ CVS = new (function () {
}
}
+////////////////////////////////// Stuff that should be overwritten
+
+ this.write = function(str) {
+ if(js.global.write)
+ write(str);
+ else if(js.global.print)
+ print(str);
+ else
+ this.writeln(str);
+ }
+
+ this.writeln = function(str) {
+ if(js.global.writeln)
+ writeln(str);
+ if(js.global.print)
+ print(str+"\n");
+ else
+ log(LOG_INFO, str);
+ }
+
+ this.errstr = function(str) {
+ log(LOG_INFO, str);
+ if(js.global.alert)
+ alert(str);
+ else if(js.global.writeln)
+ writeln(str);
+ else if(js.global.print)
+ print(str+"\n");
+ }
+
+ this.flush = function() {
+ }
+
////////////////////////////////// MAGIC PROPERTIES
/*
@@ -261,41 +294,28 @@ CVS = new (function () {
this.files[repofile].status=cmd[0];
break;
case 'M':
- if(js.global.writeln)
- writeln(cmd[1]);
- else
- log(LOG_INFO, cmd[1]);
+ this.println(cmd[1]);
break;
case 'MT':
var m=split_cmd(cmd[1],2);
switch(m[0]) {
case 'newline':
- if(js.global.writeln)
- writeln('');
+ this.writeln('');
break;
case 'text':
- if(js.global.write)
- write(m[1]);
- else
- log(LOG_INFO, m[1]);
+ this.write(m[1]);
break;
default:
- if(m.length > 1) {
- if(js.global.write)
- write(m[1]);
- else
- log(LOG_INFO, m[1]);
- }
+ if(m.length > 1)
+ this.write(m[1]);
break;
}
break;
case 'E':
- if(js.global.alert)
- alert(cmd[1]);
- else
- log(LOG_ERR, cmd[1]);
+ this.errstr(cmd[1]);
break;
case 'F':
+ this.flush();
break;
case 'Valid-requests':
var m=cmd[1].split(' ');
@@ -306,11 +326,11 @@ CVS = new (function () {
case 'error':
var m=cmd[1].split(' ',2);
if(m[0].length > 0) {
- log(LOG_ERR, "ERROR "+m[0]+" - "+m[1]);
+ this.errstr("ERROR "+m[0]+" - "+m[1]);
}
else {
if(m[1].length > 0)
- log(LOG_ERR, "ERROR - "+m[1]);
+ this.errstr("ERROR - "+m[1]);
}
return response;
default:
--
GitLab