<br><br><div class="gmail_quote">2011/10/14 Greg Ward <span dir="ltr"><<a href="mailto:greg@gerg.ca">greg@gerg.ca</a>></span><br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
# HG changeset patch<br>
# User Greg Ward <<a href="mailto:greg@gerg.ca">greg@gerg.ca</a>><br>
# Date 1318551869 14400<br>
# Node ID f984c9e433a6632c1da83206c709846f306ea10e<br>
# Parent 72400acb2d76b81fd6f0f873054309b95a1a62b8<br>
largefiles: improve error reporting<br>
<br>
- tweak wording of some error messages<br>
- use consistent capitalization<br>
- always say 'largefile', not 'lfile'<br>
- fix I18N problems<br>
- only raise Abort for errors the user can do something about<br>
<br>
diff --git a/hgext/largefiles/basestore.py b/hgext/largefiles/basestore.py<br>
--- a/hgext/largefiles/basestore.py<br>
+++ b/hgext/largefiles/basestore.py<br>
@@ -199,4 +199,4 @@<br>
except lfutil.storeprotonotcapable:<br>
pass<br>
<br>
- raise util.Abort(_('%s does not appear to be a lfile store'), path)<br>
+ raise util.Abort(_('%s does not appear to be a largefile store'), path)<br>
diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py<br>
--- a/hgext/largefiles/lfcommands.py<br>
+++ b/hgext/largefiles/lfcommands.py<br>
@@ -345,7 +345,7 @@<br>
total=len(files))<br>
source = lfutil.findfile(rsrc, hash)<br>
if not source:<br>
- raise util.Abort(_('Missing largefile %s needs to be uploaded')<br>
+ raise util.Abort(_('largefile %s missing from store (needs to be uploaded)')<br>
% hash)<br>
# XXX check for errors here<br>
store.put(source, hash)<br>
diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py<br>
--- a/hgext/largefiles/lfutil.py<br>
+++ b/hgext/largefiles/lfutil.py<br>
@@ -91,7 +91,7 @@<br>
elif <a href="http://os.name" target="_blank">os.name</a> == 'posix':<br>
path = os.path.join(os.getenv('HOME'), '.' + longname, hash)<br>
else:<br>
- raise util.Abort(_('Unknown operating system: %s\n') % <a href="http://os.name" target="_blank">os.name</a>)<br>
+ raise util.Abort(_('unknown operating system: %s\n') % <a href="http://os.name" target="_blank">os.name</a>)<br>
return path<br>
<br>
def insystemcache(ui, hash):<br>
diff --git a/hgext/largefiles/remotestore.py b/hgext/largefiles/remotestore.py<br>
--- a/hgext/largefiles/remotestore.py<br>
+++ b/hgext/largefiles/remotestore.py<br>
@@ -50,9 +50,10 @@<br>
def _getfile(self, tmpfile, filename, hash):<br>
# quit if the largefile isn't there<br>
stat = self._stat(hash)<br>
- if stat:<br>
- raise util.Abort(_('remotestore: largefile %s is %s') %<br>
- (hash, stat == 1 and 'invalid' or 'missing'))<br>
+ if stat == 1:<br>
+ raise util.Abort(_('remotestore: largefile %s is invalid') % hash)<br>
+ elif stat == 2:<br>
+ raise util.Abort(_('remotestore: largefile %s is missing') % hash)<br>
<br>
try:<br>
length, infile = self._get(hash)<br>
@@ -64,7 +65,7 @@<br>
# This usually indicates a connection problem, so don't<br>
# keep trying with the other files... they will probably<br>
# all fail too.<br>
- raise util.Abort('%s: %s' % (self.url, str(e.reason)))<br>
+ raise util.Abort('%s: %s' % (self.url, e.reason))<br>
except IOError, e:<br>
raise basestore.StoreError(filename, hash, self.url, str(e))<br>
<br>
@@ -101,5 +102,5 @@<br>
% (cset, filename))<br>
return True # failed<br>
else:<br>
- raise util.Abort(_('check failed, unexpected response'<br>
- 'statlfile: %d') % stat)<br>
+ raise RuntimeError('verify failed: unexpected response from '<br>
+ 'statlfile (%r)' % stat)<br>
diff --git a/hgext/largefiles/reposetup.py b/hgext/largefiles/reposetup.py<br>
--- a/hgext/largefiles/reposetup.py<br>
+++ b/hgext/largefiles/reposetup.py<br>
@@ -277,7 +277,9 @@<br>
for file in match.files():<br>
if lfutil.isstandin(file):<br>
raise util.Abort(<br>
- "Don't commit largefile standin. Commit largefile.")<br>
+ _('%s: is a largefile standin; commit the '<br>
+ 'largefile itself instead')<br>
+ % file)<br></blockquote><div><br>Beware this change will break the test suite. Someone should fix it assuming patch goes in.<br><br>Cheers,<br>Na'Tosha<br> <br></div></div>-- <br><div><div>
<span style="color: rgb(153, 153, 153);"><b>Na'Tosha Bard</b></span></div><div><font color="#999999">Build & Infrastructure Developer | Unity Technologies</font></div><div><font color="#999999"><br></font></div><div>
<font color="#999999"><b>E-Mail:</b> <a href="mailto:natosha@unity3d.com" target="_blank">natosha@unity3d.com</a></font></div><div><font color="#999999"><b>Skype:</b> natosha.bard</font></div></div><br>