{"thread":{"id":"13094","subject":"StGit: kha/{stable,safe,experimental} updated","startedAt":"2008-04-13T19:11:40Z","lastAt":"2008-04-15T00:26:13Z","messageCount":6,"participants":["Karl Hasselström","Samuel Tardieu"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"74264","messageId":"20080413191140.GA1912@diana.vm.bytemark.co.uk","threadId":"13094","inReplyTo":null,"subject":"StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-04-13T19:11:40Z","receivedAt":"2008-04-13T19:11:40Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"I've rebased my branches on top of Catalin's latest master and stable.\nThey include all the patches I've sent to the list recently.\n\nI've added a \"stable\" branch, for patches intended for Catalin's\n\"stable\".\n\nIn the experimental branch, I've updated the reset command a bit -- it\nshould now be quite usable. Bug reports and feature requests and\ngeneral comments welcome. (Note to those who already run my\nexperimental branch: I've changed the stack log format, so you'll have\nto nuke your <branchname>.stgit branches. StGit will remind you if you\nforget.)\n\n\n                                 -+-\n\n\nThe following changes since commit bd3f01319a03fc883d391f24639176f0f65727e5:\n  Catalin Marinas (1):\n        Release 0.14.2\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git stable\n\nKarl Hasselström (1):\n      Fix problems in t1000-branch-create\n\n t/t1000-branch-create.sh |   56 +++++++++++++++++++++++++++++----------------\n 1 files changed, 36 insertions(+), 20 deletions(-)\n\n\n                                 -+-\n\n\nThe following changes since commit 719309aa54c8fa43bd8700f09b1e293923ed4e0a:\n  Catalin Marinas (1):\n        Merge branch 'stable'\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git safe\n\nKarl Hasselström (5):\n      Fix problems in t1000-branch-create\n      Merge branch 'stable' into stable-master-merge\n      Don't both change directory and set GIT_WORK_TREE\n      Log environment and cwd as well as the actual command\n      emacs mode: handle \"stg status\" output with #\n\n contrib/stgit.el         |    2 +-\n stgit/lib/git.py         |   14 +++++++----\n stgit/run.py             |    6 +++++\n t/t1000-branch-create.sh |   56 +++++++++++++++++++++++++++++----------------\n 4 files changed, 52 insertions(+), 26 deletions(-)\n\n\n                                 -+-\n\n\nThe following changes since commit 999dcbc241e377f8b39f0064dd8cc1670e667f18:\n  Karl Hasselström (1):\n        emacs mode: handle \"stg status\" output with #\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git experimental\n\nKarl Hasselström (12):\n      Disable patchlog test for \"stg new\"\n      Convert \"stg new\" to the new infrastructure\n      Refactor --author/--committer options\n      Let \"stg new\" support more message options\n      Emacs mode: use \"stg new --file\"\n      Convert \"stg delete\" to the new infrastructure\n      Emacs mode: delete patches\n      Add property with a list of all patch names\n      Library functions for tree and blob manipulation\n      Write to a stack log when stack is modified\n      Add utility function for reordering patches\n      New command: stg reset\n\n contrib/stgit.el           |   33 +++++++---\n stgit/commands/branch.py   |   18 ++++--\n stgit/commands/clone.py    |    3 +-\n stgit/commands/coalesce.py |    3 +-\n stgit/commands/commit.py   |    6 +-\n stgit/commands/common.py   |   33 +++-------\n stgit/commands/delete.py   |   70 ++++++---------------\n stgit/commands/edit.py     |   26 +-------\n stgit/commands/float.py    |    3 +\n stgit/commands/fold.py     |    3 +-\n stgit/commands/imprt.py    |    3 +-\n stgit/commands/init.py     |    3 +-\n stgit/commands/new.py      |   97 ++++++++++++++++-------------\n stgit/commands/pick.py     |    4 +-\n stgit/commands/pop.py      |    3 +-\n stgit/commands/pull.py     |    3 +-\n stgit/commands/push.py     |    6 +-\n stgit/commands/rebase.py   |    4 +-\n stgit/commands/refresh.py  |    4 +-\n stgit/commands/rename.py   |    4 +-\n stgit/commands/reset.py    |   67 ++++++++++++++++++++\n stgit/commands/resolved.py |    4 +-\n stgit/commands/sink.py     |    3 +-\n stgit/commands/sync.py     |    5 +-\n stgit/commands/uncommit.py |    2 +-\n stgit/lib/git.py           |  147 ++++++++++++++++++++++++++++++++++++--------\n stgit/lib/log.py           |  130 ++++++++++++++++++++++++++++++++++++++\n stgit/lib/stack.py         |    1 +\n stgit/lib/transaction.py   |   17 +++++-\n stgit/main.py              |    2 +\n stgit/utils.py             |   50 +++++++++++++++\n t/t1400-patch-history.sh   |    2 -\n t/t1600-delete-one.sh      |    8 +-\n 33 files changed, 559 insertions(+), 208 deletions(-)\n create mode 100644 stgit/commands/reset.py\n create mode 100644 stgit/lib/log.py\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"74314","messageId":"2008-04-14-08-44-30+trackit+sam@rfc1149.net","threadId":"13094","inReplyTo":"20080413191140.GA1912@diana.vm.bytemark.co.uk","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Samuel Tardieu","fromEmail":"sam@rfc1149.net","sentAt":"2008-04-14T06:44:29Z","receivedAt":"2008-04-14T06:44:29Z","isPatch":false,"sender":{"key":"sam@rfc1149.net","avatar":"https://avatars.githubusercontent.com/u/44656?v=4"},"body":">>>>> \"Karl\" == Karl Hasselström <kha@treskal.com> writes:\n\nKarl> In the experimental branch, I've updated the reset command a bit\nKarl> -- it should now be quite usable. Bug reports and feature\nKarl> requests and general comments welcome. (Note to those who\nKarl> already run my experimental branch: I've changed the stack log\nKarl> format, so you'll have to nuke your <branchname>.stgit\nKarl> branches. StGit will remind you if you forget.)\n\nKarl,\n\nI was using the StGit in Debian/unstable and just switched to your\nexperimental branch.\n\nWhen doing \"stg pull\", I get, at the end:\n\nPushing patch \"pr20822\" ... done\nPushing patch \"pr22387\" ... done\nPushing patch \"pr30614\" ... done\nError: Unhandled exception:\nTraceback (most recent call last):\n  File \"/usr/local/lib/python2.4/site-packages/stgit/main.py\", line\n  280, in main\n    ret = command.func(parser, options, args)\n  File\n  \"/usr/local/lib/python2.4/site-packages/stgit/commands/pull.py\",\n  line 109, in func\n    log.log_entry(log.default_stack(), 'stg pull')\n  File \"/usr/local/lib/python2.4/site-packages/stgit/lib/log.py\", line\n  45, in log_entry\n    stack.repository.refs.get(ref))]\n  File \"/usr/local/lib/python2.4/site-packages/stgit/lib/log.py\", line\n  94, in __init__\n    self.unapplied, patches = pl('unapplied')\n  File \"/usr/local/lib/python2.4/site-packages/stgit/lib/log.py\", line\n  89, in pl\n    return ([pn for sha1, pn in patches],\nValueError: need more than 0 values to unpack\n\nNote that I have no unapplied patch in case it matters, only hidden\nones (and applied ones of course).\n"},{"id":"74322","messageId":"20080414070348.GA9135@diana.vm.bytemark.co.uk","threadId":"13094","inReplyTo":"2008-04-14-08-44-30+trackit+sam@rfc1149.net","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-04-14T07:03:48Z","receivedAt":"2008-04-14T07:03:48Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-04-14 08:44:29 +0200, Samuel Tardieu wrote:\n\n> I was using the StGit in Debian/unstable and just switched to your\n> experimental branch.\n>\n> When doing \"stg pull\", I get, at the end:\n>\n> Pushing patch \"pr20822\" ... done\n> Pushing patch \"pr22387\" ... done\n> Pushing patch \"pr30614\" ... done\n> Error: Unhandled exception:\n> Traceback (most recent call last):\n>   File \"/usr/local/lib/python2.4/site-packages/stgit/main.py\", line\n>   280, in main\n>     ret = command.func(parser, options, args)\n>   File\n>   \"/usr/local/lib/python2.4/site-packages/stgit/commands/pull.py\",\n>   line 109, in func\n>     log.log_entry(log.default_stack(), 'stg pull')\n>   File \"/usr/local/lib/python2.4/site-packages/stgit/lib/log.py\", line\n>   45, in log_entry\n>     stack.repository.refs.get(ref))]\n>   File \"/usr/local/lib/python2.4/site-packages/stgit/lib/log.py\", line\n>   94, in __init__\n>     self.unapplied, patches = pl('unapplied')\n>   File \"/usr/local/lib/python2.4/site-packages/stgit/lib/log.py\", line\n>   89, in pl\n>     return ([pn for sha1, pn in patches],\n> ValueError: need more than 0 values to unpack\n\nEuh! Thanks for the report, I'll look into it tonight after work.\n\n> Note that I have no unapplied patch in case it matters, only hidden\n> ones (and applied ones of course).\n\nYeah, that might be a clue. Though I was under the impression that I'd\ntested it with a fully applied stack ... I guess the test suite needs\nan addition or two.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"74337","messageId":"20080414081139.GB9135@diana.vm.bytemark.co.uk","threadId":"13094","inReplyTo":"20080414070348.GA9135@diana.vm.bytemark.co.uk","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-04-14T08:11:39Z","receivedAt":"2008-04-14T08:11:39Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-04-14 09:03:48 +0200, Karl Hasselström wrote:\n\n> Though I was under the impression that I'd tested it with a fully\n> applied stack ... I guess the test suite needs an addition or two.\n\nThe real proble turned out to be a certain developer who remembers\nrunning the test suite before pushing out his branches, even though no\nsuch thing occurred. Ahem.\n\nThis fixes the bug for me; I'll be squashing it into one of the other\npatches tonight. Sorry for the breakage.\n\ndiff --git a/stgit/lib/log.py b/stgit/lib/log.py\nindex 083a546..1830cbd 100644\n--- a/stgit/lib/log.py\n+++ b/stgit/lib/log.py\n@@ -84,7 +84,7 @@ class Log(object):\n         def pl(name):\n             patches = [x.split() for x in\n                        self.commit.data.tree.data.entries[name][1]\n-                       .data.str.strip().split('\\n')]\n+                       .data.str.strip().split('\\n') if x]\n             # TODO: handle case where we don't have the commit object.\n             return ([pn for sha1, pn in patches],\n                     dict((pn, repo.get_commit(sha1)) for sha1, pn in patches))\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"74378","messageId":"20080414200814.GA21039@diana.vm.bytemark.co.uk","threadId":"13094","inReplyTo":"20080414081139.GB9135@diana.vm.bytemark.co.uk","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-04-14T20:08:14Z","receivedAt":"2008-04-14T20:08:14Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-04-14 10:11:39 +0200, Karl Hasselström wrote:\n\n> This fixes the bug for me; I'll be squashing it into one of the\n> other patches tonight. Sorry for the breakage.\n\nDone, and pushed out.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"74393","messageId":"20080415002613.GA24093@diana.vm.bytemark.co.uk","threadId":"13094","inReplyTo":"20080413191140.GA1912@diana.vm.bytemark.co.uk","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-04-15T00:26:13Z","receivedAt":"2008-04-15T00:26:13Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-04-13 21:11:40 +0200, Karl Hasselström wrote:\n\n> I've rebased my branches on top of Catalin's latest master and\n> stable. They include all the patches I've sent to the list recently.\n\nUpdated again with the newest stuff. No shortlog since it's hardly\nchanged since last post. Get it here:\n\n  git://repo.or.cz/stgit/kha.git stable\n  git://repo.or.cz/stgit/kha.git safe\n  git://repo.or.cz/stgit/kha.git experimental\n\nAnd this time I made _sure_ to run the test suite.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"}]}