From: Chuck Lever <cel@netapp.com>
To: catalin.marinas@gmail.com
Cc: git@vger.kernel.org
Subject: [PATCH 2/2] Clean up StGIT's "branch --delete" command
Date: Tue, 15 Nov 2005 17:52:56 -0500 [thread overview]
Message-ID: <20051115225256.16350.73548.stgit@dexter.citi.umich.edu> (raw)
In-Reply-To: <20051115225136.16350.96122.stgit@dexter.citi.umich.edu>
os.path.isfile is not the same as os.path.exists.
Signed-off-by: Chuck Lever <cel@netapp.com>
---
stgit/stack.py | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 0907b37..7bf7e7c 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -404,16 +404,17 @@ class Series:
"""Renames a series
"""
to_stack = Series(to_name)
- if os.path.isdir(to_stack.__patch_dir):
- raise StackException, '"%s" already exists' % to_stack.__patch_dir
- if os.path.isfile(to_stack.__base_file):
- raise StackException, '"%s" already exists' % to_stack.__base_file
+
+ if to_stack.is_initialised:
+ raise StackException, '"%s" already exists' % to_stack.get_branch()
+ if os.path.exists(to_stack.__base_file):
+ os.remove(to_stack.__base_file)
git.rename_branch(self.__name, to_name)
if os.path.isdir(self.__patch_dir):
os.rename(self.__patch_dir, to_stack.__patch_dir)
- if os.path.isfile(self.__base_file):
+ if os.path.exists(self.__base_file):
os.rename(self.__base_file, to_stack.__base_file)
self.__init__(to_name)
@@ -430,20 +431,20 @@ class Series:
for p in patches:
self.delete_patch(p)
- if os.path.isfile(self.__applied_file):
+ if os.path.exists(self.__applied_file):
os.remove(self.__applied_file)
- if os.path.isfile(self.__unapplied_file):
+ if os.path.exists(self.__unapplied_file):
os.remove(self.__unapplied_file)
- if os.path.isfile(self.__current_file):
+ if os.path.exists(self.__current_file):
os.remove(self.__current_file)
- if os.path.isfile(self.__descr_file):
+ if os.path.exists(self.__descr_file):
os.remove(self.__descr_file)
if not os.listdir(self.__patch_dir):
os.rmdir(self.__patch_dir)
else:
print 'Series directory %s is not empty.' % self.__name
- if os.path.isfile(self.__base_file):
+ if os.path.exists(self.__base_file):
os.remove(self.__base_file)
def refresh_patch(self, message = None, edit = False, show_patch = False,
prev parent reply other threads:[~2005-11-15 22:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-15 22:51 [PATCH 0/2] Two more small clean-ups Chuck Lever
2005-11-15 22:52 ` [PATCH 1/2] Cleanup: remove unused variable Chuck Lever
2005-11-15 22:52 ` Chuck Lever [this message]
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=20051115225256.16350.73548.stgit@dexter.citi.umich.edu \
--to=cel@netapp.com \
--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