{"thread":{"id":"11064","subject":"StGit kha/experimental branch updated","startedAt":"2007-11-30T06:49:38Z","lastAt":"2007-12-09T13:11:16Z","messageCount":2,"participants":["Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"61481","messageId":"20071130064938.GA19892@diana.vm.bytemark.co.uk","threadId":"11064","inReplyTo":null,"subject":"StGit kha/experimental branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-11-30T06:49:38Z","receivedAt":"2007-11-30T06:49:38Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"I've fixed a handful of minor problems in the \"new infrastructure\"\nseries, and added one new patch at the end of David's series that\nmight be a tad controversial: the removal of \"stg resolved\".\n\nThe reason for removing it are simply that \"git add\" and \"git\nmergetool\" can do the same job, and I think it's a bad idea to make\nStGit's command set any bigger than necessary. If it ain't about\npatches, we should leave the job to git (and if we feel that git does\na suboptimal job, we should fix git).\n\n                                 -+-\n\nThe following changes since commit 8d2b87ac26d01c7110d911aefea8988ca5a9b183:\n  Karl Hasselström (1):\n        Make \"stg repair\" help text more helpful\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git experimental\n\nDavid Kågedal (9):\n      Check bottom and invariants\n      Remove the 'bottom' field\n      Remove the 'top' field\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      Ask git about unmerged files\n\nKarl Hasselström (20):\n      Better error message if merge fails\n      Fix \"stg resolved\" to work with new conflict representation\n      Refactoring: pass more than one file to resolved()\n      We keep the different stages of a conflict in the index now\n      \"stg status --reset\" is not needed anymore\n      Remove \"stg add\"\n      Remove \"stg rm\"\n      Remove \"stg cp\"\n      Remove \"stg resolved\"\n      New StGit core infrastructure: repository operations\n      Write metadata files used by the old infrastructure\n      Upgrade older stacks to newest version\n      Let \"stg clean\" use the new infrastructure\n      Add \"stg coalesce\"\n      Let \"stg applied\" and \"stg unapplied\" use the new infrastructure\n      Teach the new infrastructure about the index and worktree\n      Let \"stg clean\" use the new transaction primitives\n      Let \"stg goto\" use the new infrastructure\n      Convert \"stg uncommit\" to the new infrastructure\n      New infrastructure: Make sure that the branch is initialized\n\n Documentation/stg-cp.txt      |   63 -------\n Documentation/stg.txt         |    2 -\n Documentation/tutorial.txt    |   31 ++--\n contrib/stgit-completion.bash |    4 +-\n examples/gitconfig            |   19 +--\n setup.py                      |    2 +-\n stgit/commands/add.py         |   44 -----\n stgit/commands/applied.py     |   27 ++--\n stgit/commands/clean.py       |   49 ++----\n stgit/commands/coalesce.py    |  112 ++++++++++++\n stgit/commands/common.py      |   35 ++--\n stgit/commands/copy.py        |   45 -----\n stgit/commands/goto.py        |   52 ++----\n stgit/commands/pick.py        |    2 +-\n stgit/commands/resolved.py    |   94 ----------\n stgit/commands/rm.py          |   48 -----\n stgit/commands/status.py      |   31 ++--\n stgit/commands/sync.py        |    1 -\n stgit/commands/unapplied.py   |   23 ++--\n stgit/commands/uncommit.py    |   79 ++++-----\n stgit/config.py               |    1 -\n stgit/git.py                  |   72 +++++----\n stgit/gitmergeonefile.py      |   97 +----------\n stgit/lib/__init__.py         |   18 ++\n stgit/lib/git.py              |  383 +++++++++++++++++++++++++++++++++++++++++\n stgit/lib/stack.py            |  171 ++++++++++++++++++\n stgit/lib/stackupgrade.py     |   98 +++++++++++\n stgit/lib/transaction.py      |  195 +++++++++++++++++++++\n stgit/main.py                 |   10 +-\n stgit/run.py                  |    3 +\n stgit/stack.py                |  151 +++-------------\n stgit/utils.py                |   24 +++\n t/t0002-status.sh             |   13 +-\n t/t1200-push-modified.sh      |    2 +-\n t/t1202-push-undo.sh          |    4 +-\n t/t1203-push-conflict.sh      |   70 ++++++++\n t/t1204-pop-keep.sh           |    2 +-\n t/t1205-push-subdir.sh        |    8 +-\n t/t1300-uncommit.sh           |    4 +-\n t/t1301-repair.sh             |    2 +-\n t/t1400-patch-history.sh      |    4 +-\n t/t1500-float.sh              |   14 +-\n t/t1600-delete-one.sh         |   12 +-\n t/t1601-delete-many.sh        |    2 +-\n t/t1700-goto-top.sh           |    2 +-\n t/t2000-sync.sh               |   12 +-\n t/t2100-pull-policy-fetch.sh  |    4 +-\n t/t2101-pull-policy-pull.sh   |    4 +-\n t/t2102-pull-policy-rebase.sh |    4 +-\n t/t2300-refresh-subdir.sh     |    2 +-\n t/t2600-coalesce.sh           |   31 ++++\n 51 files changed, 1373 insertions(+), 809 deletions(-)\n delete mode 100644 Documentation/stg-cp.txt\n delete mode 100644 stgit/commands/add.py\n create mode 100644 stgit/commands/coalesce.py\n delete mode 100644 stgit/commands/copy.py\n delete mode 100644 stgit/commands/resolved.py\n delete mode 100644 stgit/commands/rm.py\n create mode 100644 stgit/lib/__init__.py\n create mode 100644 stgit/lib/git.py\n create mode 100644 stgit/lib/stack.py\n create mode 100644 stgit/lib/stackupgrade.py\n create mode 100644 stgit/lib/transaction.py\n create mode 100755 t/t1203-push-conflict.sh\n create mode 100755 t/t2600-coalesce.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"62484","messageId":"20071209131116.GA18527@diana.vm.bytemark.co.uk","threadId":"11064","inReplyTo":"20071130064938.GA19892@diana.vm.bytemark.co.uk","subject":"Re: StGit kha/experimental branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-12-09T13:11:16Z","receivedAt":"2007-12-09T13:11:16Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"Even more things polished now, to the point that I think this could be\nmerged soon (but after 0.14, obviously).\n\nThe most recent fixes are:\n\n  * Say \"current\" and \"patched\" in conflict markers instead of the\n    trees' sha1s; this was a regression introduced by the conflict\n    series.\n\n  * All the various \"top\" and \"bottom\" files are written again, for\n    backwards compatibility.\n\nTesting would be much appreciated.\n\n---\n\nThe following changes since commit e2c86cdeafe3d8e1f58117c16a17b0438e4d64b1:\n  Catalin Marinas (1):\n        Allow only certain gitk exit codes as valid\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git experimental\n\nDavid Kågedal (9):\n      Check bottom and invariants\n      Remove the 'bottom' field\n      Remove the 'top' field\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      Ask git about unmerged files\n\nKarl Hasselström (22):\n      Write removed fields for backwards compatibility\n      Nicer conflict markers\n      Better error message if merge fails\n      Fix \"stg resolved\" to work with new conflict representation\n      Refactoring: pass more than one file to resolved()\n      We keep the different stages of a conflict in the index now\n      \"stg status --reset\" is not needed anymore\n      Remove \"stg add\"\n      Remove \"stg rm\"\n      Remove \"stg cp\"\n      Remove \"stg resolved\"\n      New StGit core infrastructure: repository operations\n      Write metadata files used by the old infrastructure\n      Upgrade older stacks to newest version\n      Let \"stg clean\" use the new infrastructure\n      Add \"stg coalesce\"\n      Let \"stg applied\" and \"stg unapplied\" use the new infrastructure\n      Teach the new infrastructure about the index and worktree\n      Let \"stg clean\" use the new transaction primitives\n      Let \"stg goto\" use the new infrastructure\n      Convert \"stg uncommit\" to the new infrastructure\n      New infrastructure: Make sure that the branch is initialized\n\n Documentation/stg-cp.txt      |   63 -------\n Documentation/stg.txt         |    2 -\n Documentation/tutorial.txt    |   31 ++--\n contrib/stgit-completion.bash |    4 +-\n examples/gitconfig            |   19 +--\n setup.py                      |    2 +-\n stgit/commands/add.py         |   44 -----\n stgit/commands/applied.py     |   27 ++--\n stgit/commands/clean.py       |   49 ++----\n stgit/commands/coalesce.py    |  112 ++++++++++++\n stgit/commands/common.py      |   39 ++---\n stgit/commands/copy.py        |   45 -----\n stgit/commands/goto.py        |   52 ++----\n stgit/commands/pick.py        |    2 +-\n stgit/commands/resolved.py    |   94 ----------\n stgit/commands/rm.py          |   48 -----\n stgit/commands/status.py      |   31 ++--\n stgit/commands/sync.py        |    1 -\n stgit/commands/unapplied.py   |   23 ++--\n stgit/commands/uncommit.py    |   79 ++++-----\n stgit/config.py               |    1 -\n stgit/git.py                  |   75 +++++----\n stgit/gitmergeonefile.py      |   97 +----------\n stgit/lib/__init__.py         |   18 ++\n stgit/lib/git.py              |  387 +++++++++++++++++++++++++++++++++++++++++\n stgit/lib/stack.py            |  176 +++++++++++++++++++\n stgit/lib/stackupgrade.py     |   98 +++++++++++\n stgit/lib/transaction.py      |  195 +++++++++++++++++++++\n stgit/main.py                 |   10 +-\n stgit/run.py                  |    3 +\n stgit/stack.py                |  156 ++++-------------\n stgit/utils.py                |   24 +++\n t/t0002-status.sh             |   15 +-\n t/t1200-push-modified.sh      |    2 +-\n t/t1202-push-undo.sh          |    6 +-\n t/t1203-push-conflict.sh      |   70 ++++++++\n t/t1204-pop-keep.sh           |    2 +-\n t/t1205-push-subdir.sh        |    8 +-\n t/t1300-uncommit.sh           |    4 +-\n t/t1301-repair.sh             |    2 +-\n t/t1400-patch-history.sh      |    4 +-\n t/t1500-float.sh              |   14 +-\n t/t1600-delete-one.sh         |   12 +-\n t/t1601-delete-many.sh        |    2 +-\n t/t1700-goto-top.sh           |    2 +-\n t/t2000-sync.sh               |   12 +-\n t/t2100-pull-policy-fetch.sh  |    4 +-\n t/t2101-pull-policy-pull.sh   |    4 +-\n t/t2102-pull-policy-rebase.sh |    4 +-\n t/t2300-refresh-subdir.sh     |    2 +-\n t/t2600-coalesce.sh           |   31 ++++\n 51 files changed, 1393 insertions(+), 814 deletions(-)\n delete mode 100644 Documentation/stg-cp.txt\n delete mode 100644 stgit/commands/add.py\n create mode 100644 stgit/commands/coalesce.py\n delete mode 100644 stgit/commands/copy.py\n delete mode 100644 stgit/commands/resolved.py\n delete mode 100644 stgit/commands/rm.py\n create mode 100644 stgit/lib/__init__.py\n create mode 100644 stgit/lib/git.py\n create mode 100644 stgit/lib/stack.py\n create mode 100644 stgit/lib/stackupgrade.py\n create mode 100644 stgit/lib/transaction.py\n create mode 100755 t/t1203-push-conflict.sh\n create mode 100755 t/t2600-coalesce.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"}]}