tests: fixes after some later code changes

rhodecode/api/tests/test_get_pull_request.py

@@ -1,143 +1,143 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2019 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 import pytest
 import urlobject
 
 from rhodecode.api.tests.utils import (
     build_data, api_call, assert_error, assert_ok)
 from rhodecode.lib import helpers as h
 from rhodecode.lib.utils2 import safe_unicode
 
 pytestmark = pytest.mark.backends("git", "hg")
 
 
 @pytest.mark.usefixtures("testuser_api", "app")
 class TestGetPullRequest(object):
 
     def test_api_get_pull_request(self, pr_util, http_host_only_stub):
         from rhodecode.model.pull_request import PullRequestModel
         pull_request = pr_util.create_pull_request(mergeable=True)
         id_, params = build_data(
             self.apikey, 'get_pull_request',
-            pullrequestid=pull_request.pull_request_id)
+            pullrequestid=pull_request.pull_request_id, merge_state=True)
 
         response = api_call(self.app, params)
 
         assert response.status == '200 OK'
 
         url_obj = urlobject.URLObject(
             h.route_url(
                 'pullrequest_show',
                 repo_name=pull_request.target_repo.repo_name,
                 pull_request_id=pull_request.pull_request_id))
 
         pr_url = safe_unicode(
             url_obj.with_netloc(http_host_only_stub))
         source_url = safe_unicode(
             pull_request.source_repo.clone_url().with_netloc(http_host_only_stub))
         target_url = safe_unicode(
             pull_request.target_repo.clone_url().with_netloc(http_host_only_stub))
         shadow_url = safe_unicode(
             PullRequestModel().get_shadow_clone_url(pull_request))
 
         expected = {
             'pull_request_id': pull_request.pull_request_id,
             'url': pr_url,
             'title': pull_request.title,
             'description': pull_request.description,
             'status': pull_request.status,
             'state': pull_request.pull_request_state,
             'created_on': pull_request.created_on,
             'updated_on': pull_request.updated_on,
             'commit_ids': pull_request.revisions,
             'review_status': pull_request.calculated_review_status(),
             'mergeable': {
                 'status': True,
                 'message': 'This pull request can be automatically merged.',
             },
             'source': {
                 'clone_url': source_url,
                 'repository': pull_request.source_repo.repo_name,
                 'reference': {
                     'name': pull_request.source_ref_parts.name,
                     'type': pull_request.source_ref_parts.type,
                     'commit_id': pull_request.source_ref_parts.commit_id,
                 },
             },
             'target': {
                 'clone_url': target_url,
                 'repository': pull_request.target_repo.repo_name,
                 'reference': {
                     'name': pull_request.target_ref_parts.name,
                     'type': pull_request.target_ref_parts.type,
                     'commit_id': pull_request.target_ref_parts.commit_id,
                 },
             },
             'merge': {
                 'clone_url': shadow_url,
                 'reference': {
                     'name': pull_request.shadow_merge_ref.name,
                     'type': pull_request.shadow_merge_ref.type,
                     'commit_id': pull_request.shadow_merge_ref.commit_id,
                 },
             },
             'author': pull_request.author.get_api_data(include_secrets=False,
                                                        details='basic'),
             'reviewers': [
                 {
                     'user': reviewer.get_api_data(include_secrets=False,
                                                   details='basic'),
                     'reasons': reasons,
                     'review_status': st[0][1].status if st else 'not_reviewed',
                 }
                 for obj, reviewer, reasons, mandatory, st in
                 pull_request.reviewers_statuses()
             ]
         }
         assert_ok(id_, expected, response.body)
 
     def test_api_get_pull_request_repo_error(self, pr_util):
         pull_request = pr_util.create_pull_request()
         id_, params = build_data(
             self.apikey, 'get_pull_request',
             repoid=666, pullrequestid=pull_request.pull_request_id)
         response = api_call(self.app, params)
 
         expected = 'repository `666` does not exist'
         assert_error(id_, expected, given=response.body)
 
     def test_api_get_pull_request_pull_request_error(self):
         id_, params = build_data(
             self.apikey, 'get_pull_request', pullrequestid=666)
         response = api_call(self.app, params)
 
         expected = 'pull request `666` does not exist'
         assert_error(id_, expected, given=response.body)
 
     def test_api_get_pull_request_pull_request_error_just_pr_id(self):
         id_, params = build_data(
             self.apikey, 'get_pull_request',
             pullrequestid=666)
         response = api_call(self.app, params)
 
         expected = 'pull request `666` does not exist'
         assert_error(id_, expected, given=response.body)

rhodecode/apps/repository/tests/test_repo_commits.py

@@ -1,305 +1,318 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2019 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
 
 from rhodecode.lib.helpers import _shorten_commit_id
 
 
 def route_path(name, params=None, **kwargs):
     import urllib
 
     base_url = {
         'repo_commit': '/{repo_name}/changeset/{commit_id}',
         'repo_commit_children': '/{repo_name}/changeset_children/{commit_id}',
         'repo_commit_parents': '/{repo_name}/changeset_parents/{commit_id}',
         'repo_commit_raw': '/{repo_name}/changeset-diff/{commit_id}',
         'repo_commit_patch': '/{repo_name}/changeset-patch/{commit_id}',
         'repo_commit_download': '/{repo_name}/changeset-download/{commit_id}',
         'repo_commit_data': '/{repo_name}/changeset-data/{commit_id}',
         'repo_compare': '/{repo_name}/compare/{source_ref_type}@{source_ref}...{target_ref_type}@{target_ref}',
     }[name].format(**kwargs)
 
     if params:
         base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
     return base_url
 
 
 @pytest.mark.usefixtures("app")
 class TestRepoCommitView(object):
 
     def test_show_commit(self, backend):
         commit_id = self.commit_id[backend.alias]
         response = self.app.get(route_path(
             'repo_commit', repo_name=backend.repo_name, commit_id=commit_id))
         response.mustcontain('Added a symlink')
         response.mustcontain(commit_id)
         response.mustcontain('No newline at end of file')
 
     def test_show_raw(self, backend):
         commit_id = self.commit_id[backend.alias]
         response = self.app.get(route_path(
             'repo_commit_raw',
             repo_name=backend.repo_name, commit_id=commit_id))
         assert response.body == self.diffs[backend.alias]
 
     def test_show_raw_patch(self, backend):
         response = self.app.get(route_path(
             'repo_commit_patch', repo_name=backend.repo_name,
             commit_id=self.commit_id[backend.alias]))
         assert response.body == self.patches[backend.alias]
 
     def test_commit_download(self, backend):
         response = self.app.get(route_path(
             'repo_commit_download',
             repo_name=backend.repo_name,
             commit_id=self.commit_id[backend.alias]))
         assert response.body == self.diffs[backend.alias]
 
     def test_single_commit_page_different_ops(self, backend):
         commit_id = {
             'hg': '603d6c72c46d953420c89d36372f08d9f305f5dd',
             'git': '03fa803d7e9fb14daa9a3089e0d1494eda75d986',
             'svn': '337',
         }
