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

Fix file-changed-to-dir and dir-to-file commits (issue660)....

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

Vadim Gelfer - - Load All Authors

File last commit:

r2859:345bac2b default


                r5487:7a64931e

default

Download file

             httprangereader.py
        
                    28 lines
            
             | 862 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / httprangereader.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # httprangereader.py - just what it says

      #

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

      #

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

      # of the GNU General Public License, incorporated herein by reference.

      import byterange, urllib2

      class httprangereader(object):

          def __init__(self, url):

              self.url = url

              self.pos = 0

          def seek(self, pos):

              self.pos = pos

          def read(self, bytes=None):

              opener = urllib2.build_opener(byterange.HTTPRangeHandler())

              urllib2.install_opener(opener)

              req = urllib2.Request(self.url)

              end = ''

              if bytes:

                  end = self.pos + bytes - 1

              req.add_header('Range', 'bytes=%d-%s' % (self.pos, end))

              f = urllib2.urlopen(req)

              data = f.read()

              if bytes:

                  data = data[:bytes]

              return data

	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

				# httprangereader.py - just what it says
				#
				# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms
				# of the GNU General Public License, incorporated herein by reference.

				import byterange, urllib2

				class httprangereader(object):
				def __init__(self, url):
				self.url = url
				self.pos = 0
				def seek(self, pos):
				self.pos = pos
				def read(self, bytes=None):
				opener = urllib2.build_opener(byterange.HTTPRangeHandler())
				urllib2.install_opener(opener)
				req = urllib2.Request(self.url)
				end = ''
				if bytes:
				end = self.pos + bytes - 1
				req.add_header('Range', 'bytes=%d-%s' % (self.pos, end))
				f = urllib2.urlopen(req)
				data = f.read()
				if bytes:
				data = data[:bytes]
				return data