refactoring new_rev of copy

tracim/tracim/lib/content.py

@@ -894,21 +894,21 @@ class ContentApi(object):
 
         content = item.copy(parent)
         # INFO - GM - 15-03-2018 - add "copy" revision
-        content.new_revision()
-        content.parent = parent
-        content.workspace = workspace
-        content.label = label
-        content.revision_type = ActionDescription.COPY
-        content.properties['origin'] = {
-            'content': item.id,
-            'revision': item.last_revision.revision_id,
-        }
+        with new_revision(content, force_create_new_revision=True) as rev:
+            rev.parent = parent
+            rev.workspace = workspace
+            rev.label = label
+            rev.revision_type = ActionDescription.COPY
+            rev.properties['origin'] = {
+                'content': item.id,
+                'revision': item.last_revision.revision_id,
+            }
         if do_save:
             self.save(content, ActionDescription.COPY, do_notify=do_notify)
         return content
 
     def copy_children(self, origin_content: Content, new_content: Content):
-        for child in origin_content.children:
+       for child in origin_content.children:
             self.copy(child, new_content)
 
     def move_recursively(self, item: Content,

tracim/tracim/model/__init__.py

@@ -120,7 +120,10 @@ def prevent_content_revision_delete(session: Session, flush_context: UOWTransact
 
 
 @contextmanager
-def new_revision(content: Content) -> Content:
+def new_revision(
+        content: Content,
+        force_create_new_revision: bool=False,
+) -> Content:
     """
     Prepare context to update a Content. It will add a new updatable revision to the content.
     :param content: Content instance to update
@@ -128,7 +131,8 @@ def new_revision(content: Content) -> Content:
     """
     with DBSession.no_autoflush:
         try:
-            if inspect(content.revision).has_identity:
+            if force_create_new_revision \
+                    or inspect(content.revision).has_identity:
                 content.new_revision()
             RevisionsIntegrity.add_to_updatable(content.revision)
             yield content

tracim/tracim/model/data.py

@@ -1117,7 +1117,7 @@ class Content(DeclarativeBase):
         revisions = sorted(self.revisions, key=lambda revision: revision.revision_id)
         return revisions[-1]
 
-    def new_revision(self) -> None:
+    def new_revision(self) -> ContentRevisionRO:
         """
         Return and assign to this content a new revision.
         If it's a new content, revision is totally new.