kallithea Changeset - 184159c21be2

Changeset - 184159c21be2

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2014-08-01 20:28:42
madski@unity3d.com

vcs: replace recursive implementation of prev&next with iterative

It was recursing over the repo and could give "maximum recursion depth
exceeded".

The implementation is still inefficient.

2 files changed with 24 insertions and 40 deletions:

kallithea/lib/vcs/backends/git/changeset.py

kallithea/lib/vcs/backends/hg/changeset.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -198,55 +198,47 @@ class GitChangeset(BaseChangeset): @@
             if pat.match(l):
                 childs = l.split(' ')[1:]
                 children.extend(childs)
         return [self.repository.get_changeset(cs) for cs in children]
     def next(self, branch=None):
         if branch and self.branch != branch:
             raise VCSError('Branch option used on changeset not belonging '
                            'to that branch')
         def _next(changeset, branch):
         cs = self
         while True:
             try:
                 next_ = changeset.revision + 1
                 next_rev = changeset.repository.revisions[next_]
                 next_ = cs.revision + 1
                 next_rev = cs.repository.revisions[next_]
             except IndexError:
                 raise ChangesetDoesNotExistError
-            cs = changeset.repository.get_changeset(next_rev)
+            cs = cs.repository.get_changeset(next_rev)
             if branch and branch != cs.branch:
                 return _next(cs, branch)
             if not branch or branch == cs.branch:
             return cs
         return _next(self, branch)
     def prev(self, branch=None):
         if branch and self.branch != branch:
             raise VCSError('Branch option used on changeset not belonging '
                            'to that branch')
         def _prev(changeset, branch):
         cs = self
         while True:
             try:
-                prev_ = changeset.revision - 1
+                prev_ = cs.revision - 1
                 if prev_ < 0:
                     raise IndexError
-                prev_rev = changeset.repository.revisions[prev_]
+                prev_rev = cs.repository.revisions[prev_]
             except IndexError:
                 raise ChangesetDoesNotExistError
             cs = changeset.repository.get_changeset(prev_rev)
             cs = cs.repository.get_changeset(prev_rev)
             if branch and branch != cs.branch:
                 return _prev(cs, branch)
             if not branch or branch == cs.branch:
             return cs
         return _prev(self, branch)
     def diff(self, ignore_whitespace=True, context=3):
         rev1 = self.parents[0] if self.parents else self.repository.EMPTY_CHANGESET
         rev2 = self
         return ''.join(self.repository.get_diff(rev1, rev2,
                                     ignore_whitespace=ignore_whitespace,
                                     context=context))

kallithea/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -112,55 +112,47 @@ class MercurialChangeset(BaseChangeset): @@
         Returns list of children changesets.
         """
         return [self.repository.get_changeset(child.rev())
                 for child in self._ctx.children() if child.rev() >= 0]
     def next(self, branch=None):
         if branch and self.branch != branch:
             raise VCSError('Branch option used on changeset not belonging '
                            'to that branch')
         def _next(changeset, branch):
         cs = self
         while True:
             try:
                 next_ = changeset.revision + 1
                 next_rev = changeset.repository.revisions[next_]
                 next_ = cs.revision + 1
                 next_rev = cs.repository.revisions[next_]
             except IndexError:
                 raise ChangesetDoesNotExistError
-            cs = changeset.repository.get_changeset(next_rev)
+            cs = cs.repository.get_changeset(next_rev)
             if branch and branch != cs.branch:
                 return _next(cs, branch)
             if not branch or branch == cs.branch:
             return cs
         return _next(self, branch)
     def prev(self, branch=None):
         if branch and self.branch != branch:
             raise VCSError('Branch option used on changeset not belonging '
                            'to that branch')
         def _prev(changeset, branch):
         cs = self
         while True:
             try:
-                prev_ = changeset.revision - 1
+                prev_ = cs.revision - 1
                 if prev_ < 0:
                     raise IndexError
-                prev_rev = changeset.repository.revisions[prev_]
+                prev_rev = cs.repository.revisions[prev_]
             except IndexError:
                 raise ChangesetDoesNotExistError
             cs = changeset.repository.get_changeset(prev_rev)
             cs = cs.repository.get_changeset(prev_rev)
             if branch and branch != cs.branch:
                 return _prev(cs, branch)
             if not branch or branch == cs.branch:
             return cs
         return _prev(self, branch)
     def diff(self, ignore_whitespace=True, context=3):
         return ''.join(self._ctx.diff(git=True,
                                       ignore_whitespace=ignore_whitespace,
                                       context=context))
     def _fix_path(self, path):

0 comments (0 inline, 0 general)