{"thread":{"id":"9618","subject":"StGIT experimental branch updated","startedAt":"2007-08-23T02:29:58Z","lastAt":"2007-08-26T20:46:50Z","messageCount":2,"participants":["Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"51320","messageId":"20070823022958.GA9323@diana.vm.bytemark.co.uk","threadId":"9618","inReplyTo":null,"subject":"StGIT experimental branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-08-23T02:29:58Z","receivedAt":"2007-08-23T02:29:58Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"I've rebased my experimental branch against the stuff Catalin pushed\nout recently. The remaining diff is mostly the DAG series and David's\npush conflict improvements. I haven't had time to test drive it\nthoroughly, but it passes the test suite.\n\nThe following changes since commit 7e97cc0590f29482af022340df84a43b98c657ce:\n  Yann Dirson (1):\n        Include contrib scripts in the release tarball.\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git master\n\nDavid Kågedal (5):\n      Split git.merge into two functions\n      Leave working dir and index alone after failed (conflicting) push\n      Added a test case to check what happens when push finds a conflict\n      Simplify merge_recursive\n      Use the output from merge-recursive to list conflicts\n\nKarl Hasselström (12):\n      Compute patch appliedness from commit DAG\n      Test the new DAG appliedness machinery\n      Fix bash completion after the DAG appliedness patch\n      Speed up the appliedness test\n      Speed up the discovery of uninteresting commits\n      Speed up appliedness check during patch creation\n      Don't traverse the whole DAG when looking for uninteresting commits\n      Find uninteresting commits faster for special cases\n      Optimize uninterestingness checks for rebase\n      Don't touch ref files manually\n      Merge branch 'refs'\n      Merge branch 'conflict'\n\n contrib/stgit-completion.bash |   15 +-\n stgit/commands/branch.py      |    5 +-\n stgit/commands/commit.py      |    8 +-\n stgit/commands/common.py      |    4 +-\n stgit/commands/float.py       |    2 +-\n stgit/commands/imprt.py       |    2 +-\n stgit/commands/pick.py        |    2 +-\n stgit/commands/refresh.py     |    2 +-\n stgit/commands/sync.py        |    2 +-\n stgit/git.py                  |  140 ++++++----\n stgit/stack.py                |  642 ++++++++++++++++++++++++++++++++---------\n t/t0001-subdir-branches.sh    |    7 +-\n t/t1000-branch-create.sh      |   30 +--\n t/t1001-branch-rename.sh      |    2 +-\n t/t1203-push-conflict.sh      |   64 ++++\n t/t3000-git-interop.sh        |   60 ++++\n t/t4000-upgrade.sh            |    6 +\n 17 files changed, 741 insertions(+), 252 deletions(-)\n create mode 100755 t/t1203-push-conflict.sh\n create mode 100755 t/t3000-git-interop.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"51603","messageId":"20070826204650.GA22528@diana.vm.bytemark.co.uk","threadId":"9618","inReplyTo":"20070823022958.GA9323@diana.vm.bytemark.co.uk","subject":"Re: StGIT experimental branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-08-26T20:46:50Z","receivedAt":"2007-08-26T20:46:50Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"Updated again. It has all the patches I just mailed out, as well as\nthe DAG series.\n\nThe following changes since commit 5f1629be6d0d10aa2acb253c89c6f6c38fdf3cf2:\n  Catalin Marinas (1):\n        Allow 'import' to apply empty patches\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git master\n\nDavid Kågedal (5):\n      Split git.merge into two functions\n      Leave working dir and index alone after failed (conflicting) push\n      Added a test case to check what happens when push finds a conflict\n      Simplify merge_recursive\n      Use the output from merge-recursive to list conflicts\n\nKarl Hasselström (19):\n      Don't use test_expect_failure when more than one thing could fail\n      Don't write None to the conf file\n      Replace \"git repo-config\" with \"git config\" in help texts\n      Compile regexp just once\n      Refactor output handling to break circular dependency\n      Refactor subprocess creation\n      Assert that the argument to Run is a sequence of strings\n      Add optional logging of subprocess execution\n      Better error message if merge fails\n      Compute patch appliedness from commit DAG\n      Test the new DAG appliedness machinery\n      Fix bash completion after the DAG appliedness patch\n      Speed up the appliedness test\n      Speed up the discovery of uninteresting commits\n      Speed up appliedness check during patch creation\n      Don't traverse the whole DAG when looking for uninteresting commits\n      Find uninteresting commits faster for special cases\n      Optimize uninterestingness checks for rebase\n      Merge branch 'conflict-run'\n\n contrib/stgit-completion.bash |   15 +-\n examples/gitconfig            |    2 +-\n stgit/basedir.py              |   13 +-\n stgit/commands/applied.py     |    1 +\n stgit/commands/assimilate.py  |    1 +\n stgit/commands/branch.py      |    1 +\n stgit/commands/clean.py       |    1 +\n stgit/commands/commit.py      |    9 +-\n stgit/commands/common.py      |    1 +\n stgit/commands/delete.py      |    1 +\n stgit/commands/diff.py        |    1 +\n stgit/commands/export.py      |   10 +-\n stgit/commands/files.py       |    1 +\n stgit/commands/float.py       |    2 +-\n stgit/commands/fold.py        |    1 +\n stgit/commands/hide.py        |    1 +\n stgit/commands/id.py          |    1 +\n stgit/commands/imprt.py       |    3 +-\n stgit/commands/log.py         |    1 +\n stgit/commands/mail.py        |    1 +\n stgit/commands/patches.py     |    1 +\n stgit/commands/pick.py        |    3 +-\n stgit/commands/pull.py        |    1 +\n stgit/commands/push.py        |    1 +\n stgit/commands/refresh.py     |    3 +-\n stgit/commands/rename.py      |    1 +\n stgit/commands/series.py      |    1 +\n stgit/commands/sync.py        |    3 +-\n stgit/commands/top.py         |    1 +\n stgit/commands/unapplied.py   |    1 +\n stgit/commands/uncommit.py    |    1 +\n stgit/commands/unhide.py      |    1 +\n stgit/config.py               |   56 +---\n stgit/git.py                  |  374 +++++++++++---------------\n stgit/gitmergeonefile.py      |   21 +-\n stgit/main.py                 |    2 +-\n stgit/out.py                  |  100 +++++++\n stgit/run.py                  |  141 ++++++++++\n stgit/stack.py                |  583 +++++++++++++++++++++++++++++++++--------\n stgit/utils.py                |   81 +------\n t/t1203-push-conflict.sh      |   64 +++++\n t/t2101-pull-policy-pull.sh   |    4 +-\n t/t3000-git-interop.sh        |   60 +++++\n t/t4000-upgrade.sh            |    6 +\n 44 files changed, 1082 insertions(+), 495 deletions(-)\n create mode 100644 stgit/out.py\n create mode 100644 stgit/run.py\n create mode 100755 t/t1203-push-conflict.sh\n create mode 100755 t/t3000-git-interop.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"}]}