StGIT experimental branches updated

I've added the three patches I just sent out. That's all, since no one else seems to be working. :-)

Plus, I've renamed the branches to "safe" and "experimental", since that's what they're all about.

                                 -+-

The following changes since commit 18669b744dbc40df9ce025f3db44a28f7aba29ff:
  Catalin Marinas (1):
        Add the '--exclusive' option to 'uncommit'

are available in the git repository at:

  git://repo.or.cz/stgit/kha.git safe

David Kågedal (2):
      Add basic test for stg status
      Cleanup tree_status and use -z

Karl Hasselström (5):
      Write warnings and errors to stderr if not on a terminal
      Don't fail just because a subprocess wrote stuff to stderr
      Let "stg status" ignore empty directories
      Allow "stg add" when we have no stack
      Test "stg status" more thoroughly

Pavel Roskin (2):
      Use --force to overwrite python files
      Fix refresh -es

 Makefile                  |    2 +-
 stgit/commands/add.py     |    3 -
 stgit/commands/patches.py |    2 +-
 stgit/commands/refresh.py |    2 +-
 stgit/git.py              |   25 +++++----
 stgit/out.py              |   11 +++-
 stgit/run.py              |    5 ++-
 stgit/stack.py            |    3 +-
 t/t0002-status.sh         |  125 +++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 156 insertions(+), 22 deletions(-)
 create mode 100755 t/t0002-status.sh

                                 -+-

The following changes since commit eda4068ff351143504a416393514b9fc57fb7fae:
  Karl Hasselström (1):
        Test "stg status" more thoroughly

are available in the git repository at:

  git://repo.or.cz/stgit/kha.git experimental

David Kågedal (6):
      Split git.merge into two functions
      Leave working dir and index alone after failed (conflicting) push
      Added a test case to check what happens when push finds a conflict
      Simplify merge_recursive
      Use the output from merge-recursive to list conflicts
      Ask git about unmerged files

Karl Hasselström (12):
      Compute patch appliedness from commit DAG
      Test the new DAG appliedness machinery
      Fix bash completion after the DAG appliedness patch
      Speed up the appliedness test
      Speed up the discovery of uninteresting commits
      Speed up appliedness check during patch creation
      Don't traverse the whole DAG when looking for uninteresting commits
      Find uninteresting commits faster for special cases
      Optimize uninterestingness checks for rebase
      Better error message if merge fails
      Fix "stg resolved" to work with new conflict representation
      Merge branch 'conflict'

 contrib/stgit-completion.bash |   15 +-
 stgit/commands/commit.py      |    8 +-
 stgit/commands/common.py      |   24 +--
 stgit/commands/float.py       |    2 +-
 stgit/commands/imprt.py       |    2 +-
 stgit/commands/pick.py        |    2 +-
 stgit/commands/refresh.py     |    2 +-
 stgit/commands/resolved.py    |   19 +-
 stgit/commands/sync.py        |    2 +-
 stgit/git.py                  |   74 ++++--
 stgit/gitmergeonefile.py      |   99 ++++----
 stgit/stack.py                |  574 +++++++++++++++++++++++++++++++++--------
 t/t0002-status.sh             |    3 -
 t/t1203-push-conflict.sh      |   70 +++++
 t/t3000-git-interop.sh        |   60 +++++
 t/t4000-upgrade.sh            |    6 +
 16 files changed, 730 insertions(+), 232 deletions(-)
 create mode 100755 t/t1203-push-conflict.sh
 create mode 100755 t/t3000-git-interop.sh

On 03/09/07, Karl Hasselström <kha@treskal.com> wrote:

It's Monday (and morning) :-). Thanks, I merged the 'safe' branch

It makes more sense.

BTW, would an extension to 'stg import' to import patches from mailing lists (NNTP or maybe just mbox) directly be useful? There is support for mbox importing anyway and it would need a procmail filter to generate the mbox and just a regex filtering in 'import' to apply the StGIT patches only.

On 2007-09-03 09:29:18 +0100, Catalin Marinas wrote:

I don't think I'd use that function -- it's very convenient to just manually copy the patch mails I want to a separate mbox, which I then pipe to git-am. (Yes, I know, I should be using "stg import", but "stg assimilate" is just too useful.)

On 03/09/07, Karl Hasselström <kha@treskal.com> wrote:

I usually save them to an mbox as well (but use stg import). Until recently, when I started merging your 'safe' branch :-).