kallithea Changeset - 092080cd96ba

Changeset - 092080cd96ba

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2012-02-27 04:06:59
marcin@python-works.com

Git fixes
- removed remotes from git-branches
- fixed parsing for git node history
- docs updates

3 files changed with 19 insertions and 5 deletions:

docs/changelog.rst

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

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

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

 .. _changelog:
 Changelog
 =========
-.3.1 (**2012-XX-XX**)
+.3.2 (**2012-XX-XX**)
 ----------------------
 :status: in-progress
 :branch: beta
 news
@@ @@ -15,12 +15,26 @@ news @@
 fixes
 +++++
 .3.1 (**2012-02-27**)
 ----------------------
 news
 ++++
 fixes
 +++++
 - redirection loop occurs when remember-me wasn't checked during login
 - fixes issues with git blob history generation
 - don't fetch branch for git in file history dropdown. Causes unneeded slowness
 .3.0 (**2012-02-26**)
 ----------------------
 news
 ++++

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

➞

Show inline comments

@@ @@ -243,14 +243,15 @@ class GitChangeset(BaseChangeset): @@
         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.
         """
         cmd = 'log --name-status -p %s -- "%s" | grep "^commit"' \
             % (self.id, path)
         cmd = 'log --pretty="format: %%H" --name-status -p %s -- "%s"' % (
                   '', path
+               )
         so, se = self.repository.run_git_command(cmd)
         ids = re.findall(r'\w{40}', so)
         return [self.repository.get_changeset(id) for id in ids]
     def get_file_annotate(self, path):
         """

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

➞

Show inline comments

@@ @@ -239,14 +239,13 @@ class GitRepository(BaseRepository): @@
         if not self.revisions:
             return {}
         refs = self._repo.refs.as_dict()
         sortkey = lambda ctx: ctx[0]
         _branches = [('/'.join(ref.split('/')[2:]), head)
             for ref, head in refs.items()
             if ref.startswith('refs/heads/') or
             ref.startswith('refs/remotes/') and not ref.endswith('/HEAD')]
             if ref.startswith('refs/heads/') and not ref.endswith('/HEAD')]
         return OrderedDict(sorted(_branches, key=sortkey, reverse=False))
     def _get_tags(self):
         if not self.revisions:
             return {}
         sortkey = lambda ctx: ctx[0]

0 comments (0 inline, 0 general)