Rework of the 'stg pull' policy.
authorYann Dirson <ydirson@altern.org>
Tue, 20 Feb 2007 23:16:11 +0000 (00:16 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 21 Feb 2007 18:42:55 +0000 (18:42 +0000)
commit3b3c26fa79d6632363c141b68df4b024f367ad0b
tree52becaa62811c284b6e2e117c22a2bef957a5394
parente5834af733eb4377f19d59a694ad106b82c63d5d
Rework of the 'stg pull' policy.

This patch changes the way "stg pull" behaviour is selected, by
replacing stgit.pull-does-rebase and stgit.pullcmd with
stgit.pull-policy, stgit.pullcmd and stgit.fetchcmd.  In the standard
case, only pull-policy needs to be set.

Those 3 config variables are also available per-branch as
branch.*.stgit.<name>.

This patch also add a set of tests for the fetch-rebase policy,
including interferences with "stg commit" occuring with 0.12.

Signed-off-by: Yann Dirson <ydirson@altern.org>
examples/gitconfig
stgit/commands/pull.py
stgit/config.py
stgit/git.py
t/t2100-pull-policy-fetch.sh [new file with mode: 0755]