Skip to content

add hide_merge_commit for less content #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lethee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add hide_merge_commit for less content #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sphinx_git/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ class GitChangelog(GitDirectiveBase):
'hide_author': bool,
'hide_date': bool,
'hide_details': bool,
'hide_merge_commit': bool,
'repo-dir': six.text_type,
}

Expand Down Expand Up @@ -168,6 +169,10 @@ def _filter_commits_on_filenames(self, commits):
def _build_markup(self, commits):
list_node = nodes.bullet_list()
for commit in commits:
if self.options.get('hide_merge_commit'):
if len(commit.parents) > 1:
continue

date_str = datetime.fromtimestamp(commit.authored_date)
if '\n' in commit.message:
message, detailed_message = commit.message.split('\n', 1)
Expand Down