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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
