self._set_field('description', line)
def get_parent_remote(self):
- return config.get('branch.%s.remote' % self.__name) or 'origin'
+ value = config.get('branch.%s.remote' % self.__name)
+ if value:
+ return value
+ elif 'origin' in git.remotes_list():
+ print 'Notice: no parent remote declared for stack "%s", defaulting to "origin".' \
+ 'Consider setting "branch.%s.remote" with "git repo-config".' \
+ % (self.__name, self.__name)
+ return 'origin'
+ else:
+ raise StackException, 'Cannot find a parent remote for "%s"' % self.__name
def __set_parent_remote(self, remote):
value = config.set('branch.%s.remote' % self.__name, remote)
if value:
return value
elif git.rev_parse('heads/origin'):
+ print 'Notice: no parent branch declared for stack "%s", defaulting to "heads/origin".' \
+ 'Consider setting "branch.%s.merge" with "git repo-config".' \
+ % (self.__name, self.__name)
return 'heads/origin'
else:
raise StackException, 'Cannot find a parent branch for "%s"' % self.__name