Even more things polished now, to the point that I think this could be
merged soon (but after 0.14, obviously).
The most recent fixes are:
* Say "current" and "patched" in conflict markers instead of the
trees' sha1s; this was a regression introduced by the conflict
series.
* All the various "top" and "bottom" files are written again, for
backwards compatibility.
Testing would be much appreciated.
---
The following changes since commit e2c86cdeafe3d8e1f58117c16a17b0438e4d64b1:
Catalin Marinas (1):
Allow only certain gitk exit codes as valid
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
David Kågedal (9):
Check bottom and invariants
Remove the 'bottom' field
Remove the 'top' field
Split git.merge into two functions
Leave working dir and index alone after failed (conflicting) push
Added a test case to check what happens when push finds a conflict
Simplify merge_recursive
Use the output from merge-recursive to list conflicts
Ask git about unmerged files
Karl Hasselström (22):
Write removed fields for backwards compatibility
Nicer conflict markers
Better error message if merge fails
Fix "stg resolved" to work with new conflict representation
Refactoring: pass more than one file to resolved()
We keep the different stages of a conflict in the index now
"stg status --reset" is not needed anymore
Remove "stg add"
Remove "stg rm"
Remove "stg cp"
Remove "stg resolved"
New StGit core infrastructure: repository operations
Write metadata files used by the old infrastructure
Upgrade older stacks to newest version
Let "stg clean" use the new infrastructure
Add "stg coalesce"
Let "stg applied" and "stg unapplied" use the new infrastructure
Teach the new infrastructure about the index and worktree
Let "stg clean" use the new transaction primitives
Let "stg goto" use the new infrastructure
Convert "stg uncommit" to the new infrastructure
New infrastructure: Make sure that the branch is initialized
Documentation/stg-cp.txt | 63 -------
Documentation/stg.txt | 2 -
Documentation/tutorial.txt | 31 ++--
contrib/stgit-completion.bash | 4 +-
examples/gitconfig | 19 +--
setup.py | 2 +-
stgit/commands/add.py | 44 -----
stgit/commands/applied.py | 27 ++--
stgit/commands/clean.py | 49 ++----
stgit/commands/coalesce.py | 112 ++++++++++++
stgit/commands/common.py | 39 ++---
stgit/commands/copy.py | 45 -----
stgit/commands/goto.py | 52 ++----
stgit/commands/pick.py | 2 +-
stgit/commands/resolved.py | 94 ----------
stgit/commands/rm.py | 48 -----
stgit/commands/status.py | 31 ++--
stgit/commands/sync.py | 1 -
stgit/commands/unapplied.py | 23 ++--
stgit/commands/uncommit.py | 79 ++++-----
stgit/config.py | 1 -
stgit/git.py | 75 +++++----
stgit/gitmergeonefile.py | 97 +----------
stgit/lib/__init__.py | 18 ++
stgit/lib/git.py | 387 +++++++++++++++++++++++++++++++++++++++++
stgit/lib/stack.py | 176 +++++++++++++++++++
stgit/lib/stackupgrade.py | 98 +++++++++++
stgit/lib/transaction.py | 195 +++++++++++++++++++++
stgit/main.py | 10 +-
stgit/run.py | 3 +
stgit/stack.py | 156 ++++-------------
stgit/utils.py | 24 +++
t/t0002-status.sh | 15 +-
t/t1200-push-modified.sh | 2 +-
t/t1202-push-undo.sh | 6 +-
t/t1203-push-conflict.sh | 70 ++++++++
t/t1204-pop-keep.sh | 2 +-
t/t1205-push-subdir.sh | 8 +-
t/t1300-uncommit.sh | 4 +-
t/t1301-repair.sh | 2 +-
t/t1400-patch-history.sh | 4 +-
t/t1500-float.sh | 14 +-
t/t1600-delete-one.sh | 12 +-
t/t1601-delete-many.sh | 2 +-
t/t1700-goto-top.sh | 2 +-
t/t2000-sync.sh | 12 +-
t/t2100-pull-policy-fetch.sh | 4 +-
t/t2101-pull-policy-pull.sh | 4 +-
t/t2102-pull-policy-rebase.sh | 4 +-
t/t2300-refresh-subdir.sh | 2 +-
t/t2600-coalesce.sh | 31 ++++
51 files changed, 1393 insertions(+), 814 deletions(-)
delete mode 100644 Documentation/stg-cp.txt
delete mode 100644 stgit/commands/add.py
create mode 100644 stgit/commands/coalesce.py
delete mode 100644 stgit/commands/copy.py
delete mode 100644 stgit/commands/resolved.py
delete mode 100644 stgit/commands/rm.py
create mode 100644 stgit/lib/__init__.py
create mode 100644 stgit/lib/git.py
create mode 100644 stgit/lib/stack.py
create mode 100644 stgit/lib/stackupgrade.py
create mode 100644 stgit/lib/transaction.py
create mode 100755 t/t1203-push-conflict.sh
create mode 100755 t/t2600-coalesce.sh
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
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
