Patchwork [3,of,3] hgweb: rename linerangelog.js as followlines.js

login
register
mail settings
Submitter Denis Laxalde
Date April 3, 2017, 8:33 a.m.
Message ID <90569fa94f7e29148fd3.1491208433@sh77.tls.logilab.fr>
Download mbox | patch
Permalink /patch/19928/
State Accepted
Headers show

Comments

Denis Laxalde - April 3, 2017, 8:33 a.m.
# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1491206575 -7200
#      Mon Apr 03 10:02:55 2017 +0200
# Node ID 90569fa94f7e29148fd3697474074f5531231550
# Parent  99f5eb0cb78b74e418a2035dde180381a0b89622
# Available At http://hg.logilab.org/users/dlaxalde/hg
#              hg pull http://hg.logilab.org/users/dlaxalde/hg -r 90569fa94f7e
hgweb: rename linerangelog.js as followlines.js

So that the file name matches both the feature name and user facing vocabulary
(e.g. the revset function).
Augie Fackler - April 3, 2017, 7:04 p.m.
On Mon, Apr 03, 2017 at 10:33:53AM +0200, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis.laxalde@logilab.fr>
> # Date 1491206575 -7200
> #      Mon Apr 03 10:02:55 2017 +0200
> # Node ID 90569fa94f7e29148fd3697474074f5531231550
> # Parent  99f5eb0cb78b74e418a2035dde180381a0b89622
> # Available At http://hg.logilab.org/users/dlaxalde/hg
> #              hg pull http://hg.logilab.org/users/dlaxalde/hg -r 90569fa94f7e
> hgweb: rename linerangelog.js as followlines.js

Queued per indygreg's review, thanks.

>
> So that the file name matches both the feature name and user facing vocabulary
> (e.g. the revset function).
>
> diff --git a/contrib/wix/templates.wxs b/contrib/wix/templates.wxs
> --- a/contrib/wix/templates.wxs
> +++ b/contrib/wix/templates.wxs
> @@ -225,7 +225,7 @@
>              <File Id="static.coal.file.png"      Name="coal-file.png" />
>              <File Id="static.coal.folder.png"    Name="coal-folder.png" />
>              <File Id="static.excanvas.js"        Name="excanvas.js" />
> -            <File Id="static.linerangelog.js"    Name="linerangelog.js" />
> +            <File Id="static.followlines.js"     Name="followlines.js" />
>              <File Id="static.mercurial.js"       Name="mercurial.js" />
>              <File Id="static.hgicon.png"         Name="hgicon.png" />
>              <File Id="static.hglogo.png"         Name="hglogo.png" />
> diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl
> --- a/mercurial/templates/paper/filerevision.tmpl
> +++ b/mercurial/templates/paper/filerevision.tmpl
> @@ -74,7 +74,7 @@
>  <pre class="sourcelines stripes4 wrap bottomline" data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}">{text%fileline}</pre>
>  </div>
>
> -<script type="text/javascript" src="{staticurl|urlescape}linerangelog.js"></script>
> +<script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>
>
>  </div>
>  </div>
> diff --git a/mercurial/templates/static/linerangelog.js b/mercurial/templates/static/followlines.js
> rename from mercurial/templates/static/linerangelog.js
> rename to mercurial/templates/static/followlines.js
> --- a/mercurial/templates/static/linerangelog.js
> +++ b/mercurial/templates/static/followlines.js
> @@ -1,4 +1,4 @@
> -// linerangelog.js - JavaScript utilities for followlines UI
> +// followlines.js - JavaScript utilities for followlines UI
>  //
>  // Copyright 2017 Logilab SA <contact@logilab.fr>
>  //
> diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
> --- a/tests/test-hgweb-commands.t
> +++ b/tests/test-hgweb-commands.t
> @@ -1347,7 +1347,7 @@ File-related
>    <span id="l1">foo</span><a href="#l1"></a></pre>
>    </div>
>
> -  <script type="text/javascript" src="/static/linerangelog.js"></script>
> +  <script type="text/javascript" src="/static/followlines.js"></script>
>
>    </div>
>    </div>
> @@ -1475,7 +1475,7 @@ File-related
>    <span id="l1">another</span><a href="#l1"></a></pre>
>    </div>
>
> -  <script type="text/javascript" src="/static/linerangelog.js"></script>
> +  <script type="text/javascript" src="/static/followlines.js"></script>
>
>    </div>
>    </div>
> diff --git a/tests/test-highlight.t b/tests/test-highlight.t
> --- a/tests/test-highlight.t
> +++ b/tests/test-highlight.t
> @@ -185,7 +185,7 @@ hgweb filerevision, html
>    <span id="l33"></span><a href="#l33"></a></pre>
>    </div>
>
> -  <script type="text/javascript" src="/static/linerangelog.js"></script>
> +  <script type="text/javascript" src="/static/followlines.js"></script>
>
>    </div>
>    </div>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/contrib/wix/templates.wxs b/contrib/wix/templates.wxs
--- a/contrib/wix/templates.wxs
+++ b/contrib/wix/templates.wxs
@@ -225,7 +225,7 @@ 
             <File Id="static.coal.file.png"      Name="coal-file.png" />
             <File Id="static.coal.folder.png"    Name="coal-folder.png" />
             <File Id="static.excanvas.js"        Name="excanvas.js" />
