1 # -*- coding: utf-8 -*-
4 Copyright (C) 2006, Karl Hasselström <kha@treskal.com>
6 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License version 2 as
8 published by the Free Software Foundation.
10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details.
15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 from optparse import OptionParser, make_option
23 from stgit.commands.common import *
24 from stgit.utils import *
25 from stgit.out import *
26 from stgit.run import *
27 from stgit import stack, git
29 help = 'StGit-ify any git commits made on top of your StGit stack'
30 usage = """%prog [options]
32 "assimilate" will repair three kinds of inconsistencies in your StGit
33 stack, all of them caused by using plain git commands on the branch:
35 1. If you have made regular git commits on top of your stack of
36 StGit patches, "assimilate" converts them to StGit patches,
37 preserving their contents.
39 2. Merge commits cannot become patches; if you have committed a
40 merge on top of your stack, "assimilate" will simply mark all
41 patches below the merge unapplied, since they are no longer
42 reachable. If this is not what you want, use "git reset" to get
43 rid of the merge and run "assimilate" again.
45 3. The applied patches are supposed to be precisely those that are
46 reachable from the branch head. If you have used e.g. "git reset"
47 to move the head, some applied patches may no longer be
48 reachable, and some unapplied patches may have become reachable.
49 "assimilate" will correct the appliedness of such patches.
51 Note that these are "inconsistencies", not "errors"; furthermore,
52 "assimilate" will repair them reliably. As long as you are satisfied
53 with the way "assimilate" handles them, you have no reason to avoid
54 causing them in the first place if that is convenient for you."""
59 def __init__(self, id):
65 def __get_commit(self):
67 self.__commit = git.get_commit(self.id)
69 commit = property(__get_commit)
72 return '%s (%s)' % (self.id, self.patch)
76 return '<%s>' % str(self)
78 def read_commit_dag(branch):
79 out.start('Reading commit DAG')
82 for line in Run('git-rev-list', '--parents', '--all').output_lines():
86 commits[id] = Commit(id)
88 commits[cs[0]].parents.add(commits[id])
89 commits[id].children.add(commits[cs[0]])
90 for line in Run('git-show-ref').output_lines():
91 id, ref = line.split()
92 m = re.match(r'^refs/patches/%s/(.+)$' % branch, ref)
98 return commits, patches
100 def func(parser, options, args):
101 """Assimilate a number of patches.
105 out.info('No commits to assimilate')
107 orig_applied = crt_series.get_applied()
108 orig_unapplied = crt_series.get_unapplied()
110 # If head == top, we're done.
111 head = git.get_commit(git.get_head()).get_id_hash()
112 top = crt_series.get_current_patch()
113 if top and head == top.get_top():
114 return nothing_to_do()
116 if crt_series.get_protected():
118 'This branch is protected. Modification is not permitted.')
120 # Find commits to assimilate, and applied patches.
121 commits, patches = read_commit_dag(crt_series.get_name())
125 while len(c.parents) == 1:
135 # Find patches hidden behind a merge.
143 todo |= c.parents - seen
147 out.warn(('%d patch%s are hidden below the merge commit'
148 % (len(hidden), ['es', ''][len(hidden) == 1])),
149 '%s,' % merge.id, 'and will be considered unapplied.')
151 # Assimilate any linear sequence of commits on top of a patch.
152 names = set(p.patch for p in patches)
153 def name_taken(name):
155 if applied and patchify:
156 out.start('Creating %d new patch%s'
157 % (len(patchify), ['es', ''][len(patchify) == 1]))
159 name = make_patch_name(p.commit.get_log(), name_taken)
160 out.info('Creating patch %s from commit %s' % (name, p.id))
161 aname, amail, adate = name_email_date(p.commit.get_author())
162 cname, cmail, cdate = name_email_date(p.commit.get_committer())
164 crt_series.new_patch(
165 name, can_edit = False, commit = False,
166 top = p.id, bottom = parent.id, message = p.commit.get_log(),
167 author_name = aname, author_email = amail, author_date = adate,
168 committer_name = cname, committer_email = cmail)
174 # Write the applied/unapplied files.
175 out.start('Checking patch appliedness')
176 applied_name_set = set(p.patch for p in applied)
178 for name in orig_applied:
179 if not name in applied_name_set:
180 out.info('%s is now unapplied' % name)
181 unapplied_names.append(name)
182 for name in orig_unapplied:
183 if name in applied_name_set:
184 out.info('%s is now applied' % name)
186 unapplied_names.append(name)
187 crt_series.set_applied(p.patch for p in applied)
188 crt_series.set_unapplied(unapplied_names)