option_list = command.options)
options, args = parser.parse_args()
try:
- # 'clone' doesn't expect an already initialised GIT tree
- if cmd == 'clone':
- stgit.commands.common.crt_series = stack.Series('master')
- elif hasattr(options, 'branch') and options.branch:
- stgit.commands.common.crt_series = stack.Series(options.branch)
- else:
- stgit.commands.common.crt_series = stack.Series()
- # the line below is a simple way to avoid an exception when
- # stgit is run outside an initialised tree
- setattr(command, 'crt_series', stgit.commands.common.crt_series)
+ # 'clone' doesn't expect an already initialised GIT tree. A Series
+ # object will be created after the GIT tree is cloned
+ if cmd != 'clone':
+ if hasattr(options, 'branch') and options.branch:
+ command.crt_series = stack.Series(options.branch)
+ else:
+ command.crt_series = stack.Series()
+ stgit.commands.common.crt_series = command.crt_series
command.func(parser, options, args)
except (IOError, CmdException, stack.StackException, git.GitException), \
def __init__(self, name = None):
"""Takes a series name as the parameter.
"""
- if name:
- self.__name = name
- else:
- self.__name = git.get_head_file()
-
- if self.__name:
+ try:
+ if name:
+ self.__name = name
+ else:
+ self.__name = git.get_head_file()
base_dir = git.get_base_dir()
- self.__patch_dir = os.path.join(base_dir, 'patches',
- self.__name)
- self.__base_file = os.path.join(base_dir, 'refs', 'bases',
- self.__name)
- self.__applied_file = os.path.join(self.__patch_dir, 'applied')
- self.__unapplied_file = os.path.join(self.__patch_dir, 'unapplied')
- self.__current_file = os.path.join(self.__patch_dir, 'current')
- self.__descr_file = os.path.join(self.__patch_dir, 'description')
+ except git.GitException, ex:
+ raise StackException, 'GIT tree not initialised: %s' % ex
+
+ self.__patch_dir = os.path.join(base_dir, 'patches',
+ self.__name)
+ self.__base_file = os.path.join(base_dir, 'refs', 'bases',
+ self.__name)
+ self.__applied_file = os.path.join(self.__patch_dir, 'applied')
+ self.__unapplied_file = os.path.join(self.__patch_dir, 'unapplied')
+ self.__current_file = os.path.join(self.__patch_dir, 'current')
+ self.__descr_file = os.path.join(self.__patch_dir, 'description')
def get_branch(self):
"""Return the branch name for the Series object