# HG changeset patch # User Marcin Kuzminski # Date 2013-02-21 01:31:21 # Node ID fe2bb88bf7ac7d117b090f9d1814b5aca7332215 # Parent f2425f427f8eb6cccc606cddfd4d68549ca228a0 whitespace cleanup diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -141,7 +141,7 @@ class PullrequestsController(BaseRepoCon c.default_other_refs, class_='refs') } - # gather forks and add to this list ... even though it is rare to + # gather forks and add to this list ... even though it is rare to # request forks to pull their parent for fork in org_repo.forks: c.other_repos.append((fork.repo_name, fork.repo_name)) diff --git a/rhodecode/lib/vcs/backends/git/changeset.py b/rhodecode/lib/vcs/backends/git/changeset.py --- a/rhodecode/lib/vcs/backends/git/changeset.py +++ b/rhodecode/lib/vcs/backends/git/changeset.py @@ -364,7 +364,7 @@ class GitChangeset(BaseChangeset): else: frmt = 'tar' _git_path = rhodecode.CONFIG.get('git_path', 'git') - cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path, + cmd = '%s archive --format=%s --prefix=%s/ %s' % (_git_path, frmt, prefix, self.raw_id) if kind == 'tgz': cmd += ' | gzip -9' diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html --- a/rhodecode/templates/admin/repos/repo_edit.html +++ b/rhodecode/templates/admin/repos/repo_edit.html @@ -292,10 +292,10 @@
${h.submit('remove_%s' % c.repo_info.repo_name,_('Remove this repository'),class_="ui-btn red",onclick="return confirm('"+_('Confirm to delete this repository')+"');")} %if c.repo_info.forks.count(): - - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()} + - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()} - %endif + %endif