-"""Function/variables commmon to all the commands
+"""Function/variables common to all the commands
"""
__copyright__ = """
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""
-import sys, os
+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
# Command exception class
pass
-# Global variables
-try:
- crt_series = stack.Series()
-except (IOError, stack.StackException, git.GitException), err:
- print >> sys.stderr, err
- sys.exit(2)
+# 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<patch>[^@/]+)'
+ branch_re = r'@(?P<branch>%s+)' % branch_chars
+ patch_id_re = r'%s(?P<patch_id>[a-z.]*)' % patch_id_mark
-# Utility functions
-def git_id(string):
+ # 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 string:
+ if not rev:
return None
-
- string_list = string.split('/')
-
- if len(string_list) == 1:
- patch_name = None
- git_id = string_list[0]
-
- if git_id == 'HEAD':
- return git.get_head()
- if git_id == 'base':
- return read_string(crt_series.get_base_file())
-
- for path in [os.path.join(git.base_dir, 'refs', 'heads'),
- os.path.join(git.base_dir, 'refs', 'tags')]:
- id_file = os.path.join(path, git_id)
- if os.path.isfile(id_file):
- return read_string(id_file)
- elif len(string_list) == 2:
- patch_name = string_list[0]
- if patch_name == '':
- patch_name = crt_series.get_current()
- git_id = string_list[1]
-
- if not patch_name:
- raise CmdException, 'No patches applied'
- elif not (patch_name in crt_series.get_applied()
- + crt_series.get_unapplied()):
- raise CmdException, 'Unknown patch "%s"' % patch_name
-
- if git_id == 'bottom':
- return crt_series.get_patch(patch_name).get_bottom()
- if git_id == 'top':
- return crt_series.get_patch(patch_name).get_top()
-
- raise CmdException, 'Unknown id: %s' % string
+ 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 ouside 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.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:
+ patch = crt_series.get_current()
+ else:
+ patch = stack.Series(branch).get_current()
-def print_crt_patch():
- patch = crt_series.get_current()
if patch:
print 'Now at patch "%s"' % patch
else:
print 'No patches applied'
-def resolved(filename):
- git.update_cache([filename])
- for ext in ['.local', '.older', '.remote']:
+def resolved(filename, reset = None):
+ if reset:
+ reset_file = filename + file_extensions()[reset]
+ if os.path.isfile(reset_file):
+ if os.path.isfile(filename):
+ os.remove(filename)
+ os.rename(reset_file, filename)
+
+ git.update_cache([filename], force = True)
+
+ for ext in file_extensions().values():
fn = filename + ext
if os.path.isfile(fn):
os.remove(fn)
-def resolved_all():
+def resolved_all(reset = None):
conflicts = git.get_conflicts()
if conflicts:
for filename in conflicts:
- resolved(filename)
- os.remove(os.path.join(git.base_dir, 'conflicts'))
+ resolved(filename, reset)
+ 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 <email>' or 'email (name)' string
+ """
+ address = re.sub('[\\\\"]', '\\\\\g<0>', address)
+ str_list = re.findall('^(.*)\s*<(.*)>\s*$', address)
+ if not str_list:
+ str_list = re.findall('^(.*)\s*\((.*)\)\s*$', address)
+ if not str_list:
+ raise CmdException, 'Incorrect "name <email>"/"email (name)" string: %s' % address
+ return ( str_list[0][1], str_list[0][0] )
+
+ return str_list[0]
+
+def name_email_date(address):
+ """Return a tuple consisting of the name, email and date parsed
+ from a 'name <email> date' string
+ """
+ address = re.sub('[\\\\"]', '\\\\\g<0>', address)
+ str_list = re.findall('^(.*)\s*<(.*)>\s*(.*)\s*$', address)
+ if not str_list:
+ raise CmdException, 'Incorrect "name <email> 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
~mdw / stgit / blobdiff