chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach "stg assimilate" to repair patch reachability
[stgit]
/
stgit
/
stack.py
diff --git
a/stgit/stack.py
b/stgit/stack.py
index 37ffb6a6ce6e2e6101b055c83203cb92651a96af..d889f37797c18aee446ae9362f67b17af172675e 100644
(file)
--- a/
stgit/stack.py
+++ b/
stgit/stack.py
@@
-23,6
+23,7
@@
from email.Utils import formatdate
from stgit.utils import *
from stgit.out import *
from stgit.utils import *
from stgit.out import *
+from stgit.run import *
from stgit import git, basedir, templates
from stgit.config import config
from shutil import copyfile
from stgit import git, basedir, templates
from stgit.config import config
from shutil import copyfile
@@
-508,11
+509,17
@@
class Series(PatchSet):
raise StackException, 'Branch "%s" not initialised' % self.get_name()
return read_strings(self.__applied_file)
raise StackException, 'Branch "%s" not initialised' % self.get_name()
return read_strings(self.__applied_file)
+ def set_applied(self, applied):
+ write_strings(self.__applied_file, applied)
+
def get_unapplied(self):
if not os.path.isfile(self.__unapplied_file):
raise StackException, 'Branch "%s" not initialised' % self.get_name()
return read_strings(self.__unapplied_file)
def get_unapplied(self):
if not os.path.isfile(self.__unapplied_file):
raise StackException, 'Branch "%s" not initialised' % self.get_name()
return read_strings(self.__unapplied_file)
+ def set_unapplied(self, unapplied):
+ write_strings(self.__unapplied_file, unapplied)
+
def get_hidden(self):
if not os.path.isfile(self.__hidden_file):
return []
def get_hidden(self):
if not os.path.isfile(self.__hidden_file):
return []
@@
-754,7
+761,7
@@
class Series(PatchSet):
author_date = None,
committer_name = None, committer_email = None,
backup = False, sign_str = None, log = 'refresh',
author_date = None,
committer_name = None, committer_email = None,
backup = False, sign_str = None, log = 'refresh',
- notes = None):
+ notes = None
, bottom = None
):
"""Generates a new commit for the topmost patch
"""
patch = self.get_current_patch()
"""Generates a new commit for the topmost patch
"""
patch = self.get_current_patch()
@@
-788,7
+795,8
@@
class Series(PatchSet):
descr = add_sign_line(descr, sign_str, committer_name, committer_email)
descr = add_sign_line(descr, sign_str, committer_name, committer_email)
- bottom = patch.get_bottom()
+ if not bottom:
+ bottom = patch.get_bottom()
commit_id = git.commit(files = files,
message = descr, parents = [bottom],
commit_id = git.commit(files = files,
message = descr, parents = [bottom],
@@
-840,9
+848,16
@@
class Series(PatchSet):
author_name = None, author_email = None, author_date = None,
committer_name = None, committer_email = None,
before_existing = False):
author_name = None, author_email = None, author_date = None,
committer_name = None, committer_email = None,
before_existing = False):
- """Creates a new patch
+ """Creates a new patch, either pointing to an existing commit object,
+ or by creating a new commit object.
"""
"""
+ assert commit or (top and bottom)
+ assert not before_existing or (top and bottom)
+ assert not (commit and before_existing)
+ assert (top and bottom) or (not top and not bottom)
+ assert not top or (bottom == git.get_commit(top).get_parent())
+
if name != None:
self.__patch_name_valid(name)
if self.patch_exists(name):
if name != None:
self.__patch_name_valid(name)
if self.patch_exists(name):
@@
-866,13
+881,6
@@
class Series(PatchSet):
patch = self.get_patch(name)
patch.create()
patch = self.get_patch(name)
patch.create()
- if not bottom:
- bottom = head
- if not top:
- top = head
-
- patch.set_bottom(bottom)
- patch.set_top(top)
patch.set_description(descr)
patch.set_authname(author_name)
patch.set_authemail(author_email)
patch.set_description(descr)
patch.set_authname(author_name)
patch.set_authemail(author_email)
@@
-882,9
+890,6
@@
class Series(PatchSet):
if before_existing:
insert_string(self.__applied_file, patch.get_name())
if before_existing:
insert_string(self.__applied_file, patch.get_name())
- # no need to commit anything as the object is already
- # present (mainly used by 'uncommit')
- commit = False
elif unapplied:
patches = [patch.get_name()] + self.get_unapplied()
write_strings(self.__unapplied_file, patches)
elif unapplied:
patches = [patch.get_name()] + self.get_unapplied()
write_strings(self.__unapplied_file, patches)
@@
-894,10
+899,15
@@
class Series(PatchSet):
set_head = True
if commit:
set_head = True
if commit:
+ if top:
+ top_commit = git.get_commit(top)
+ else:
+ bottom = head
+ top_commit = git.get_commit(head)
+
# create a commit for the patch (may be empty if top == bottom);
# only commit on top of the current branch
assert(unapplied or bottom == head)
# create a commit for the patch (may be empty if top == bottom);
# only commit on top of the current branch
assert(unapplied or bottom == head)
- top_commit = git.get_commit(top)
commit_id = git.commit(message = descr, parents = [bottom],
cache_update = False,
tree_id = top_commit.get_tree(),
commit_id = git.commit(message = descr, parents = [bottom],
cache_update = False,
tree_id = top_commit.get_tree(),
@@
-908,7
+918,12
@@
class Series(PatchSet):
committer_name = committer_name,
committer_email = committer_email)
# set the patch top to the new commit
committer_name = committer_name,
committer_email = committer_email)
# set the patch top to the new commit
+ patch.set_bottom(bottom)
patch.set_top(commit_id)
patch.set_top(commit_id)
+ else:
+ assert top != bottom
+ patch.set_bottom(bottom)
+ patch.set_top(top)
self.log_patch(patch, 'new')
self.log_patch(patch, 'new')
@@
-1036,20
+1051,15
@@
class Series(PatchSet):
unapplied = self.get_unapplied()
assert(name in unapplied)
unapplied = self.get_unapplied()
assert(name in unapplied)
- patch = self.get_patch(name)
+
#
patch = self.get_patch(name)
head = git.get_head()
head = git.get_head()
- # The top is updated by refresh_patch since we need an empty
- # commit
- patch.set_bottom(head, backup = True)
- patch.set_top(head, backup = True)
-
append_string(self.__applied_file, name)
unapplied.remove(name)
write_strings(self.__unapplied_file, unapplied)
append_string(self.__applied_file, name)
unapplied.remove(name)
write_strings(self.__unapplied_file, unapplied)
- self.refresh_patch(cache_update = False, log = 'push(m)')
+ self.refresh_patch(
bottom = head,
cache_update = False, log = 'push(m)')
def push_patch(self, name):
"""Pushes a patch on the stack
def push_patch(self, name):
"""Pushes a patch on the stack
@@
-1081,11
+1091,6
@@
class Series(PatchSet):
ex = None
modified = False
ex = None
modified = False
- # new patch needs to be refreshed.
- # The current patch is empty after merge.
- patch.set_bottom(head, backup = True)
- patch.set_top(head, backup = True)
-
# Try the fast applying first. If this fails, fall back to the
# three-way merge
if not git.apply_diff(bottom, top):
# Try the fast applying first. If this fails, fall back to the
# three-way merge
if not git.apply_diff(bottom, top):
@@
-1113,13
+1118,14
@@
class Series(PatchSet):
log = 'push(m)'
else:
log = 'push'
log = 'push(m)'
else:
log = 'push'
- self.refresh_patch(cache_update = False, log = log)
+ self.refresh_patch(
bottom = head,
cache_update = False, log = log)
else:
# we store the correctly merged files only for
# tracking the conflict history. Note that the
# git.merge() operations should always leave the index
# in a valid state (i.e. only stage 0 files)
else:
# we store the correctly merged files only for
# tracking the conflict history. Note that the
# git.merge() operations should always leave the index
# in a valid state (i.e. only stage 0 files)
- self.refresh_patch(cache_update = False, log = 'push(c)')
+ self.refresh_patch(bottom = head, cache_update = False,
+ log = 'push(c)')
raise StackException, str(ex)
return modified
raise StackException, str(ex)
return modified
~mdw / stgit / blobdiff