upstream/mercurial-mirror Files · mercurial/node.py

hgweb: add HTML elements to control whitespace settings for annotate...

hgweb: add HTML elements to control whitespace settings for annotate Building on top of the new URL query string arguments to control whitespace settings for annotate, this commit adds HTML checkboxes reflecting the values of these arguments to the paper and gitweb themes. The actual diff settings are now exported to the templating layer. The HTML templates add these as data-* attributes so they are accessible to the DOM. A new <form> with various <input> elements is added. The <form> is initially hidden via CSS. A shared JavaScript function (which runs after the <form> has been rendered but before the annotate HTML (because annotate HTML could take a while to load and we want the form to render quickly) takes care of setting the checked state of each box from the data-* attributes. It also registers an event handler to modify the URL and refresh the page whenever the checkbox state is changed. I'm using the URLSearchParams interface to perform URL manipulation. https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams tells me this may not be supported on older web browsers. Yes, apparently the web API didn't have a standard API to parse and format query strings until recently. Hence the check for the presence of this feature in the JavaScript. If the browser doesn't support the feature, the <form> will remain hidden and behavior will like it currently is. We could polyfill this feature or implement our own query string parsing. But I'm lazy and this could be done as a follow-up if people miss it. We could certainly expand this feature to support more diff options (such as lines of context). That's why the potentially reusable code is stored in a reusable place. It is also certainly possible to add diff controls to other pages that display diffs. But since Mozillians are making noise about controlling which revisions annotate shows, I figured I'd start there. .. feature:: Control whitespace settings for annotation on hgweb /annotate URLs on hgweb now accept query string arguments to influence how whitespace changes impact results. The arguments "ignorews," "ignorewsamount," "ignorewseol," and "ignoreblanklines" now have the same meaning as their [annotate] config section counterparts. Any provided setting overrides the server default. HTML checkboxes have been added to the paper and gitweb themes to expose current whitespace settings and to easily modify the current view. Differential Revision: https://phab.mercurial-scm.org/D850

Yuya Nishihara - - Load All Authors

File last commit:

r32684:af854b1b default


                r34392:6797f1fb

default

Download file

             node.py
        
                    35 lines
            
             | 917 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
put license and copyright info into comment blocks

              r8226
            
      # node.py - basic nodeid manipulation for mercurial

      #

      # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

      #

      # This software may be used and distributed according to the terms of the

        Matt Mackall
    
Update license to GPLv2+

              r10263
            
      # GNU General Public License version 2 or any later version.

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Gregory Szorc
    
node: use absolute_import

              r25962
            
      from __future__ import absolute_import

        Matt Mackall
    
Replace demandload with new demandimport

              r3877
            
      import binascii

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

              r26980
            
      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      bin = binascii.unhexlify

        Thomas Arendsen Hein
    
Define and use nullrev (revision of nullid) instead of -1.

              r3578
            
      nullrev = -1

        Gregory Szorc
    
node: use byte literals to construct nullid and wdirid...

              r28585
            
      nullid = b"\0" * 20

        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

              r26980
            
      nullhex = hex(nullid)

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
      # Phony node value to stand-in for new files in some uses of

      # manifests.

      newnodeid = '!' * 20

        Durham Goode
    
dirstate: change added/modified placeholder hash length to 20 bytes...

              r30361
            
      addednodeid = ('0' * 15) + 'added'

      modifiednodeid = ('0' * 12) + 'modified'

        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
        Martin von Zweigbergk
    
cleanup: use set literals...

              r32291
            
      wdirnodes = {newnodeid, addednodeid, modifiednodeid}

        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
        Yuya Nishihara
    
node: define experimental identifiers for working directory...

              r25737
            
      # pseudo identifiers for working directory

      # (they are experimental, so don't add too many dependencies on them)

      wdirrev = 0x7fffffff

        Gregory Szorc
    
node: use byte literals to construct nullid and wdirid...

              r28585
            
      wdirid = b"\xff" * 20

        Yuya Nishihara
    
revlog: add support for partial matching of wdir node id...

              r32684
            
      wdirhex = hex(wdirid)

        Yuya Nishihara
    
node: define experimental identifiers for working directory...

              r25737
            
        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
      def short(node):

          return hex(node[:6])

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Martin Geisler put license and copyright info into comment blocks	r8226	# node.py - basic nodeid manipulation for mercurial
		#
		# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
		#
		# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
mpm@selenic.com Break apart hg.py...	r1089
Gregory Szorc node: use absolute_import	r25962	from __future__ import absolute_import

Matt Mackall Replace demandload with new demandimport	r3877	import binascii
mpm@selenic.com Break apart hg.py...	r1089
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	# This ugly style has a noticeable effect in manifest parsing
		hex = binascii.hexlify
		bin = binascii.unhexlify

Thomas Arendsen Hein Define and use nullrev (revision of nullid) instead of -1.	r3578	nullrev = -1
Gregory Szorc node: use byte literals to construct nullid and wdirid...	r28585	nullid = b"\0" * 20
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	nullhex = hex(nullid)
mpm@selenic.com Break apart hg.py...	r1089
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360	# Phony node value to stand-in for new files in some uses of
		# manifests.
		newnodeid = '!' * 20
Durham Goode dirstate: change added/modified placeholder hash length to 20 bytes...	r30361	addednodeid = ('0' * 15) + 'added'
		modifiednodeid = ('0' * 12) + 'modified'
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360
Martin von Zweigbergk cleanup: use set literals...	r32291	wdirnodes = {newnodeid, addednodeid, modifiednodeid}
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360
Yuya Nishihara node: define experimental identifiers for working directory...	r25737	# pseudo identifiers for working directory
		# (they are experimental, so don't add too many dependencies on them)
		wdirrev = 0x7fffffff
Gregory Szorc node: use byte literals to construct nullid and wdirid...	r28585	wdirid = b"\xff" * 20
Yuya Nishihara revlog: add support for partial matching of wdir node id...	r32684	wdirhex = hex(wdirid)
Yuya Nishihara node: define experimental identifiers for working directory...	r25737
mpm@selenic.com Break apart hg.py...	r1089	def short(node):
		return hex(node[:6])