chiark / gitweb /
Teach "stg assimilate" to repair patch reachability
authorKarl Hasselström <kha@treskal.com>
Tue, 25 Sep 2007 18:21:46 +0000 (20:21 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 7 Oct 2007 22:14:10 +0000 (00:14 +0200)
commitca2160163b2a8209e5b04e155a8f4dafbe9334c8
tree94216d3738df71823b2b4bfc6dd136cd76bdf9fc
parent764d110156e4951ca5671a700ee2402fa3597734
Teach "stg assimilate" to repair patch reachability

Rewrite "stg assimilate" so that it in addition to assimilating
commits made on top of the patch stack also will rewrite the
applied/unapplied files to reflect reality. A patch is considered to
be applied if it is reachable from HEAD without passing through a
merge, and unreachable otherwise.

Performance is adequate: On my laptop, it takes less than four seconds
to process the Linux tree (with hot caches).

Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/commands/assimilate.py
stgit/commands/common.py
stgit/stack.py
t/t1301-assimilate.sh