[StGit PATCH 0/5] Various StGit patches

From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mar 12, 2009, 12:08 UTC
Message-ID: <20090312120426.2992.35213.stgit@pc1117.cambridge.arm.com>

Some of these patches were posted before and there were some suggestions which I added. The "Check for local changes with goto" patch was slightly improved so that the "stgit.keep" option could be set to "yes" if this is preferred as a default behaviour.

I plan to implement transition as many commands as possible to the new infrastructure. For some of them it should be trivial. The "status" command needs some support in stgit.lib.

Catalin Marinas (5):
      Convert "float" to the lib infrastructure
      Convert "sink" to the new infrastructure
      Add automatic git-mergetool invocation to the new infrastructure
      Add mergetool support to the classic StGit infrastructure
      Check for local changes with "goto"

 examples/gitconfig         |   24 +------
 stgit/argparse.py          |    5 +
 stgit/commands/edit.py     |    2 -
 stgit/commands/float.py    |   75 +++++++++-------------
 stgit/commands/goto.py     |    9 ++-
 stgit/commands/resolved.py |    5 -
 stgit/commands/sink.py     |   86 +++++++++++--------------
 stgit/config.py            |    1 
 stgit/git.py               |   33 ++++++----
 stgit/gitmergeonefile.py   |  150 --------------------------------------------
 stgit/lib/git.py           |   35 +++++++++-
 stgit/lib/transaction.py   |   17 ++++-
 t/t0002-status.sh          |    3 -
 t/t1501-sink.sh            |    2 -
 t/t2300-refresh-subdir.sh  |    2 -
 t/t2800-goto-subdir.sh     |    4 +
 t/t3000-dirty-merge.sh     |    2 -
 17 files changed, 153 insertions(+), 302 deletions(-)
 delete mode 100644 stgit/gitmergeonefile.py

-- 
Catalin