[commits] (vajda) [15298] - fixed bug 10780 (r=grant)

[commits]

Title: [commits] (vajda) [15298] - fixed bug 10780 (r=grant)

Revision

15298

Author

vajda

Date

2007-09-05 10:16:01 -0700 (Wed, 05 Sep 2007)

Log Message

- fixed bug 10780 (r=grant)
(http://bugzilla.osafoundation.org/show_bug.cgi?id=10780)
(undo() needs MERGED bit persisted)
- upgraded build to chandlerdb 0.7-25

Modified Paths

• trunk/chandler/Makefile
• trunk/chandler/repository/persistence/DBContainer.py
• trunk/chandler/repository/persistence/DBItemIO.py

Diff

Modified: trunk/chandler/Makefile (15297 => 15298)

--- trunk/chandler/Makefile	2007-09-05 17:05:58 UTC (rev 15297)
+++ trunk/chandler/Makefile	2007-09-05 17:16:01 UTC (rev 15298)
@@ -34,7 +34,7 @@
 
 ARCHIVES = \
     $(CHANDLERARCHIVES)/Launchers-$(SNAP)-0.9-$(BP)20.tar.gz \
-    $(CHANDLERARCHIVES)/chandlerdb-$(SNAP)-0.7-$(BP)24.tar.gz \
+    $(CHANDLERARCHIVES)/chandlerdb-$(SNAP)-0.7-$(BP)25.tar.gz \
     $(CHANDLERARCHIVES)/db-$(SNAP)-4.5.20-$(BP)3.tar.gz \
     $(CHANDLERARCHIVES)/python-$(SNAP)-2.5.1-$(BP)4.tar.gz \
     $(CHANDLERARCHIVES)/epydoc-$(SNAP)-3.0beta1-$(BP)1.tar.gz \

Modified: trunk/chandler/repository/persistence/DBContainer.py (15297 => 15298)

--- trunk/chandler/repository/persistence/DBContainer.py	2007-09-05 17:05:58 UTC (rev 15297)
+++ trunk/chandler/repository/persistence/DBContainer.py	2007-09-05 17:16:01 UTC (rev 15298)
@@ -1508,8 +1508,9 @@
     # 0.7.6: added storage of a view's timezone
     # 0.7.7: added support for preventing some indexes from being deferred
     # 0.7.8: == values in sorted indexes now ranked by comparing their keys
+    # 0.7.9: MERGED item bit persisted
 
-    FORMAT_VERSION = 0x00070800
+    FORMAT_VERSION = 0x00070900
 
     SCHEMA_KEY  = pack('>16sl', Repository.itsUUID._uuid, 0)
     VERSION_KEY = pack('>16sl', Repository.itsUUID._uuid, 1)

Modified: trunk/chandler/repository/persistence/DBItemIO.py (15297 => 15298)

--- trunk/chandler/repository/persistence/DBItemIO.py	2007-09-05 17:05:58 UTC (rev 15297)
+++ trunk/chandler/repository/persistence/DBItemIO.py	2007-09-05 17:16:01 UTC (rev 15298)
@@ -1037,7 +1037,7 @@
         self.status = status
         self.uParent = uParent
 
-        if status & CItem.NEW:
+        if status & (CItem.NEW | CItem.MERGED):
             self.hashes = None
         else:
             self.hashes = list(dirties)

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits