# StGit kha safe branch updated 2 messages from 2007-10-07 to 2007-10-07. Participants: Karl Hasselström. Thread: https://gitlist.dev/t/10185 ## Karl Hasselström, 2007-10-07 23:29 Subject: StGit kha safe branch updated Message-ID: <20071007232943.GA1262@diana.vm.bytemark.co.uk> URL: https://gitlist.dev/e/20071007232943.GA1262%40diana.vm.bytemark.co.uk ``` These are the assimilate patches, plus the two new series I just mailed out. The following changes since commit 764d110156e4951ca5671a700ee2402fa3597734: Yann Dirson (1): Better diagnostic for wrong branch configuration. are available in the git repository at: git://repo.or.cz/stgit/kha.git safe Karl Hasselström (16): 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 stgit/commands/add.py | 1 + stgit/commands/applied.py | 1 + stgit/commands/assimilate.py | 199 +++++++++++++++++++++++++++++++---------- stgit/commands/branch.py | 1 + stgit/commands/clean.py | 1 + stgit/commands/clone.py | 1 + stgit/commands/commit.py | 1 + stgit/commands/common.py | 88 +++++++++++++++--- stgit/commands/copy.py | 1 + stgit/commands/delete.py | 1 + stgit/commands/diff.py | 1 + stgit/commands/edit.py | 34 ++++---- stgit/commands/export.py | 1 + stgit/commands/files.py | 1 + stgit/commands/float.py | 1 + stgit/commands/fold.py | 1 + stgit/commands/goto.py | 1 + stgit/commands/hide.py | 1 + stgit/commands/id.py | 1 + stgit/commands/imprt.py | 1 + stgit/commands/init.py | 1 + stgit/commands/log.py | 1 + stgit/commands/mail.py | 1 + stgit/commands/new.py | 7 +- stgit/commands/patches.py | 1 + stgit/commands/pick.py | 1 + stgit/commands/pop.py | 1 + stgit/commands/pull.py | 6 +- stgit/commands/push.py | 1 + stgit/commands/rebase.py | 6 +- stgit/commands/refresh.py | 1 + stgit/commands/rename.py | 1 + stgit/commands/resolved.py | 1 + stgit/commands/rm.py | 1 + stgit/commands/series.py | 1 + stgit/commands/show.py | 1 + stgit/commands/sink.py | 1 + stgit/commands/status.py | 1 + stgit/commands/sync.py | 1 + stgit/commands/top.py | 1 + stgit/commands/unapplied.py | 1 + stgit/commands/uncommit.py | 1 + stgit/commands/unhide.py | 1 + stgit/config.py | 3 +- stgit/exception.py | 3 + stgit/git.py | 6 +- stgit/gitmergeonefile.py | 3 +- stgit/main.py | 17 ++--- stgit/run.py | 5 +- stgit/stack.py | 20 +++- stgit/utils.py | 3 +- t/t1204-pop-keep.sh | 42 +++++++++ t/t1205-push-subdir.sh | 55 +++++++++++ t/t1301-assimilate.sh | 12 +-- t/t1302-assimilate-interop.sh | 59 ++++++++++++ t/t2100-pull-policy-fetch.sh | 14 --- t/t2102-pull-policy-rebase.sh | 24 ----- t/t2300-refresh-subdir.sh | 27 ++++++ 58 files changed, 514 insertions(+), 156 deletions(-) create mode 100644 stgit/exception.py create mode 100755 t/t1204-pop-keep.sh create mode 100755 t/t1205-push-subdir.sh create mode 100755 t/t1302-assimilate-interop.sh create mode 100755 t/t2300-refresh-subdir.sh -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle ``` ## Karl Hasselström, 2007-10-07 23:39 Subject: StGit kha experimental branch updated Message-ID: <20071007233902.GB1262@diana.vm.bytemark.co.uk> URL: https://gitlist.dev/e/20071007233902.GB1262%40diana.vm.bytemark.co.uk In-Reply-To: <20071007232943.GA1262@diana.vm.bytemark.co.uk> ``` There's nothing new here; it's all just rebased on top of the updated safe branch. In order, we have * David's patches that remove the "top" and "bottom" patch fields. These need a format version upgrade function (trivial), but are otherwise ready, I think. * David's conflict refactoring series, with some fixes by me, and removal of some commands that become superfluous. Almost ready, but it makes ugly conflict markers, and "stg resolved" should probably be removed. The following changes since commit 2299c463794f214b750ecc33e24779243ddc5aff: Karl Hasselström (1): Make "stg refresh" subdirectory safe 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 (9): 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 Clean up the logic in "stg resolved" "stg status --reset" is not needed anymore Remove "stg add" Remove "stg rm" Remove "stg cp" Documentation/stg-cp.txt | 63 -------------------------- Documentation/tutorial.txt | 22 +++++---- stgit/commands/add.py | 44 ------------------ stgit/commands/common.py | 25 +++------- stgit/commands/copy.py | 45 ------------------ stgit/commands/pick.py | 2 +- stgit/commands/resolved.py | 70 ++++++++++------------------- stgit/commands/rm.py | 48 -------------------- stgit/commands/status.py | 34 +++++--------- stgit/commands/sync.py | 1 - stgit/git.py | 72 +++++++++++++++++------------ stgit/gitmergeonefile.py | 99 ++++++++++++++++++++++------------------ stgit/main.py | 6 --- stgit/run.py | 3 + stgit/stack.py | 65 +++++++++++---------------- t/t0002-status.sh | 11 +++-- t/t1200-push-modified.sh | 2 +- t/t1202-push-undo.sh | 4 +- t/t1203-push-conflict.sh | 70 +++++++++++++++++++++++++++++ t/t1204-pop-keep.sh | 2 +- t/t1205-push-subdir.sh | 4 +- t/t1300-uncommit.sh | 4 +- t/t1301-assimilate.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 | 8 ++-- 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 +- 33 files changed, 295 insertions(+), 459 deletions(-) delete mode 100644 Documentation/stg-cp.txt delete mode 100644 stgit/commands/add.py delete mode 100644 stgit/commands/copy.py delete mode 100644 stgit/commands/rm.py create mode 100755 t/t1203-push-conflict.sh -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle ```