[ANNOUNCE] Stacked GIT 0.14

[ANNOUNCE] Stacked GIT 0.14

[Catalin Marinas]

Stacked GIT 0.14 release is available from http://www.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.

This release requires at least Python 2.4 and GIT 1.5.2.

The main features in this release:

    * Support for correctly running StGIT in subdirectories
    * 'repair' command for fixing an StGIT repository modified by GIT
commands such as 'commit', 'pull', 'merge' or 'rebase'
    * 'edit' command for editing both the patch description and diff
    * Support for SMTP over TLS
    * Support for MIME multipart e-mail templates
    * '--attach' option to the 'mail' command to send a patch attached
rather than inline
    * Diff statistics and shortlog added to the cover e-mail template
    * '--sign/ack' options to the 'import' and 'new' commands
    * '--number' to the 'log' command for limiting the output
    * Support for binary files in patches
    * Support for detached HEAD
    * Refactoring of some modules with better support for debugging
    * Many bug-fixes

Acknowledgements (many thanks to all the people who contributed code,
reported bugs or made suggestions):

Karl Hasselström (73):
      Teach StGIT about core.excludesfile
      New test: make sure that popping doesn't change patch order
      Verify patch status during the test
      Add an --smtp-server commandline option to "stg mail"
      Test that all branch config information is renamed
      Rename all config sections of a branch
      New test: make sure that StGIT can 	handle packed refs
      Make use of the get_patch() utility function
      Don't touch ref files manually
      Don't use test_expect_failure when more than one thing could fail
      Don't write None to the conf file
      Replace "git repo-config" with "git config" in help texts
      Compile regexp just once
      Refactor output handling to break circular dependency
      Refactor subprocess creation
      Assert that the argument to Run is a sequence of strings
      Add optional logging of subprocess execution
      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
      Use subprocess.Popen to call git executables
      Use the builtin set() instead of sets.Set()
      Discard stderr when determining if a patch is already applied
      Add the any() and all() utility functions from Python 2.5
      Add --sign and --ack options to "stg import"
      Add diffstat of whole patch series to cover mail
      Add shortlog of patch series to cover mail
      Include summary of added/deleted files in diffstat
      It doesn't make sense to sink below an unapplied patch
      Don't special-case the "master" branch during branch delete
      Don't try to delete the branch twice
      Properly remove all config for a deleted branch
      Add simple test for "stg branch --delete"
      New test: make sure tha we can run "stg help"
      Make sure that the output of "stg status" is sorted
      New policy: Only use test_expect_failure for broken tests
      Make Run available in stack.py
      Teach "stg assimilate" to repair patch reachability
      Test the new powers of "stg assimilate"
      Let "stg assimilate" handle missing patches
      Add --ack/--sign options to "stg new"
      New test: "stg pop --keep"
      Fix up the help text for "stg edit"
      Don't split long and short description in "stg edit"
      Make a common superclass for all StGit exceptions
      Simplify debug level error checking
      Discard stderr output from git-rev-parse
      Remove the --force flag to "stg rebase" and "stg pull"
      Infrastructure for current directory handling
      New test: Try "stg push" in a subdirectory
      Make "stg push" subdirectory safe
      New test: try "stg refresh" in a subdirectory
      Make "stg refresh" subdirectory safe
      Allow caller to customize title of error/warning message
      Use our nice message printout wrapping system
      Properly detect that HEAD is detached
      Refactor crt_series creation
      Don't have a global crt_series in stgit.commans.common
      Fix error message generation
      New test: "stg diff"
      Simple test for "stg clean"
      Cogito is deprecated, so don't point to it
      Let some commands work with detached HEAD
      Rename "stg assimilate" to "stg repair"
      stg repair: Patchify non-patch commits between patches
      Push and pop don't have --to flags anymore
      Add missing switch to "stg uncommit" usage line
      Make "stg repair" help text more helpful
      Fix bashism
      Discard exitcode of subprocess in a better way
      Don't use test_expect_failure for tests that are supposed to work

