Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / lib / wlrepo / mercurial_backend / document.py

diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py
index a8f7adc..3911d04 100644 (file)
--- a/lib/wlrepo/mercurial_backend/document.py
+++ b/lib/wlrepo/mercurial_backend/document.py
@@ -1,11 +1,18 @@
 # -*- encoding: utf-8 -*-
 
 # -*- encoding: utf-8 -*-
 

+import logging
+log = logging.getLogger('ral.mercurial')
+

 __author__ = "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:35:06$"
 __doc__ = "Module documentation."
 
 import wlrepo
 import mercurial.error
 __author__ = "Łukasz Rekucki"
 __date__ = "$2009-09-25 09:35:06$"
 __doc__ = "Module documentation."
 
 import wlrepo
 import mercurial.error

+import re
+
+import logging
+log = logging.getLogger('wlrepo.document')

 
 class MercurialDocument(wlrepo.Document):
 
 
 class MercurialDocument(wlrepo.Document):
 


@@ -71,6 +78,9 @@ class MercurialDocument(wlrepo.Document):
     def ismain(self):
         return self._revision.user_name is None
 
     def ismain(self):
         return self._revision.user_name is None
 

+    def islatest(self):
+        return (self == self.latest())
+

     def shared(self):
         if self.ismain():
             return self
     def shared(self):
         if self.ismain():
             return self


@@ -85,13 +95,20 @@ class MercurialDocument(wlrepo.Document):
 
         def take_action(library, resolve):
             # branch from latest 
 
         def take_action(library, resolve):
             # branch from latest 

-            library._create_branch(fullid, parent=self._revision)            
+            library._set_branchname(fullid)

 
         if not self._library.has_revision(fullid):
 
         if not self._library.has_revision(fullid):

+            log.info("Checking out document %s" % fullid)
+

             self.invoke_and_commit(take_action, \
                 lambda d: ("$AUTO$ File checkout.", user) )
 
         return self._library.document_for_rev(fullid)
             self.invoke_and_commit(take_action, \
                 lambda d: ("$AUTO$ File checkout.", user) )
 
         return self._library.document_for_rev(fullid)

+
+    def up_to_date(self):
+        return self.ismain() or (\
+            self.shared().ancestorof(self) )
+        

             
     def update(self, user):
         """Update parts of the document."""
             
     def update(self, user):
         """Update parts of the document."""


@@ -99,24 +116,24 @@ class MercurialDocument(wlrepo.Document):
         try:
             if self.ismain():
                 # main revision of the document
         try:
             if self.ismain():
                 # main revision of the document

-                return (True, False)
+                return self

             
             

-            if self._revision.has_children():
-                print 'Update failed: has children.'
-                # can't update non-latest revision
-                return (False, False)
+            if self._revision.has_children():                
+                raise UpdateException("Revision has children.")

 
             sv = self.shared()
 
             if self.parentof(sv):
 
             sv = self.shared()
 
             if self.parentof(sv):

-                return (True, False)
+                return self

 
             if sv.ancestorof(self):
 
             if sv.ancestorof(self):

-                return (True, False)
-
+                return self

 
 

-            return self._revision.merge_with(sv._revision, user=user,
-                message="$AUTO$ Personal branch update.")
+            if self._revision.merge_with(sv._revision, user=user,\
+                message="$AUTO$ Personal branch update."):
+                return self.latest()
+            else:
+                raise UpdateException("Merge failed.")

         finally:
             lock.release()  
 
         finally:
             lock.release()  
 


@@ -124,7 +141,7 @@ class MercurialDocument(wlrepo.Document):
         lock = self.library.lock()
         try:            
             if self.ismain():
         lock = self.library.lock()
         try:            
             if self.ismain():

-                return (True, False) # always shared
+                return False # always shared

 
             user = self._revision.user_name
             main = self.shared()._revision
 
             user = self._revision.user_name
             main = self.shared()._revision


@@ -142,29 +159,17 @@ class MercurialDocument(wlrepo.Document):
             # so we don't need to update yet again, but we need to
             # merge down to default branch, even if there was
             # no commit's since last update
             # so we don't need to update yet again, but we need to
             # merge down to default branch, even if there was
             # no commit's since last update

-
-            if main.ancestorof(local):
-                print "case 1"
-                success, changed = main.merge_with(local, user=user, message=message)                
-            # Case 2:
-            #
-            # main *  * local
-            #      |\ |
-            #      | \|
-            #      |  *
-            #      |  |

             #
             #

-            # Default has no changes, to update from this branch
-            # since the last merge of local to default.
-            elif local.has_common_ancestor(main):
-                print "case 2"
-                if not local.parentof(main):
-                    success, changed = main.merge_with(local, user=user, message=message)
+            # This is actually the only good case!
+            if main.ancestorof(local):
+                success, changed = main.merge_with(local, user=user, message=message)

 
 

-                success = True
-                changed = False
+                if not success:
+                    raise LibraryException("Merge failed.")

 
 

-            # Case 3:
+                return changed
+            
+            # Case 2:

             # main *
             #      |
             #      * <- this case overlaps with previos one
             # main *
             #      |
             #      * <- this case overlaps with previos one


@@ -176,41 +181,27 @@ class MercurialDocument(wlrepo.Document):
             # There was a recent merge to the defaul branch and
             # no changes to local branch recently.
             #
             # There was a recent merge to the defaul branch and
             # no changes to local branch recently.
             #

-            # Use the fact, that user is prepared to see changes, to
-            # update his branch if there are any
-            elif local.ancestorof(main):
-                print "case 3"
-                if not local.parentof(main):
-                    success, changed = local.merge_with(main, user=user, \
-                        message='$AUTO$ Local branch update during share.')
-
-                success = True
-                changed = False
-                    
-            else:
-                print "case 4"
-                success, changed = local.merge_with(main, user=user, \
-                        message='$AUTO$ Local branch update during share.')
-
-                if not success:
-                    return False
+            # Nothing to do
+            elif local.ancestorof(main):                
+                return False

 
 

-                if changed:
-                    local = self.latest()._revision
-                    
-                success, changed = main.merge_with(local, user=user,\
-                    message=message)
-            
-            return success, changed
+            # In all other cases, the local needs an update
+            # and possibly conflict resolution, so fail
+            raise LibraryExcepton("Document not prepared for sharing.")
+        

         finally:
         finally:

-            lock.release()     
+            lock.release()
+
+
+    def has_conflict_marks(self):
+        return re.search("^(?:<<<<<<< .*|=======|>>>>>>> .*)$", self.data('xml'), re.MULTILINE)        

 
     def __unicode__(self):
 
     def __unicode__(self):

-        return u"Document(%s:%s)" % (self.name, self.owner)
+        return u"Document(%s:%s)" % (self.id, self.owner)

 
     def __str__(self):
         return self.__unicode__().encode('utf-8')
     
     def __eq__(self, other):
 
     def __str__(self):
         return self.__unicode__().encode('utf-8')
     
     def __eq__(self, other):

-        return (self._revision == other._revision) and (self.name == other.name)
+        return (self._revision == other._revision)