-            <File Id="static.linerangelog.js"    Name="linerangelog.js" />
+            <File Id="static.followlines.js"     Name="followlines.js" />
             <File Id="static.mercurial.js"       Name="mercurial.js" />
             <File Id="static.hgicon.png"         Name="hgicon.png" />
             <File Id="static.hglogo.png"         Name="hglogo.png" />
diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl
--- a/mercurial/templates/paper/filerevision.tmpl
+++ b/mercurial/templates/paper/filerevision.tmpl
@@ -74,7 +74,7 @@ 
 <pre class="sourcelines stripes4 wrap bottomline" data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}">{text%fileline}</pre>
 </div>
 
-<script type="text/javascript" src="{staticurl|urlescape}linerangelog.js"></script>
+<script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>
 
 </div>
 </div>
diff --git a/mercurial/templates/static/linerangelog.js b/mercurial/templates/static/followlines.js
rename from mercurial/templates/static/linerangelog.js
rename to mercurial/templates/static/followlines.js
--- a/mercurial/templates/static/linerangelog.js
+++ b/mercurial/templates/static/followlines.js
@@ -1,4 +1,4 @@ 
-// linerangelog.js - JavaScript utilities for followlines UI
+// followlines.js - JavaScript utilities for followlines UI
 //
 // Copyright 2017 Logilab SA <contact@logilab.fr>
 //
diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -1347,7 +1347,7 @@  File-related
   <span id="l1">foo</span><a href="#l1"></a></pre>
   </div>
   
-  <script type="text/javascript" src="/static/linerangelog.js"></script>
+  <script type="text/javascript" src="/static/followlines.js"></script>
   
   </div>
   </div>
@@ -1475,7 +1475,7 @@  File-related
   <span id="l1">another</span><a href="#l1"></a></pre>
   </div>
   
-  <script type="text/javascript" src="/static/linerangelog.js"></script>
+  <script type="text/javascript" src="/static/followlines.js"></script>
   
   </div>
   </div>
diff --git a/tests/test-highlight.t b/tests/test-highlight.t
--- a/tests/test-highlight.t
+++ b/tests/test-highlight.t
@@ -185,7 +185,7 @@  hgweb filerevision, html
   <span id="l33"></span><a href="#l33"></a></pre>
   </div>
   
-  <script type="text/javascript" src="/static/linerangelog.js"></script>
+  <script type="text/javascript" src="/static/followlines.js"></script>
   
   </div>
   </div>