-"""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, re
+import sys, os, os.path, re
from optparse import OptionParser, make_option
from stgit.utils import *
-from stgit import stack, git
+from stgit.out import *
+from stgit import stack, git, basedir
+from stgit.config import config, file_extensions
+
+crt_series = None
# Command exception class
# Utility functions
-def git_id(string):
- """Return the GIT id
- """
- if not string:
- return None
-
- string_list = string.split('/')
- if len(string_list) == 2:
- patch_id = string_list[1]
- if not patch_id:
- patch_id = 'top'
- elif len(string_list) == 1:
- patch_id = 'top'
- else:
- patch_id = None
+class RevParseException(Exception):
+ """Revision spec parse error."""
+ pass
- patch_branch = string_list[0].split('@')
- if len(patch_branch) == 1:
- series = crt_series
- elif len(patch_branch) == 2:
- series = stack.Series(patch_branch[1])
+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 //."""
+ if '/' in ''.join(git.get_heads()):
+ # We have branch names with / in them.
+ branch_chars = r'[^@]'
+ patch_id_mark = r'//'
else:
- raise CmdException, 'Unknown id: %s' % string
+ # 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
+
+ # Try //patch_id.
+ m = re.match(r'^%s$' % patch_id_re, rev)
+ if m:
+ return None, None, m.group('patch_id')
- patch_name = patch_branch[0]
- if not patch_name:
- patch_name = series.get_current()
- if not patch_name:
- raise CmdException, 'No patches applied'
+ # 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')
- # 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()
+ # Try patch[@branch].
+ m = re.match(r'^%s(%s)?$' % (patch_re, branch_re), rev)
+ if m:
+ return m.group('patch'), m.group('branch'), None
- # base
- if patch_name == 'base' and len(string_list) == 1:
- return read_string(series.get_base_file())
+ # No, we can't parse that.
+ raise RevParseException
- # anything else failed
- return git.rev_parse(string)
+def git_id(rev):
+ """Return the GIT id
+ """
+ if not rev:
+ return None
+ 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() or \
+ patch in series.get_hidden():
+ 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 series.get_base()
+ 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 = stack.Series(branch).get_current()
if patch:
- print 'Now at patch "%s"' % patch
+ out.info('Now at patch "%s"' % patch)
else:
- print 'No patches applied'
+ out.info('No patches applied')
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)
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)
if conflicts:
for filename in conflicts:
resolved(filename, reset)
- os.remove(os.path.join(git.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:
+ out.info('Fast-forwarded patches "%s" - "%s"'
+ % (patches[0], patches[forwarded - 1]))
+ elif forwarded == 1:
+ out.info('Fast-forwarded patch "%s"' % patches[0])
+
+ names = patches[forwarded:]
+
+ # check for patches merged upstream
+ if names and check_merged:
+ out.start('Checking for patches merged upstream')
+
+ merged = crt_series.merged_patches(names)
+
+ out.done('%d found' % len(merged))
+ else:
+ merged = []
+
+ for p in names:
+ out.start('Pushing patch "%s"' % p)
+
+ if p in merged:
+ crt_series.push_patch(p, empty = True)
+ out.done('merged upstream')
+ else:
+ modified = crt_series.push_patch(p)
+
+ if crt_series.empty_patch(p):
+ out.done('empty patch')
+ elif modified:
+ out.done('modified')
+ else:
+ out.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:
+ out.info('Nothing to push/pop')
+ else:
+ p = patches[-1]
+ if len(patches) == 1:
+ out.start('Popping patch "%s"' % p)
+ else:
+ out.start('Popping patches "%s" - "%s"' % (patches[0], p))
+ crt_series.pop_patch(p, keep)
+ out.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(string):
+def name_email(address):
"""Return a tuple consisting of the name and email parsed from a
- standard 'name <email>' string
+ standard 'name <email>' or 'email (name)' string
"""
- string = re.sub('([^\w\s<>@.])', '\\\\\\1', string)
- str_list = re.findall('^(.*)\s*<(.*)>\s*$', string)
+ address = re.sub('[\\\\"]', '\\\\\g<0>', address)
+ str_list = re.findall('^(.*)\s*<(.*)>\s*$', address)
if not str_list:
- raise CmdException, 'Incorrect "name <email>" string: %s' % string
+ 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(string):
+def name_email_date(address):
"""Return a tuple consisting of the name, email and date parsed
from a 'name <email> date' string
"""
- string = re.sub('([^\w\s<>@.])', '\\\\\\1', string)
- str_list = re.findall('^(.*)\s*<(.*)>\s*(.*)\s*$', 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' % string
+ raise CmdException, 'Incorrect "name <email> date" string: %s' % address
return str_list[0]
+
+def address_or_alias(addr_str):
+ """Return the address if it contains an e-mail address or look up
+ the aliases in the config files.
+ """
+ def __address_or_alias(addr):
+ if not addr:
+ return None
+ if addr.find('@') >= 0:
+ # it's an e-mail address
+ return addr
+ alias = config.get('mail.alias.'+addr)
+ if alias:
+ # it's an alias
+ return alias
+ raise CmdException, 'unknown e-mail alias: %s' % addr
+
+ addr_list = [__address_or_alias(addr.strip())
+ for addr in addr_str.split(',')]
+ return ', '.join([addr for addr in addr_list if addr])
+
+def prepare_rebase(force=None):
+ if not force:
+ # Be sure we won't loose results of stg-(un)commit by error.
+ # Do not require an existing orig-base for compatibility with 0.12 and earlier.
+ origbase = crt_series._get_field('orig-base')
+ if origbase and crt_series.get_base() != origbase:
+ raise CmdException, 'Rebasing would possibly lose data'
+
+ # pop all patches
+ applied = crt_series.get_applied()
+ if len(applied) > 0:
+ out.start('Popping all applied patches')
+ crt_series.pop_patch(applied[0])
+ out.done()
+ return applied
+
+def rebase(target):
+ if target == git.get_head():
+ out.info('Already at "%s", no need for rebasing.' % target)
+ return
+ out.start('Rebasing to "%s"' % target)
+ git.reset(tree_id = git_id(target))
+ out.done()
+
+def post_rebase(applied, nopush, merged):
+ # memorize that we rebased to here
+ crt_series._set_field('orig-base', git.get_head())
+ # push the patches back
+ if not nopush:
+ push_patches(applied, merged)
+
+#
+# Patch description/e-mail/diff parsing
+#
+def __end_descr(line):
+ return re.match('---\s*$', line) or re.match('diff -', line) or \
+ re.match('Index: ', line)
+
+def __split_descr_diff(string):
+ """Return the description and the diff from the given string
+ """
+ descr = diff = ''
+ top = True
+
+ for line in string.split('\n'):
+ if top:
+ if not __end_descr(line):
+ descr += line + '\n'
+ continue
+ else:
+ top = False
+ diff += line + '\n'
+
+ return (descr.rstrip(), diff)
+
+def __parse_description(descr):
+ """Parse the patch description and return the new description and
+ author information (if any).
+ """
+ subject = body = ''
+ authname = authemail = authdate = None
+
+ descr_lines = [line.rstrip() for line in descr.split('\n')]
+ if not descr_lines:
+ raise CmdException, "Empty patch description"
+
+ lasthdr = 0
+ end = len(descr_lines)
+
+ # Parse the patch header
+ for pos in range(0, end):
+ if not descr_lines[pos]:
+ continue
+ # check for a "From|Author:" line
+ if re.match('\s*(?:from|author):\s+', descr_lines[pos], re.I):
+ auth = re.findall('^.*?:\s+(.*)$', descr_lines[pos])[0]
+ authname, authemail = name_email(auth)
+ lasthdr = pos + 1
+ continue
+ # check for a "Date:" line
+ if re.match('\s*date:\s+', descr_lines[pos], re.I):
+ authdate = re.findall('^.*?:\s+(.*)$', descr_lines[pos])[0]
+ lasthdr = pos + 1
+ continue
+ if subject:
+ break
+ # get the subject
+ subject = descr_lines[pos]
+ lasthdr = pos + 1
+
+ # get the body
+ if lasthdr < end:
+ body = reduce(lambda x, y: x + '\n' + y, descr_lines[lasthdr:], '')
+
+ return (subject + body, authname, authemail, authdate)
+
+def parse_mail(msg):
+ """Parse the message object and return (description, authname,
+ authemail, authdate, diff)
+ """
+ from email.Header import decode_header, make_header
+
+ def __decode_header(header):
+ """Decode a qp-encoded e-mail header as per rfc2047"""
+ try:
+ words_enc = decode_header(header)
+ hobj = make_header(words_enc)
+ except Exception, ex:
+ raise CmdException, 'header decoding error: %s' % str(ex)
+ return unicode(hobj).encode('utf-8')
+
+ # parse the headers
+ if msg.has_key('from'):
+ authname, authemail = name_email(__decode_header(msg['from']))
+ else:
+ authname = authemail = None
+
+ # '\n\t' can be found on multi-line headers
+ descr = __decode_header(msg['subject']).replace('\n\t', ' ')
+ authdate = msg['date']
+
+ # remove the '[*PATCH*]' expression in the subject
+ if descr:
+ descr = re.findall('^(\[.*?[Pp][Aa][Tt][Cc][Hh].*?\])?\s*(.*)$',
+ descr)[0][1]
+ else:
+ raise CmdException, 'Subject: line not found'
+
+ # the rest of the message
+ msg_text = ''
+ for part in msg.walk():
+ if part.get_content_type() == 'text/plain':
+ msg_text += part.get_payload(decode = True)
+
+ rem_descr, diff = __split_descr_diff(msg_text)
+ if rem_descr:
+ descr += '\n\n' + rem_descr
+
+ # parse the description for author information
+ descr, descr_authname, descr_authemail, descr_authdate = \
+ __parse_description(descr)
+ if descr_authname:
+ authname = descr_authname
+ if descr_authemail:
+ authemail = descr_authemail
+ if descr_authdate:
+ authdate = descr_authdate
+
+ return (descr, authname, authemail, authdate, diff)
+
+def parse_patch(fobj):
+ """Parse the input file and return (description, authname,
+ authemail, authdate, diff)
+ """
+ descr, diff = __split_descr_diff(fobj.read())
+ descr, authname, authemail, authdate = __parse_description(descr)
+
+ # we don't yet have an agreed place for the creation date.
+ # Just return None
+ return (descr, authname, authemail, authdate, diff)
~mdw / stgit / blobdiff