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

status: disable morestatus when using -0...

status: disable morestatus when using -0 Without this patch, you get something like this: ``` M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc) # Unresolved merge conflicts: # # a # # To mark files as resolved: hg resolve --mark FILE # To continue: hg commit # To abort: hg merge --abort ``` That doesn't seem like something one would ever want. I considered making it an error to combine `-0` with morestatus, but it seems very likely that that would just make the user spend time trying to figure out how to disable morestatus, so it feels like we might as well just do it for them. Differential Revision: https://phab.mercurial-scm.org/D9545

Augie Fackler - - Load All Authors

File last commit:

r43812:2fe6121c default


                r46696:7a2b67e6

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