Mercurial > hg
changeset 15188:8e115063950d
largefiles: don't break existing tests (syntax error, bad imports)
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Sat, 01 Oct 2011 16:39:51 -0400 |
| parents | 0292f88d3b86 |
| children | dc360709cea9 |
| files | hgext/largefiles/lfutil.py hgext/largefiles/remotestore.py hgext/largefiles/uisetup.py |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py Sat Oct 01 16:18:51 2011 -0500 +++ b/hgext/largefiles/lfutil.py Sat Oct 01 16:39:51 2011 -0400 @@ -484,7 +484,7 @@ def islfilesrepo(repo): return ('largefiles' in repo.requirements and - any_(shortname + '/' in f[0] for f in repo.store.datafiles()) + any_(shortname + '/' in f[0] for f in repo.store.datafiles())) def any_(gen): for x in gen:
--- a/hgext/largefiles/remotestore.py Sat Oct 01 16:18:51 2011 -0500 +++ b/hgext/largefiles/remotestore.py Sat Oct 01 16:39:51 2011 -0400 @@ -7,7 +7,6 @@ '''Remote largefile store; the base class for servestore''' import urllib2 -import HTTPError from mercurial import util from mercurial.i18n import _ @@ -57,7 +56,7 @@ try: length, infile = self._get(hash) - except HTTPError, e: + except urllib2.HTTPError, 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))
--- a/hgext/largefiles/uisetup.py Sat Oct 01 16:18:51 2011 -0500 +++ b/hgext/largefiles/uisetup.py Sat Oct 01 16:39:51 2011 -0400 @@ -9,7 +9,7 @@ '''setup for largefiles extension: uisetup''' from mercurial import archival, cmdutil, commands, extensions, filemerge, hg, \ - httprepo, localrepo, sshrepo, sshserver, wireproto + httprepo, localrepo, sshrepo, sshserver, util, wireproto from mercurial.i18n import _ from mercurial.hgweb import hgweb_mod, protocol