+        diff_stat = {
+            'git': '20 files changed: 941 inserted, 286 deleted',
+            'svn': '21 files changed: 943 inserted, 288 deleted',
+            'hg': '21 files changed: 943 inserted, 288 deleted',
+
+        }
         commit_id = commit_id[backend.alias]
         response = self.app.get(route_path(
             'repo_commit',
             repo_name=backend.repo_name, commit_id=commit_id))
 
         response.mustcontain(_shorten_commit_id(commit_id))
-        response.mustcontain('21 files changed: 943 inserted, 288 deleted')
+        response.mustcontain(diff_stat[backend.alias])
 
         # files op files
         response.mustcontain('File not present at commit: %s' %
                              _shorten_commit_id(commit_id))
 
         # svn uses a different filename
         if backend.alias == 'svn':
             response.mustcontain('new file 10644')
         else:
             response.mustcontain('new file 100644')
         response.mustcontain('Changed theme to ADC theme')  # commit msg
 
         self._check_new_diff_menus(response, right_menu=True)
 
     def test_commit_range_page_different_ops(self, backend):
         commit_id_range = {
             'hg': (
                 '25d7e49c18b159446cadfa506a5cf8ad1cb04067',
                 '603d6c72c46d953420c89d36372f08d9f305f5dd'),
             'git': (
                 '6fc9270775aaf5544c1deb014f4ddd60c952fcbb',
                 '03fa803d7e9fb14daa9a3089e0d1494eda75d986'),
             'svn': (
                 '335',
                 '337'),
         }
         commit_ids = commit_id_range[backend.alias]
         commit_id = '%s...%s' % (commit_ids[0], commit_ids[1])
         response = self.app.get(route_path(
             'repo_commit',
             repo_name=backend.repo_name, commit_id=commit_id))
 
         response.mustcontain(_shorten_commit_id(commit_ids[0]))
         response.mustcontain(_shorten_commit_id(commit_ids[1]))
 
         # svn is special
         if backend.alias == 'svn':
             response.mustcontain('new file 10644')
             response.mustcontain('1 file changed: 5 inserted, 1 deleted')
             response.mustcontain('12 files changed: 236 inserted, 22 deleted')
             response.mustcontain('21 files changed: 943 inserted, 288 deleted')
+        elif backend.alias == 'git':
+            response.mustcontain('new file 100644')
+            response.mustcontain('12 files changed: 222 inserted, 20 deleted')
+            response.mustcontain('20 files changed: 941 inserted, 286 deleted')
         else:
             response.mustcontain('new file 100644')
             response.mustcontain('12 files changed: 222 inserted, 20 deleted')
             response.mustcontain('21 files changed: 943 inserted, 288 deleted')
 
         # files op files
         response.mustcontain('File not present at commit: %s' %
                              _shorten_commit_id(commit_ids[1]))
         response.mustcontain('Added docstrings to vcs.cli')  # commit msg
         response.mustcontain('Changed theme to ADC theme')  # commit msg
 
         self._check_new_diff_menus(response)
 
     def test_combined_compare_commit_page_different_ops(self, backend):
         commit_id_range = {
             'hg': (
                 '4fdd71e9427417b2e904e0464c634fdee85ec5a7',
                 '603d6c72c46d953420c89d36372f08d9f305f5dd'),
             'git': (
                 'f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
                 '03fa803d7e9fb14daa9a3089e0d1494eda75d986'),
             'svn': (
                 '335',
                 '337'),
         }
         commit_ids = commit_id_range[backend.alias]
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=backend.repo_name,
             source_ref_type='rev', source_ref=commit_ids[0],
             target_ref_type='rev', target_ref=commit_ids[1], ))
 
         response.mustcontain(_shorten_commit_id(commit_ids[0]))
         response.mustcontain(_shorten_commit_id(commit_ids[1]))
 
         # files op files
         response.mustcontain('File not present at commit: %s' %
                              _shorten_commit_id(commit_ids[1]))
 
         # svn is special
         if backend.alias == 'svn':
             response.mustcontain('new file 10644')
             response.mustcontain('32 files changed: 1179 inserted, 310 deleted')
