--- a/hgstorage.py	Fri May 13 22:11:54 2011 +0200
+++ b/hgstorage.py	Fri May 13 22:14:46 2011 +0200
@@ -84,7 +84,7 @@
     def update(self):
         self.tip = self.storage.repo.changectx('tip')
 
-    def save(self, data, key, user=None, message=None, parent_rev=None,
+    def save(self, key, data, user=None, message=None, parent_rev=None,
              encoding=None, force=False):
         """Save a new revision of the item."""
 
@@ -128,7 +128,7 @@
         try:
             filetip = self.tip[filename]
         except mercurial.revlog.LookupError:
-            raise KeyError("item %r doesn't exist" % filename )
+            raise KeyError("item %r doesn't exist" % key )
         if rev is None:
             filectx = filetip
         else:

--- a/test_repo.py	Fri May 13 22:11:54 2011 +0200
+++ b/test_repo.py	Fri May 13 22:14:46 2011 +0200
@@ -40,7 +40,7 @@
         """Test saving of items."""
 
         s = storage.session()
-        s.save('text', 'title', 'user', 'message')
+        s.save('title', 'text', 'user', 'message')
         s = storage.session()
         exists = 'title' in s
         assert exists
@@ -54,7 +54,7 @@
         """Test saving of items in the same session."""
 
         s = storage.session()
-        s.save('text', 'title', 'user', 'message')
+        s.save('title', 'text', 'user', 'message')
         exists = 'title' in s
         assert exists
         data = s.load('title')
@@ -65,8 +65,8 @@
 
     def test_double_save(self, storage):
         s = storage.session()
-        s.save('text1', 'title', 'user1', 'message1', -1, encoding='utf8')
-        s.save('text2', 'title', 'user2', 'message2', 0, encoding='utf8')
+        s.save('title', 'text1', 'user1', 'message1', -1, encoding='utf8')
+        s.save('title', 'text2', 'user2', 'message2', 0, encoding='utf8')
         data = s.load('title')
         assert 'text2' == data
         data = s.load('title', 0)