Stacked GIT 0.4

Stacked GIT 0.4 release is available from http://procode.org/stgit/

StGIT is a Python application providing similar functionality to Quilt (i.e. pushing/popping patches to/from a stack) on top of GIT. These operations are performed using GIT commands and the patches are stored as GIT commit objects, allowing easy merging of the StGIT patches into other repositories using standard GIT functionality.

Note that StGIT is not an SCM interface on top of GIT and it expects a previously initialised GIT repository. For standard SCM operations, either use plain GIT commands or the Cogito tool.

For more information, see the README file in the archive.

What's new in this release:

      * Support for configuration files (/etc/stgitrc,
        ~/.stgitrc, .git/stgitrc)
      * Configurable merge tool ('diff3' by default)
      * Empty patches are marked with a '0' when listed with
        'series' (useful for tracking upstream merges)
      * Support for patch description templates (with variables like
        author details and diffstats)
      * 'files' command to show the files modified by a patch (either a
        simple list or with diffstats)
      * 'push --undo' option to cancel a push operation
      * 'push/pop --to' option to perform the operation on a range of
        patches between the given names
      * 'push --reverse' option to push patches in reverse order
      * 'diff --stat' option to show the diffstats instead of the diff
      * Faster 'pop' - it now switches directly to the bottom of the
        last patch to be popped
      * The three files involved in a three-way merge are left in the
        working tree in case of a conflict for further analysis (can be
        overwritten with the 'keeporig' option)
      * Many bug fixes

-- Catalin

Catalin Marinas wrote:

Very nice.

Here's my wishlist.  Hopefully I'll be able to dig in and help out.

import: the complement to export template files for the "series" output of export, to put it into a format that "sendpatchset" understands.

Bryan

Bryan Larsen <bryan.larsen@gmail.com> wrote:

It is written in the TODO file but didn't have time to do it. I'm working on moving all the commands from main.py into separate files under stgit/commands/ for a clearer view. This should be ready in the next day or two and, after that, I will work on other commands.

I thought about integrating sendpatchset into stgit but it is much simpler to just generate a control file (especially if you want to review what you're going to send). Is the subject line always the first line of the patch description?

Catalin Marinas wrote:

I haven't been using "the Linux way" for long, so I'm probably the wrong guy to answer, but for my current set of patches, the name of the patch would be the right thing to put in the Subject line.

But my current set of patches is really small, so if you implemented the "first line" convention, I'd be happy to switch to it.

Bryan

On Tue, 2005-07-12 at 07:05 -0400, Bryan Larsen wrote:

A first implementation of 'import' is available in the tonight's snapshot (and in the StGIT git repository mirror).

As you noticed, I implemented the 'mail' command.

Once the current snapshot gets a bit more testing, I will release the 0.5 version. After that, I will focus more on a tutorial and the file compatibility with Cogito.