[m-rev.] diff: retry -f

[Zoltan Somogyi]

trace/mercury_trace.c:
	Retries in minimal model grades can require skipping to an exit or fail
	port before carrying out the retry. The second retry is supposed to be
	automatic, so prevent mdb from asking the user redundant questions.

	Fix bad English in messages.

Zoltan.

cvs diff: Diffing .
Index: mercury_trace_internal.c
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/mercury_trace_internal.c,v
retrieving revision 1.141
diff -u -b -r1.141 mercury_trace_internal.c
--- mercury_trace_internal.c	14 Oct 2002 06:36:14 -0000	1.141
+++ mercury_trace_internal.c	14 Oct 2002 08:53:25 -0000
@@ -1641,7 +1641,7 @@
 		cmd->MR_trace_print_level = MR_PRINT_LEVEL_NONE;
 
 		/* Arrange to retry the call once it is finished. */
-		MR_insert_line_at_head("retry");
+		MR_insert_line_at_head("retry -f");
 		return STOP_INTERACTING;
 
 	case MR_RETRY_OK_FAIL_FIRST:
@@ -1652,7 +1652,7 @@
 		cmd->MR_trace_print_level = MR_PRINT_LEVEL_NONE;
 
 		/* Arrange to retry the call once it is finished. */
-		MR_insert_line_at_head("retry");
+		MR_insert_line_at_head("retry -f");
 		return STOP_INTERACTING;
 
 	case MR_RETRY_ERROR:
@@ -3344,11 +3344,11 @@
 {
 	if (word_count == 2 && MR_streq(words[1], "off")) {
 		MR_trace_unhide_events = MR_FALSE;
-		fprintf(MR_mdb_out, "hidden events values are hidden\n");
+		fprintf(MR_mdb_out, "hidden events are hidden\n");
 	} else if (word_count == 2 && MR_streq(words[1], "on")) {
 		MR_trace_unhide_events = MR_TRUE;
 		MR_trace_have_unhid_events = MR_TRUE;
-		fprintf(MR_mdb_out, "hidden events values are exposed\n");
+		fprintf(MR_mdb_out, "hidden events are exposed\n");
 	} else if (word_count == 1)  {
 		fprintf(MR_mdb_out,
 			"hidden events are %s\n",
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------