Patch (Stringlist function): Difference between revisions

From m204wiki
Jump to navigation Jump to search
mNo edit summary
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
&#42;* 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
&#42;* 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
&#42;* 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}}

Revision as of 19:24, 31 October 2012

Update base Stringlist with patch Stringlist (Stringlist class)


This method uses Unix-style diff output to update text lines that are stored in a Stringlist.

Typically, a diff 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, Patch = diff(base, updated). 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:

  • In the line orientation, the diff treats each file as a set of lines, and it reports whole-line differences, specifying changes by line number.
  • In the character orientation, the diff treats each file as a single string of characters, and it reports character differences, specifying changes by character position.

Patch supports only line-oriented differences. For working with character-oriented diff output, use PatchString.

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

Note: The patch file you use is assumed to be in line-oriented diff output format. The reference source used for this format is the GNU diff manual, see Comparing and Merging Files.

Only output from a normal diff command or from a diff [-u | U n] command is supported.

Syntax

%updList = sl:Patch( patchList, [Options= string])

Syntax terms

updList A Stringlist object that reproduces the original updated file, that is, sl updated by the patchList updates.
sl A Stringlist object that contains the original base file, each line stored as a sl item.
patchList A Stringlist object that contains the patch file (one line per patchList item).
Options The optional Options argument (name required) is the string value ErrRet, which may be specified in uppercase or lowercase. If you specify Options='ErrRet', Patch method errors return a null updList Stringlist and no error message instead of canceling the request. If you do not specify Options='ErrRet' and a method error occurs, you will receive an error message and the request will be canceled.

Usage notes

  • The Stringlist returned by the Patch method, updList, will be a Null object if Patch encounters a non-canceling error.
  • Patch supports normal and unified diff output formats only. A supported unified-format patch may either be:
    • Output from diff -u, which includes the three lines of text immediately before and after a change to the base.
    • Output from diff -U n, where n is 0 or greater, which includes the number of lines of surrounding text you specify with n.

    A patch file in context format (output from diff -c or from diff -C n) is not supported. If specified, a Null Stringlist object is returned or the request is canceled. A context-format diff also may include the text immediately before and after a change.

  • The representation of the patch file data in Stringlist form should match the original patch exactly. For example, it is critical to preserve leading and trailing blanks.
  • If the patch contains an incomplete line warning like " \ No newline at end of file," which indicates a missing line-end character, Patch will ignore it.
  • Patch is available as of Sirius Mods Version 7.1.

Examples

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 Model 204 after comparing the PC files basefile.txt and basefileUpd.txt. The AppendOpenProcedire converts the procedure text to Stringlists.

Begin %base is object stringList %ptch is object stringList %upd is object stringList %rc is float %base = new %ptch = new ** move base file into stringlist %rc = $procopn('BASEFILE', 'JALPROC') %base:appendOpenProcedure Print '***************Here is base:***************' %base:Print ** move patch file into stringlist %rc = $procopn('BASEDIFF', 'JALPROC') %ptch:appendOpenProcedure Print '****************Here is patch:***************' %ptch:Print ** produce updated file from patch %upd = %base:Patch(%ptch) Print '****************Here is updated base:***************' %upd:Print End

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

***************Here is base:*************** ATTORNEY: Doctor, before you performed the autopsy, did you check for a pulse? WITNESS: No. ATTORNEY: Did you check for blood pressure? WITNESS: No. ATTORNEY: Did you check for breathing? WITNESS: No. ATTORNEY: So, then it is possible that the patient was alive when you began the autopsy? WITNESS: No. ATTORNEY: How can you be so sure, Doctor? WITNESS: Because his brain was sitting on my desk in a jar. ATTORNEY: I see, but could the patient have still been alive, nevertheless? WITNESS: Yes, it is possible that he could have been alive and practicing law. ****************Here is patch:*************** 1,16c1,9 < ATTORNEY: Doctor, before you performed the autopsy, < did you check for a pulse? < WITNESS: No. < ATTORNEY: Did you check for blood pressure? < WITNESS: No. < ATTORNEY: Did you check for breathing? < WITNESS: No. < ATTORNEY: So, then it is possible that the patient was alive < when you began the autopsy? < WITNESS: No. < ATTORNEY: How can you be so sure, Doctor? < WITNESS: Because his brain was sitting on my desk in a jar. < ATTORNEY: I see, but could the patient have still been < alive, nevertheless? < WITNESS: Yes, it is possible that he could have been alive < and practicing law. --- > ATTORNEY: Is it possible that the patient was alive > when you began the autopsy? > WITNESS: No. > ATTORNEY: How can you be so sure, Doctor? > WITNESS: Because his brain was sitting in a jar on my desk. > ATTORNEY: I see. But could the patient have still been > alive, nevertheless? > WITNESS: Yes. It is possible that he could have been alive > and practicing law. ****************Here is updated base:*************** ATTORNEY: Is it possible that the patient was alive when you began the autopsy? WITNESS: No. ATTORNEY: How can you be so sure, Doctor? WITNESS: Because his brain was sitting in a jar on my desk. ATTORNEY: I see. But could the patient have still been alive, nevertheless? WITNESS: Yes. It is possible that he could have been alive and practicing law.

See also

  • diff for creation of the patch file sl
  • Patchlines for revised syntax layout.
  • PatchString for working with character-oriented diff output.