Mercurial > hgstorage

changeset 15:63f72bd28748 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow deleting a key by passing None as the data to save.
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 12 May 2013 12:06:03 +0200
parents 8f53ae3e6696
children
files hgstorage.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgstorage.py	Sat May 11 20:28:56 2013 +0200
+++ b/hgstorage.py	Sun May 12 12:06:03 2013 +0200
@@ -197,10 +197,12 @@
         filename = self.storage._key_to_file(key)
         parent, other = self._get_parents(filename, parent_rev)
 
-        if other is not None:
+        if data is not None and other is not None:
             data = self._merge(filename, parent, other, data, merge_func)
 
         def filectxfn(repo, memctx, path):
+            if data is None:
+                raise IOError()
             return mercurial.context.memfilectx(path, data, False, False, None)
 
         ctx = mercurial.context.memctx(