kallithea Changeset - 058fc80b052e

Changeset - 058fc80b052e

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Marcin Kuzminski - 14 years ago 2012-05-16 00:06:43
marcin@python-works.com

merge with beta

2 files changed with 3 insertions and 2 deletions:

docs/changelog.rst

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

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -9,24 +9,25 @@ Changelog @@
 news
 ++++
 - chinese traditional translation
 fixes
 +++++
 - fixed no scm found warning
 - fixed __future__ import error on rcextensions
 - made simplejson required lib for speedup on JSON encoding
 - fixes #449 bad regex could get more than revisions from parsing history
 .3.5 (**2012-05-10**)
 ----------------------
 news
 ++++
 - use ext_json for json module
 - unified annotation view with file source view
 - notification improvements, better inbox + css
 - #419 don't strip passwords for login forms, make rhodecode
   more compatible with LDAP servers

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

➞

Show inline comments

@@ @@ -231,29 +231,29 @@ class GitChangeset(BaseChangeset): @@
         node = self.get_node(path)
         return node.history[0]
     def get_file_history(self, path):
         """
         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.
         """
         cmd = 'log --pretty="format: %%H" --name-status -p %s -- "%s"' % (
+        cmd = 'log --pretty="format: --%%H--" --name-status -p %s -- "%s"' % (
                   self.id, path
+               )
         so, se = self.repository.run_git_command(cmd)
         ids = re.findall(r'\w{40}', so)
+        ids = re.findall(r'(?:--)(\w{40})(?:--)', so)
         return [self.repository.get_changeset(id) for id in ids]
     def get_file_annotate(self, path):
         """
         Returns a list of three element tuples with lineno,changeset and line
         TODO: This function now uses os underlying 'git' command which is
         generally not good. Should be replaced with algorithm iterating
         commits.
         """
         cmd = 'blame -l --root -r %s -- "%s"' % (self.id, path)
         # -l     ==> outputs long shas (and we need all 40 characters)

0 comments (0 inline, 0 general)