The following series removes the 'bottom' and 'top' files for each
patch, and instead uses the commit objects to keep track of the
patches.
The patches are based on kha/safe
24a81d7a94cd7c9ad2fc741b0179db5b830cce78 and will conflict with the
'conflict' series in at least one place.
The first ten patches are actually only cleanups and refactoring that
could go in regardless of the last ones. Some of the changes are not
really necessary, but I did them while digging into the the code, and
believe they are improvements. They should not change the way stg
behaves in any way.
The eleventh one is just a sanity check before applying the last two
that removes the top and bottom files.
The last two patches do the final cleansing. Obviously, this changes
the format, and the format version should be increased and and update
function be written. So it's not really ready to go in yet.
Also, there are some documentation changes not included in this.
Maybe I should have sent the first ten patches separately, but this
makes it clearer why I did it.
---
David Kågedal (13):
Remove the 'top' field
Remove the 'bottom' field
Check bottom and invariants
Refactor Series.new_patch
Clear up the semantics of Series.new_patch
Add a 'bottom' parameter to Series.refresh_patch and use it
Clean up Series.refresh_patch
Refactor Series.push_patch
Remove dead code from push_empty_patch
Split Series.push_patch in two
Moved that status function to the status command file
Clear up semantics of tree_status
Add some more tests of "stg status" output
stgit/commands/common.py | 2
stgit/commands/status.py | 42 +++++++++-
stgit/commands/sync.py | 1
stgit/commands/uncommit.py | 1
stgit/git.py | 61 +++-----------
stgit/stack.py | 189 ++++++++++++++++++++++----------------------
t/t0002-status.sh | 36 ++++++++
7 files changed, 185 insertions(+), 147 deletions(-)
--
Signature
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
