Mercurial > hg-stable

changeset 15430:54c0517c0fe8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
author Martin Geisler <mg@aragost.com>
date Fri, 04 Nov 2011 10:31:38 +0100
parents e48f0913f018 (current diff) db8b0ee74025 (diff)
children 2ddae301d0a2 6ba2fc0a87ab d8238600265d
files
diffstat 4 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py	Thu Nov 03 23:12:31 2011 -0400
+++ b/hgext/largefiles/lfutil.py	Fri Nov 04 10:31:38 2011 +0100
@@ -110,7 +110,9 @@
         repo.ui.note(_('Found %s in store\n') % hash)
     elif inusercache(repo.ui, hash):
         repo.ui.note(_('Found %s in system cache\n') % hash)
-        link(usercachepath(repo.ui, hash), storepath(repo, hash))
+        path = storepath(repo, hash)
+        util.makedirs(os.path.dirname(path))
+        link(usercachepath(repo.ui, hash), path)
     else:
         return None
     return storepath(repo, hash)
--- a/mercurial/ignore.py	Thu Nov 03 23:12:31 2011 -0400
+++ b/mercurial/ignore.py	Fri Nov 04 10:31:38 2011 +0100
@@ -78,6 +78,7 @@
             pats[f] = []
             fp = open(f)
             pats[f], warnings = ignorepats(fp)
+            fp.close()
             for warning in warnings:
                 warn("%s: %s\n" % (f, warning))
         except IOError, inst:
--- a/mercurial/revlog.py	Thu Nov 03 23:12:31 2011 -0400
+++ b/mercurial/revlog.py	Fri Nov 04 10:31:38 2011 +0100
@@ -800,6 +800,7 @@
         readahead = max(65536, length)
         df.seek(offset)
         d = df.read(readahead)
+        df.close()
         self._addchunk(offset, d)
         if readahead > length:
             return d[:length]
--- a/mercurial/ui.py	Thu Nov 03 23:12:31 2011 -0400
+++ b/mercurial/ui.py	Fri Nov 04 10:31:38 2011 +0100
@@ -79,6 +79,7 @@
 
         try:
             cfg.read(filename, fp, sections=sections, remap=remap)
+            fp.close()
         except error.ConfigError, inst:
             if trusted:
                 raise