From: Yann Dirson <ydirson@altern.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: GIT list <git@vger.kernel.org>
Subject: [PATCH 1/4] Make Series::patch_applied public.
Date: Fri, 24 Nov 2006 00:16:44 +0100 [thread overview]
Message-ID: <20061123231632.9769.72003.stgit@gandelf.nowhere.earth> (raw)
In-Reply-To: <20061123230721.9769.38403.stgit@gandelf.nowhere.earth>
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
stgit/stack.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index a477e7d..49cfebb 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -417,7 +417,7 @@ class Series:
def __patch_is_current(self, patch):
return patch.get_name() == read_string(self.__current_file)
- def __patch_applied(self, name):
+ def patch_applied(self, name):
"""Return true if the patch exists in the applied list
"""
return name in self.get_applied()
@@ -430,7 +430,7 @@ class Series:
def patch_exists(self, name):
"""Return true if there is a patch with the given name, false
otherwise."""
- return self.__patch_applied(name) or self.__patch_unapplied(name)
+ return self.patch_applied(name) or self.__patch_unapplied(name)
def __begin_stack_check(self):
"""Save the current HEAD into .git/refs/heads/base if the stack
@@ -713,7 +713,7 @@ class Series:
before_existing = False, refresh = True):
"""Creates a new patch
"""
- if self.__patch_applied(name) or self.__patch_unapplied(name):
+ if self.patch_applied(name) or self.__patch_unapplied(name):
raise StackException, 'Patch "%s" already exists' % name
if not message and can_edit:
@@ -773,7 +773,7 @@ class Series:
if self.__patch_is_current(patch):
self.pop_patch(name)
- elif self.__patch_applied(name):
+ elif self.patch_applied(name):
raise StackException, 'Cannot remove an applied patch, "%s", ' \
'which is not current' % name
next prev parent reply other threads:[~2006-11-23 23:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-23 23:16 [PATCH 0/4] Series short description Yann Dirson
2006-11-23 23:16 ` Yann Dirson [this message]
2006-11-23 23:16 ` [PATCH 2/4] Allows to refresh a non-top applied patch Yann Dirson
2006-11-23 23:17 ` [PATCH 3/4] Optimize stg goto in the pop case Yann Dirson
2006-11-23 23:17 ` [PATCH 4/4] Bomb out when --ack and --sign are both passed to "refresh" Yann Dirson
2006-11-24 15:37 ` [PATCH 0/4] Series short description Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061123231632.9769.72003.stgit@gandelf.nowhere.earth \
--to=ydirson@altern.org \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).