+        elif backend.alias == 'git':
+            response.mustcontain('new file 100644')
+            response.mustcontain('31 files changed: 1163 inserted, 306 deleted')
         else:
             response.mustcontain('new file 100644')
             response.mustcontain('32 files changed: 1165 inserted, 308 deleted')
 
         response.mustcontain('Added docstrings to vcs.cli')  # commit msg
         response.mustcontain('Changed theme to ADC theme')  # commit msg
 
         self._check_new_diff_menus(response)
 
     def test_changeset_range(self, backend):
         self._check_changeset_range(
             backend, self.commit_id_range, self.commit_id_range_result)
 
     def test_changeset_range_with_initial_commit(self, backend):
         commit_id_range = {
             'hg': (
                 'b986218ba1c9b0d6a259fac9b050b1724ed8e545'
                 '...6cba7170863a2411822803fa77a0a264f1310b35'),
             'git': (
                 'c1214f7e79e02fc37156ff215cd71275450cffc3'
                 '...fa6600f6848800641328adbf7811fd2372c02ab2'),
             'svn': '1...3',
         }
         commit_id_range_result = {
             'hg': ['b986218ba1c9', '3d8f361e72ab', '6cba7170863a'],
             'git': ['c1214f7e79e0', '38b5fe81f109', 'fa6600f68488'],
             'svn': ['1', '2', '3'],
         }
         self._check_changeset_range(
             backend, commit_id_range, commit_id_range_result)
 
     def _check_changeset_range(
             self, backend, commit_id_ranges, commit_id_range_result):
         response = self.app.get(
             route_path('repo_commit',
                        repo_name=backend.repo_name,
                        commit_id=commit_id_ranges[backend.alias]))
 
         expected_result = commit_id_range_result[backend.alias]
         response.mustcontain('{} commits'.format(len(expected_result)))
         for commit_id in expected_result:
             response.mustcontain(commit_id)
 
     commit_id = {
         'hg': '2062ec7beeeaf9f44a1c25c41479565040b930b2',
         'svn': '393',
         'git': 'fd627b9e0dd80b47be81af07c4a98518244ed2f7',
     }
 
     commit_id_range = {
         'hg': (
             'a53d9201d4bc278910d416d94941b7ea007ecd52'
             '...2062ec7beeeaf9f44a1c25c41479565040b930b2'),
         'git': (
             '7ab37bc680b4aa72c34d07b230c866c28e9fc204'
             '...fd627b9e0dd80b47be81af07c4a98518244ed2f7'),
         'svn': '391...393',
     }
 
     commit_id_range_result = {
         'hg': ['a53d9201d4bc', '96507bd11ecc', '2062ec7beeea'],
         'git': ['7ab37bc680b4', '5f2c6ee19592', 'fd627b9e0dd8'],
         'svn': ['391', '392', '393'],
     }
 
     diffs = {
         'hg': r"""diff --git a/README b/README
 new file mode 120000
 --- /dev/null
 +++ b/README
 @@ -0,0 +1,1 @@
 +README.rst
 \ No newline at end of file
 """,
         'git': r"""diff --git a/README b/README
 new file mode 120000
-index 0000000000000000000000000000000000000000..92cacd285355271487b7e379dba6ca60f9a554a4
+index 0000000..92cacd2
 --- /dev/null
 +++ b/README
 @@ -0,0 +1 @@
 +README.rst
 \ No newline at end of file
 """,
         'svn': """Index: README
 ===================================================================
 diff --git a/README b/README
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/README\t(revision 393)
 @@ -0,0 +1 @@
 +link README.rst
 \\ No newline at end of file
 """,
     }
 
     patches = {
         'hg': r"""# HG changeset patch
 # User Marcin Kuzminski <[e-mail]>
 # Date 2014-01-07 12:21:40
 # Node ID 2062ec7beeeaf9f44a1c25c41479565040b930b2
 # Parent  96507bd11ecc815ebc6270fdf6db110928c09c1e
 
 Added a symlink
 
 """ + diffs['hg'],
         'git': r"""From fd627b9e0dd80b47be81af07c4a98518244ed2f7 2014-01-07 12:22:20
 From: Marcin Kuzminski <[e-mail]>
 Date: 2014-01-07 12:22:20
 Subject: [PATCH] Added a symlink
 
 ---
 
 """ + diffs['git'],
         'svn': r"""# SVN changeset patch
 # User marcin
 # Date 2014-09-02 12:25:22.071142
 # Revision 393
 
 Added a symlink
 
 """ + diffs['svn'],
     }
 
     def _check_new_diff_menus(self, response, right_menu=False,):
         # individual file diff menus
         for elem in ['Show file before', 'Show file after']:
             response.mustcontain(elem)
 
         # right pane diff menus
         if right_menu:
             for elem in ['Hide whitespace changes', 'Toggle Wide Mode diff',
                          'Show full context diff']:
                 response.mustcontain(elem)

rhodecode/apps/repository/tests/test_repo_compare_local.py

