From: Karl Hasselström <kha@treskal.com>
Date: Sun, 21 Sep 2008 12:17:42 +0000 (+0200)
Subject: Convert "stg refresh" to the new infrastructure
X-Git-Tag: v0.15-rc1~135
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/85aaed816bde469b3de72e80d8f8ed7830302fbf?hp=85aaed816bde469b3de72e80d8f8ed7830302fbf

Convert "stg refresh" to the new infrastructure

And in the process, make it more powerful: it will now first create a
temp patch containing the updates, and then try to merge it into the
patch to be updated. If that patch is applied, this is done by
popping, pushing, and coalescing; if it is unapplied, it is done with
an in-index merge. This allows us to correctly handle a few corner
cases that didn't use to work, such as adding a new file to a
non-topmost patch (fixes the t2701 test failure).

The temp patch creation and merging is logged in two separate stages,
so that the user can undo them separately.

Also, whenever path limiting is used, we will now use a temporary
index in order to avoid including all staged updates (since they may
touch stuff outside the path limiters).

Support for the --force, --undo, and --annotate flags were dropped.

Signed-off-by: Karl Hasselström <kha@treskal.com>
---