kallithea Changeset - ca9df5a30ab2

Changeset - ca9df5a30ab2

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 6 years ago 2019-12-26 22:39:10
mads@kiilerich.com

Grafted from: f49ebe0b53e0

vcs: refactor run_git_command to just return stdout as unicode string

This will be convenient for py3.

4 files changed with 14 insertions and 14 deletions:

kallithea/controllers/compare.py

kallithea/lib/hooks.py

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

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

0 comments (0 inline, 0 general)

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -150,13 +150,13 @@ class CompareController(BaseRepoControll @@
                 gitrepo_remote.close()
             else:
-                so, se = org_repo.run_git_command(
                 so = org_repo.run_git_command(
                     ['log', '--reverse', '--pretty=format:%H',
                      '-s', '%s..%s' % (org_rev, other_rev)]
+                )
                 other_changesets = [org_repo.get_changeset(cs)
                               for cs in re.findall(r'[0-9a-fA-F]{40}', so)]
-                so, se = org_repo.run_git_command(
                 so = org_repo.run_git_command(
                     ['merge-base', org_rev, other_rev]
+                )
                 ancestors = [re.findall(r'[0-9a-fA-F]{40}', so)[0]]

kallithea/lib/hooks.py

➞

Show inline comments

@@ @@ -368,14 +368,14 @@ def handle_git_post_receive(repo_path, g @@
                 # build exclude list without the ref
                 cmd = ['for-each-ref', '--format=%(refname)', 'refs/heads/*']
-                stdout, stderr = scm_repo.run_git_command(cmd)
                 stdout = scm_repo.run_git_command(cmd)
                 ref = push_ref['ref']
                 heads = [head for head in stdout.splitlines() if head != ref]
                 # now list the git revs while excluding from the list
                 cmd = ['log', push_ref['new_rev'], '--reverse', '--pretty=format:%H']
                 cmd.append('--not')
                 cmd.extend(heads) # empty list is ok
-                stdout, stderr = scm_repo.run_git_command(cmd)
                 stdout = scm_repo.run_git_command(cmd)
                 git_revs += stdout.splitlines()
             elif push_ref['new_rev'] == EmptyChangeset().raw_id:
@@ @@ -384,7 +384,7 @@ def handle_git_post_receive(repo_path, g @@
             else:
                 cmd = ['log', '%(old_rev)s..%(new_rev)s' % push_ref,
                        '--reverse', '--pretty=format:%H']
-                stdout, stderr = scm_repo.run_git_command(cmd)
                 stdout = scm_repo.run_git_command(cmd)
                 git_revs += stdout.splitlines()
         elif _type == 'tags':

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

➞

Show inline comments

@@ @@ -194,7 +194,7 @@ class GitChangeset(BaseChangeset): @@
         Returns list of children changesets.
         """
         rev_filter = settings.GIT_REV_FILTER
-        so, se = self.repository.run_git_command(
         so = self.repository.run_git_command(
             ['rev-list', rev_filter, '--children']
+        )
         return [
@@ @@ -299,7 +299,7 @@ class GitChangeset(BaseChangeset): @@
         else:
             cmd = ['log',
                    '--pretty=format:%H', '-s', cs_id, '--', f_path]
-        so, se = self.repository.run_git_command(cmd)
         so = self.repository.run_git_command(cmd)
         ids = re.findall(r'[0-9a-fA-F]{40}', so)
         return [self.repository.get_changeset(sha) for sha in ids]
@@ @@ -330,7 +330,7 @@ class GitChangeset(BaseChangeset): @@
         # -l     ==> outputs long shas (and we need all 40 characters)
         # --root ==> doesn't put '^' character for boundaries
         # -r sha ==> blames for the given revision
-        so, se = self.repository.run_git_command(cmd)
         so = self.repository.run_git_command(cmd)
         for i, blame_line in enumerate(so.split('\n')[:-1]):
             ln_no = i + 1

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

➞

Show inline comments

@@ @@ -137,13 +137,13 @@ class GitRepository(BaseRepository): @@
     def run_git_command(self, cmd):
         """
         Runs given ``cmd`` as git command with cwd set to current repo.
         Returns output bytes in a tuple (stdout, stderr) ... or raise
         RepositoryError.
         Returns stdout as unicode str ... or raise RepositoryError.
         """
         cwd = None
         if os.path.isdir(self.path):
             cwd = self.path
         return self._run_git_command(cmd, cwd=cwd)
         stdout, _stderr = self._run_git_command(cmd, cwd=cwd)
         return safe_unicode(stdout)
     @classmethod
     def _check_url(cls, url):
@@ @@ -243,7 +243,7 @@ class GitRepository(BaseRepository): @@
         rev_filter = settings.GIT_REV_FILTER
         cmd = ['rev-list', rev_filter, '--reverse', '--date-order']
         try:
-            so, se = self.run_git_command(cmd)
             so = self.run_git_command(cmd)
         except RepositoryError:
             # Can be raised for empty repositories
             return []
@@ @@ -538,7 +538,7 @@ class GitRepository(BaseRepository): @@
         else:
             cmd.append(settings.GIT_REV_FILTER)
-        revs = self.run_git_command(cmd)[0].splitlines()
         revs = self.run_git_command(cmd).splitlines()
         start_pos = 0
         end_pos = len(revs)
         if start:
@@ @@ -674,7 +674,7 @@ class GitRepository(BaseRepository): @@
         Tries to pull changes from external location.
         """
         url = self._get_url(url)
-        so, se = self.run_git_command(['ls-remote', '-h', url])
         so = self.run_git_command(['ls-remote', '-h', url])
         cmd = ['fetch', url, '--']
         for line in (x for x in so.splitlines()):
             sha, ref = line.split('\t')

0 comments (0 inline, 0 general)