Add --binary flag to commands that generate diffs

[stgit] / stgit / stack.py

"""Basic quilt-like functionality
"""

__copyright__ = """
Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""

import sys, os, re

from stgit.utils import *
from stgit import git, basedir, templates
from stgit.config import config
from shutil import copyfile


# stack exception class
class StackException(Exception):
    pass

class FilterUntil:
    def __init__(self):
        self.should_print = True
    def __call__(self, x, until_test, prefix):
        if until_test(x):
            self.should_print = False
        if self.should_print:
            return x[0:len(prefix)] != prefix
        return False

#
# Functions
#
__comment_prefix = 'STG:'
__patch_prefix = 'STG_PATCH:'

def __clean_comments(f):
    """Removes lines marked for status in a commit file
    """
    f.seek(0)

    # remove status-prefixed lines
    lines = f.readlines()

    patch_filter = FilterUntil()
    until_test = lambda t: t == (__patch_prefix + '\n')
    lines = [l for l in lines if patch_filter(l, until_test, __comment_prefix)]

    # remove empty lines at the end
    while len(lines) != 0 and lines[-1] == '\n':
        del lines[-1]

    f.seek(0); f.truncate()
    f.writelines(lines)

def edit_file(series, line, comment, show_patch = True):
    fname = '.stgitmsg.txt'
    tmpl = templates.get_template('patchdescr.tmpl')

    f = file(fname, 'w+')
    if line:
        print >> f, line
    elif tmpl:
        print >> f, tmpl,
    else:
        print >> f
    print >> f, __comment_prefix, comment
    print >> f, __comment_prefix, \
          'Lines prefixed with "%s" will be automatically removed.' \
          % __comment_prefix
    print >> f, __comment_prefix, \
          'Trailing empty lines will be automatically removed.'

    if show_patch:
       print >> f, __patch_prefix
       # series.get_patch(series.get_current()).get_top()
       git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f)

    #Vim modeline must be near the end.
    print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'
    f.close()

    call_editor(fname)

    f = file(fname, 'r+')

    __clean_comments(f)
    f.seek(0)
    result = f.read()

    f.close()
    os.remove(fname)

    return result

#
# Classes
#

class StgitObject:
    """An object with stgit-like properties stored as files in a directory
    """
    def _set_dir(self, dir):
        self.__dir = dir
    def _dir(self):
        return self.__dir

    def create_empty_field(self, name):
        create_empty_file(os.path.join(self.__dir, name))

    def _get_field(self, name, multiline = False):
        id_file = os.path.join(self.__dir, name)
        if os.path.isfile(id_file):
            line = read_string(id_file, multiline)
            if line == '':
                return None
            else:
                return line
        else:
            return None

    def _set_field(self, name, value, multiline = False):
        fname = os.path.join(self.__dir, name)
        if value and value != '':
            write_string(fname, value, multiline)
        elif os.path.isfile(fname):
            os.remove(fname)

    
class Patch(StgitObject):
    """Basic patch implementation
    """
    def __init__(self, name, series_dir, refs_dir):
        self.__series_dir = series_dir
        self.__name = name
        self._set_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)
        self.__log_ref_file = os.path.join(self.__refs_dir,
                                           self.__name + '.log')

    def create(self):
        os.mkdir(self._dir())
        self.create_empty_field('bottom')
        self.create_empty_field('top')

    def delete(self):
        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)
        if os.path.exists(self.__log_ref_file):
            os.remove(self.__log_ref_file)

    def get_name(self):
        return self.__name

    def rename(self, newname):
        olddir = self._dir()
        old_top_ref_file = self.__top_ref_file
        old_log_ref_file = self.__log_ref_file
        self.__name = newname
        self._set_dir(os.path.join(self.__series_dir, self.__name))
        self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
        self.__log_ref_file = os.path.join(self.__refs_dir,
                                           self.__name + '.log')

        os.rename(olddir, self._dir())
        os.rename(old_top_ref_file, self.__top_ref_file)
        if os.path.exists(old_log_ref_file):
            os.rename(old_log_ref_file, self.__log_ref_file)

    def __update_top_ref(self, ref):
        write_string(self.__top_ref_file, ref)

    def __update_log_ref(self, ref):
        write_string(self.__log_ref_file, ref)

    def update_top_ref(self):
        top = self.get_top()
        if top:
            self.__update_top_ref(top)

    def get_old_bottom(self):
        return self._get_field('bottom.old')

    def get_bottom(self):
        return self._get_field('bottom')

    def set_bottom(self, value, backup = False):
        if backup:
            curr = self._get_field('bottom')
            self._set_field('bottom.old', curr)
        self._set_field('bottom', value)

    def get_old_top(self):
        return self._get_field('top.old')

    def get_top(self):
        return self._get_field('top')

    def set_top(self, value, backup = False):
        if backup:
            curr = self._get_field('top')
            self._set_field('top.old', curr)
        self._set_field('top', value)
        self.__update_top_ref(value)

    def restore_old_boundaries(self):
        bottom = self._get_field('bottom.old')
        top = self._get_field('top.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

    def get_description(self):
        return self._get_field('description', True)

    def set_description(self, line):
        self._set_field('description', line, True)

    def get_authname(self):
        return self._get_field('authname')

    def set_authname(self, name):
        self._set_field('authname', name or git.author().name)

    def get_authemail(self):
        return self._get_field('authemail')

    def set_authemail(self, email):
        self._set_field('authemail', email or git.author().email)

    def get_authdate(self):
        return self._get_field('authdate')

    def set_authdate(self, date):
        self._set_field('authdate', date or git.author().date)

    def get_commname(self):
        return self._get_field('commname')

    def set_commname(self, name):
        self._set_field('commname', name or git.committer().name)

    def get_commemail(self):
        return self._get_field('commemail')

    def set_commemail(self, email):
        self._set_field('commemail', email or git.committer().email)

    def get_log(self):
        return self._get_field('log')

    def set_log(self, value, backup = False):
        self._set_field('log', value)
        self.__update_log_ref(value)

# The current StGIT metadata format version.
FORMAT_VERSION = 2

def format_version_key(branch):
    return 'branch.%s.stgitformatversion' % branch

def update_to_current_format_version(branch, git_dir):
    """Update a potentially older StGIT directory structure to the
    latest version. Note: This function should depend as little as
    possible on external functions that may change during a format
    version bump, since it must remain able to process older formats."""

    branch_dir = os.path.join(git_dir, 'patches', branch)
    def get_format_version():
        """Return the integer format version number, or None if the
        branch doesn't have any StGIT metadata at all, of any version."""
        fv = config.get(format_version_key(branch))
        if fv:
            # Great, there's an explicitly recorded format version
            # number, which means that the branch is initialized and
            # of that exact version.
            return int(fv)
        elif os.path.isdir(os.path.join(branch_dir, 'patches')):
            # There's a .git/patches/<branch>/patches dirctory, which
            # means this is an initialized version 1 branch.
            return 1
        elif os.path.isdir(branch_dir):
            # There's a .git/patches/<branch> directory, which means
            # this is an initialized version 0 branch.
            return 0
        else:
            # The branch doesn't seem to be initialized at all.
            return None
    def set_format_version(v):
        config.set(format_version_key(branch), '%d' % v)
    def mkdir(d):
        if not os.path.isdir(d):
            os.makedirs(d)
    def rm(f):
        if os.path.exists(f):
            os.remove(f)

    # Update 0 -> 1.
    if get_format_version() == 0:
        mkdir(os.path.join(branch_dir, 'trash'))
        patch_dir = os.path.join(branch_dir, 'patches')
        mkdir(patch_dir)
        refs_dir = os.path.join(git_dir, 'refs', 'patches', branch)
        mkdir(refs_dir)
        for patch in (file(os.path.join(branch_dir, 'unapplied')).readlines()
                      + file(os.path.join(branch_dir, 'applied')).readlines()):
            patch = patch.strip()
            os.rename(os.path.join(branch_dir, patch),
                      os.path.join(patch_dir, patch))
            Patch(patch, patch_dir, refs_dir).update_top_ref()
        set_format_version(1)

    # Update 1 -> 2.
    if get_format_version() == 1:
        desc_file = os.path.join(branch_dir, 'description')
        if os.path.isfile(desc_file):
            desc = read_string(desc_file)
            if desc:
                config.set('branch.%s.description' % branch, desc)
            rm(desc_file)
        rm(os.path.join(branch_dir, 'current'))
        rm(os.path.join(git_dir, 'refs', 'bases', branch))
        set_format_version(2)

    # Make sure we're at the latest version.
    if not get_format_version() in [None, FORMAT_VERSION]:
        raise StackException('Branch %s is at format version %d, expected %d'
                             % (branch, get_format_version(), FORMAT_VERSION))

