##// END OF EJS Templates
largefiles: don't break existing tests (syntax error, bad imports)
Greg Ward -
r15188:8e115063 default
parent child Browse files
Show More
@@ -484,7 +484,7 b' def unixpath(path):'
484 484
485 485 def islfilesrepo(repo):
486 486 return ('largefiles' in repo.requirements and
487 any_(shortname + '/' in f[0] for f in repo.store.datafiles())
487 any_(shortname + '/' in f[0] for f in repo.store.datafiles()))
488 488
489 489 def any_(gen):
490 490 for x in gen:
@@ -7,7 +7,6 b''
7 7 '''Remote largefile store; the base class for servestore'''
8 8
9 9 import urllib2
10 import HTTPError
11 10
12 11 from mercurial import util
13 12 from mercurial.i18n import _
@@ -57,7 +56,7 b' class remotestore(basestore.basestore):'
57 56
58 57 try:
59 58 length, infile = self._get(hash)
60 except HTTPError, e:
59 except urllib2.HTTPError, e:
61 60 # 401s get converted to util.Aborts; everything else is fine being
62 61 # turned into a StoreError
63 62 raise basestore.StoreError(filename, hash, self.url, str(e))
@@ -9,7 +9,7 b''
9 9 '''setup for largefiles extension: uisetup'''
10 10
11 11 from mercurial import archival, cmdutil, commands, extensions, filemerge, hg, \
12 httprepo, localrepo, sshrepo, sshserver, wireproto
12 httprepo, localrepo, sshrepo, sshserver, util, wireproto
13 13 from mercurial.i18n import _
14 14 from mercurial.hgweb import hgweb_mod, protocol
15 15
General Comments 0
You need to be logged in to leave comments. Login now