x
/
git-upstream
Code Issues Proposed changes

pep8 and whitespace fixups

This commit is contained in:
Darragh Bailey 2014-07-17 15:12:44 +01:00
parent 6c14e66c4f
commit ac46c29962
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git_upstream/commands/supersede.py
View File

@ -17,7 +17,7 @@
from git_upstream.errors import GitUpstreamError
from git_upstream.log import LogDedentMixin
from git_upstream.lib import note
from git_upstream.lib import note # noqa
from git_upstream.lib.utils import GitMixin
from git_upstream.lib.searchers import CommitMessageSearcher
from git_upstream import subcommand, log
@ -135,11 +135,11 @@ class Supersede(LogDedentMixin, GitMixin):
Check if a supersede header is already present in the note containing
one of change ids passed on the command line
"""
note = self.commit.note(note_ref=Supersede.NOTE_REF)
if note:
new_note = self.commit.note(note_ref=Supersede.NOTE_REF)
if new_note:
pattern = '^%s\s?(%s)$' % (Supersede.SUPERSEDE_HEADER,
'|'.join(self.change_ids))
m = re.search(pattern, note, re.MULTILINE | re.IGNORECASE)
m = re.search(pattern, new_note, re.MULTILINE | re.IGNORECASE)
if m:
self.log.warning(
("Change-Id '%s' already present in the note for commit" +

1
git_upstream/rebase_editor.py
View File

@ -124,4 +124,3 @@ def main():
if __name__ == '__main__':
main()

35
setup.cfg
View File

@ -9,31 +9,30 @@ summary = git tool to help manage upstream repositories
description-file = DESCRIPTION
license = Apache License (2.0)
keywords = git upstream workflow
classifiers =
Programming Language :: Python :: 2
Programming Language :: Python :: 3
Programming Language :: Python
Development Status :: 4 - Beta
Environment :: Console
Environment :: OpenStack
Intended Audience :: Developers
Intended Audience :: Information Technology
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
classifiers =
Programming Language :: Python :: 2
Programming Language :: Python :: 3
Programming Language :: Python
Development Status :: 4 - Beta
Environment :: Console
Environment :: OpenStack
Intended Audience :: Developers
Intended Audience :: Information Technology
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
[global]
commands = build_manpage.BuildManpage
[files]
packages =
git_upstream
packages =
git_upstream
data_files =
etc/bash_completion.d = bash_completion/git-upstream
etc/bash_completion.d = bash_completion/git-upstream
[entry_points]
console_scripts =
git-upstream = git_upstream.main:main
rebase-editor = git_upstream.rebase_editor:main
console_scripts =
git-upstream = git_upstream.main:main
rebase-editor = git_upstream.rebase_editor:main
[easy_install]