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

hgweb: fix diff hunks filtering by line range in webutil.diffs()...

hgweb: fix diff hunks filtering by line range in webutil.diffs() The previous clause for filter out a diff hunk was too restrictive. We need to consider the following cases (assuming linerange=(lb, ub) and the @s2,l2 hunkrange): <-(s2)--------(s2+l2)-> <-(lb)---(ub)-> <-(lb)---(ub)-> <-(lb)---(ub)-> previously on the first and last situations were considered. In test-hgweb-filelog.t, add a couple of lines at the beginning of file "b" so that the line range we will follow does not start at the beginning of file. This covers the change in aforementioned diff hunk filter clause.

FUJIWARA Katsunori - - Load All Authors

File last commit:

r31050:20653270 default


                r31704:cbe0bea8

default

Download file

             txnutil.py
        
                    36 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / txnutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # txnutil.py - transaction related utilities

      #

      #  Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others

      #

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

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

      from __future__ import absolute_import

      import errno

      from . import (

          encoding,

      )

      def mayhavepending(root):

          '''return whether 'root' may have pending changes, which are

          visible to this process.

          '''

          return root == encoding.environ.get('HG_PENDING')

      def trypending(root, vfs, filename, **kwargs):

          '''Open  file to be read according to HG_PENDING environment variable

          This opens '.pending' of specified 'filename' only when HG_PENDING

          is equal to 'root'.

          This returns '(fp, is_pending_opened)' tuple.

          '''

          if mayhavepending(root):

              try:

                  return (vfs('%s.pending' % filename, **kwargs), True)

              except IOError as inst:

                  if inst.errno != errno.ENOENT:

                      raise

          return (vfs(filename, **kwargs), False)

	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

				# txnutil.py - transaction related utilities
				#
				# Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				import errno

				from . import (
				encoding,
				)

				def mayhavepending(root):
				'''return whether 'root' may have pending changes, which are
				visible to this process.
				'''
				return root == encoding.environ.get('HG_PENDING')

				def trypending(root, vfs, filename, **kwargs):
				'''Open file to be read according to HG_PENDING environment variable

				This opens '.pending' of specified 'filename' only when HG_PENDING
				is equal to 'root'.

				This returns '(fp, is_pending_opened)' tuple.
				'''
				if mayhavepending(root):
				try:
				return (vfs('%s.pending' % filename, **kwargs), True)
				except IOError as inst:
				if inst.errno != errno.ENOENT:
				raise
				return (vfs(filename, **kwargs), False)