upstream/mercurial-mirror Files · hgext/infinitepush/common.py

hgweb: handle None from templatedir() equally bad in webcommands.py...

hgweb: handle None from templatedir() equally bad in webcommands.py The following paragraph is based just on my reading of the code; I have not tried to test it. Before my recent work on templates in frozen binaries, it seems both `hgwebdir_mod.py` and `webcommands.py` would pass in an empty list into `staticfile()` when running in a frozen binary. That would then result in a variable in that function (`path`) not getting bound before its first use. I then changed that without thinking in D8786 so we passed a `None` value into the function, which made it break in another way (trying to iterate over `None`). Then I tried to fix it up in D8810, but I only changed `hgwebdir_mod.py` for some reason, and it still doesn't actually work in frozen binaries (which seems fair, since was broken before my changes too). This patch just replicates the half-assed "fix" from D8810 in `webcommands.py`, so they look more similar so I can start refactoring them in the same way. Differential Revision: https://phab.mercurial-scm.org/D8933

Augie Fackler - - Load All Authors

File last commit:

r43812:2fe6121c default


                r45937:da3b7c80

default

Download file

             common.py
        
                    52 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / infinitepush / common.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Copyright 2017 Facebook, 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

      import os

      from mercurial.node import hex

      from mercurial import (

          error,

          extensions,

          pycompat,

      )

      def isremotebooksenabled(ui):

          return b'remotenames' in extensions._extensions and ui.configbool(

              b'remotenames', b'bookmarks'

          )

      def downloadbundle(repo, unknownbinhead):

          index = repo.bundlestore.index

          store = repo.bundlestore.store

          bundleid = index.getbundle(hex(unknownbinhead))

          if bundleid is None:

              raise error.Abort(b'%s head is not known' % hex(unknownbinhead))

          bundleraw = store.read(bundleid)

          return _makebundlefromraw(bundleraw)

      def _makebundlefromraw(data):

          fp = None

          fd, bundlefile = pycompat.mkstemp()

          try:  # guards bundlefile

              try:  # guards fp

                  fp = os.fdopen(fd, 'wb')

                  fp.write(data)

              finally:

                  fp.close()

          except Exception:

              try:

                  os.unlink(bundlefile)

              except Exception:

                  # we would rather see the original exception

                  pass

              raise

          return bundlefile

	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

				# Copyright 2017 Facebook, 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

				import os

				from mercurial.node import hex

				from mercurial import (
				error,
				extensions,
				pycompat,
				)


				def isremotebooksenabled(ui):
				return b'remotenames' in extensions._extensions and ui.configbool(
				b'remotenames', b'bookmarks'
				)


				def downloadbundle(repo, unknownbinhead):
				index = repo.bundlestore.index
				store = repo.bundlestore.store
				bundleid = index.getbundle(hex(unknownbinhead))
				if bundleid is None:
				raise error.Abort(b'%s head is not known' % hex(unknownbinhead))
				bundleraw = store.read(bundleid)
				return _makebundlefromraw(bundleraw)


				def _makebundlefromraw(data):
				fp = None
				fd, bundlefile = pycompat.mkstemp()
				try: # guards bundlefile
				try: # guards fp
				fp = os.fdopen(fd, 'wb')
				fp.write(data)
				finally:
				fp.close()
				except Exception:
				try:
				os.unlink(bundlefile)
				except Exception:
				# we would rather see the original exception
				pass
				raise

				return bundlefile