Patch (Stringlist function) - Revision history

JAL: link repair

2015-06-26T16:06:29Z

link repair

← Older revision		Revision as of 16:06, 26 June 2015
Line 145:		Line 145:
	<ul>		<ul>
	<li>[http://en.wikipedia.org/wiki/Diff diff] for creation of the patch file <var>StringList</var>.</li>		<li>[http://en.wikipedia.org/wiki/Diff diff] for creation of the patch file <var>StringList</var>.</li>
	<li><var>[[~~Patchlines~~ (Stringlist function)\|~~Patchlines~~]]</var> for revised syntax layout.</li>		<li><var>[[PatchLines (Stringlist function)\|PatchLines]]</var> for revised syntax layout.</li>
	<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented <tt>diff</tt> output.</li>		<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented <tt>diff</tt> output.</li>
	</ul>		</ul>

	{{Template:Stringlist:Patch footer}}		{{Template:Stringlist:Patch footer}}

JAL: minor cleanup

2015-02-03T17:14:06Z

minor cleanup

← Older revision		Revision as of 17:14, 3 February 2015
Line 1:		Line 1:
	{{Template:Stringlist:Patch subtitle}}		{{Template:Stringlist:Patch subtitle}}

	This method uses Unix-style ~~<var class="term">~~[http://en.wikipedia.org/wiki/Diff diff]~~</var>~~ output to update text lines that are stored in a <var>Stringlist</var>.		This method uses Unix-style [http://en.wikipedia.org/wiki/Diff diff] output to update text lines that are stored in a <var>Stringlist</var>.

	Typically, a <~~var class="term"~~>diff</~~var~~> utility creates a report (a "patch file") of the differences between two "files," a base file and an updated version of the base file: that is, <~~var~~>~~Patch~~</~~var~~> = <~~var class="term"~~>~~diff(~~base, updated)</~~var~~>. Depending on which diff utility and command format that creates it, a patch may report the differences between the two files using a line orientation or a character orientation:		Typically, a <tt>diff</tt> utility creates a report (a "patch file") of the differences between two "files," a base file and an updated version of the base file: that is, <code><i>patch</i> = diff(<i>base</i>, <i>updated</i>)</code>. Depending on which <tt>diff</tt> utility and command format that creates it, a patch may report the differences between the two files using a line orientation or a character orientation:
	<ul><li>In the line orientation, the <~~var class="term"~~>diff</~~var~~> treats each file as a set of lines, and it reports whole-line differences, specifying changes by line number.		<ul>
	<li>In the character orientation, the <~~var class="term"~~>diff</~~var~~> treats each file as a single string of characters, and it reports character differences, specifying changes by character position.</ul>		<li>In the line orientation, the <tt>diff</tt> treats each file as a set of lines, and it reports whole-line differences, specifying changes by line number.</li>
			<li>In the character orientation, the <tt>diff</tt> treats each file as a single string of characters, and it reports character differences, specifying changes by character position.</li>
	~~<var>Patch~~</~~var~~> ~~supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.~~		</ul>

	<var>Patch</var> ~~applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the~~ differences ~~contained in the patch file~~. <~~var~~>~~Patch~~</~~var~~> ~~has the same functionality as the~~ <var>[[~~PatchLines~~ (Stringlist function)\|~~PatchLines~~]]~~</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>PatchLines</var> and <var>PatchString~~</var>.		The <var>Patch</var> method supports only line-oriented differences. For working with character-oriented <tt>diff</tt> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.

	<b>~~Note:~~</b> ~~The~~ patch file ~~you use is assumed~~ to ~~be in line-oriented~~ <var ~~class="term"~~>~~diff~~</var> output ~~format. The reference source used for this format~~ is the ~~GNU diff manual, see [http://www~~.~~gnu.org~~/~~software~~/~~diffutils~~/~~manual~~/~~#Top Comparing and Merging Files]~~.		<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. <var>Patch</var> has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> method, but its syntax is slightly different: it reverses the method object and first argument of <var>PatchLines</var> and <var>PatchString</var>.

	Only output from a normal <~~var class="term"~~>diff</~~var~~> command or from a <~~var class="term"~~>diff [-u \| U <i>n</i>]</~~var~~> command is supported.		<p class="note"><b>Note:</b> The patch file you use is assumed to be in line-oriented <tt>diff</tt> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].
			Only output from a normal <tt>diff</tt> command or from a <code>diff [-u \| U <i>n</i>]</code> command is supported.</p>

	==Syntax==		==Syntax==
Line 20:		Line 21:
	===Syntax terms===		===Syntax terms===
	<table class="syntaxTable">		<table class="syntaxTable">
	<tr><th>updList</th>		<tr><th>%updList</th>
	<td>A <var>Stringlist</var> object that reproduces the original updated file, that is, <var class="term">sl</var> updated by the <var class="term">patchList</var> updates. </td></tr>		<td>A <var>Stringlist</var> object that reproduces the original updated file, that is, <var class="term">sl</var> updated by the <var class="term">patchList</var> updates. </td></tr>

Line 30:		Line 31:

	<tr><th><var>Options</var></th>		<tr><th><var>Options</var></th>
	<td>The optional <var>Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you ~~will~~ receive an error message and the request ~~will be~~ canceled.</td></tr>		<td>The optional <var>Options</var> argument ([[Notation conventions for methods#Named arguments\|name required]]) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">%updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you receive an error message and the request is canceled.</td></tr>
	</table>		</table>

	==Usage notes==		==Usage notes==
	<ul>		<ul>
	<li>The <var>Stringlist</var> returned by the <var>Patch</var> method, <var class="term">updList</var>, will be a Null object if <var>Patch</var> encounters a non-canceling error.		<li>The <var>Stringlist</var> returned by the <var>Patch</var> method, <var class="term">%updList</var>, will be a <var>Null</var> object if <var>Patch</var> encounters a non-canceling error.</li>

	<li><var>Patch</var> supports <~~var class="term"~~>normal</~~var~~> and <~~var class="term"~~>unified</~~var~~> <~~var class="term"~~>diff</~~var~~> output formats only. A supported unified-format patch may either be:		<li><var>Patch</var> supports <b>normal</b> and <b>unified</b> <tt>diff</tt> output formats only. A supported unified-format patch may either be:
	<ul>		<ul>
	<li>Output from <~~var class="term"~~>diff -u</~~var~~>, which includes the three lines of text immediately before and after a change to the base.		<li>Output from <code>diff -u</code>, which includes the three lines of text immediately before and after a change to the base.
	<li>Output from <~~var class="term"~~>diff -U <i>n</i></~~var~~>, where <i>n</i> is 0 or greater, which includes the number of lines of surrounding text you specify with <i>n</i>.		<li>Output from <code>diff -U <i>n</i></code>, where <i>n</i> is 0 or greater, which includes the number of lines of surrounding text you specify with <i>n</i>.
	</ul>		</ul>
	A patch file in <b>context</b> format (output from <~~var class="term"~~>diff -c</~~var~~> or from <~~var class="term"~~>diff -C <i>n</i></~~var~~>) is <b><i>not</i></b> supported. If specified, a <var>Null</var> <var>Stringlist</var> object is returned or the request is canceled. A context-format <~~var class="term"~~>diff</~~var~~> also may include the text immediately before and after a change.		A patch file in <b>context</b> format (output from <code>diff -c</code> or from <code>diff -C <i>n</i></code>) is <b><i>not</i></b> supported. If specified, a <var>Null</var> <var>Stringlist</var> object is returned or the request is canceled. A context-format <tt>diff</tt> also may include the text immediately before and after a change.</li>

	<li>The representation of the patch file data in <var>Stringlist</var> form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.		<li>The representation of the patch file data in <var>Stringlist</var> form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.</li>

	<li>If the patch contains an ~~<b>~~<i>incomplete line</i~~></b~~> warning like " \ No newline at end of file," which indicates a missing line-end character, <var>Patch</var> ~~will ignore~~ it.		<li>If the patch contains an <i>incomplete line</i> warning like " \ No newline at end of file," which indicates a missing line-end character, <var>Patch</var> ignores it.</li>

	<li><var>Patch</var> is available as of <var class="product">Sirius Mods</var> Version 7.1.		<li><var>Patch</var> is available as of <var class="product">Sirius Mods</var> Version 7.1.</li>
	</ul>		</ul>

Line 84:		Line 85:
	The program results show the updated version of the base file, preceded by a display of the base file and the patch file:		The program results show the updated version of the base file, preceded by a display of the base file and the patch file:

	<p class="~~code~~">*************Here is base:*************		<p class="output">*************Here is base:*************
	ATTORNEY: Doctor, before you performed the autopsy,		ATTORNEY: Doctor, before you performed the autopsy,
	did you check for a pulse?		did you check for a pulse?
Line 143:		Line 144:
	==See also==		==See also==
	<ul>		<ul>
	<li~~><var class="term"~~>[http://en.wikipedia.org/wiki/Diff diff]~~</var>~~ for creation of the patch file <var ~~class="term"~~>sl</var><li><var>[[Patchlines (Stringlist function)\|Patchlines]]</var> for revised syntax layout.<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented <~~var class="term"~~>diff</~~var~~> output.		<li>[http://en.wikipedia.org/wiki/Diff diff] for creation of the patch file <var>StringList</var>.</li>
			<li><var>[[Patchlines (Stringlist function)\|Patchlines]]</var> for revised syntax layout.</li>
			<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented <tt>diff</tt> output.</li>
	</ul>		</ul>

	{{Template:Stringlist:Patch footer}}		{{Template:Stringlist:Patch footer}}

JAL at 19:24, 31 October 2012

2012-10-31T19:24:16Z

← Older revision		Revision as of 19:24, 31 October 2012
Line 9:		Line 9:
	<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.		<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.

	<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. <var>Patch</var> has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines ~~(Stringlist function)\|PatchLines]]~~</var> and <var>~~[[PatchString (Stringlist function)\|~~PatchString]]</var>.		<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. <var>Patch</var> has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>PatchLines</var> and <var>PatchString</var>.

	<b>Note:</b>The patch file you use is assumed to be in line-oriented <var class="term">diff</var> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].		<b>Note:</b> The patch file you use is assumed to be in line-oriented <var class="term">diff</var> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].

	Only output from a normal <var class="term">diff</var> command or from a <var class="term">diff [-u \| U <i>n</i>]</var> command is supported.		Only output from a normal <var class="term">diff</var> command or from a <var class="term">diff [-u \| U <i>n</i>]</var> command is supported.
Line 17:		Line 17:
	==Syntax==		==Syntax==
	{{Template:Stringlist:Patch syntax}}		{{Template:Stringlist:Patch syntax}}

	===Syntax terms===		===Syntax terms===
	<table class="syntaxTable">		<table class="syntaxTable">
	<tr><th>updList</th>		<tr><th>updList</th>
	<td>A <var>Stringlist</var> object that reproduces the original updated file, that is, <var class="term">sl</var> updated by the <var class="term">patchList</var> updates. </td></tr>		<td>A <var>Stringlist</var> object that reproduces the original updated file, that is, <var class="term">sl</var> updated by the <var class="term">patchList</var> updates. </td></tr>

	<tr><th>sl</th>		<tr><th>sl</th>
	<td>A <var>Stringlist</var> object that contains the original base file, each line stored as a <var class="term">sl</var> item. </td></tr>		<td>A <var>Stringlist</var> object that contains the original base file, each line stored as a <var class="term">sl</var> item. </td></tr>

	<tr><th>patchList</th>		<tr><th>patchList</th>
	<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>		<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>

	<tr><th><var>Options</var></th>		<tr><th><var>Options</var></th>
	<td>The optional <var>Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>		<td>The optional <var>Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>
Line 30:		Line 34:

	==Usage notes==		==Usage notes==
	<ul><li>The <var>Stringlist</var> returned by the <var>Patch</var> method, <var class="term">updList</var>, will be a Null object if <var>Patch</var> encounters a non-canceling error.		<ul>
			<li>The <var>Stringlist</var> returned by the <var>Patch</var> method, <var class="term">updList</var>, will be a Null object if <var>Patch</var> encounters a non-canceling error.

	<li><var>Patch</var> supports <var class="term">normal</var> and <var class="term">unified</var> <var class="term">diff</var> output formats only. A supported unified-format patch may either be:		<li><var>Patch</var> supports <var class="term">normal</var> and <var class="term">unified</var> <var class="term">diff</var> output formats only. A supported unified-format patch may either be:
	<ul><li>Output from <var class="term">diff -u</var>, which includes the three lines of text immediately before and after a change to the base.		<ul>
			<li>Output from <var class="term">diff -u</var>, which includes the three lines of text immediately before and after a change to the base.
	<li>Output from <var class="term">diff -U <i>n</i></var>, where <i>n</i> is 0 or greater, which includes the number of lines of surrounding text you specify with <i>n</i>.		<li>Output from <var class="term">diff -U <i>n</i></var>, where <i>n</i> is 0 or greater, which includes the number of lines of surrounding text you specify with <i>n</i>.
	</ul>		</ul>
	A patch file in <b>context</b> format (output from <var class="term">diff -c</var> or from <var class="term">diff -C <i>n</i></var>) is <b><i>not</i></b> supported. If specified, a Null <var>Stringlist</var> object is returned or the request is canceled. A context-format <var class="term">diff</var> also may include the text immediately before and after a change.<li>The representation of the patch file data in <var>Stringlist</var> form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.<li>If the patch contains an <b><i>incomplete line</i></b> warning like " \ No newline at end of file," which indicates a missing line-end character, <var>Patch</var> will ignore it.<li><var>Patch</var> is available as of <var class="product">Sirius Mods</var> Version 7.1.		A patch file in <b>context</b> format (output from <var class="term">diff -c</var> or from <var class="term">diff -C <i>n</i></var>) is <b><i>not</i></b> supported. If specified, a <var>Null</var> <var>Stringlist</var> object is returned or the request is canceled. A context-format <var class="term">diff</var> also may include the text immediately before and after a change.

			<li>The representation of the patch file data in <var>Stringlist</var> form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.

			<li>If the patch contains an <b><i>incomplete line</i></b> warning like " \ No newline at end of file," which indicates a missing line-end character, <var>Patch</var> will ignore it.

			<li><var>Patch</var> is available as of <var class="product">Sirius Mods</var> Version 7.1.
	</ul>		</ul>

	==Examples==		==Examples==
	~~<ol><li>~~		In the following example, a patch file (procedure <code>BASEDIFF</code>) is applied to a base file (procedure <code>BASEFILE</code>) to reproduce the updated version of the base file. <code>BASEDIFF</code> contains the diff output (normal), which was sent to <var class="product">Model 204</var> after comparing the PC files <code>basefile.txt</code> and <code>basefileUpd.txt</code>. The <var>[[AppendOpenProcedure (Stringlist function)\|AppendOpenProcedire]]</var> converts the procedure text to <var>Stringlists</var>.
	In the following example, a patch file (procedure BASEDIFF) is applied to a base file (procedure BASEFILE) to reproduce the updated version of the base file. BASEDIFF contains the diff output (normal), which was sent to <var class="product">Model 204</var> after comparing the PC files basefile.txt and basefileUpd.txt. The <var>[[AppendOpenProcedure (Stringlist function)\|AppendOpenProcedire]]</var> converts the procedure text to <var>Stringlists</var>.

	<p class="code">Begin		<p class="code">Begin
Line 50:		Line 62:
	%ptch = new		%ptch = new

	~~<nowiki>~~*~~</nowiki>~~ move base file into stringlist		** move base file into stringlist
	%rc = $procopn('BASEFILE', 'JALPROC')		%rc = $procopn('BASEFILE', 'JALPROC')
	%base:appendOpenProcedure		%base:appendOpenProcedure
Line 56:		Line 68:
	%base:Print		%base:Print

	~~<nowiki>~~*~~</nowiki>~~ move patch file into stringlist		** move patch file into stringlist
	%rc = $procopn('BASEDIFF', 'JALPROC')		%rc = $procopn('BASEDIFF', 'JALPROC')
	%ptch:appendOpenProcedure		%ptch:appendOpenProcedure
Line 62:		Line 74:
	%ptch:Print		%ptch:Print

	~~<nowiki>~~*~~</nowiki>~~ produce updated file from patch		** produce updated file from patch
	%upd = %base:Patch(%ptch)		%upd = %base:Patch(%ptch)
	Print '**************Here is updated base:*************'		Print '**************Here is updated base:*************'
Line 127:		Line 139:
	WITNESS: Yes. It is possible that he could have been alive		WITNESS: Yes. It is possible that he could have been alive
	and practicing law.		and practicing law.
	</p~~></ol~~>		</p>

	==See also==		==See also==
	<ul><li><var class="term">[http://en.wikipedia.org/wiki/Diff diff]</var> for creation of the patch file <var class="term">sl</var><li><var>[[Patchlines (Stringlist function)\|Patchlines]]</var> for revised syntax layout.<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented diff output.</ul>		<ul>
			<li><var class="term">[http://en.wikipedia.org/wiki/Diff diff]</var> for creation of the patch file <var class="term">sl</var><li><var>[[Patchlines (Stringlist function)\|Patchlines]]</var> for revised syntax layout.<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented <var class="term">diff</var> output.
			</ul>

	{{Template:Stringlist:Patch footer}}		{{Template:Stringlist:Patch footer}}

JAL2: /* Syntax terms */

2011-04-13T20:58:32Z

Syntax terms

← Older revision		Revision as of 20:58, 13 April 2011
Line 26:		Line 26:
	<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>		<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>
	<tr><th><var>Options</var></th>		<tr><th><var>Options</var></th>
	<td>The optional <var ~~class="term"~~>Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>		<td>The optional <var>Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>
	</table>		</table>

JAL2: /* Syntax terms */

2011-04-13T20:57:45Z

Syntax terms

← Older revision		Revision as of 20:57, 13 April 2011
Line 25:		Line 25:
	<tr><th>patchList</th>		<tr><th>patchList</th>
	<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>		<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>
	<tr><th>Options</th>		<tr><th><var>Options</var></th>
	<td>The optional <var class="term">Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>		<td>The optional <var class="term">Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>
	</table>		</table>

Goff: reviewed and some tags

2011-01-29T08:52:20Z

reviewed and some tags

← Older revision		Revision as of 08:52, 29 January 2011
Line 9:		Line 9:
	<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.		<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.

	<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. <var>Patch</var> has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> (and <var>[[PatchString (Stringlist function)\|PatchString]]</var>).		<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. <var>Patch</var> has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> and <var>[[PatchString (Stringlist function)\|PatchString]]</var>.

	<b>Note:</b>The patch file you use is assumed to be in line-oriented <var class="term">diff</var> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].		<b>Note:</b>The patch file you use is assumed to be in line-oriented <var class="term">diff</var> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].

Goff: see also

2011-01-27T04:18:26Z

Goff: Apply Dave's comments

2011-01-27T03:24:32Z

Apply Dave's comments

← Older revision		Revision as of 03:24, 27 January 2011
Line 14:		Line 14:

	Only output from a normal <var class="term">diff</var> command or from a <var class="term">diff [-u \| U <i>n</i>]</var> command is supported.		Only output from a normal <var class="term">diff</var> command or from a <var class="term">diff [-u \| U <i>n</i>]</var> command is supported.

	~~<var>Patch</var> is available as of <var class="product">Sirius Mods</var> Version 7.1.~~

	==Syntax==		==Syntax==
Line 28:		Line 26:
	<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>		<td>A <var>Stringlist</var> object that contains the patch file (one line per <var class="term">patchList</var> item). </td></tr>
	<tr><th>Options</th>		<tr><th>Options</th>
	<td>The optional <var class="term">Options</var> argument (name required) is the string value <~~var class="term"~~>'ErrRet'</~~var~~>, which may be specified in uppercase or lowercase. If you specify <~~var class="term"~~>Options='ErrRet'</~~var~~>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <~~var class="term"~~>Options='ErrRet'</~~var~~> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>		<td>The optional <var class="term">Options</var> argument (name required) is the string value <code>ErrRet</code>, which may be specified in uppercase or lowercase. If you specify <code>Options='ErrRet'</code>, <var>Patch</var> method errors return a null <var class="term">updList</var> <var>Stringlist</var> and no error message instead of canceling the request. If you do not specify <code>Options='ErrRet'</code> and a method error occurs, you will receive an error message and the request will be canceled.</td></tr>
	</table>		</table>

Line 37:		Line 35:
	<li>Output from <var class="term">diff -U <i>n</i></var>, where <i>n</i> is 0 or greater, which includes the number of lines of surrounding text you specify with <i>n</i>.		<li>Output from <var class="term">diff -U <i>n</i></var>, where <i>n</i> is 0 or greater, which includes the number of lines of surrounding text you specify with <i>n</i>.
	</ul>		</ul>
	A patch file in <b>context</b> format (output from <var class="term">diff -c</var> or from <var class="term">diff -C <i>n</i></var>) is <b><i>not</i></b> supported. If specified, a Null <var>Stringlist</var> object is returned or the request is canceled. A context-format <var class="term">diff</var> also may include the text immediately before and after a change.		A patch file in <b>context</b> format (output from <var class="term">diff -c</var> or from <var class="term">diff -C <i>n</i></var>) is <b><i>not</i></b> supported. If specified, a Null <var>Stringlist</var> object is returned or the request is canceled. A context-format <var class="term">diff</var> also may include the text immediately before and after a change.<li>The representation of the patch file data in <var>Stringlist</var> form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.<li>If the patch contains an <b><i>incomplete line</i></b> warning like " \ No newline at end of file," which indicates a missing line-end character, <var>Patch</var> will ignore it.<li><var>Patch</var> is available as of <var class="product">Sirius Mods</var> Version 7.1.
	<li>The representation of the patch file data in <var>Stringlist</var> form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.
	<li>If the patch contains an <b><i>incomplete line</i></b> warning like " \ No newline at end of file," which indicates a missing line-end character, <var>Patch</var> will ignore it.
	</ul>		</ul>

	==Examples==		==Examples==
			<ol><li>
	In the following example, a patch file (procedure BASEDIFF) is applied to a base file (procedure BASEFILE) to reproduce the updated version of the base file. BASEDIFF contains the diff output (normal), which was sent to <var class="product">Model 204</var> after comparing the PC files basefile.txt and basefileUpd.txt. The <var>[[AppendOpenProcedure (Stringlist function)\|AppendOpenProcedire]]</var> converts the procedure text to <var>Stringlists</var>.		In the following example, a patch file (procedure BASEDIFF) is applied to a base file (procedure BASEFILE) to reproduce the updated version of the base file. BASEDIFF contains the diff output (normal), which was sent to <var class="product">Model 204</var> after comparing the PC files basefile.txt and basefileUpd.txt. The <var>[[AppendOpenProcedure (Stringlist function)\|AppendOpenProcedire]]</var> converts the procedure text to <var>Stringlists</var>.

Line 130:		Line 127:
	WITNESS: Yes. It is possible that he could have been alive		WITNESS: Yes. It is possible that he could have been alive
	and practicing law.		and practicing law.
	</p>		</p></ol>

	==See also==		==See also==
	{{Template:Stringlist:Patch footer}}		{{Template:Stringlist:Patch footer}}

Dme at 01:36, 27 January 2011

2011-01-27T01:36:02Z

← Older revision		Revision as of 01:36, 27 January 2011
Line 7:		Line 7:
	<li>In the character orientation, the <var class="term">diff</var> treats each file as a single string of characters, and it reports character differences, specifying changes by character position.</ul>		<li>In the character orientation, the <var class="term">diff</var> treats each file as a single string of characters, and it reports character differences, specifying changes by character position.</ul>

	<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use ~~the~~ <var>[[PatchString (Stringlist function)\|PatchString]]</var>.		<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.

	<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. Patch has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> (and <var>[[PatchString (Stringlist function)\|PatchString]]</var>).		<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. Patch has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> (and <var>[[PatchString (Stringlist function)\|PatchString]]</var>).

Dme at 01:35, 27 January 2011

2011-01-27T01:35:23Z

← Older revision		Revision as of 01:35, 27 January 2011
Line 1:		Line 1:
	{{Template:Stringlist:Patch subtitle}}		{{Template:Stringlist:Patch subtitle}}

	This method uses Unix-style <var class="term">diff</var> output to update text lines that are stored in a <var>Stringlist</var>.		This method uses Unix-style <var class="term">[http://en.wikipedia.org/wiki/Diff diff]</var> output to update text lines that are stored in a <var>Stringlist</var>.

	Typically, a <var class="term">diff</var> utility creates a report (a "patch file") of the differences between two "files," a base file and an updated version of the base file: that is, <var class="~~example~~">~~patch =~~ diff(base, updated)</var>. Depending on which diff utility and command format that creates it, a patch may report the differences between the two files using a line orientation or a character orientation:		Typically, a <var class="term">diff</var> utility creates a report (a "patch file") of the differences between two "files," a base file and an updated version of the base file: that is, <var>Patch</var> = <var class="term">diff(base, updated)</var>. Depending on which diff utility and command format that creates it, a patch may report the differences between the two files using a line orientation or a character orientation:
	<ul><li>In the line orientation, the <var class="term">diff</var> treats each file as a set of lines, and it reports whole-line differences, specifying changes by line number.		<ul><li>In the line orientation, the <var class="term">diff</var> treats each file as a set of lines, and it reports whole-line differences, specifying changes by line number.
	<li>In the character orientation, the <var class="term">diff</var> treats each file as a single string of characters, and it reports character differences, specifying changes by character position.</ul>		<li>In the character orientation, the <var class="term">diff</var> treats each file as a single string of characters, and it reports character differences, specifying changes by character position.</ul>

← Older revision		Revision as of 04:18, 27 January 2011
Line 9:		Line 9:
	<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.		<var>Patch</var> supports only line-oriented differences. For working with character-oriented <var class="term">diff</var> output, use <var>[[PatchString (Stringlist function)\|PatchString]]</var>.

	<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. Patch has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> (and <var>[[PatchString (Stringlist function)\|PatchString]]</var>).		<var>Patch</var> applies a given patch file (converted to a <var>Stringlist</var>) to a base file (also a <var>Stringlist</var>), and it returns an output <var>Stringlist</var> that is the base file updated by the differences contained in the patch file. <var>Patch</var> has the same functionality as the <var>[[PatchLines (Stringlist function)\|PatchLines]]</var>, but its syntax is slightly different: it reverses the method object and first argument of <var>[[PatchLines (Stringlist function)\|PatchLines]]</var> (and <var>[[PatchString (Stringlist function)\|PatchString]]</var>).

	<b>Note:</b>The patch file you use is assumed to be in line-oriented <var class="term">diff</var> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].		<b>Note:</b>The patch file you use is assumed to be in line-oriented <var class="term">diff</var> output format. The reference source used for this format is the GNU diff manual, see [http://www.gnu.org/software/diffutils/manual/#Top Comparing and Merging Files].
Line 130:		Line 130:

	==See also==		==See also==
			<ul><li><var class="term">[http://en.wikipedia.org/wiki/Diff diff]</var> for creation of the patch file <var class="term">sl</var><li><var>[[Patchlines (Stringlist function)\|Patchlines]]</var> for revised syntax layout.<li><var>[[PatchString (Stringlist function)\|PatchString]]</var> for working with character-oriented diff output.</ul>

	{{Template:Stringlist:Patch footer}}		{{Template:Stringlist:Patch footer}}