@@ -1,167 +1,167 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2019 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
 
 from .test_repo_compare import ComparePage
 
 
 def route_path(name, params=None, **kwargs):
     import urllib
 
     base_url = {
         'repo_compare_select': '/{repo_name}/compare',
         'repo_compare': '/{repo_name}/compare/{source_ref_type}@{source_ref}...{target_ref_type}@{target_ref}',
     }[name].format(**kwargs)
 
     if params:
         base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
     return base_url
 
 
 @pytest.mark.usefixtures("autologin_user", "app")
 class TestCompareView(object):
 
     @pytest.mark.xfail_backends("svn", msg="Depends on branch and tag support")
     def test_compare_tag(self, backend):
         tag1 = 'v0.1.2'
         tag2 = 'v0.1.3'
         response = self.app.get(
             route_path(
                 'repo_compare',
                 repo_name=backend.repo_name,
                 source_ref_type="tag", source_ref=tag1,
                 target_ref_type="tag", target_ref=tag2),
             status=200)
 
         response.mustcontain('%s@%s' % (backend.repo_name, tag1))
         response.mustcontain('%s@%s' % (backend.repo_name, tag2))
 
         # outgoing commits between tags
         commit_indexes = {
             'git': [113] + range(115, 121),
             'hg': [112] + range(115, 121),
         }
         repo = backend.repo
         commits = (repo.get_commit(commit_idx=idx)
                    for idx in commit_indexes[backend.alias])
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(11, 94, 64)
         compare_page.contains_commits(commits)
 
         # files diff
         short_id = short_id_new = ''
         if backend.alias == 'git':
             short_id = '5a3a8fb00555'
             short_id_new = '0ba5f8a46600'
         if backend.alias == 'hg':
             short_id = '17544fbfcd33'
             short_id_new = 'a7e60bff65d5'
 
         compare_page.contains_file_links_and_anchors([
             # modified
             ('docs/api/utils/index.rst', 'a_c-{}-1c5cf9e91c12'.format(short_id)),
             ('test_and_report.sh', 'a_c-{}-e3305437df55'.format(short_id)),
             # added
             ('.hgignore', 'a_c-{}-c8e92ef85cd1'.format(short_id_new)),
             ('.hgtags', 'a_c-{}-6e08b694d687'.format(short_id_new)),
             ('docs/api/index.rst', 'a_c-{}-2c14b00f3393'.format(short_id_new)),
             ('vcs/__init__.py', 'a_c-{}-430ccbc82bdf'.format(short_id_new)),
             ('vcs/backends/hg.py', 'a_c-{}-9c390eb52cd6'.format(short_id_new)),
             ('vcs/utils/__init__.py', 'a_c-{}-ebb592c595c0'.format(short_id_new)),
             ('vcs/utils/annotate.py', 'a_c-{}-7abc741b5052'.format(short_id_new)),
             ('vcs/utils/diffs.py', 'a_c-{}-2ef0ef106c56'.format(short_id_new)),
             ('vcs/utils/lazy.py', 'a_c-{}-3150cb87d4b7'.format(short_id_new)),
         ])
 
     @pytest.mark.xfail_backends("svn", msg="Depends on branch and tag support")
     def test_compare_tag_branch(self, backend):
         revisions = {
             'hg': {
                 'tag': 'v0.2.0',
                 'branch': 'default',
                 'response': (147, 5701, 10177)
             },
             'git': {
                 'tag': 'v0.2.2',
                 'branch': 'master',
-                'response': (71, 2269, 3416)
+                'response': (70, 1855, 3002)
             },
         }
 
         # Backend specific data, depends on the test repository for
         # functional tests.
         data = revisions[backend.alias]
 
         response = self.app.get(
             route_path(
                 'repo_compare',
                 repo_name=backend.repo_name,
                 source_ref_type='branch', source_ref=data['branch'],
                 target_ref_type="tag", target_ref=data['tag'],
             ))
 
         response.mustcontain('%s@%s' % (backend.repo_name, data['branch']))
         response.mustcontain('%s@%s' % (backend.repo_name, data['tag']))
         compare_page = ComparePage(response)
         compare_page.contains_change_summary(*data['response'])
 
     def test_index_branch(self, backend):
         head_id = backend.default_head_id
         response = self.app.get(
             route_path(
                 'repo_compare',
                 repo_name=backend.repo_name,
                 source_ref_type="branch", source_ref=head_id,
                 target_ref_type="branch", target_ref=head_id,
             ))
 
         response.mustcontain('%s@%s' % (backend.repo_name, head_id))
 
         # branches are equal
         response.mustcontain('No files')
         response.mustcontain('No commits in this compare')
 
     def test_compare_commits(self, backend):
         repo = backend.repo
         commit1 = repo.get_commit(commit_idx=0)
         commit1_short_id = commit1.short_id
         commit2 = repo.get_commit(commit_idx=1)
         commit2_short_id = commit2.short_id
 
         response = self.app.get(
             route_path(
                 'repo_compare',
                 repo_name=backend.repo_name,
                 source_ref_type="rev", source_ref=commit1.raw_id,
                 target_ref_type="rev", target_ref=commit2.raw_id,
             ))
         response.mustcontain('%s@%s' % (backend.repo_name, commit1.raw_id))
         response.mustcontain('%s@%s' % (backend.repo_name, commit2.raw_id))
         compare_page = ComparePage(response)
 
         # files
         compare_page.contains_change_summary(1, 7, 0)
 
         # outgoing commits between those commits
         compare_page.contains_commits([commit2])
         anchor = 'a_c-{}-c8e92ef85cd1'.format(commit2_short_id)
         response.mustcontain(anchor)
         compare_page.contains_file_links_and_anchors([('.hgignore', anchor),])

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -1,259 +1,259 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2019 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import pytest
 
 from rhodecode.lib.vcs import nodes
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.tests.fixture import Fixture
 from rhodecode.tests.utils import commit_change
 
 fixture = Fixture()
 
 
 def route_path(name, params=None, **kwargs):
     import urllib
 
     base_url = {
         'repo_compare_select': '/{repo_name}/compare',
         'repo_compare': '/{repo_name}/compare/{source_ref_type}@{source_ref}...{target_ref_type}@{target_ref}',
     }[name].format(**kwargs)
 
     if params:
         base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
     return base_url
 
 
 @pytest.mark.usefixtures("autologin_user", "app")
 class TestSideBySideDiff(object):
 
     def test_diff_sidebyside_single_commit(self, app, backend):
         commit_id_range = {
             'hg': {
                 'commits': ['25d7e49c18b159446cadfa506a5cf8ad1cb04067',
                             '603d6c72c46d953420c89d36372f08d9f305f5dd'],
                 'changes': '21 files changed: 943 inserted, 288 deleted'
             },
             'git': {
                 'commits': ['6fc9270775aaf5544c1deb014f4ddd60c952fcbb',
                             '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
-                'changes': '21 files changed: 943 inserted, 288 deleted'
+                'changes': '20 files changed: 941 inserted, 286 deleted'
             },
 
             'svn': {
                 'commits': ['336',
                             '337'],
                 'changes': '21 files changed: 943 inserted, 288 deleted'
             },
         }
 
         commit_info = commit_id_range[backend.alias]
         commit2, commit1 = commit_info['commits']
         file_changes = commit_info['changes']
 
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=backend.repo_name,
             source_ref_type='rev',
             source_ref=commit2,
             target_repo=backend.repo_name,
             target_ref_type='rev',
             target_ref=commit1,
             params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
         response.mustcontain(file_changes)
         response.mustcontain('Expand 1 commit')
 
     def test_diff_sidebyside_two_commits(self, app, backend):
         commit_id_range = {
             'hg': {
                 'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
                             '603d6c72c46d953420c89d36372f08d9f305f5dd'],
                 'changes': '32 files changed: 1165 inserted, 308 deleted'
             },
             'git': {
                 'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
                             '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
-                'changes': '32 files changed: 1165 inserted, 308 deleted'
+                'changes': '31 files changed: 1163 inserted, 306 deleted'
             },
 
             'svn': {
                 'commits': ['335',
                             '337'],
                 'changes': '32 files changed: 1179 inserted, 310 deleted'
             },
         }
 
         commit_info = commit_id_range[backend.alias]
         commit2, commit1 = commit_info['commits']
         file_changes = commit_info['changes']
 
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=backend.repo_name,
             source_ref_type='rev',
             source_ref=commit2,
             target_repo=backend.repo_name,
             target_ref_type='rev',
             target_ref=commit1,
             params=dict(target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
         response.mustcontain(file_changes)
         response.mustcontain('Expand 2 commits')
 
     @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
     def test_diff_side_by_side_from_0_commit(self, app, backend, backend_stub):
         f_path = 'test_sidebyside_file.py'
         commit1_content = 'content-25d7e49c18b159446c\n'
         commit2_content = 'content-603d6c72c46d953420\n'
         repo = backend.create_repo()
 
         commit1 = commit_change(
             repo.repo_name, filename=f_path, content=commit1_content,
             message='A', vcs_type=backend.alias, parent=None, newfile=True)
 
         commit2 = commit_change(
             repo.repo_name, filename=f_path, content=commit2_content,
             message='B, child of A', vcs_type=backend.alias, parent=commit1)
 
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=repo.repo_name,
             source_ref_type='rev',
             source_ref=EmptyCommit().raw_id,
             target_ref_type='rev',
             target_ref=commit2.raw_id,
             params=dict(diffmode='sidebyside')
         ))
 
         response.mustcontain('Expand 2 commits')
         response.mustcontain('123 file changed')
 
         response.mustcontain(
             'r%s:%s...r%s:%s' % (
                 commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
 
         response.mustcontain('<strong>{}</strong>'.format(f_path))
 
     @pytest.mark.xfail(reason='GIT does not handle empty commit compare correct (missing 1 commit)')
     def test_diff_side_by_side_from_0_commit_with_file_filter(self, app, backend, backend_stub):
         f_path = 'test_sidebyside_file.py'
         commit1_content = 'content-25d7e49c18b159446c\n'
         commit2_content = 'content-603d6c72c46d953420\n'
         repo = backend.create_repo()
 
         commit1 = commit_change(
             repo.repo_name, filename=f_path, content=commit1_content,
             message='A', vcs_type=backend.alias, parent=None, newfile=True)
 
         commit2 = commit_change(
             repo.repo_name, filename=f_path, content=commit2_content,
             message='B, child of A', vcs_type=backend.alias, parent=commit1)
 
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=repo.repo_name,
             source_ref_type='rev',
             source_ref=EmptyCommit().raw_id,
             target_ref_type='rev',
             target_ref=commit2.raw_id,
             params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
         ))
 
         response.mustcontain('Expand 2 commits')
         response.mustcontain('1 file changed')
 
         response.mustcontain(
             'r%s:%s...r%s:%s' % (
                 commit1.idx, commit1.short_id, commit2.idx, commit2.short_id))
 
         response.mustcontain('<strong>{}</strong>'.format(f_path))
 
     def test_diff_side_by_side_with_empty_file(self, app, backend, backend_stub):
         commits = [
             {'message': 'First commit'},
             {'message': 'Second commit'},
             {'message': 'Commit with binary',
              'added': [nodes.FileNode('file.empty', content='')]},
         ]
         f_path = 'file.empty'
         repo = backend.create_repo(commits=commits)
         commit1 = repo.get_commit(commit_idx=0)
         commit2 = repo.get_commit(commit_idx=1)
         commit3 = repo.get_commit(commit_idx=2)
 
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=repo.repo_name,
             source_ref_type='rev',
             source_ref=commit1.raw_id,
             target_ref_type='rev',
             target_ref=commit3.raw_id,
             params=dict(f_path=f_path, target_repo=repo.repo_name, diffmode='sidebyside')
         ))
 
         response.mustcontain('Expand 2 commits')
         response.mustcontain('1 file changed')
 
         response.mustcontain(
             'r%s:%s...r%s:%s' % (
                 commit2.idx, commit2.short_id, commit3.idx, commit3.short_id))
 
         response.mustcontain('<strong>{}</strong>'.format(f_path))
 
     def test_diff_sidebyside_two_commits_with_file_filter(self, app, backend):
         commit_id_range = {
             'hg': {
                 'commits': ['4fdd71e9427417b2e904e0464c634fdee85ec5a7',
                             '603d6c72c46d953420c89d36372f08d9f305f5dd'],
                 'changes': '1 file changed: 3 inserted, 3 deleted'
             },
             'git': {
                 'commits': ['f5fbf9cfd5f1f1be146f6d3b38bcd791a7480c13',
                             '03fa803d7e9fb14daa9a3089e0d1494eda75d986'],
                 'changes': '1 file changed: 3 inserted, 3 deleted'
             },
 
             'svn': {
                 'commits': ['335',
                             '337'],
                 'changes': '1 file changed: 3 inserted, 3 deleted'
             },
         }
         f_path = 'docs/conf.py'
 
         commit_info = commit_id_range[backend.alias]
         commit2, commit1 = commit_info['commits']
         file_changes = commit_info['changes']
 
         response = self.app.get(route_path(
             'repo_compare',
             repo_name=backend.repo_name,
             source_ref_type='rev',
             source_ref=commit2,
             target_ref_type='rev',
             target_ref=commit1,
             params=dict(f_path=f_path, target_repo=backend.repo_name, diffmode='sidebyside')
         ))
 
         response.mustcontain('Expand 2 commits')
         response.mustcontain(file_changes)

