<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>227980</bug_id>
          
          <creation_ts>2021-07-15 00:15:28 -0700</creation_ts>
          <short_desc>Resolve land v. land-cowhand differences</short_desc>
          <delta_ts>2023-12-06 11:02:13 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Local Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>INVALID</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          <blocked>221991</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Sam Sneddon [:gsnedders]">gsnedders</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>dpino</cc>
    
    <cc>jbedard</cc>
    
    <cc>ross.kirsling</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1777142</commentid>
    <comment_count>0</comment_count>
    <who name="Sam Sneddon [:gsnedders]">gsnedders</who>
    <bug_when>2021-07-15 00:15:28 -0700</bug_when>
    <thetext>From Bug 221991:

(In reply to Diego Pino from comment #22)
&gt; (In reply to Jonathan Bedard from comment #18)
&gt; 
&gt; &gt; Any reason you&apos;re using `land-cowhand` over `land`? My understanding was
&gt; &gt; that `land-cowhand` skipped the pre-commit tests, but `land` no longer has
&gt; &gt; pre-commit tests in it.
&gt; 
&gt; No other reason than tradition. When I asked other more experienced WebKit
&gt; developers how I could land a patch without filing a bug I was taught
&gt; `land-cowhand` and I&apos;ve been keep using it since then for that kind of task.

(In reply to Wenson Hsieh from comment #25)
&gt; FWIW, I generally prefer `land-cowhand` over `land`, since it automatically
&gt; generates and presents a pretty-printed version of the patch that I can
&gt; check for sanity.

Looking at the code, there&apos;s a fair difference between land and land-cowhand:

Land:
    steps = [
        steps.AddSvnMimetypeForPng,
        steps.UpdateChangeLogsWithReviewer,
        steps.ValidateReviewer,
        steps.ValidateChangeLogs,
        steps.Build,
        steps.Commit,
        steps.CloseBugForLandDiff,
    ]

LandCowhand:
    steps = [
        steps.SortXcodeProjectFiles,
        steps.PrepareChangeLog,
        steps.EditChangeLog,
        steps.CheckStyle,
        steps.ConfirmDiff,
        steps.Build,
        steps.Commit,
        steps.CloseBugForLandDiff,
    ]

These are very different, and indicate very different intended uses, as far as I can tell. land is intended to be used when landing a reviewed patch, whereas land-cowhand is intended to be used when landing an unreviewed patch.

While I&apos;m skeptical about putting much in the way of resources into this given the forthcoming transition to GitHub PRs, I suspect we should try and reduce the difference between the two (e.g. adding steps.ConfirmDiff to Land), and potentially rename land-cowhand (again) to something like land-unreviewed to make it clear what the intended use.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1777143</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2021-07-15 00:15:40 -0700</bug_when>
    <thetext>&lt;rdar://problem/80617267&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1997254</commentid>
    <comment_count>2</comment_count>
    <who name="Sam Sneddon [:gsnedders]">gsnedders</who>
    <bug_when>2023-12-05 15:52:43 -0800</bug_when>
    <thetext>Nobody in the past two years has complained about LandCowhand being deprecated (and we have admittedly moved to git since!), so I suggest we close this as invalid when we just remove the deprecated command.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1997438</commentid>
    <comment_count>3</comment_count>
    <who name="Sam Sneddon [:gsnedders]">gsnedders</who>
    <bug_when>2023-12-06 11:02:13 -0800</bug_when>
    <thetext>LandCowhand no longer exists (removed via bug 221991).</thetext>
  </long_desc>
      
      

    </bug>

</bugzilla>