##// END OF EJS Templates
merge with beta
marcink -
r2275:058fc80b merge default
parent child Browse files
Show More
@@ -18,6 +18,7 b' fixes'
18 - fixed no scm found warning
18 - fixed no scm found warning
19 - fixed __future__ import error on rcextensions
19 - fixed __future__ import error on rcextensions
20 - made simplejson required lib for speedup on JSON encoding
20 - made simplejson required lib for speedup on JSON encoding
21 - fixes #449 bad regex could get more than revisions from parsing history
21
22
22 1.3.5 (**2012-05-10**)
23 1.3.5 (**2012-05-10**)
23 ----------------------
24 ----------------------
@@ -240,11 +240,11 b' class GitChangeset(BaseChangeset):'
240 which is generally not good. Should be replaced with algorithm
240 which is generally not good. Should be replaced with algorithm
241 iterating commits.
241 iterating commits.
242 """
242 """
243 cmd = 'log --pretty="format: %%H" --name-status -p %s -- "%s"' % (
243 cmd = 'log --pretty="format: --%%H--" --name-status -p %s -- "%s"' % (
244 self.id, path
244 self.id, path
245 )
245 )
246 so, se = self.repository.run_git_command(cmd)
246 so, se = self.repository.run_git_command(cmd)
247 ids = re.findall(r'\w{40}', so)
247 ids = re.findall(r'(?:--)(\w{40})(?:--)', so)
248 return [self.repository.get_changeset(id) for id in ids]
248 return [self.repository.get_changeset(id) for id in ids]
249
249
250 def get_file_annotate(self, path):
250 def get_file_annotate(self, path):
General Comments 0
You need to be logged in to leave comments. Login now