rhodecode/tests/vcs/test_diff.py

@@ -1,548 +1,548 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2019 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import datetime
 import pytest
 
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.tests.vcs.conftest import BackendTestMixin
 
 
 class TestGetDiffValidation:
 
     def test_raises_on_string_input(self, vcsbackend):
         repo = vcsbackend.repo
         with pytest.raises(TypeError):
             repo.get_diff("1", "2")
 
     def test_raises_if_commits_not_of_this_repository(self, vcsbackend):
         repo = vcsbackend.repo
         target_repo = vcsbackend.create_repo(number_of_commits=1)
         repo_commit = repo[0]
         wrong_commit = target_repo[0]
         with pytest.raises(ValueError):
             repo.get_diff(repo_commit, wrong_commit)
 
     def test_allows_empty_commit(self, vcsbackend):
         repo = vcsbackend.repo
         commit = repo[0]
         repo.get_diff(repo.EMPTY_COMMIT, commit)
 
     def test_raise_if_both_commits_are_empty(self, vcsbackend):
         repo = vcsbackend.repo
         empty_commit = repo.EMPTY_COMMIT
         with pytest.raises(ValueError):
             repo.get_diff(empty_commit, empty_commit)
 
     def test_supports_path1_parameter(self, vcsbackend):
         repo = vcsbackend.repo
         commit = repo[1]
         repo.get_diff(
             repo.EMPTY_COMMIT, commit,
             path='vcs/__init__.py', path1='vcs/__init__.py')
 
     @pytest.mark.backends("git", "hg")
     def test_raises_value_error_if_paths_not_supported(self, vcsbackend):
         repo = vcsbackend.repo
         commit = repo[1]
         with pytest.raises(ValueError):
             repo.get_diff(
                 repo.EMPTY_COMMIT, commit,
                 path='trunk/example.py', path1='branches/argparse/example.py')
 
 
 @pytest.mark.usefixtures("vcs_repository_support")
 class TestRepositoryGetDiff(BackendTestMixin):
 
     recreate_repo_per_test = False
 
     @classmethod
     def _get_commits(cls):
         commits = [
             {
                 'message': 'Initial commit',
                 'author': 'Joe Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 20),
                 'added': [
                     FileNode('foobar', content='foobar'),
                     FileNode('foobar2', content='foobar2'),
                 ],
             },
             {
                 'message': 'Changed foobar, added foobar3',
                 'author': 'Jane Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 21),
                 'added': [
                     FileNode('foobar3', content='foobar3'),
                 ],
                 'changed': [
                     FileNode('foobar', 'FOOBAR'),
                 ],
             },
             {
                 'message': 'Removed foobar, changed foobar3',
                 'author': 'Jane Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 22),
                 'changed': [
                     FileNode('foobar3', content='FOOBAR\nFOOBAR\nFOOBAR\n'),
                 ],
                 'removed': [FileNode('foobar')],
             },
             {
                 'message': 'Whitespace changes',
                 'author': 'Jane Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 23),
                 'changed': [
                     FileNode('foobar3', content='FOOBAR  \nFOOBAR\nFOOBAR\n'),
                 ],
             },
         ]
         return commits
 
     def test_initial_commit_diff(self):
         initial_commit = self.repo[0]
         diff = self.repo.get_diff(self.repo.EMPTY_COMMIT, initial_commit)
         assert diff.raw == self.first_commit_diffs[self.repo.alias]
 
     def test_second_commit_diff(self):
         diff = self.repo.get_diff(self.repo[0], self.repo[1])
         assert diff.raw == self.second_commit_diffs[self.repo.alias]
 
     def test_third_commit_diff(self):
         diff = self.repo.get_diff(self.repo[1], self.repo[2])
         assert diff.raw == self.third_commit_diffs[self.repo.alias]
 
     def test_ignore_whitespace(self):
         diff = self.repo.get_diff(
             self.repo[2], self.repo[3], ignore_whitespace=True)
         assert '@@' not in diff.raw
 
     def test_only_one_file(self):
         diff = self.repo.get_diff(
             self.repo.EMPTY_COMMIT, self.repo[0], path='foobar')
         assert 'foobar2' not in diff.raw
 
     def test_context_parameter(self):
         first_commit = self.repo.get_commit(commit_idx=0)
         diff = self.repo.get_diff(
             self.repo.EMPTY_COMMIT, first_commit, context=2)
         assert diff.raw == self.first_commit_diffs[self.repo.alias]
 
     def test_context_only_one_file(self):
         diff = self.repo.get_diff(
             self.repo.EMPTY_COMMIT, self.repo[0], path='foobar', context=2)
         assert diff.raw == self.first_commit_one_file[self.repo.alias]
 
     first_commit_diffs = {
         'git': r"""diff --git a/foobar b/foobar
 new file mode 100644
-index 0000000000000000000000000000000000000000..f6ea0495187600e7b2288c8ac19c5886383a4632
+index 0000000..f6ea049
 --- /dev/null
 +++ b/foobar
 @@ -0,0 +1 @@
 +foobar
 \ No newline at end of file
 diff --git a/foobar2 b/foobar2
 new file mode 100644
-index 0000000000000000000000000000000000000000..e8c9d6b98e3dce993a464935e1a53f50b56a3783
+index 0000000..e8c9d6b
 --- /dev/null
 +++ b/foobar2
 @@ -0,0 +1 @@
 +foobar2
 \ No newline at end of file
 """,
         'hg': r"""diff --git a/foobar b/foobar
 new file mode 100644
 --- /dev/null
 +++ b/foobar
 @@ -0,0 +1,1 @@
 +foobar
 \ No newline at end of file
 diff --git a/foobar2 b/foobar2
 new file mode 100644
 --- /dev/null
 +++ b/foobar2
 @@ -0,0 +1,1 @@
 +foobar2
 \ No newline at end of file
 """,
         'svn': """Index: foobar
 ===================================================================
 diff --git a/foobar b/foobar
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/foobar\t(revision 1)
 @@ -0,0 +1 @@
 +foobar
 \\ No newline at end of file
 Index: foobar2
 ===================================================================
 diff --git a/foobar2 b/foobar2
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/foobar2\t(revision 1)
 @@ -0,0 +1 @@
 +foobar2
 \\ No newline at end of file
 """,
     }
 
     second_commit_diffs = {
         'git': r"""diff --git a/foobar b/foobar
-index f6ea0495187600e7b2288c8ac19c5886383a4632..389865bb681b358c9b102d79abd8d5f941e96551 100644
+index f6ea049..389865b 100644
 --- a/foobar
 +++ b/foobar
 @@ -1 +1 @@
 -foobar
 \ No newline at end of file
 +FOOBAR
 \ No newline at end of file
 diff --git a/foobar3 b/foobar3
 new file mode 100644
-index 0000000000000000000000000000000000000000..c11c37d41d33fb47741cff93fa5f9d798c1535b0
+index 0000000..c11c37d
 --- /dev/null
 +++ b/foobar3
 @@ -0,0 +1 @@
 +foobar3
 \ No newline at end of file
 """,
         'hg': r"""diff --git a/foobar b/foobar
 --- a/foobar
 +++ b/foobar
 @@ -1,1 +1,1 @@
 -foobar
 \ No newline at end of file
 +FOOBAR
 \ No newline at end of file
 diff --git a/foobar3 b/foobar3
 new file mode 100644
 --- /dev/null
 +++ b/foobar3
 @@ -0,0 +1,1 @@
 +foobar3
 \ No newline at end of file
 """,
         'svn': """Index: foobar
 ===================================================================
 diff --git a/foobar b/foobar
 --- a/foobar\t(revision 1)
 +++ b/foobar\t(revision 2)
 @@ -1 +1 @@
 -foobar
 \\ No newline at end of file
 +FOOBAR
 \\ No newline at end of file
 Index: foobar3
 ===================================================================
 diff --git a/foobar3 b/foobar3
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/foobar3\t(revision 2)
 @@ -0,0 +1 @@
 +foobar3
 \\ No newline at end of file
 """,
     }
 
     third_commit_diffs = {
         'git': r"""diff --git a/foobar b/foobar
 deleted file mode 100644
-index 389865bb681b358c9b102d79abd8d5f941e96551..0000000000000000000000000000000000000000
+index 389865b..0000000
 --- a/foobar
 +++ /dev/null
 @@ -1 +0,0 @@
 -FOOBAR
 \ No newline at end of file
 diff --git a/foobar3 b/foobar3
-index c11c37d41d33fb47741cff93fa5f9d798c1535b0..f9324477362684ff692aaf5b9a81e01b9e9a671c 100644
+index c11c37d..f932447 100644
 --- a/foobar3
 +++ b/foobar3
 @@ -1 +1,3 @@
 -foobar3
 \ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 """,
         'hg': r"""diff --git a/foobar b/foobar
 deleted file mode 100644
 --- a/foobar
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -FOOBAR
 \ No newline at end of file
 diff --git a/foobar3 b/foobar3
 --- a/foobar3
 +++ b/foobar3
 @@ -1,1 +1,3 @@
 -foobar3
 \ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 """,
         'svn': """Index: foobar
 ===================================================================
 diff --git a/foobar b/foobar
 deleted file mode 10644
 --- a/foobar\t(revision 2)
 +++ /dev/null\t(revision 3)
 @@ -1 +0,0 @@
 -FOOBAR
 \\ No newline at end of file
 Index: foobar3
 ===================================================================
 diff --git a/foobar3 b/foobar3
 --- a/foobar3\t(revision 2)
 +++ b/foobar3\t(revision 3)
 @@ -1 +1,3 @@
 -foobar3
 \\ No newline at end of file
 +FOOBAR
 +FOOBAR
 +FOOBAR
 """,
     }
 
     first_commit_one_file = {
         'git': r"""diff --git a/foobar b/foobar
 new file mode 100644
-index 0000000000000000000000000000000000000000..f6ea0495187600e7b2288c8ac19c5886383a4632
+index 0000000..f6ea049
 --- /dev/null
 +++ b/foobar
 @@ -0,0 +1 @@
 +foobar
 \ No newline at end of file
 """,
         'hg': r"""diff --git a/foobar b/foobar
 new file mode 100644
 --- /dev/null
 +++ b/foobar
 @@ -0,0 +1,1 @@
 +foobar
 \ No newline at end of file
 """,
         'svn': """Index: foobar
 ===================================================================
 diff --git a/foobar b/foobar
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/foobar\t(revision 1)
 @@ -0,0 +1 @@
 +foobar
 \\ No newline at end of file
 """,
     }
 
 
