kallithea Changeset - 4e429252f3ee

Changeset - 4e429252f3ee

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 12 years ago 2013-09-02 16:57:30
marcin@python-works.com

Don't use -p flag together with -s in git calls. Latest
git version changes behaviour of such call changing the output.

In all the calls where -p -s was used we're only interested in
list of changesets and not the diff.

2 files changed with 6 insertions and 8 deletions:

rhodecode/controllers/compare.py

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

0 comments (0 inline, 0 general)

rhodecode/controllers/compare.py

➞

Show inline comments

@@ @@ -121,49 +121,49 @@ class CompareController(BaseRepoControll @@
             else:
                 hgrepo = other_repo._repo
             if merge:
                 revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)",
                                    other_rev, org_rev, org_rev)
                 ancestors = hgrepo.revs("ancestor(id(%s), id(%s))", org_rev, other_rev)
                 if ancestors:
                     # pick arbitrary ancestor - but there is usually only one
                     ancestor = hgrepo[ancestors[0]].hex()
             else:
                 # TODO: have both + and - changesets
                 revs = hgrepo.revs("id(%s) :: id(%s) - id(%s)",
                                    org_rev, other_rev, org_rev)
             changesets = [other_repo.get_changeset(rev) for rev in revs]
         elif alias == 'git':
             if org_repo != other_repo:
                 raise Exception('Comparing of different GIT repositories is not'
                                 'allowed. Got %s != %s' % (org_repo, other_repo))
             so, se = org_repo.run_git_command(
-                'log --reverse --pretty="format: %%H" -s -p %s..%s'
                 'log --reverse --pretty="format: %%H" -s %s..%s'
                     % (org_rev, other_rev)
+            )
             changesets = [org_repo.get_changeset(cs)
                           for cs in re.findall(r'[0-9a-fA-F]{40}', so)]
         return changesets, ancestor
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def index(self, org_ref_type, org_ref, other_ref_type, other_ref):
         # org_ref will be evaluated in org_repo
         org_repo = c.rhodecode_db_repo.repo_name
         org_ref = (org_ref_type, org_ref)
         # other_ref will be evaluated in other_repo
         other_ref = (other_ref_type, other_ref)
         other_repo = request.GET.get('other_repo', org_repo)
         # If merge is True:
         #   Show what org would get if merged with other:
         #   List changesets that are ancestors of other but not of org.
         #   New changesets in org is thus ignored.
         #   Diff will be from common ancestor, and merges of org to other will thus be ignored.
         # If merge is False:
         #   Make a raw diff from org to other, no matter if related or not.

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

➞

Show inline comments

@@ @@ -273,59 +273,57 @@ class GitChangeset(BaseChangeset): @@
         id = self._get_id_for_path(path)
         blob = self.repository._repo[id]
         return blob.raw_length()
     def get_file_changeset(self, path):
         """
         Returns last commit of the file at the given ``path``.
         """
         return self.get_file_history(path, limit=1)[0]
     def get_file_history(self, path, limit=None):
         """
         Returns history of file as reversed list of ``Changeset`` objects for
         which file at given ``path`` has been modified.
         TODO: This function now uses os underlying 'git' and 'grep' commands
         which is generally not good. Should be replaced with algorithm
         iterating commits.
         """
         self._get_filectx(path)
         cs_id = safe_str(self.id)
         f_path = safe_str(path)
         if limit:
             cmd = 'log -n %s --pretty="format: %%H" -s -p %s -- "%s"' % (
                       safe_int(limit, 0), cs_id, f_path
+                   )
             cmd = 'log -n %s --pretty="format: %%H" -s %s -- "%s"' % (
                       safe_int(limit, 0), cs_id, f_path)
         else:
             cmd = 'log --pretty="format: %%H" -s -p %s -- "%s"' % (
                       cs_id, f_path
+                   )
             cmd = 'log --pretty="format: %%H" -s %s -- "%s"' % (
                       cs_id, f_path)
         so, se = self.repository.run_git_command(cmd)
         ids = re.findall(r'[0-9a-fA-F]{40}', so)
-        return [self.repository.get_changeset(id) for id in ids]
+        return [self.repository.get_changeset(sha) for sha in ids]
     def get_file_history_2(self, path):
         """
         Returns history of file as reversed list of ``Changeset`` objects for
         which file at given ``path`` has been modified.
         """
         self._get_filectx(path)
         from dulwich.walk import Walker
         include = [self.id]
         walker = Walker(self.repository._repo.object_store, include,
                         paths=[path], max_entries=1)
         return [self.repository.get_changeset(sha)
                 for sha in (x.commit.id for x in walker)]
     def get_file_annotate(self, path):
         """
         Returns a generator of four element tuples with
             lineno, sha, changeset lazy loader and line
         TODO: This function now uses os underlying 'git' command which is
         generally not good. Should be replaced with algorithm iterating
         commits.
         """

0 comments (0 inline, 0 general)