kallithea Changeset - 8447d35b674e

Changeset - 8447d35b674e

Parent rev.

Child rev.

[Not reviewed]

codereview

0 2 0

Marcin Kuzminski - 14 years ago 2012-05-17 00:47:45
marcin@python-works.com

Added simple versioning for changeset status

2 files changed with 18 insertions and 22 deletions:

rhodecode/model/changeset_status.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/model/changeset_status.py

➞

Show inline comments

@@ @@ -49,7 +49,9 @@ class ChangesetStatusModel(BaseModel): @@
     def get_status(self, repo, revision):
         """
         Returns status of changeset for given revision
         Returns status of changeset for given revision and version 0
         versioning makes a history of statuses, and version == 0 is always the
         current one
         :param repo:
         :type repo:
@@ @@ -60,14 +62,16 @@ class ChangesetStatusModel(BaseModel): @@
         status = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == repo)\
             .filter(ChangesetStatus.revision == revision).scalar()
             .filter(ChangesetStatus.revision == revision)\
             .filter(ChangesetStatus.version == 0).scalar()
         status = status.status if status else status
         st = status or ChangesetStatus.DEFAULT
         return str(st)
     def set_status(self, repo, revision, status, user, comment):
         """
         Creates new status for changeset or updates the old one
         Creates new status for changeset or updates the old ones bumping their
         version, leaving the current status at
         :param repo:
         :type repo:
@@ @@ -82,11 +86,15 @@ class ChangesetStatusModel(BaseModel): @@
         """
         repo = self.__get_repo(repo)
-        cur_status = ChangesetStatus.query()\
+        cur_statuses = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == repo)\
             .filter(ChangesetStatus.revision == revision)\
             .scalar()
         new_status = cur_status or ChangesetStatus()
             .all()
         if cur_statuses:
             for st in cur_statuses:
                 st.version += 1
                 self.sa.add(st)
         new_status = ChangesetStatus()
         new_status.author = self.__get_user(user)
         new_status.repo = self.__get_repo(repo)
         new_status.status = status

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -686,7 +686,8 @@ class Repository(Base, BaseModel): @@
         """
         statuses = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == self)
             .filter(ChangesetStatus.repo == self)\
             .filter(ChangesetStatus.version == 0)
         if revisions:
             statuses = statuses.filter(ChangesetStatus.revision.in_(revisions))
         grouped = {}
@@ @@ -1230,7 +1231,7 @@ class ChangesetComment(Base, BaseModel): @@
 class ChangesetStatus(Base, BaseModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         UniqueConstraint('repo_id', 'revision'),
+        UniqueConstraint('repo_id', 'revision', 'version'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )
@@ @@ -1250,7 +1251,7 @@ class ChangesetStatus(Base, BaseModel): @@
     status = Column('status', String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
+    version = Column('version', Integer(), nullable=False, default=0)
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     comment = relationship('ChangesetComment', lazy='joined')
@@ @@ -1260,19 +1261,6 @@ class ChangesetStatus(Base, BaseModel): @@
         return dict(self.STATUSES).get(self.status)
 class ChangesetStatusHistory(Base, BaseModel):
     __tablename__ = 'changeset_statuses_history'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )
     #TODO: check if sqla has a nice history table implementation
     changeset_status_id = Column('changeset_status_id', Integer(), ForeignKey('changeset_statuses.changeset_status_id'), nullable=False, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     status = Column('status', String(128), nullable=False)
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
 class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = (

0 comments (0 inline, 0 general)