kallithea Changeset - b6b3c6dc49aa

Changeset - b6b3c6dc49aa

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 7 years ago 2018-08-05 23:16:23
mads@kiilerich.com

hg: don't use custom diff arguments when generating diffstats for rss feed

With Mercurial 4.7, it is no longer possible to pass arguments like `git=True`
to `ctx.diff()`.

This will change the reported data slightly, but the difference isn't
important. Also, the code should be refactored to do something similar to what
we do in other places.

1 file changed with 3 insertions and 4 deletions:

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

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -193,52 +193,51 @@ class MercurialChangeset(BaseChangeset): @@
             cs = cs.repository.get_changeset(next_rev)
             if not branch or branch == cs.branch:
                 return cs
     def prev(self, branch=None):
         if branch and self.branch != branch:
             raise VCSError('Branch option used on changeset not belonging '
                            'to that branch')
         cs = self
         while True:
             try:
                 prev_ = cs.repository.revisions.index(cs.raw_id) - 1
                 if prev_ < 0:
                     raise IndexError
                 prev_rev = cs.repository.revisions[prev_]
             except IndexError:
                 raise ChangesetDoesNotExistError
             cs = cs.repository.get_changeset(prev_rev)
             if not branch or branch == cs.branch:
                 return cs
     def diff(self, ignore_whitespace=True, context=3):
         return ''.join(self._ctx.diff(git=True,
                                       ignore_whitespace=ignore_whitespace,
                                       context=context))
     def diff(self):
         # Only used for feed diffstat
         return ''.join(self._ctx.diff())
     def _fix_path(self, path):
         """
         Paths are stored without trailing slash so we need to get rid off it if
         needed. Also mercurial keeps filenodes as str so we need to decode
         from unicode to str
         """
         if path.endswith('/'):
             path = path.rstrip('/')
         return safe_str(path)
     def _get_kind(self, path):
         path = self._fix_path(path)
         if path in self._file_paths:
             return NodeKind.FILE
         elif path in self._dir_paths:
             return NodeKind.DIR
         else:
             raise ChangesetError("Node does not exist at the given path '%s'"
                 % (path))
     def _get_filectx(self, path):
         path = self._fix_path(path)

0 comments (0 inline, 0 general)