2009/3/23 Karl Hasselström <kha@xxxxxxxxxxx>:
> On 2009-03-20 16:15:45 +0000, Catalin Marinas wrote:
>> @@ -752,12 +752,13 @@ class Index(RunWithEnv):
>> assert current == None or isinstance(current, Tree)
>>
>> # Take care of the really trivial cases.
>> - if base == ours:
>> - return (theirs, current)
>> - if base == theirs:
>> - return (ours, current)
>> - if ours == theirs:
>> - return (ours, current)
>> + if check_trivial:
>> + if base == ours:
>> + return (theirs, current)
>> + if base == theirs:
>> + return (ours, current)
>> + if ours == theirs:
>> + return (ours, current)
>
> Uh, what? What's the point of not doing this unconditionally?
There are a few cases where my algorithm failed because the reverse
applying of patches fell on one of those special cases (otherwise they
wouldn't apply). The check_merged() function assumes that if a patch
can be reversed in a given tree, it was already included in that tree.
Let's assume that the tree corresponding to the top patch is T1. We
have the following cases for reverse-applying a patch which fall under
the trivial cases above (patch expressed as bottom_tree..top_tree):
The empty patch cases should be ignored from such test (not done currently):
T1..T1 => merge(T1, T1, T1) == T1
T2..T2 => merge(T2, T1, T2) == T1
The non-empty patch situations:
T1..T2 => merge(T2, T1, T1) == T1
T2..T1 => merge(T1, T1, T2) == T2
The T1..T2 is pretty common and happens when the base of a patch
wasn't modified. Reverse-applying such patch should not normally
succeed but the merge() here uses one of those special cases. The
merge() result is correct since we want two trees merged, T1 and T1,
with a common base, T2, used a helper.
The T2..T1 cases would succeed with both trivial checks and
apply_treediff() and that's probably OK since if a patch generates the
same tree when applied, the changes it makes were probably already
included.
Now I understand it better :-). Reading my explanation above, it seems
that only the T1..T2 case matters and it can be taken care of in the
check_merged() function. Checking whether the tree returned by merge()
is different than "ours" should be enough for all the above cases.
>> @@ -379,3 +385,25 @@ class StackTransaction(object):
>> assert set(self.unapplied + self.hidden) == set(unapplied + hidden)
>> self.unapplied = unapplied
>> self.hidden = hidden
>> +
>> + def check_merged(self, patches):
>> + """Return a subset of patches already merged."""
>> + merged = []
>> + temp_index = self.__stack.repository.temp_index()
>> + temp_index_tree = None
>
> There's no need to create a new temp index here. The transaction
> object already has one.
I had the impression that an Index object would hold some state and
didn't want to break it. It seems OK to use as long as I don't touch
self.temp_index_tree. See below for an updated patch:
Add the --merged option to goto
From: Catalin Marinas <catalin.marinas@xxxxxxxxx>
This patch adds support for checking which patches were already merged
upstream. This checking is done by trying to reverse-apply the patches
in the index before pushing them onto the stack.
Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxxxx>
---
stgit/argparse.py | 4 ++++
stgit/commands/goto.py | 12 +++++++++---
stgit/lib/git.py | 2 +-
stgit/lib/transaction.py | 38 +++++++++++++++++++++++++++++++-------
4 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/stgit/argparse.py b/stgit/argparse.py
index 85ee6e3..765579c 100644
--- a/stgit/argparse.py
+++ b/stgit/argparse.py
@@ -225,6 +225,10 @@ def keep_option():
short = 'Keep the local changes',
default = config.get('stgit.autokeep') == 'yes')]
+def merged_option():
+ return [opt('-m', '--merged', action = 'store_true',
+ short = 'Check for patches merged upstream')]
+
class CompgenBase(object):
def actions(self, var): return set()
def words(self, var): return set()
diff --git a/stgit/commands/goto.py b/stgit/commands/goto.py
index 66f49df..839b75c 100644
--- a/stgit/commands/goto.py
+++ b/stgit/commands/goto.py
@@ -28,7 +28,7 @@ Push/pop patches to/from the stack until the one
given on the command
line becomes current."""
args = [argparse.other_applied_patches, argparse.unapplied_patches]
-options = argparse.keep_option()
+options = argparse.keep_option() + argparse.merged_option()
directory = common.DirectoryHasRepositoryLib()
@@ -47,8 +47,14 @@ def func(parser, options, args):
assert not trans.pop_patches(lambda pn: pn in to_pop)
elif patch in trans.unapplied:
try:
- for pn in trans.unapplied[:trans.unapplied.index(patch)+1]:
- trans.push_patch(pn, iw, allow_interactive = True)
+ to_push = trans.unapplied[:trans.unapplied.index(patch)+1]
+ if options.merged:
+ merged = set(trans.check_merged(to_push))
+ else:
+ merged = set()
+ for pn in to_push:
+ trans.push_patch(pn, iw, allow_interactive = True,
+ already_merged = pn in merged)
except transaction.TransactionHalted:
pass
elif patch in trans.hidden:
diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index e0a3c96..fcac918 100644
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -732,7 +732,7 @@ class Index(RunWithEnv):
# to use --binary.
self.apply(self.__repository.diff_tree(tree1, tree2, ['--full-index']),
quiet)
- def merge(self, base, ours, theirs, current = None):
+ def merge(self, base, ours, theirs, current = None, check_trivial = True):
"""Use the index (and only the index) to do a 3-way merge of the
L{Tree}s C{base}, C{ours} and C{theirs}. The merge will either
succeed (in which case the first half of the return value is
diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index b146648..9fa75c1 100644
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -297,7 +297,8 @@ class StackTransaction(object):
out.info('Deleted %s%s' % (pn, s))
return popped
- def push_patch(self, pn, iw = None, allow_interactive = False):
+ def push_patch(self, pn, iw = None, allow_interactive = False,
+ already_merged = False):
"""Attempt to push the named patch. If this results in conflicts,
halts the transaction. If index+worktree are given, spill any
conflicts to them."""
@@ -305,11 +306,14 @@ class StackTransaction(object):
cd = orig_cd.set_committer(None)
oldparent = cd.parent
cd = cd.set_parent(self.top)
- base = oldparent.data.tree
- ours = cd.parent.data.tree
- theirs = cd.tree
- tree, self.temp_index_tree = self.temp_index.merge(
- base, ours, theirs, self.temp_index_tree)
+ if already_merged:
+ tree = cd.tree
+ else:
+ base = oldparent.data.tree
+ ours = cd.parent.data.tree
+ theirs = cd.tree
+ tree, self.temp_index_tree = self.temp_index.merge(
+ base, ours, theirs, self.temp_index_tree)
s = ''
merge_conflict = False
if not tree:
@@ -341,7 +345,9 @@ class StackTransaction(object):
else:
comm = None
s = ' (unmodified)'
- if not merge_conflict and cd.is_nochange():
+ if already_merged:
+ s = ' (merged)'
+ elif not merge_conflict and cd.is_nochange():
s = ' (empty)'
out.info('Pushed %s%s' % (pn, s))
def update():
@@ -379,3 +385,21 @@ class StackTransaction(object):
assert set(self.unapplied + self.hidden) == set(unapplied + hidden)
self.unapplied = unapplied
self.hidden = hidden
+
+ def check_merged(self, patches):
+ """Return a subset of patches already merged."""
+ merged = []
+ temp_index_tree = None
+ ours = self.stack.head.data.tree
+ for pn in reversed(patches):
+ # check whether patch changes can be reversed in the current tree
+ cd = self.patches[pn].data
+ base = cd.tree
+ theirs = cd.parent.data.tree
+ tree, temp_index_tree = \
+ self.temp_index.merge(base, ours, theirs, temp_index_tree,
+ check_trivial = False)
+ if tree and tree != ours:
+ merged.append(pn)
+ ours = tree
+ return merged
--
Catalin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