Catalin Marinas (36):
      Allow 'import' to apply empty patches
      Make the maximum patch name length configurable
      Add the '--exclusive' option to 'uncommit'
      Add patch editing command
      Add 'edit' to the patchcommands list
      Print 'updating patch' earlier in 'edit'
      Allow the rebase command to be defined
      Fix the rebasing with an external command
      Fix assertion in patch creation
      "stg pop --keep" fails because of git-apply --index (bug #8972)
      Do not raise an exception if no FETCH_HEAD
      Allow StGIT commands to run correctly in subdirectories
      Allow "branch --create" to be given a tag id
      Fix more commands to run correctly in subdirectories
      Allow the diff showing in the log command if patch modified by edit
      'stg pop --keep' doesn't update the index
      Execute the 'git ...' rather than 'git-...'
      Keep the patch log when import --replace deletes patches
      Improve the t1205 test for push
      Make Series.refresh_patch automatically save the undo information
      Check for disappeared newborn files in git.tree_status (bug #8516)
      Correctly identify the parent branch (bug #10014)
      Clean-up if the branch creation fails (bug #10015)
      Allow multipart templates for patch e-mails (bug #10237)
      Add a test for the 'mail --attach' command
      Check the minimum required versions of GIT and Python (bug #10218)
      git.pretty_commit() re-implemented with "git show" (bug #10018)
      Allow 'show' and 'id' to work on non-StGIT branches (bug #10011)
      Change the file timestamp in 'resolved --reset' (bug #10017)
      Add the 'log --number' option to limit the output
      Ignore the gitk exit code in 'stg log -g' (bug #10010)
      Some clean-up of the branch manipulation commands
      Make sure the refid given to 'mail' has the angle brackets
      Allow only certain gitk exit codes as valid
      Better handling of binary files (bug #8495)
      Release 0.14

David Kågedal (15):
      Don't print unnecessary backtraces when testing
      Fixed indeterminism in t2102-pull-policy-rebase
      Add basic test for stg status
      Cleanup tree_status and use -z
      Add some more tests of "stg status" output
      Clear up semantics of tree_status
      Moved that status function to the status command file
      Split Series.push_patch in two
      Remove dead code from push_empty_patch
      Refactor Series.push_patch
      Clean up Series.refresh_patch
      Add a 'bottom' parameter to Series.refresh_patch and use it
      Clear up the semantics of Series.new_patch
      Refactor Series.new_patch
      Added test case for stg refresh

Yann Dirson (9):
      Improve stg-fold-files-from doc.
      New contrib scripts: stg-dispatch and stg-show.
      Add -O flag to stg-fold-files-from.
      Add a no-act flag to stg-dispatch and stg-fold-file-from.
      Provide file completion for add/resolved/refresh based on status.
      Fixed completion function hardcoding .git/.
      Include contrib scripts in the release tarball.
      Better diagnostic for wrong branch configuration.
      stg-gitk: allow passing args to gitk; add --help.

Pavel Roskin (7):
      Add support for SMTP over Transport Layer Security (TLS)
      Ask for SMTP password if it's not provided
      Use --force to overwrite python files
      Fix refresh -es
      git.__remotes_from_dir() should only return lists
      Set GIT_TEMPLATE_DIR in the testsuite, like it's done in git
      Support tags in uncommit - use git_id instead of rev_parse

-- 
Catalin

[PATCH] Fix typo: we require Python 2.4, not 2.5

[Karl Hasselström]

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

---

On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:

> This release requires at least Python 2.4 and GIT 1.5.2.

Yeah. So 0.14.1 (to be released very soon) should probably have this
fix. :-)

diff --git a/stgit/version.py b/stgit/version.py
index edd79e0..2e49e76 100644
--- a/stgit/version.py
+++ b/stgit/version.py
@@ -2,4 +2,4 @@ version = '0.13'
 
 # minimum version requirements
 git_min_ver = '1.5.2'
-python_min_ver = '2.5'
+python_min_ver = '2.4'

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Catalin Marinas]

On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> Signed-off-by: Karl Hasselström <kha@treskal.com>
>
> ---
>
> On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:
>
> > This release requires at least Python 2.4 and GIT 1.5.2.
>
> Yeah. So 0.14.1 (to be released very soon) should probably have this
> fix. :-)

Oops, I did some tests and forgot to revert it to 2.4. This would only
affect people using the source tarball. The rpm and deb packages
should be fine.

Is the GIT version OK or just too restrictive?

Thanks.

-- 
Catalin

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Jakub Narebski]

"Catalin Marinas" <catalin.marinas@gmail.com> writes:

> On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> > On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:
> >
> > > This release requires at least Python 2.4 and GIT 1.5.2.
> >
> > Yeah. So 0.14.1 (to be released very soon) should probably have this
> > fix. :-)
> 
> Oops, I did some tests and forgot to revert it to 2.4. This would only
> affect people using the source tarball. The rpm and deb packages
> should be fine.

Hmmm...

$ rpm -Uhv --test stgit-0.14-1.noarch.rpm 
error: Failed dependencies:
        python(abi) = 2.5 is needed by stgit-0.14-1.noarch

Although I guess that it is something that rpmbuild sets (if not set)
automatically during building.

I'll just download SRPMS (which is available, just not linked from
download area on homepage).

P.S. By the way: [application/x-wais-source]?
-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Catalin Marinas]

On 11/12/2007, Jakub Narebski <jnareb@gmail.com> wrote:
> $ rpm -Uhv --test stgit-0.14-1.noarch.rpm
> error: Failed dependencies:
>         python(abi) = 2.5 is needed by stgit-0.14-1.noarch

I use Ubuntu 7.10, not the best system for building RPMs.

> Although I guess that it is something that rpmbuild sets (if not set)
> automatically during building.

Yes. If you know what to add to setup.py, please let me know.

> I'll just download SRPMS (which is available, just not linked from
> download area on homepage).

It's not linked as I always thought people would use the .tar.gz.

What about adding it to cheeseshop.python.org and only run
"easy_install stgit"? The drawback of easy_install is that there is no
easy_uninstall yet.

> P.S. By the way: [application/x-wais-source]?

I don't control the web server my ISP provides. I should move
everything to gna.org but I was too lazy to modify my release script
(for Debian, gna.org even gives information on how to set up an apt
repository).

-- 
Catalin

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Jakub Narebski]

Jakub Narebski <jnareb@gmail.com> writes:

> "Catalin Marinas" <catalin.marinas@gmail.com> writes:
> 
> > On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> > > On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:
> > >
> > > > This release requires at least Python 2.4 and GIT 1.5.2.
> > >
> > > Yeah. So 0.14.1 (to be released very soon) should probably have this
> > > fix. :-)
> > 
> > Oops, I did some tests and forgot to revert it to 2.4. This would only
> > affect people using the source tarball. The rpm and deb packages
> > should be fine.
> 
> Hmmm...
> 
> $ rpm -Uhv --test stgit-0.14-1.noarch.rpm 
> error: Failed dependencies:
>         python(abi) = 2.5 is needed by stgit-0.14-1.noarch
> 
> Although I guess that it is something that rpmbuild sets (if not set)
> automatically during building.
> 
> I'll just download SRPMS (which is available, just not linked from
> download area on homepage).

