From: David Kågedal Date: Fri, 14 Sep 2007 22:31:44 +0000 (+0200) Subject: Clean up Series.refresh_patch X-Git-Tag: v0.14~74 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/692c15ef411fc32357d1cd3a4eb6559c8bb93c91 Clean up Series.refresh_patch This patch does some minor simplifications of the code and updates the documentation string of Series.refresh_patch. Signed-off-by: David Kågedal Signed-off-by: Karl Hasselström --- diff --git a/stgit/stack.py b/stgit/stack.py index d953baf..37ffb6a 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -755,14 +755,12 @@ class Series(PatchSet): committer_name = None, committer_email = None, backup = False, sign_str = None, log = 'refresh', notes = None): - """Generates a new commit for the given patch + """Generates a new commit for the topmost patch """ - name = self.get_current() - if not name: + patch = self.get_current_patch() + if not patch: raise StackException, 'No patches applied' - patch = self.get_patch(name) - descr = patch.get_description() if not (message or descr): edit = True @@ -775,7 +773,7 @@ class Series(PatchSet): if not message and edit: descr = edit_file(self, descr.rstrip(), \ 'Please edit the description for patch "%s" ' \ - 'above.' % name, show_patch) + 'above.' % patch.get_name(), show_patch) if not author_name: author_name = patch.get_authname()