{"thread":{"id":"11222","subject":"[ANNOUNCE] Stacked GIT 0.14","startedAt":"2007-12-10T11:40:41Z","lastAt":"2007-12-12T15:07:13Z","messageCount":11,"participants":["Catalin Marinas","Karl Hasselström","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"62564","messageId":"b0943d9e0712100340p78326b4avf2b7e64008bba6d6@mail.gmail.com","threadId":"11222","inReplyTo":null,"subject":"[ANNOUNCE] Stacked GIT 0.14","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-12-10T11:40:41Z","receivedAt":"2007-12-10T11:40:41Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"Stacked GIT 0.14 release is available from http://www.procode.org/stgit/.\n\nStGIT is a Python application providing similar functionality to Quilt\n(i.e. pushing/popping patches to/from a stack) on top of GIT. These\noperations are performed using GIT commands and the patches are stored\nas GIT commit objects, allowing easy merging of the StGIT patches into\nother repositories using standard GIT functionality.\n\nThis release requires at least Python 2.4 and GIT 1.5.2.\n\nThe main features in this release:\n\n    * Support for correctly running StGIT in subdirectories\n    * 'repair' command for fixing an StGIT repository modified by GIT\ncommands such as 'commit', 'pull', 'merge' or 'rebase'\n    * 'edit' command for editing both the patch description and diff\n    * Support for SMTP over TLS\n    * Support for MIME multipart e-mail templates\n    * '--attach' option to the 'mail' command to send a patch attached\nrather than inline\n    * Diff statistics and shortlog added to the cover e-mail template\n    * '--sign/ack' options to the 'import' and 'new' commands\n    * '--number' to the 'log' command for limiting the output\n    * Support for binary files in patches\n    * Support for detached HEAD\n    * Refactoring of some modules with better support for debugging\n    * Many bug-fixes\n\nAcknowledgements (many thanks to all the people who contributed code,\nreported bugs or made suggestions):\n\nKarl Hasselström (73):\n      Teach StGIT about core.excludesfile\n      New test: make sure that popping doesn't change patch order\n      Verify patch status during the test\n      Add an --smtp-server commandline option to \"stg mail\"\n      Test that all branch config information is renamed\n      Rename all config sections of a branch\n      New test: make sure that StGIT can \thandle packed refs\n      Make use of the get_patch() utility function\n      Don't touch ref files manually\n      Don't use test_expect_failure when more than one thing could fail\n      Don't write None to the conf file\n      Replace \"git repo-config\" with \"git config\" in help texts\n      Compile regexp just once\n      Refactor output handling to break circular dependency\n      Refactor subprocess creation\n      Assert that the argument to Run is a sequence of strings\n      Add optional logging of subprocess execution\n      Write warnings and errors to stderr if not on a terminal\n      Don't fail just because a subprocess wrote stuff to stderr\n      Let \"stg status\" ignore empty directories\n      Allow \"stg add\" when we have no stack\n      Test \"stg status\" more thoroughly\n      Use subprocess.Popen to call git executables\n      Use the builtin set() instead of sets.Set()\n      Discard stderr when determining if a patch is already applied\n      Add the any() and all() utility functions from Python 2.5\n      Add --sign and --ack options to \"stg import\"\n      Add diffstat of whole patch series to cover mail\n      Add shortlog of patch series to cover mail\n      Include summary of added/deleted files in diffstat\n      It doesn't make sense to sink below an unapplied patch\n      Don't special-case the \"master\" branch during branch delete\n      Don't try to delete the branch twice\n      Properly remove all config for a deleted branch\n      Add simple test for \"stg branch --delete\"\n      New test: make sure tha we can run \"stg help\"\n      Make sure that the output of \"stg status\" is sorted\n      New policy: Only use test_expect_failure for broken tests\n      Make Run available in stack.py\n      Teach \"stg assimilate\" to repair patch reachability\n      Test the new powers of \"stg assimilate\"\n      Let \"stg assimilate\" handle missing patches\n      Add --ack/--sign options to \"stg new\"\n      New test: \"stg pop --keep\"\n      Fix up the help text for \"stg edit\"\n      Don't split long and short description in \"stg edit\"\n      Make a common superclass for all StGit exceptions\n      Simplify debug level error checking\n      Discard stderr output from git-rev-parse\n      Remove the --force flag to \"stg rebase\" and \"stg pull\"\n      Infrastructure for current directory handling\n      New test: Try \"stg push\" in a subdirectory\n      Make \"stg push\" subdirectory safe\n      New test: try \"stg refresh\" in a subdirectory\n      Make \"stg refresh\" subdirectory safe\n      Allow caller to customize title of error/warning message\n      Use our nice message printout wrapping system\n      Properly detect that HEAD is detached\n      Refactor crt_series creation\n      Don't have a global crt_series in stgit.commans.common\n      Fix error message generation\n      New test: \"stg diff\"\n      Simple test for \"stg clean\"\n      Cogito is deprecated, so don't point to it\n      Let some commands work with detached HEAD\n      Rename \"stg assimilate\" to \"stg repair\"\n      stg repair: Patchify non-patch commits between patches\n      Push and pop don't have --to flags anymore\n      Add missing switch to \"stg uncommit\" usage line\n      Make \"stg repair\" help text more helpful\n      Fix bashism\n      Discard exitcode of subprocess in a better way\n      Don't use test_expect_failure for tests that are supposed to work\n\nCatalin Marinas (36):\n      Allow 'import' to apply empty patches\n      Make the maximum patch name length configurable\n      Add the '--exclusive' option to 'uncommit'\n      Add patch editing command\n      Add 'edit' to the patchcommands list\n      Print 'updating patch' earlier in 'edit'\n      Allow the rebase command to be defined\n      Fix the rebasing with an external command\n      Fix assertion in patch creation\n      \"stg pop --keep\" fails because of git-apply --index (bug #8972)\n      Do not raise an exception if no FETCH_HEAD\n      Allow StGIT commands to run correctly in subdirectories\n      Allow \"branch --create\" to be given a tag id\n      Fix more commands to run correctly in subdirectories\n      Allow the diff showing in the log command if patch modified by edit\n      'stg pop --keep' doesn't update the index\n      Execute the 'git ...' rather than 'git-...'\n      Keep the patch log when import --replace deletes patches\n      Improve the t1205 test for push\n      Make Series.refresh_patch automatically save the undo information\n      Check for disappeared newborn files in git.tree_status (bug #8516)\n      Correctly identify the parent branch (bug #10014)\n      Clean-up if the branch creation fails (bug #10015)\n      Allow multipart templates for patch e-mails (bug #10237)\n      Add a test for the 'mail --attach' command\n      Check the minimum required versions of GIT and Python (bug #10218)\n      git.pretty_commit() re-implemented with \"git show\" (bug #10018)\n      Allow 'show' and 'id' to work on non-StGIT branches (bug #10011)\n      Change the file timestamp in 'resolved --reset' (bug #10017)\n      Add the 'log --number' option to limit the output\n      Ignore the gitk exit code in 'stg log -g' (bug #10010)\n      Some clean-up of the branch manipulation commands\n      Make sure the refid given to 'mail' has the angle brackets\n      Allow only certain gitk exit codes as valid\n      Better handling of binary files (bug #8495)\n      Release 0.14\n\nDavid Kågedal (15):\n      Don't print unnecessary backtraces when testing\n      Fixed indeterminism in t2102-pull-policy-rebase\n      Add basic test for stg status\n      Cleanup tree_status and use -z\n      Add some more tests of \"stg status\" output\n      Clear up semantics of tree_status\n      Moved that status function to the status command file\n      Split Series.push_patch in two\n      Remove dead code from push_empty_patch\n      Refactor Series.push_patch\n      Clean up Series.refresh_patch\n      Add a 'bottom' parameter to Series.refresh_patch and use it\n      Clear up the semantics of Series.new_patch\n      Refactor Series.new_patch\n      Added test case for stg refresh\n\nYann Dirson (9):\n      Improve stg-fold-files-from doc.\n      New contrib scripts: stg-dispatch and stg-show.\n      Add -O flag to stg-fold-files-from.\n      Add a no-act flag to stg-dispatch and stg-fold-file-from.\n      Provide file completion for add/resolved/refresh based on status.\n      Fixed completion function hardcoding .git/.\n      Include contrib scripts in the release tarball.\n      Better diagnostic for wrong branch configuration.\n      stg-gitk: allow passing args to gitk; add --help.\n\nPavel Roskin (7):\n      Add support for SMTP over Transport Layer Security (TLS)\n      Ask for SMTP password if it's not provided\n      Use --force to overwrite python files\n      Fix refresh -es\n      git.__remotes_from_dir() should only return lists\n      Set GIT_TEMPLATE_DIR in the testsuite, like it's done in git\n      Support tags in uncommit - use git_id instead of rev_parse\n\n-- \nCatalin\n"},{"id":"62720","messageId":"20071211142347.GA22879@diana.vm.bytemark.co.uk","threadId":"11222","inReplyTo":"b0943d9e0712100340p78326b4avf2b7e64008bba6d6@mail.gmail.com","subject":"[PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-12-11T14:23:47Z","receivedAt":"2007-12-11T14:23:47Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"Signed-off-by: Karl Hasselström <kha@treskal.com>\n\n---\n\nOn 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:\n\n> This release requires at least Python 2.4 and GIT 1.5.2.\n\nYeah. So 0.14.1 (to be released very soon) should probably have this\nfix. :-)\n\ndiff --git a/stgit/version.py b/stgit/version.py\nindex edd79e0..2e49e76 100644\n--- a/stgit/version.py\n+++ b/stgit/version.py\n@@ -2,4 +2,4 @@ version = '0.13'\n \n # minimum version requirements\n git_min_ver = '1.5.2'\n-python_min_ver = '2.5'\n+python_min_ver = '2.4'\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"62721","messageId":"b0943d9e0712110627g70ad0aecyfeaafd8b8655fb57@mail.gmail.com","threadId":"11222","inReplyTo":"20071211142347.GA22879@diana.vm.bytemark.co.uk","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-12-11T14:27:08Z","receivedAt":"2007-12-11T14:27:08Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:\n> Signed-off-by: Karl Hasselström <kha@treskal.com>\n>\n> ---\n>\n> On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:\n>\n> > This release requires at least Python 2.4 and GIT 1.5.2.\n>\n> Yeah. So 0.14.1 (to be released very soon) should probably have this\n> fix. :-)\n\nOops, I did some tests and forgot to revert it to 2.4. This would only\naffect people using the source tarball. The rpm and deb packages\nshould be fine.\n\nIs the GIT version OK or just too restrictive?\n\nThanks.\n\n-- \nCatalin\n"},{"id":"62723","messageId":"m3r6hts2yk.fsf@roke.D-201","threadId":"11222","inReplyTo":"b0943d9e0712110627g70ad0aecyfeaafd8b8655fb57@mail.gmail.com","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-12-11T14:47:38Z","receivedAt":"2007-12-11T14:47:38Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"\"Catalin Marinas\" <catalin.marinas@gmail.com> writes:\n\n> On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:\n> > On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:\n> >\n> > > This release requires at least Python 2.4 and GIT 1.5.2.\n> >\n> > Yeah. So 0.14.1 (to be released very soon) should probably have this\n> > fix. :-)\n> \n> Oops, I did some tests and forgot to revert it to 2.4. This would only\n> affect people using the source tarball. The rpm and deb packages\n> should be fine.\n\nHmmm...\n\n$ rpm -Uhv --test stgit-0.14-1.noarch.rpm \nerror: Failed dependencies:\n        python(abi) = 2.5 is needed by stgit-0.14-1.noarch\n\nAlthough I guess that it is something that rpmbuild sets (if not set)\nautomatically during building.\n\nI'll just download SRPMS (which is available, just not linked from\ndownload area on homepage).\n\nP.S. By the way: [application/x-wais-source]?\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"62726","messageId":"20071211150156.GA23609@diana.vm.bytemark.co.uk","threadId":"11222","inReplyTo":"b0943d9e0712110627g70ad0aecyfeaafd8b8655fb57@mail.gmail.com","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-12-11T15:01:56Z","receivedAt":"2007-12-11T15:01:56Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-12-11 14:27:08 +0000, Catalin Marinas wrote:\n\n> Is the GIT version OK or just too restrictive?\n\nThe only restriction I've checked is this one:\n\ncommit 9a6bcbe26b6032c39031773da020fd7bf4015953\nAuthor: Karl Hasselström <kha@treskal.com>\nDate:   Sat Sep 22 10:22:18 2007 +0200\n\n    Properly remove all config for a deleted branch\n\n    This uses \"git-config --remove-section\", which was first released in\n    git 1.5.1-rc1. I'm not sure if this is later than what we used to\n    depend on; we already use \"git-config --rename-section\", but that's\n    been in since git 1.5.0-rc0.\n\nSo I guess we should require at least 1.5.1. But I don't think\nrequiring 1.5.2 is that bad.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"62727","messageId":"b0943d9e0712110702m170ba227g2d2224f4f6af3cf0@mail.gmail.com","threadId":"11222","inReplyTo":"m3r6hts2yk.fsf@roke.D-201","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-12-11T15:02:21Z","receivedAt":"2007-12-11T15:02:21Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 11/12/2007, Jakub Narebski <jnareb@gmail.com> wrote:\n> $ rpm -Uhv --test stgit-0.14-1.noarch.rpm\n> error: Failed dependencies:\n>         python(abi) = 2.5 is needed by stgit-0.14-1.noarch\n\nI use Ubuntu 7.10, not the best system for building RPMs.\n\n> Although I guess that it is something that rpmbuild sets (if not set)\n> automatically during building.\n\nYes. If you know what to add to setup.py, please let me know.\n\n> I'll just download SRPMS (which is available, just not linked from\n> download area on homepage).\n\nIt's not linked as I always thought people would use the .tar.gz.\n\nWhat about adding it to cheeseshop.python.org and only run\n\"easy_install stgit\"? The drawback of easy_install is that there is no\neasy_uninstall yet.\n\n> P.S. By the way: [application/x-wais-source]?\n\nI don't control the web server my ISP provides. I should move\neverything to gna.org but I was too lazy to modify my release script\n(for Debian, gna.org even gives information on how to set up an apt\nrepository).\n\n-- \nCatalin\n"},{"id":"62728","messageId":"20071211150300.GB23609@diana.vm.bytemark.co.uk","threadId":"11222","inReplyTo":"b0943d9e0712110627g70ad0aecyfeaafd8b8655fb57@mail.gmail.com","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-12-11T15:03:00Z","receivedAt":"2007-12-11T15:03:00Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-12-11 14:27:08 +0000, Catalin Marinas wrote:\n\n> This would only affect people using the source tarball. The rpm and\n> deb packages should be fine.\n\nAh, they don't run the install script?\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"62729","messageId":"m3myshs27c.fsf@roke.D-201","threadId":"11222","inReplyTo":"m3r6hts2yk.fsf@roke.D-201","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-12-11T15:03:55Z","receivedAt":"2007-12-11T15:03:55Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> \"Catalin Marinas\" <catalin.marinas@gmail.com> writes:\n> \n> > On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:\n> > > On 2007-12-10 11:40:41 +0000, Catalin Marinas wrote:\n> > >\n> > > > This release requires at least Python 2.4 and GIT 1.5.2.\n> > >\n> > > Yeah. So 0.14.1 (to be released very soon) should probably have this\n> > > fix. :-)\n> > \n> > Oops, I did some tests and forgot to revert it to 2.4. This would only\n> > affect people using the source tarball. The rpm and deb packages\n> > should be fine.\n> \n> Hmmm...\n> \n> $ rpm -Uhv --test stgit-0.14-1.noarch.rpm \n> error: Failed dependencies:\n>         python(abi) = 2.5 is needed by stgit-0.14-1.noarch\n> \n> Although I guess that it is something that rpmbuild sets (if not set)\n> automatically during building.\n> \n> I'll just download SRPMS (which is available, just not linked from\n> download area on homepage).\n\nOoops... I think I'd have to wait for 0.14.1\n\n$ rpmbuild --rebuild --target=noarch stgit-0.14-1.src.rpm\n[...]\nPython version 2.5 or newer required. Found 2.4.3.final.0\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"62730","messageId":"b0943d9e0712110706l324b98bfy1e71f9dfa36da4ab@mail.gmail.com","threadId":"11222","inReplyTo":"m3myshs27c.fsf@roke.D-201","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-12-11T15:06:30Z","receivedAt":"2007-12-11T15:06:30Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 11/12/2007, Jakub Narebski <jnareb@gmail.com> wrote:\n> Jakub Narebski <jnareb@gmail.com> writes:\n> Ooops... I think I'd have to wait for 0.14.1\n>\n> $ rpmbuild --rebuild --target=noarch stgit-0.14-1.src.rpm\n> [...]\n> Python version 2.5 or newer required. Found 2.4.3.final.0\n\nOr just change the string in stgit/version.py.\n\n-- \nCatalin\n"},{"id":"62900","messageId":"b0943d9e0712120604m97aac2cyaf60cb33c51cf9a7@mail.gmail.com","threadId":"11222","inReplyTo":"20071211142347.GA22879@diana.vm.bytemark.co.uk","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2007-12-12T14:04:11Z","receivedAt":"2007-12-12T14:04:11Z","isPatch":true,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:\n> Yeah. So 0.14.1 (to be released very soon) should probably have this\n> fix. :-)\n\nOK, done. Thanks.\n\nOn the RPM side, I found a way to specify the required Python version\non the \"setup.py bdist_rpm\" command line but I don't think it makes\nany difference since the installed files will go into the python2.5\ndirectory.\n\nAnyway, I linked the SRPMS as well from the website's page.\n\n-- \nCatalin\n"},{"id":"62908","messageId":"m31w9srlyb.fsf@roke.D-201","threadId":"11222","inReplyTo":"b0943d9e0712120604m97aac2cyaf60cb33c51cf9a7@mail.gmail.com","subject":"Re: [PATCH] Fix typo: we require Python 2.4, not 2.5","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-12-12T15:07:13Z","receivedAt":"2007-12-12T15:07:13Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"\"Catalin Marinas\" <catalin.marinas@gmail.com> writes:\n\n> On 11/12/2007, Karl Hasselström <kha@treskal.com> wrote:\n> > Yeah. So 0.14.1 (to be released very soon) should probably have this\n> > fix. :-)\n> \n> OK, done. Thanks.\n> \n> On the RPM side, I found a way to specify the required Python version\n> on the \"setup.py bdist_rpm\" command line but I don't think it makes\n> any difference since the installed files will go into the python2.5\n> directory.\n> \n> Anyway, I linked the SRPMS as well from the website's page.\n\nThanks. At least compiling SRPMS works:\n\n  $ stg version\n  Stacked GIT 0.14.1\n  git version 1.5.3.7\n  Python version 2.4.3 (#1, Jun 13 2006, 16:41:18) \n  [GCC 4.0.2 20051125 (Red Hat 4.0.2-8)]\n  $ rpm -q stgit\n  stgit-0.14.1-1\n\n-- \nJakub Narebski                      http://www.ohloh.net/accounts/11224\nShadeHawk on #git                   Linux Registered User #239074\n"}]}