X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/e2d769b29016dcb4e2294646f52a09d777a724d1..06848faba60e1c4e637b15b608e5bd94989c4196:/stgit/commands/common.py diff --git a/stgit/commands/common.py b/stgit/commands/common.py index 2e1ba7a..466f584 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -18,11 +18,12 @@ 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 +import sys, os, os.path, re from optparse import OptionParser, make_option from stgit.utils import * -from stgit import stack, git +from stgit import stack, git, basedir +from stgit.config import config, file_extensions crt_series = None @@ -33,71 +34,95 @@ class CmdException(Exception): # Utility functions +class RevParseException(Exception): + """Revision spec parse error.""" + pass + +def parse_rev(rev): + """Parse a revision specification into its + patchname@branchname//patch_id parts. If no branch name has a slash + in it, also accept / instead of //.""" + files, dirs = list_files_and_dirs(os.path.join(basedir.get(), + 'refs', 'heads')) + if len(dirs) != 0: + # We have branch names with / in them. + branch_chars = r'[^@]' + patch_id_mark = r'//' + else: + # No / in branch names. + branch_chars = r'[^@/]' + patch_id_mark = r'(/|//)' + patch_re = r'(?P[^@/]+)' + branch_re = r'@(?P%s+)' % branch_chars + patch_id_re = r'%s(?P[a-z.]*)' % patch_id_mark + + # Try //patch_id. + m = re.match(r'^%s$' % patch_id_re, rev) + if m: + return None, None, m.group('patch_id') + + # Try path[@branch]//patch_id. + m = re.match(r'^%s(%s)?%s$' % (patch_re, branch_re, patch_id_re), rev) + if m: + return m.group('patch'), m.group('branch'), m.group('patch_id') + + # Try patch[@branch]. + m = re.match(r'^%s(%s)?$' % (patch_re, branch_re), rev) + if m: + return m.group('patch'), m.group('branch'), None + + # No, we can't parse that. + raise RevParseException + def git_id(rev): """Return the GIT id """ if not rev: return None - - rev_list = rev.split('/') - if len(rev_list) == 2: - patch_id = rev_list[1] - if not patch_id: - patch_id = 'top' - elif len(rev_list) == 1: - patch_id = 'top' - else: - patch_id = None - - patch_branch = rev_list[0].split('@') - if len(patch_branch) == 1: - series = crt_series - elif len(patch_branch) == 2: - series = stack.Series(patch_branch[1]) - else: - raise CmdException, 'Unknown id: %s' % rev - - patch_name = patch_branch[0] - if not patch_name: - patch_name = series.get_current() - if not patch_name: - raise CmdException, 'No patches applied' - - # patch - if patch_name in series.get_applied() \ - or patch_name in series.get_unapplied(): - if patch_id == 'top': - return series.get_patch(patch_name).get_top() - elif patch_id == 'bottom': - return series.get_patch(patch_name).get_bottom() - # Note we can return None here. - elif patch_id == 'top.old': - return series.get_patch(patch_name).get_old_top() - elif patch_id == 'bottom.old': - return series.get_patch(patch_name).get_old_bottom() - - # base - if patch_name == 'base' and len(rev_list) == 1: - return read_string(series.get_base_file()) - - # anything else failed + try: + patch, branch, patch_id = parse_rev(rev) + if branch == None: + series = crt_series + else: + series = stack.Series(branch) + if patch == None: + patch = series.get_current() + if not patch: + raise CmdException, 'No patches applied' + if patch in series.get_applied() or patch in series.get_unapplied(): + if patch_id in ['top', '', None]: + return series.get_patch(patch).get_top() + elif patch_id == 'bottom': + return series.get_patch(patch).get_bottom() + elif patch_id == 'top.old': + return series.get_patch(patch).get_old_top() + elif patch_id == 'bottom.old': + return series.get_patch(patch).get_old_bottom() + elif patch_id == 'log': + return series.get_patch(patch).get_log() + if patch == 'base' and patch_id == None: + return read_string(series.get_base_file()) + except RevParseException: + pass return git.rev_parse(rev + '^{commit}') def check_local_changes(): if git.local_changes(): raise CmdException, \ - 'local changes in the tree. Use "refresh" to commit them' + 'local changes in the tree. Use "refresh" or "status --reset"' def check_head_top_equal(): if not crt_series.head_top_equal(): - raise CmdException, \ - 'HEAD and top are not the same. You probably committed\n' \ - ' changes to the tree outside of StGIT. If you know what you\n' \ - ' are doing, use the "refresh -f" command' + raise CmdException( + 'HEAD and top are not the same. You probably committed\n' + ' changes to the tree outside of StGIT. To bring them\n' + ' into StGIT, use the "assimilate" command') def check_conflicts(): - if os.path.exists(os.path.join(git.get_base_dir(), 'conflicts')): - raise CmdException, 'Unsolved conflicts. Please resolve them first' + if os.path.exists(os.path.join(basedir.get(), 'conflicts')): + raise CmdException, \ + 'Unsolved conflicts. Please resolve them first or\n' \ + ' revert the changes with "status --reset"' def print_crt_patch(branch = None): if not branch: @@ -112,7 +137,7 @@ def print_crt_patch(branch = None): def resolved(filename, reset = None): if reset: - reset_file = filename + '.' + reset + reset_file = filename + file_extensions()[reset] if os.path.isfile(reset_file): if os.path.isfile(filename): os.remove(filename) @@ -120,7 +145,7 @@ def resolved(filename, reset = None): git.update_cache([filename], force = True) - for ext in ['.local', '.older', '.remote']: + for ext in file_extensions().values(): fn = filename + ext if os.path.isfile(fn): os.remove(fn) @@ -130,16 +155,140 @@ def resolved_all(reset = None): if conflicts: for filename in conflicts: resolved(filename, reset) - os.remove(os.path.join(git.get_base_dir(), 'conflicts')) + os.remove(os.path.join(basedir.get(), 'conflicts')) + +def push_patches(patches, check_merged = False): + """Push multiple patches onto the stack. This function is shared + between the push and pull commands + """ + forwarded = crt_series.forward_patches(patches) + if forwarded > 1: + print 'Fast-forwarded patches "%s" - "%s"' % (patches[0], + patches[forwarded - 1]) + elif forwarded == 1: + print 'Fast-forwarded patch "%s"' % patches[0] + + names = patches[forwarded:] + + # check for patches merged upstream + if check_merged: + print 'Checking for patches merged upstream...', + sys.stdout.flush() + + merged = crt_series.merged_patches(names) + + print 'done (%d found)' % len(merged) + else: + merged = [] + + for p in names: + print 'Pushing patch "%s"...' % p, + sys.stdout.flush() + + if p in merged: + crt_series.push_patch(p, empty = True) + print 'done (merged upstream)' + else: + modified = crt_series.push_patch(p) + + if crt_series.empty_patch(p): + print 'done (empty patch)' + elif modified: + print 'done (modified)' + else: + print 'done' + +def pop_patches(patches, keep = False): + """Pop the patches in the list from the stack. It is assumed that + the patches are listed in the stack reverse order. + """ + if len(patches) == 0: + print 'nothing to push/pop' + else: + p = patches[-1] + if len(patches) == 1: + print 'Popping patch "%s"...' % p, + else: + print 'Popping "%s" - "%s" patches...' % (patches[0], p), + sys.stdout.flush() + + crt_series.pop_patch(p, keep) + + print 'done' + +def parse_patches(patch_args, patch_list, boundary = 0, ordered = False): + """Parse patch_args list for patch names in patch_list and return + a list. The names can be individual patches and/or in the + patch1..patch2 format. + """ + patches = [] + + for name in patch_args: + pair = name.split('..') + for p in pair: + if p and not p in patch_list: + raise CmdException, 'Unknown patch name: %s' % p + + if len(pair) == 1: + # single patch name + pl = pair + elif len(pair) == 2: + # patch range [p1]..[p2] + # inclusive boundary + if pair[0]: + first = patch_list.index(pair[0]) + else: + first = -1 + # exclusive boundary + if pair[1]: + last = patch_list.index(pair[1]) + 1 + else: + last = -1 + + # only cross the boundary if explicitly asked + if not boundary: + boundary = len(patch_list) + if first < 0: + if last <= boundary: + first = 0 + else: + first = boundary + if last < 0: + if first < boundary: + last = boundary + else: + last = len(patch_list) + + if last > first: + pl = patch_list[first:last] + else: + pl = patch_list[(last - 1):(first + 1)] + pl.reverse() + else: + raise CmdException, 'Malformed patch name: %s' % name + + for p in pl: + if p in patches: + raise CmdException, 'Duplicate patch name: %s' % p + + patches += pl + + if ordered: + patches = [p for p in patch_list if p in patches] + + return patches def name_email(address): """Return a tuple consisting of the name and email parsed from a - standard 'name ' string + standard 'name ' or 'email (name)' string """ address = re.sub('[\\\\"]', '\\\\\g<0>', address) str_list = re.findall('^(.*)\s*<(.*)>\s*$', address) if not str_list: - raise CmdException, 'Incorrect "name " string: %s' % address + str_list = re.findall('^(.*)\s*\((.*)\)\s*$', address) + if not str_list: + raise CmdException, 'Incorrect "name "/"email (name)" string: %s' % address + return ( str_list[0][1], str_list[0][0] ) return str_list[0] @@ -153,3 +302,28 @@ def name_email_date(address): raise CmdException, 'Incorrect "name date" string: %s' % address return str_list[0] + +def patch_name_from_msg(msg): + """Return a string to be used as a patch name. This is generated + from the first 30 characters of the top line of the string passed + as argument.""" + if not msg: + return None + + subject_line = msg[:30].lstrip().split('\n', 1)[0].lower() + return re.sub('[\W]+', '-', subject_line).strip('-') + +def make_patch_name(msg, unacceptable, default_name = 'patch', + alternative = True): + """Return a patch name generated from the given commit message, + guaranteed to make unacceptable(name) be false. If the commit + message is empty, base the name on default_name instead.""" + patchname = patch_name_from_msg(msg) + if not patchname: + patchname = default_name + if alternative and unacceptable(patchname): + suffix = 0 + while unacceptable('%s-%d' % (patchname, suffix)): + suffix += 1 + patchname = '%s-%d' % (patchname, suffix) + return patchname