Mercurial > hg
view hgext/largefiles/remotestore.py @ 26362:3bfc473f4d33
gitweb, monoblue: fix vertical align of spans in .sourcelines
Empty lines in file view could produce an inexplicable margin before the next
line (most noticeable in browsers on webkit/blink engine). That was making
empty lines seem taller than the rest.
Instead of using default vertical align, let's set it to 'top'.
This issue is actually present in paper, and only recently got into gitweb
(2239626369f5) and monoblue (119202d4d7a4). There's a bit more to it in paper,
so that will be dealt with in a future patch.
Recipe to see live: preferably using a webkit/blink browser, such as chromium,
browse a file with empty lines, e.g. https://selenic.com/hg/file/3.5/README#l8
Selecting a block of text that includes empty lines will reveal white "breaks"
in the selection. Highlighted line (#l8) also shows such a break below itself.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 25 Sep 2015 03:02:38 +0800 |
parents | 328739ea70c3 |
children | 56b2bcea2529 |
line wrap: on
line source
# Copyright 2010-2011 Fog Creek Software # Copyright 2010-2011 Unity Technologies # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. '''remote largefile store; the base class for wirestore''' import urllib2 from mercurial import util, wireproto from mercurial.i18n import _ import lfutil import basestore class remotestore(basestore.basestore): '''a largefile store accessed over a network''' def __init__(self, ui, repo, url): super(remotestore, self).__init__(ui, repo, url) def put(self, source, hash): if self.sendfile(source, hash): raise util.Abort( _('remotestore: could not put %s to remote store %s') % (source, util.hidepassword(self.url))) self.ui.debug( _('remotestore: put %s to remote store %s\n') % (source, util.hidepassword(self.url))) def exists(self, hashes): return dict((h, s == 0) for (h, s) in # dict-from-generator self._stat(hashes).iteritems()) def sendfile(self, filename, hash): self.ui.debug('remotestore: sendfile(%s, %s)\n' % (filename, hash)) fd = None try: fd = lfutil.httpsendfile(self.ui, filename) return self._put(hash, fd) except IOError as e: raise util.Abort( _('remotestore: could not open file %s: %s') % (filename, str(e))) finally: if fd: fd.close() def _getfile(self, tmpfile, filename, hash): try: chunks = self._get(hash) except urllib2.HTTPError as e: # 401s get converted to util.Aborts; everything else is fine being # turned into a StoreError raise basestore.StoreError(filename, hash, self.url, str(e)) except urllib2.URLError as e: # This usually indicates a connection problem, so don't # keep trying with the other files... they will probably # all fail too. raise util.Abort('%s: %s' % (util.hidepassword(self.url), e.reason)) except IOError as e: raise basestore.StoreError(filename, hash, self.url, str(e)) return lfutil.copyandhash(chunks, tmpfile) def _verifyfile(self, cctx, cset, contents, standin, verified): filename = lfutil.splitstandin(standin) if not filename: return False fctx = cctx[standin] key = (filename, fctx.filenode()) if key in verified: return False verified.add(key) expecthash = fctx.data()[0:40] stat = self._stat([expecthash])[expecthash] if not stat: return False elif stat == 1: self.ui.warn( _('changeset %s: %s: contents differ\n') % (cset, filename)) return True # failed elif stat == 2: self.ui.warn( _('changeset %s: %s missing\n') % (cset, filename)) return True # failed else: raise RuntimeError('verify failed: unexpected response from ' 'statlfile (%r)' % stat) def batch(self): '''Support for remote batching.''' return wireproto.remotebatch(self)