x/git-upstream
Code Issues Proposed changes

pep8 and whitespace fixups

Browse Source
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
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.errors import GitUpstreamError
from git_upstream.log import LogDedentMixin 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.utils import GitMixin
from git_upstream.lib.searchers import CommitMessageSearcher from git_upstream.lib.searchers import CommitMessageSearcher
from git_upstream import subcommand, log 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 Check if a supersede header is already present in the note containing
one of change ids passed on the command line one of change ids passed on the command line
""" """
note = self.commit.note(note_ref=Supersede.NOTE_REF) new_note = self.commit.note(note_ref=Supersede.NOTE_REF)
if note: if new_note:
pattern = '^%s\s?(%s)$' % (Supersede.SUPERSEDE_HEADER, pattern = '^%s\s?(%s)$' % (Supersede.SUPERSEDE_HEADER,
'|'.join(self.change_ids)) '|'.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: if m:
self.log.warning( self.log.warning(
("Change-Id '%s' already present in the note for commit" + ("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__': if __name__ == '__main__':
main() main()

1
setup.cfg
View File

@@ -36,4 +36,3 @@ console_scripts =
rebase-editor = git_upstream.rebase_editor:main rebase-editor = git_upstream.rebase_editor:main
[easy_install] [easy_install]