Ooops... I think I'd have to wait for 0.14.1

$ rpmbuild --rebuild --target=noarch stgit-0.14-1.src.rpm
[...]
Python version 2.5 or newer required. Found 2.4.3.final.0

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Catalin Marinas]

On 11/12/2007, Jakub Narebski <jnareb@gmail.com> wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
> Ooops... I think I'd have to wait for 0.14.1
>
> $ rpmbuild --rebuild --target=noarch stgit-0.14-1.src.rpm
> [...]
> Python version 2.5 or newer required. Found 2.4.3.final.0

Or just change the string in stgit/version.py.

-- 
Catalin

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Karl Hasselström]

On 2007-12-11 14:27:08 +0000, Catalin Marinas wrote:

> Is the GIT version OK or just too restrictive?

The only restriction I've checked is this one:

commit 9a6bcbe26b6032c39031773da020fd7bf4015953
Author: Karl Hasselström <kha@treskal.com>
Date:   Sat Sep 22 10:22:18 2007 +0200

    Properly remove all config for a deleted branch

    This uses "git-config --remove-section", which was first released in
    git 1.5.1-rc1. I'm not sure if this is later than what we used to
    depend on; we already use "git-config --rename-section", but that's
    been in since git 1.5.0-rc0.

So I guess we should require at least 1.5.1. But I don't think
requiring 1.5.2 is that bad.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Karl Hasselström]

On 2007-12-11 14:27:08 +0000, Catalin Marinas wrote:

> This would only affect people using the source tarball. The rpm and
> deb packages should be fine.

Ah, they don't run the install script?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Catalin Marinas]

On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> Yeah. So 0.14.1 (to be released very soon) should probably have this
> fix. :-)

OK, done. Thanks.

On the RPM side, I found a way to specify the required Python version
on the "setup.py bdist_rpm" command line but I don't think it makes
any difference since the installed files will go into the python2.5
directory.

Anyway, I linked the SRPMS as well from the website's page.

-- 
Catalin

Re: [PATCH] Fix typo: we require Python 2.4, not 2.5

[Jakub Narebski]

"Catalin Marinas" <catalin.marinas@gmail.com> writes:

> On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:
> > Yeah. So 0.14.1 (to be released very soon) should probably have this
> > fix. :-)
> 
> OK, done. Thanks.
> 
> On the RPM side, I found a way to specify the required Python version
> on the "setup.py bdist_rpm" command line but I don't think it makes
> any difference since the installed files will go into the python2.5
> directory.
> 
> Anyway, I linked the SRPMS as well from the website's page.

Thanks. At least compiling SRPMS works:

  $ stg version
  Stacked GIT 0.14.1
  git version 1.5.3.7
  Python version 2.4.3 (#1, Jun 13 2006, 16:41:18) 
  [GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]
  $ rpm -q stgit
  stgit-0.14.1-1

-- 
Jakub Narebski                      http://www.ohloh.net/accounts/11224
ShadeHawk on #git                   Linux Registered User #239074