Karl HasselströmI've promoted a bunch of stuff from "experimental" to "safe", so that "experimental" currently only consists of the stack log stuff.
The stack log stuff in experimental now sports a rewrite of "stg log", so that you can see what's in your log. This work is nearing completion, or at least nearing the point where I'll be considering moving it to "safe".
-+-
The following changes since commit 9564af74822b276d435319fc271eda591e5125a6:
Catalin Marinas (1):
Merge branch 'stable'are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
Karl Hasselström (10):
Try the built-in version string before git-describe
Disable patchlog test for "stg new"
Convert "stg new" to the new infrastructure
Refactor --author/--committer options
Let "stg new" support more message options
Emacs mode: use "stg new --file"
Convert "stg delete" to the new infrastructure
Emacs mode: delete patches
Prevent most commands from running when there are conflicts
Add property with a list of all patch namescontrib/stgit.el | 33 +++++++++++---- setup.py | 45 +++++++++++--------- stgit/.gitignore | 1 - stgit/commands/clean.py | 2 +- stgit/commands/coalesce.py | 6 +- stgit/commands/commit.py | 13 ++++-- stgit/commands/common.py | 33 +++++---------- stgit/commands/delete.py | 76 +++++++++++++---------------------- stgit/commands/edit.py | 28 ++---------- stgit/commands/new.py | 97 ++++++++++++++++++++++++------------------- stgit/commands/uncommit.py | 5 +- stgit/lib/git.py | 8 ++-- stgit/lib/stack.py | 1 + stgit/lib/transaction.py | 27 ++++++++++-- stgit/utils.py | 50 ++++++++++++++++++++++ stgit/version.py | 15 +++++- t/t1400-patch-history.sh | 2 - t/t1600-delete-one.sh | 8 ++-- 18 files changed, 255 insertions(+), 195 deletions(-)
-+-
The following changes since commit a5920051ee4326489c4b43e85d93f71d4c4ce34a:
Karl Hasselström (1):
Add property with a list of all patch namesare available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
Karl Hasselström (13):
Library functions for tree and blob manipulation
Write to a stack log when stack is modified
Add utility function for reordering patches
New command: stg reset
Log conflicts separately
Log conflicts separately for all commands
Add a --hard flag to stg reset
Don't write a log entry if there were no changes
Move stack reset function to a shared location
New command: stg undo
New command: stg redo
Log and undo external modifications
Make "stg log" show stack log instead of patch logstgit/commands/branch.py | 19 ++- stgit/commands/common.py | 9 +- stgit/commands/diff.py | 2 +- stgit/commands/export.py | 2 +- stgit/commands/files.py | 2 +- stgit/commands/id.py | 2 +- stgit/commands/log.py | 164 +++++++---------------- stgit/commands/mail.py | 2 +- stgit/commands/patches.py | 2 +- stgit/commands/redo.py | 52 +++++++ stgit/commands/reset.py | 56 ++++++++ stgit/commands/series.py | 2 +- stgit/commands/show.py | 2 +- stgit/commands/status.py | 3 +- stgit/commands/top.py | 2 +- stgit/commands/undo.py | 49 +++++++ stgit/lib/git.py | 146 +++++++++++++++++--- stgit/lib/log.py | 304 ++++++++++++++++++++++++++++++++++++++++++ stgit/lib/stack.py | 16 +++ stgit/lib/transaction.py | 115 +++++++++++----- stgit/main.py | 8 + t/t1400-patch-history.sh | 103 -------------- t/t3100-reset.sh | 151 +++++++++++++++++++++ t/t3101-reset-hard.sh | 56 ++++++++ t/t3102-undo.sh | 86 ++++++++++++ t/t3103-undo-hard.sh | 56 ++++++++ t/t3104-redo.sh | 122 +++++++++++++++++ t/t3105-undo-external-mod.sh | 68 ++++++++++ 28 files changed, 1310 insertions(+), 291 deletions(-) create mode 100644 stgit/commands/redo.py create mode 100644 stgit/commands/reset.py create mode 100644 stgit/commands/undo.py create mode 100644 stgit/lib/log.py delete mode 100755 t/t1400-patch-history.sh create mode 100755 t/t3100-reset.sh create mode 100755 t/t3101-reset-hard.sh create mode 100755 t/t3102-undo.sh create mode 100755 t/t3103-undo-hard.sh create mode 100755 t/t3104-redo.sh create mode 100755 t/t3105-undo-external-mod.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle