upstream/mercurial-mirror Files · hgext/narrow/narrowpatch.py

push: continue without locking on lock failure other than EEXIST (issue5882)...

push: continue without locking on lock failure other than EEXIST (issue5882) This code was added by "push: make locking of source optional (issue3684)", but EACCES isn't the only error that could be triggered by filesystem permission. I think catching LockUnavailable is more appropriate than testing errno value by caller.

Martin von Zweigbergk - - Load All Authors

File last commit:

r36490:d0d5eef5 default


                r38111:7c05198c

stable

Download file

             narrowpatch.py
        
                    41 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / narrow / narrowpatch.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
      # narrowpatch.py - extensions to mercurial patch module to support narrow clones

      #

      # Copyright 2017 Google, Inc.

      #

      # 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

      from mercurial import (

          extensions,

          patch,

      )

      def setup(repo):

          def _filepairs(orig, *args):

              """Only includes files within the narrow spec in the diff."""

        Martin von Zweigbergk
    
narrow: drop safehasattr() checks for always-present repo.narrowmatch...

              r36490
            
              narrowmatch = repo.narrowmatch()

              if not narrowmatch.always():

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
                  for x in orig(*args):

                      f1, f2, copyop = x

                      if ((not f1 or narrowmatch(f1)) and

                          (not f2 or narrowmatch(f2))):

                          yield x

              else:

                  for x in orig(*args):

                      yield x

          def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,

                      copy, getfilectx, *args, **kwargs):

        Martin von Zweigbergk
    
narrow: drop safehasattr() checks for always-present repo.narrowmatch...

              r36490
            
              narrowmatch = repo.narrowmatch()

              if not narrowmatch.always():

        Augie Fackler
    
narrow: use list comprehension instead of filter for filtering lists...

              r36363
            
                  modified = [f for f in modified if narrowmatch(f)]

                  added = [f for f in added if narrowmatch(f)]

                  removed = [f for f in removed if narrowmatch(f)]

        Augie Fackler
    
narrow: import experimental extension from narrowhg revision cb51d673e9c5...

              r36096
            
                  copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}

              return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,

                          getfilectx, *args, **kwargs)

          extensions.wrapfunction(patch, '_filepairs', _filepairs)

          extensions.wrapfunction(patch, 'trydiff', trydiff)

	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

Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	# narrowpatch.py - extensions to mercurial patch module to support narrow clones
		#
		# Copyright 2017 Google, Inc.
		#
		# 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

		from mercurial import (
		extensions,
		patch,
		)

		def setup(repo):
		def _filepairs(orig, *args):
		"""Only includes files within the narrow spec in the diff."""
Martin von Zweigbergk narrow: drop safehasattr() checks for always-present repo.narrowmatch...	r36490	narrowmatch = repo.narrowmatch()
		if not narrowmatch.always():
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	for x in orig(*args):
		f1, f2, copyop = x
		if ((not f1 or narrowmatch(f1)) and
		(not f2 or narrowmatch(f2))):
		yield x
		else:
		for x in orig(*args):
		yield x

		def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
		copy, getfilectx, args, *kwargs):
Martin von Zweigbergk narrow: drop safehasattr() checks for always-present repo.narrowmatch...	r36490	narrowmatch = repo.narrowmatch()
		if not narrowmatch.always():
Augie Fackler narrow: use list comprehension instead of filter for filtering lists...	r36363	modified = [f for f in modified if narrowmatch(f)]
		added = [f for f in added if narrowmatch(f)]
		removed = [f for f in removed if narrowmatch(f)]
Augie Fackler narrow: import experimental extension from narrowhg revision cb51d673e9c5...	r36096	copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}
		return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,
		getfilectx, args, *kwargs)

		extensions.wrapfunction(patch, '_filepairs', _filepairs)
		extensions.wrapfunction(patch, 'trydiff', trydiff)