class Patch:
"""Basic patch implementation
"""
- def __init__(self, name, patch_dir):
- self.__patch_dir = patch_dir
+ def __init__(self, name, series_dir, refs_dir):
+ self.__series_dir = series_dir
self.__name = name
- self.__dir = os.path.join(self.__patch_dir, self.__name)
+ self.__dir = os.path.join(self.__series_dir, self.__name)
+ self.__refs_dir = refs_dir
+ self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
def create(self):
os.mkdir(self.__dir)
for f in os.listdir(self.__dir):
os.remove(os.path.join(self.__dir, f))
os.rmdir(self.__dir)
+ os.remove(self.__top_ref_file)
def get_name(self):
return self.__name
def rename(self, newname):
olddir = self.__dir
+ old_ref_file = self.__top_ref_file
self.__name = newname
- self.__dir = os.path.join(self.__patch_dir, self.__name)
+ self.__dir = os.path.join(self.__series_dir, self.__name)
+ self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
os.rename(olddir, self.__dir)
+ os.rename(old_ref_file, self.__top_ref_file)
+
+ def __update_top_ref(self, ref):
+ write_string(self.__top_ref_file, ref)
+
+ def update_top_ref(self):
+ top = self.get_top()
+ if top:
+ self.__update_top_ref(top)
def __get_field(self, name, multiline = False):
id_file = os.path.join(self.__dir, name)
else:
self.__set_field('top.old', None)
self.__set_field('top', value)
+ self.__update_top_ref(value)
def restore_old_boundaries(self):
bottom = self.__get_field('bottom.old')
if top and bottom:
self.__set_field('bottom', bottom)
self.__set_field('top', top)
+ self.__update_top_ref(top)
return True
else:
return False
return self.__get_field('authname')
def set_authname(self, name):
- if not name and config.has_option('stgit', 'authname'):
- name = config.get('stgit', 'authname')
+ if not name:
+ if config.has_option('stgit', 'authname'):
+ name = config.get('stgit', 'authname')
+ elif 'GIT_AUTHOR_NAME' in os.environ:
+ name = os.environ['GIT_AUTHOR_NAME']
self.__set_field('authname', name)
def get_authemail(self):
return self.__get_field('authemail')
def set_authemail(self, address):
- if not address and config.has_option('stgit', 'authemail'):
- address = config.get('stgit', 'authemail')
+ if not address:
+ if config.has_option('stgit', 'authemail'):
+ address = config.get('stgit', 'authemail')
+ elif 'GIT_AUTHOR_EMAIL' in os.environ:
+ address = os.environ['GIT_AUTHOR_EMAIL']
self.__set_field('authemail', address)
def get_authdate(self):
return self.__get_field('authdate')
- def set_authdate(self, authdate):
- self.__set_field('authdate', authdate)
+ def set_authdate(self, date):
+ if not date and 'GIT_AUTHOR_DATE' in os.environ:
+ date = os.environ['GIT_AUTHOR_DATE']
+ self.__set_field('authdate', date)
def get_commname(self):
return self.__get_field('commname')
def set_commname(self, name):
- if not name and config.has_option('stgit', 'commname'):
- name = config.get('stgit', 'commname')
+ if not name:
+ if config.has_option('stgit', 'commname'):
+ name = config.get('stgit', 'commname')
+ elif 'GIT_COMMITTER_NAME' in os.environ:
+ name = os.environ['GIT_COMMITTER_NAME']
self.__set_field('commname', name)
def get_commemail(self):
return self.__get_field('commemail')
def set_commemail(self, address):
- if not address and config.has_option('stgit', 'commemail'):
- address = config.get('stgit', 'commemail')
+ if not address:
+ if config.has_option('stgit', 'commemail'):
+ address = config.get('stgit', 'commemail')
+ elif 'GIT_COMMITTER_EMAIL' in os.environ:
+ address = os.environ['GIT_COMMITTER_EMAIL']
self.__set_field('commemail', address)
self.__name = name
else:
self.__name = git.get_head_file()
- base_dir = git.get_base_dir()
+ self.__base_dir = git.get_base_dir()
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.__series_dir = os.path.join(self.__base_dir, 'patches',
+ self.__name)
+ self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
+ self.__name)
+ self.__base_file = os.path.join(self.__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')
+
+ self.__applied_file = os.path.join(self.__series_dir, 'applied')
+ self.__unapplied_file = os.path.join(self.__series_dir, 'unapplied')
+ self.__current_file = os.path.join(self.__series_dir, 'current')
+ self.__descr_file = os.path.join(self.__series_dir, 'description')
+
+ # where this series keeps its patches
+ self.__patch_dir = os.path.join(self.__series_dir, 'patches')
+ if not os.path.isdir(self.__patch_dir):
+ self.__patch_dir = self.__series_dir
+
+ # if no __refs_dir, create and populate it (upgrade old repositories)
+ if self.is_initialised() and not os.path.isdir(self.__refs_dir):
+ os.makedirs(self.__refs_dir)
+ for patch in self.get_applied() + self.get_unapplied():
+ self.get_patch(patch).update_top_ref()
def get_branch(self):
"""Return the branch name for the Series object
def get_patch(self, name):
"""Return a Patch object for the given name
"""
- return Patch(name, self.__patch_dir)
+ return Patch(name, self.__patch_dir, self.__refs_dir)
def get_current(self):
"""Return a Patch object representing the topmost patch
return self.__base_file
def get_protected(self):
- return os.path.isfile(os.path.join(self.__patch_dir, 'protected'))
+ return os.path.isfile(os.path.join(self.__series_dir, 'protected'))
def protect(self):
- protect_file = os.path.join(self.__patch_dir, 'protected')
+ protect_file = os.path.join(self.__series_dir, 'protected')
if not os.path.isfile(protect_file):
create_empty_file(protect_file)
def unprotect(self):
- protect_file = os.path.join(self.__patch_dir, 'protected')
+ protect_file = os.path.join(self.__series_dir, 'protected')
if os.path.isfile(protect_file):
os.remove(protect_file)
if not crt:
# we don't care, no patches applied
return True
- return git.get_head() == Patch(crt, self.__patch_dir).get_top()
+ return git.get_head() == Patch(crt, self.__patch_dir,
+ self.__refs_dir).get_top()
def is_initialised(self):
"""Checks if series is already initialised
def init(self):
"""Initialises the stgit series
"""
- bases_dir = os.path.join(git.get_base_dir(), 'refs', 'bases')
+ bases_dir = os.path.join(self.__base_dir, 'refs', 'bases')
if self.is_initialised():
raise StackException, self.__patch_dir + ' already exists'
create_empty_file(self.__applied_file)
create_empty_file(self.__unapplied_file)
create_empty_file(self.__descr_file)
+ os.makedirs(os.path.join(self.__series_dir, 'patches'))
+ os.makedirs(self.__refs_dir)
self.__begin_stack_check()
+ def convert(self):
+ """Either convert to use a separate patch directory, or
+ unconvert to place the patches in the same directory with
+ series control files
+ """
+ if self.__patch_dir == self.__series_dir:
+ print 'Converting old-style to new-style...',
+ sys.stdout.flush()
+
+ self.__patch_dir = os.path.join(self.__series_dir, 'patches')
+ os.makedirs(self.__patch_dir)
+
+ for p in self.get_applied() + self.get_unapplied():
+ src = os.path.join(self.__series_dir, p)
+ dest = os.path.join(self.__patch_dir, p)
+ os.rename(src, dest)
+
+ print 'done'
+
+ else:
+ print 'Converting new-style to old-style...',
+ sys.stdout.flush()
+
+ for p in self.get_applied() + self.get_unapplied():
+ src = os.path.join(self.__patch_dir, p)
+ dest = os.path.join(self.__series_dir, p)
+ os.rename(src, dest)
+
+ if not os.listdir(self.__patch_dir):
+ os.rmdir(self.__patch_dir)
+ print 'done'
+ else:
+ print 'Patch directory %s is not empty.' % self.__name
+
+ self.__patch_dir = self.__series_dir
+
def rename(self, to_name):
"""Renames a series
"""
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.isdir(self.__series_dir):
+ os.rename(self.__series_dir, to_stack.__series_dir)
if os.path.exists(self.__base_file):
os.rename(self.__base_file, to_stack.__base_file)
raise StackException, \
'Cannot delete: the series still contains patches'
for p in patches:
- Patch(p, self.__patch_dir).delete()
+ Patch(p, self.__patch_dir, self.__refs_dir).delete()
if os.path.exists(self.__applied_file):
os.remove(self.__applied_file)
if not os.listdir(self.__patch_dir):
os.rmdir(self.__patch_dir)
else:
+ print 'Patch directory %s is not empty.' % self.__name
+ if not os.listdir(self.__series_dir):
+ os.rmdir(self.__series_dir)
+ else:
print 'Series directory %s is not empty.' % self.__name
+ if not os.listdir(self.__refs_dir):
+ os.rmdir(self.__refs_dir)
+ else:
+ print 'Refs directory %s is not empty.' % self.__refs_dir
if os.path.exists(self.__base_file):
os.remove(self.__base_file)
- def refresh_patch(self, message = None, edit = False, show_patch = False,
+ def refresh_patch(self, files = None, message = None, edit = False,
+ show_patch = False,
cache_update = True,
author_name = None, author_email = None,
author_date = None,
if not name:
raise StackException, 'No patches applied'
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
descr = patch.get_description()
if not (message or descr):
if not committer_email:
committer_email = patch.get_commemail()
- commit_id = git.commit(message = descr, parents = [patch.get_bottom()],
+ commit_id = git.commit(files = files,
+ message = descr, parents = [patch.get_bottom()],
cache_update = cache_update,
allowempty = True,
author_name = author_name,
self.__begin_stack_check()
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
patch.create()
if bottom:
def delete_patch(self, name):
"""Deletes a patch
"""
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
if self.__patch_is_current(patch):
self.pop_patch(name)
for name in names:
assert(name in unapplied)
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
head = top
bottom = patch.get_bottom()
self.__begin_stack_check()
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
head = git.get_head()
bottom = patch.get_bottom()
name = self.get_current()
assert(name)
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
git.reset()
self.pop_patch(name)
return patch.restore_old_boundaries()
applied.reverse()
assert(name in applied)
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
git.switch(patch.get_bottom())
def empty_patch(self, name):
"""Returns True if the patch is empty
"""
- patch = Patch(name, self.__patch_dir)
+ patch = Patch(name, self.__patch_dir, self.__refs_dir)
bottom = patch.get_bottom()
top = patch.get_top()
raise StackException, 'Patch "%s" already exists' % newname
if oldname in unapplied:
- Patch(oldname, self.__patch_dir).rename(newname)
+ Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname)
unapplied[unapplied.index(oldname)] = newname
f = file(self.__unapplied_file, 'w+')
f.writelines([line + '\n' for line in unapplied])
f.close()
elif oldname in applied:
- Patch(oldname, self.__patch_dir).rename(newname)
+ Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname)
if oldname == self.get_current():
self.__set_current(newname)
~mdw / stgit / blobdiff