kallithea Changeset - 39ba3ee88c7c

Changeset - 39ba3ee88c7c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich (mads) - 6 years ago 2019-12-31 15:39:17
mads@kiilerich.com

Grafted from: 4f6b9e6883fd

vcs: use more correct git revision identifiers

It will have the right types and make a difference for py3.

1 file changed with 4 insertions and 4 deletions:

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

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -37,13 +37,13 @@ class GitChangeset(BaseChangeset): @@
         self._commit = commit
         self._tree_id = commit.tree
         self._committer_property = 'committer'
         self._author_property = 'author'
         self._date_property = 'commit_time'
         self._date_tz_property = 'commit_timezone'
-        self.revision = repository.revisions.index(revision)
+        self.revision = repository.revisions.index(self.raw_id)
         self.nodes = {}
         self._paths = {}
     @LazyProperty
     def bookmarks(self):
@@ @@ -88,13 +88,13 @@ class GitChangeset(BaseChangeset): @@
     @LazyProperty
     def branch(self):
         # Note: This function will return one branch name for the changeset -
         # that might not make sense in Git where branches() is a better match
         # for the basic model
         heads = self.repository._heads(reverse=False)
-        ref = heads.get(self.raw_id)
+        ref = heads.get(self._commit.id)
         if ref:
             return safe_unicode(ref)
     @LazyProperty
     def branches(self):
         heads = self.repository._heads(reverse=True)
@@ @@ -502,14 +502,14 @@ class GitChangeset(BaseChangeset): @@
         if not self.parents:
             parents = [EmptyChangeset()]
         for parent in parents:
             if isinstance(parent, EmptyChangeset):
                 oid = None
             else:
                 oid = _r[parent.raw_id].tree
             changes = _r.object_store.tree_changes(oid, _r[self.raw_id].tree)
                 oid = _r[parent._commit.id].tree
             changes = _r.object_store.tree_changes(oid, _r[self._commit.id].tree)
             for (oldpath, newpath), (_, _), (_, _) in changes:
                 if newpath and oldpath:
                     modified.add(newpath)
                 elif newpath and not oldpath:
                     added.add(newpath)
                 elif not newpath and oldpath:

0 comments (0 inline, 0 general)