# [PATCH 0/2] Two more small clean-ups 3 messages from 2005-11-15 to 2005-11-15. Participants: Chuck Lever. Thread: https://gitlist.dev/t/2537 ## Chuck Lever, 2005-11-15 22:51 Subject: [PATCH 0/2] Two more small clean-ups Message-ID: <20051115225136.16350.96122.stgit@dexter.citi.umich.edu> URL: https://gitlist.dev/e/20051115225136.16350.96122.stgit%40dexter.citi.umich.edu ``` -- Chuck Lever -- corporate: personal: ``` ## Chuck Lever, 2005-11-15 22:52 Subject: [PATCH 1/2] Cleanup: remove unused variable Message-ID: <20051115225254.16350.65938.stgit@dexter.citi.umich.edu> URL: https://gitlist.dev/e/20051115225254.16350.65938.stgit%40dexter.citi.umich.edu In-Reply-To: <20051115225136.16350.96122.stgit@dexter.citi.umich.edu> ``` Get rid of git.py:head_link , as it is no longer used by any part of StGIT. Signed-off-by: Chuck Lever --- stgit/git.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/stgit/git.py b/stgit/git.py index 9a07fa5..066a8f0 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -33,7 +33,6 @@ if 'GIT_DIR' in os.environ: else: base_dir = '.git' -head_link = os.path.join(base_dir, 'HEAD') # # Classes ``` ## Chuck Lever, 2005-11-15 22:52 Subject: [PATCH 2/2] Clean up StGIT's "branch --delete" command Message-ID: <20051115225256.16350.73548.stgit@dexter.citi.umich.edu> URL: https://gitlist.dev/e/20051115225256.16350.73548.stgit%40dexter.citi.umich.edu 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 --- 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, ```