-class TestSvnGetDiff:
+class TestSvnGetDiff(object):
 
     @pytest.mark.parametrize('path, path1', [
         ('trunk/example.py', 'tags/v0.2/example.py'),
         ('trunk', 'tags/v0.2')
     ], ids=['file', 'dir'])
     def test_diff_to_tagged_version(self, vcsbackend_svn, path, path1):
         repo = vcsbackend_svn['svn-simple-layout']
         commit1 = repo[-2]
         commit2 = repo[-1]
         diff = repo.get_diff(commit1, commit2, path=path, path1=path1)
         assert diff.raw == self.expected_diff_v_0_2
 
     expected_diff_v_0_2 = '''Index: example.py
 ===================================================================
 diff --git a/example.py b/example.py
 --- a/example.py\t(revision 25)
 +++ b/example.py\t(revision 26)
 @@ -7,8 +7,12 @@
  
  @click.command()
  def main():
 +    """
 +    Will print out a useful message on invocation.
 +    """
      click.echo("Hello world!")
  
  
 +# Main entry point
  if __name__ == '__main__':
      main()
 '''
 
     def test_diff_of_moved_directory(self, vcsbackend_svn):
         repo = vcsbackend_svn['svn-move-directory']
         diff = repo.get_diff(repo[0], repo[1])
         # TODO: johbo: Think about supporting svn directory nodes
         # a little bit better, source is here like a file
         expected_diff = """Index: source
 ===================================================================
 diff --git a/source b/source
 deleted file mode 10644
 --- a/source\t(revision 1)
 +++ /dev/null\t(revision 2)
 Index: target/file
 ===================================================================
 diff --git a/target/file b/target/file
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/target/file\t(revision 2)
 """
         assert diff.raw == expected_diff
 
 
 @pytest.mark.usefixtures("vcs_repository_support")
 class TestGetDiffBinary(BackendTestMixin):
 
     recreate_repo_per_test = False
 
     # Note: "Fake" PNG files, has the correct magic as prefix
     BINARY = """\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00"""
     BINARY2 = """\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x01\x00\x00"""
 
     @staticmethod
     def _get_commits():
         commits = [
             {
                 'message': 'Add binary file image.png',
                 'author': 'Joe Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 20),
                 'added': [
                     FileNode('image.png', content=TestGetDiffBinary.BINARY),
                 ]},
             {
                 'message': 'Modify image.png',
                 'author': 'Joe Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 21),
                 'changed': [
                     FileNode('image.png', content=TestGetDiffBinary.BINARY2),
                 ]},
             {
                 'message': 'Remove image.png',
                 'author': 'Joe Doe <[e-mail]>',
                 'date': datetime.datetime(2010, 1, 1, 21),
                 'removed': [
                     FileNode('image.png'),
                 ]},
         ]
         return commits
 
     def test_add_a_binary_file(self):
         diff = self.repo.get_diff(self.repo.EMPTY_COMMIT, self.repo[0])
 
         expected = {
             'git': """diff --git a/image.png b/image.png
 new file mode 100644
 index 0000000000000000000000000000000000000000..28380fd4a25c58be1b68b523ba2a314f4459ee9c
 GIT binary patch
 literal 19
-YcmeAS@N?(olHy`uVBq!ia0vp^03%2O-T(jq
+Yc%17D@N?(olHy`uVBq!ia0vp^03%2O-T(jq
 
 literal 0
-HcmV?d00001
+Hc$@<O00001
 
 """,
             'hg': """diff --git a/image.png b/image.png
 new file mode 100644
 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..28380fd4a25c58be1b68b523ba2a314f4459ee9c
 GIT binary patch
 literal 19
 Yc%17D@N?(olHy`uVBq!ia0vp^03%2O-T(jq
 
 """,
             'svn': """===================================================================
 Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 Index: image.png
 ===================================================================
 diff --git a/image.png b/image.png
 new file mode 10644
 --- /dev/null\t(revision 0)
 +++ b/image.png\t(revision 1)
 """,
         }
         assert diff.raw == expected[self.repo.alias]
 
     def test_update_a_binary_file(self):
         diff = self.repo.get_diff(self.repo[0], self.repo[1])
 
         expected = {
             'git': """diff --git a/image.png b/image.png
 index 28380fd4a25c58be1b68b523ba2a314f4459ee9c..1008a77cd372386a1c24fbd96019333f67ad0065 100644
 GIT binary patch
 literal 19
-acmeAS@N?(olHy`uVBq!ia0y~$U;qFkO9I~j
+ac%17D@N?(olHy`uVBq!ia0y~$U;qFkO9I~j
 
 literal 19
-YcmeAS@N?(olHy`uVBq!ia0vp^03%2O-T(jq
+Yc%17D@N?(olHy`uVBq!ia0vp^03%2O-T(jq
 
 """,
             'hg': """diff --git a/image.png b/image.png
 index 28380fd4a25c58be1b68b523ba2a314f4459ee9c..1008a77cd372386a1c24fbd96019333f67ad0065
 GIT binary patch
 literal 19
 ac%17D@N?(olHy`uVBq!ia0y~$U;qFkO9I~j
 
 """,
             'svn': """===================================================================
 Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 Index: image.png
 ===================================================================
 diff --git a/image.png b/image.png
 --- a/image.png\t(revision 1)
 +++ b/image.png\t(revision 2)
 """,
         }
         assert diff.raw == expected[self.repo.alias]
 
     def test_remove_a_binary_file(self):
         diff = self.repo.get_diff(self.repo[1], self.repo[2])
 
         expected = {
             'git': """diff --git a/image.png b/image.png
 deleted file mode 100644
 index 1008a77cd372386a1c24fbd96019333f67ad0065..0000000000000000000000000000000000000000
 GIT binary patch
 literal 0
-HcmV?d00001
+Hc$@<O00001
 
 literal 19
-acmeAS@N?(olHy`uVBq!ia0y~$U;qFkO9I~j
+ac%17D@N?(olHy`uVBq!ia0y~$U;qFkO9I~j
 
 """,
             'hg': """diff --git a/image.png b/image.png
 deleted file mode 100644
 index 1008a77cd372386a1c24fbd96019333f67ad0065..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
 GIT binary patch
 literal 0
 Hc$@<O00001
 
 """,
             'svn': """===================================================================
 Cannot display: file marked as a binary type.
 svn:mime-type = application/octet-stream
 Index: image.png
 ===================================================================
 diff --git a/image.png b/image.png
 deleted file mode 10644
 --- a/image.png\t(revision 2)
 +++ /dev/null\t(revision 3)
 """,
         }
         assert diff.raw == expected[self.repo.alias]