* StGit kha safe branch updated
@ 2007-09-24 0:02 Karl Hasselström
2007-09-24 0:10 ` StGit kha experimental " Karl Hasselström
0 siblings, 1 reply; 3+ messages in thread
From: Karl Hasselström @ 2007-09-24 0:02 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
These are the first ten patches of David's latest series (including
the fixup he suggested) -- that is, only the cleanup part -- plus the
three patches I just mailed out.
The following changes since commit ead8e89297dfabf7c290338a86c89f19c5ba7401:
Catalin Marinas (1):
Print 'updating patch' earlier in 'edit'
are available in the git repository at:
git://repo.or.cz/stgit/kha.git safe
David Kågedal (10):
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
Karl Hasselström (3):
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
stgit/commands/common.py | 2 +-
stgit/commands/status.py | 45 +++++++++++-
stgit/commands/uncommit.py | 1 +
stgit/git.py | 61 ++++------------
stgit/stack.py | 155 ++++++++++++++++++++++------------------
t/README | 9 +--
t/t0001-subdir-branches.sh | 9 ++-
t/t0002-status.sh | 36 ++++++++++
t/t0100-help.sh | 15 ++++
t/t1000-branch-create.sh | 8 +-
t/t1001-branch-rename.sh | 4 +-
t/t1002-branch-clone.sh | 4 +-
t/t1200-push-modified.sh | 4 +-
t/t1202-push-undo.sh | 4 +-
t/t2000-sync.sh | 8 +-
t/t2100-pull-policy-fetch.sh | 4 +-
t/t2102-pull-policy-rebase.sh | 12 ++--
t/t2200-rebase.sh | 4 +-
18 files changed, 230 insertions(+), 155 deletions(-)
create mode 100755 t/t0100-help.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 3+ messages in thread
* StGit kha experimental branch updated
2007-09-24 0:02 StGit kha safe branch updated Karl Hasselström
@ 2007-09-24 0:10 ` Karl Hasselström
0 siblings, 0 replies; 3+ messages in thread
From: Karl Hasselström @ 2007-09-24 0:10 UTC (permalink / raw)
To: git
The three last patches of David's top/bottom removal series are here,
and all the old patches too. Changes:
* Everything's been rebased on top of David's top/bottom removal
series, which turned out to be a major undertaking. I'm not 100%
sure I've managed to not break anything.
* I've modified the conflict series to adhere to the new test suite
policy; it now passes the test suite at every point, by using
test_expect_failure for broken tests.
* The add/rm/cp removal patches no longer break "stg help".
The following changes since commit 5f594e90e9a0867e1b87ffb8b0a077152246b56c:
Karl Hasselström (1):
New policy: Only use test_expect_failure for broken tests
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 (20):
Remove the --force flag to "stg rebase" and "stg pull"
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"
Compute patch appliedness from commit DAG
Test the new DAG appliedness machinery
Fix bash completion after the DAG appliedness patch
Speed up the appliedness test
Speed up the discovery of uninteresting commits
Speed up appliedness check during patch creation
Don't traverse the whole DAG when looking for uninteresting commits
Find uninteresting commits faster for special cases
Optimize uninterestingness checks for rebase
Merge branch 'conflict' into experimental
Documentation/stg-cp.txt | 63 -----
Documentation/tutorial.txt | 22 +-
contrib/stgit-completion.bash | 15 +-
stgit/commands/add.py | 43 ---
stgit/commands/commit.py | 8 +-
stgit/commands/common.py | 34 +--
stgit/commands/copy.py | 44 ---
stgit/commands/float.py | 2 +-
stgit/commands/pick.py | 2 +-
stgit/commands/pull.py | 5 +-
stgit/commands/rebase.py | 5 +-
stgit/commands/resolved.py | 70 ++---
stgit/commands/rm.py | 47 ---
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 | 620 ++++++++++++++++++++++++++++++++---------
t/t0002-status.sh | 11 +-
t/t1200-push-modified.sh | 2 +-
t/t1202-push-undo.sh | 4 +-
t/t1203-push-conflict.sh | 70 +++++
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 | 18 +-
t/t2101-pull-policy-pull.sh | 4 +-
t/t2102-pull-policy-rebase.sh | 28 +--
t/t3000-git-interop.sh | 60 ++++
t/t4000-upgrade.sh | 6 +
37 files changed, 822 insertions(+), 624 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
create mode 100755 t/t3000-git-interop.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply [flat|nested] 3+ messages in thread
* StGit kha safe branch updated
@ 2007-10-07 23:29 Karl Hasselström
0 siblings, 0 replies; 3+ messages in thread
From: Karl Hasselström @ 2007-10-07 23:29 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-07 23:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-09-24 0:02 StGit kha safe branch updated Karl Hasselström
2007-09-24 0:10 ` StGit kha experimental " Karl Hasselström
-- strict thread matches above, loose matches on Subject: below --
2007-10-07 23:29 StGit kha safe " Karl Hasselström
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).