class Series(StgitObject):
    """Class including the operations on series
    """
    def __init__(self, name = None):
        """Takes a series name as the parameter.
        """
        try:
            if name:
                self.__name = name
            else:
                self.__name = git.get_head_file()
            self.__base_dir = basedir.get()
        except git.GitException, ex:
            raise StackException, 'GIT tree not initialised: %s' % ex

        self._set_dir(os.path.join(self.__base_dir, 'patches', self.__name))

        # Update the branch to the latest format version if it is
        # initialized, but don't touch it if it isn't.
        update_to_current_format_version(self.__name, self.__base_dir)

        self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
                                       self.__name)

        self.__applied_file = os.path.join(self._dir(), 'applied')
        self.__unapplied_file = os.path.join(self._dir(), 'unapplied')
        self.__hidden_file = os.path.join(self._dir(), 'hidden')

        # where this series keeps its patches
        self.__patch_dir = os.path.join(self._dir(), 'patches')

        # trash directory
        self.__trash_dir = os.path.join(self._dir(), 'trash')

    def __patch_name_valid(self, name):
        """Raise an exception if the patch name is not valid.
        """
        if not name or re.search('[^\w.-]', name):
            raise StackException, 'Invalid patch name: "%s"' % name

    def get_branch(self):
        """Return the branch name for the Series object
        """
        return self.__name

    def get_patch(self, name):
        """Return a Patch object for the given name
        """
        return Patch(name, self.__patch_dir, self.__refs_dir)

    def get_current_patch(self):
        """Return a Patch object representing the topmost patch, or
        None if there is no such patch."""
        crt = self.get_current()
        if not crt:
            return None
        return Patch(crt, self.__patch_dir, self.__refs_dir)

    def get_current(self):
        """Return the name of the topmost patch, or None if there is
        no such patch."""
        try:
            applied = self.get_applied()
        except StackException:
            # No "applied" file: branch is not initialized.
            return None
        try:
            return applied[-1]
        except IndexError:
            # No patches applied.
            return None

    def get_applied(self):
        if not os.path.isfile(self.__applied_file):
            raise StackException, 'Branch "%s" not initialised' % self.__name
        f = file(self.__applied_file)
        names = [line.strip() for line in f.readlines()]
        f.close()
        return names

    def get_unapplied(self):
        if not os.path.isfile(self.__unapplied_file):
            raise StackException, 'Branch "%s" not initialised' % self.__name
        f = file(self.__unapplied_file)
        names = [line.strip() for line in f.readlines()]
        f.close()
        return names

    def get_hidden(self):
        if not os.path.isfile(self.__hidden_file):
            return []
        f = file(self.__hidden_file)
        names = [line.strip() for line in f.readlines()]
        f.close()
        return names

    def get_base(self):
        # Return the parent of the bottommost patch, if there is one.
        if os.path.isfile(self.__applied_file):
            bottommost = file(self.__applied_file).readline().strip()
            if bottommost:
                return self.get_patch(bottommost).get_bottom()
        # No bottommost patch, so just return HEAD
        return git.get_head()

    def get_head(self):
        """Return the head of the branch
        """
        crt = self.get_current_patch()
        if crt:
            return crt.get_top()
        else:
            return self.get_base()

    def get_protected(self):
        return os.path.isfile(os.path.join(self._dir(), 'protected'))

    def protect(self):
        protect_file = os.path.join(self._dir(), 'protected')
        if not os.path.isfile(protect_file):
            create_empty_file(protect_file)

    def unprotect(self):
        protect_file = os.path.join(self._dir(), 'protected')
        if os.path.isfile(protect_file):
            os.remove(protect_file)

    def __branch_descr(self):
        return 'branch.%s.description' % self.get_branch()

    def get_description(self):
        return config.get(self.__branch_descr()) or ''

    def set_description(self, line):
        if line:
            config.set(self.__branch_descr(), line)
        else:
            config.unset(self.__branch_descr())

    def get_parent_remote(self):
        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" ' \
                  'and "branch.%s.merge" with "git repo-config".' \
                  % (self.__name, 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)

    def get_parent_branch(self):
        value = config.get('branch.%s.stgit.parentbranch' % self.__name)
        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.stgit.parentbranch" with "git repo-config".' \
                  % (self.__name, self.__name)
            return 'heads/origin'
        else:
            raise StackException, 'Cannot find a parent branch for "%s"' % self.__name

    def __set_parent_branch(self, name):
        if config.get('branch.%s.remote' % self.__name):
            # Never set merge if remote is not set to avoid
            # possibly-erroneous lookups into 'origin'
            config.set('branch.%s.merge' % self.__name, name)
        config.set('branch.%s.stgit.parentbranch' % self.__name, name)

    def set_parent(self, remote, localbranch):
        if localbranch:
            self.__set_parent_remote(remote)
            self.__set_parent_branch(localbranch)
        # We'll enforce this later
#         else:
#             raise StackException, 'Parent branch (%s) should be specified for %s' % localbranch, self.__name

    def __patch_is_current(self, patch):
        return patch.get_name() == self.get_current()

    def patch_applied(self, name):
        """Return true if the patch exists in the applied list
        """
        return name in self.get_applied()

    def patch_unapplied(self, name):
        """Return true if the patch exists in the unapplied list
        """
        return name in self.get_unapplied()

    def patch_hidden(self, name):
        """Return true if the patch is hidden.
        """
        return name in self.get_hidden()

    def patch_exists(self, name):
        """Return true if there is a patch with the given name, false
        otherwise."""
        return self.patch_applied(name) or self.patch_unapplied(name)

    def head_top_equal(self):
        """Return true if the head and the top are the same
        """
        crt = self.get_current_patch()
        if not crt:
            # we don't care, no patches applied
            return True
        return git.get_head() == crt.get_top()

    def is_initialised(self):
        """Checks if series is already initialised
        """
        return bool(config.get(format_version_key(self.get_branch())))

    def init(self, create_at=False, parent_remote=None, parent_branch=None):
        """Initialises the stgit series
        """
        if self.is_initialised():
            raise StackException, '%s already initialized' % self.get_branch()
        for d in [self._dir(), self.__refs_dir]:
            if os.path.exists(d):
                raise StackException, '%s already exists' % d

        if (create_at!=False):
            git.create_branch(self.__name, create_at)

        os.makedirs(self.__patch_dir)

        self.set_parent(parent_remote, parent_branch)

        self.create_empty_field('applied')
        self.create_empty_field('unapplied')
        os.makedirs(self.__refs_dir)
        self._set_field('orig-base', git.get_head())

        config.set(format_version_key(self.get_branch()), str(FORMAT_VERSION))

    def rename(self, to_name):
        """Renames a series
        """
        to_stack = Series(to_name)

        if to_stack.is_initialised():
            raise StackException, '"%s" already exists' % to_stack.get_branch()

        git.rename_branch(self.__name, to_name)

        if os.path.isdir(self._dir()):