diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 1fd4554..2bd7bd0 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -153,7 +153,7 @@ def generate_gitolite_acls(): ) -def update_git(obj, repo, repofolder, objtype='ticket'): +def update_git(obj, repo, repofolder): """ Update the given issue in its git. This method forks the provided repo, add/edit the issue whose file name @@ -227,7 +227,7 @@ def update_git(obj, repo, repofolder, objtype='ticket'): 'refs/heads/master', author, author, - 'Updated %s %s: %s' % (objtype, obj.uid, obj.title), + 'Updated %s %s: %s' % (obj.isa, obj.uid, obj.title), new_repo.index.write_tree(), parents) index.write() @@ -243,7 +243,7 @@ def update_git(obj, repo, repofolder, objtype='ticket'): shutil.rmtree(newpath) -def clean_git(obj, repo, repofolder, objtype='ticket'): +def clean_git(obj, repo, repofolder): """ Update the given issue remove it from its git. """ @@ -293,7 +293,7 @@ def clean_git(obj, repo, repofolder, objtype='ticket'): 'refs/heads/master', author, author, - 'Removed %s %s: %s' % (objtype, obj.uid, obj.title), + 'Removed %s %s: %s' % (obj.isa, obj.uid, obj.title), new_repo.index.write_tree(), parents) index.write() diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 257b08a..6d2831d 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -479,6 +479,11 @@ class Issue(BASE): ) @property + def isa(self): + ''' A string to allow finding out that this is an issue. ''' + return 'issue' + + @property def mail_id(self): ''' Return a unique reprensetation of the issue as string that can be used when sending emails. @@ -795,6 +800,11 @@ class PullRequest(BASE): ) @property + def isa(self): + ''' A string to allow finding out that this is an pull-request. ''' + return 'pull-request' + + @property def mail_id(self): ''' Return a unique reprensetation of the issue as string that can be used when sending emails. diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py index 9701ecc..be81c42 100644 --- a/tests/test_progit_lib_git.py +++ b/tests/test_progit_lib_git.py @@ -622,7 +622,7 @@ index 458821a..77674a8 repo = pagure.lib.get_project(self.session, 'test_ticket_repo') issue = pagure.lib.search_issues(self.session, repo, issueid=1) - pagure.lib.git.clean_git(issue, repo, tests.HERE, objtype='ticket') + pagure.lib.git.clean_git(issue, repo, tests.HERE) # No more files in the git repo commit = gitrepo.revparse_single('HEAD')