{"thread":{"id":"14667","subject":"StGit: kha/{stable,safe,experimental} updated","startedAt":"2008-07-25T01:39:36Z","lastAt":"2008-08-06T10:18:13Z","messageCount":5,"participants":["Karl Hasselström","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"84826","messageId":"20080725013936.GA20959@diana.vm.bytemark.co.uk","threadId":"14667","inReplyTo":null,"subject":"StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-07-25T01:39:36Z","receivedAt":"2008-07-25T01:39:36Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"The big update since last time is support (in kha/experimental) for\nhidden patches in the new-infrastructure commands and stack log.\n\nUnless more problems are uncovered, I'll soon move all patches in\nexperimental to safe (which means I'll be recommending that Catalin\nmerge them).\n\n\n -+-\n\n\nThe following changes since commit a6c4be12abcf0906a63de8a72c887c360f89ea82:\n Karl Hasselström (1):\n Don't allow extra diff options with \"stg status\"\n\nare available in the git repository at:\n\n git://repo.or.cz/stgit/kha.git stable\n\nDaniel White (1):\n Fixed default install location\n\nKarl Hasselström (1):\n Test that we can add a new file to a non-topmost patch with refresh -p\n\nMiklos Vajna (2):\n setup.py: don't try to import stgit.run before the python version check\n setup.py: fix error message when running with python-2.3\n\n setup.cfg | 2 +-\n setup.py | 4 ++--\n t/t2701-refresh-p.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 49 insertions(+), 3 deletions(-)\n create mode 100755 t/t2701-refresh-p.sh\n\n\n -+-\n\n\nThe following changes since commit 2e37b61d886ef21200007b57f496aaf182f42705:\n Karl Hasselström (1):\n Test for \"stg edit\"\n\nare available in the git repository at:\n\n git://repo.or.cz/stgit/kha.git safe\n\nDaniel White (1):\n Fixed default install location\n\nKarl Hasselström (19):\n Test that we can add a new file to a non-topmost patch with refresh -p\n Merge branch 'stable'\n Test for exit code with command_error()\n stg uncommit should never touch the branch head\n Make sure that stg uncommit doesn't touch the branch head\n Fix uncommit status message\n Discard stderr output from git apply if the caller wants\n Do simple in-index merge with diff+apply instead of read-tree\n Reuse the same temp index in a transaction\n Library functions for tree and blob manipulation\n Teach stgit.lib.transaction about hidden patches\n Test operations on hidden patches\n stg goto: Handle hidden patches more gracefully\n Add utility function for reordering patches\n Add some performance testing scripts\n Log subprocess activity to a file\n Show full command in subprocess profiling\n Log subprocess calls during performance testing\n Global performance logging\n\nMiklos Vajna (2):\n setup.py: don't try to import stgit.run before the python version check\n setup.py: fix error message when running with python-2.3\n\n perf/.gitignore | 2 +\n perf/create_synthetic_repo.py | 61 +++++++++\n perf/find_patchbomb.py | 31 +++++\n perf/perftest.py | 96 ++++++++++++++\n perf/setup.sh | 52 ++++++++\n setup.cfg | 2 +-\n setup.py | 4 +-\n stgit/commands/edit.py | 2 +-\n stgit/commands/goto.py | 2 +\n stgit/commands/uncommit.py | 6 +-\n stgit/lib/git.py | 274 +++++++++++++++++++++++++++++++++--------\n stgit/lib/transaction.py | 61 +++++++--\n stgit/main.py | 10 ++-\n stgit/out.py | 11 +-\n stgit/run.py | 59 +++++++--\n t/t1206-push-hidden.sh | 28 ++++\n t/t1300-uncommit.sh | 13 ++-\n t/t1303-commit.sh | 20 +++\n t/t1701-goto-hidden.sh | 23 ++++\n t/t2701-refresh-p.sh | 46 +++++++\n t/t2900-rename.sh | 7 +\n t/t3300-edit.sh | 16 ++-\n 22 files changed, 731 insertions(+), 95 deletions(-)\n create mode 100644 perf/.gitignore\n create mode 100644 perf/create_synthetic_repo.py\n create mode 100644 perf/find_patchbomb.py\n create mode 100644 perf/perftest.py\n create mode 100644 perf/setup.sh\n create mode 100755 t/t1206-push-hidden.sh\n create mode 100755 t/t1303-commit.sh\n create mode 100755 t/t1701-goto-hidden.sh\n create mode 100755 t/t2701-refresh-p.sh\n\n\n -+-\n\n\nThe following changes since commit 36a06e0194e013552499677e431e528ecb2faee9:\n Karl Hasselström (1):\n Global performance logging\n\nare available in the git repository at:\n\n git://repo.or.cz/stgit/kha.git experimental\n\nKarl Hasselström (16):\n Write to a stack log when stack is modified\n New command: stg reset\n Log conflicts separately\n Log conflicts separately for all commands\n Add a --hard flag to stg reset\n Don't write a log entry if there were no changes\n Move stack reset function to a shared location\n New command: stg undo\n New command: stg redo\n Log and undo external modifications\n Make \"stg log\" show stack log instead of patch log\n Convert \"stg refresh\" to the new infrastructure\n New refresh tests\n Remove --undo flags from stg commands and docs\n Refactor stgit.commands.edit\n Implement \"stg refresh --edit\" again\n\n Documentation/tutorial.txt | 4 +-\n TODO | 2 -\n stgit/commands/branch.py | 19 +-\n stgit/commands/clone.py | 2 +-\n stgit/commands/coalesce.py | 2 +-\n stgit/commands/common.py | 18 ++-\n stgit/commands/diff.py | 6 +-\n stgit/commands/edit.py | 82 +------\n stgit/commands/export.py | 2 +-\n stgit/commands/files.py | 6 +-\n stgit/commands/float.py | 2 +-\n stgit/commands/fold.py | 2 +-\n stgit/commands/goto.py | 3 +-\n stgit/commands/hide.py | 2 +-\n stgit/commands/id.py | 2 +-\n stgit/commands/imprt.py | 4 +-\n stgit/commands/log.py | 169 +++++----------\n stgit/commands/mail.py | 8 +-\n stgit/commands/new.py | 3 +-\n stgit/commands/patches.py | 2 +-\n stgit/commands/pick.py | 2 +-\n stgit/commands/pop.py | 4 +-\n stgit/commands/pull.py | 2 +-\n stgit/commands/push.py | 31 +--\n stgit/commands/rebase.py | 4 +-\n stgit/commands/redo.py | 52 ++++\n stgit/commands/refresh.py | 338 ++++++++++++++++++---------\n stgit/commands/rename.py | 2 +-\n stgit/commands/repair.py | 11 +-\n stgit/commands/reset.py | 57 +++++\n stgit/commands/resolved.py | 2 +-\n stgit/commands/show.py | 2 +-\n stgit/commands/sink.py | 2 +-\n stgit/commands/status.py | 3 +-\n stgit/commands/sync.py | 26 +--\n stgit/commands/undo.py | 49 ++++\n stgit/commands/unhide.py | 2 +-\n stgit/git.py | 4 -\n stgit/lib/edit.py | 99 ++++++++\n stgit/lib/git.py | 74 ++++++-\n stgit/lib/log.py | 524 ++++++++++++++++++++++++++++++++++++++++++\n stgit/lib/stack.py | 25 ++\n stgit/lib/transaction.py | 125 +++++++----\n stgit/main.py | 8 +\n stgit/stack.py | 45 +----\n stgit/utils.py | 18 +-\n t/t1200-push-modified.sh | 2 +-\n t/t1201-pull-trailing.sh | 2 +-\n t/t1202-push-undo.sh | 8 +-\n t/t1400-patch-history.sh | 103 --------\n t/t2300-refresh-subdir.sh | 29 +++-\n t/t2701-refresh-p.sh | 2 +-\n t/t3100-reset.sh | 160 +++++++++++++\n t/t3101-reset-hard.sh | 56 +++++\n t/t3102-undo.sh | 86 +++++++\n t/t3103-undo-hard.sh | 56 +++++\n t/t3104-redo.sh | 122 ++++++++++\n t/t3105-undo-external-mod.sh | 68 ++++++\n t/t3300-edit.sh | 4 +-\n 59 files changed, 1936 insertions(+), 613 deletions(-)\n create mode 100644 stgit/commands/redo.py\n create mode 100644 stgit/commands/reset.py\n create mode 100644 stgit/commands/undo.py\n create mode 100644 stgit/lib/edit.py\n create mode 100644 stgit/lib/log.py\n delete mode 100755 t/t1400-patch-history.sh\n create mode 100755 t/t3100-reset.sh\n create mode 100755 t/t3101-reset-hard.sh\n create mode 100755 t/t3102-undo.sh\n create mode 100755 t/t3103-undo-hard.sh\n create mode 100755 t/t3104-redo.sh\n create mode 100755 t/t3105-undo-external-mod.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"},{"id":"85159","messageId":"b0943d9e0807270144n359e5bd3ye3e91c52b8fa7beb@mail.gmail.com","threadId":"14667","inReplyTo":"20080725013936.GA20959@diana.vm.bytemark.co.uk","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2008-07-27T08:44:31Z","receivedAt":"2008-07-27T08:44:31Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2008/7/25 Karl Hasselström :\n> The big update since last time is support (in kha/experimental) for\n> hidden patches in the new-infrastructure commands and stack log.\n>\n> Unless more problems are uncovered, I'll soon move all patches in\n> experimental to safe (which means I'll be recommending that Catalin\n> merge them).\n\nI'll have a look at the new stack log format (my main worry) this week\nbut the other patches look OK.\n\nI merged the safe and stable branches.\n\nThanks.\n\n-- \nCatalin\n"},{"id":"85883","messageId":"20080801102208.GA29413@diana.vm.bytemark.co.uk","threadId":"14667","inReplyTo":"b0943d9e0807270144n359e5bd3ye3e91c52b8fa7beb@mail.gmail.com","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-08-01T10:22:08Z","receivedAt":"2008-08-01T10:22:08Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-07-27 09:44:31 +0100, Catalin Marinas wrote:\n\n> 2008/7/25 Karl Hasselström :\n>\n> > The big update since last time is support (in kha/experimental) for\n> > hidden patches in the new-infrastructure commands and stack log.\n> \n> I'll have a look at the new stack log format (my main worry) this\n> week but the other patches look OK.\n\nHeh. It's _always_ your main worry. But rightly so, since mistakes\ncould be costly. Thanks for spending time on this with me.\n\nI made one change apart from adding the hidden patches: use the same\ntree for both the full and simplified logs. It's no more costly to\nwrite, and made the parsing substantially simpler.\n\n> I merged the safe and stable branches.\n\nThanks.\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"},{"id":"86297","messageId":"b0943d9e0808051433i667f6a05iff1a5220e37602e7@mail.gmail.com","threadId":"14667","inReplyTo":"20080801102208.GA29413@diana.vm.bytemark.co.uk","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2008-08-05T21:33:57Z","receivedAt":"2008-08-05T21:33:57Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2008/8/1 Karl Hasselström :\n> On 2008-07-27 09:44:31 +0100, Catalin Marinas wrote:\n>\n>> 2008/7/25 Karl Hasselström :\n>>\n>> > The big update since last time is support (in kha/experimental) for\n>> > hidden patches in the new-infrastructure commands and stack log.\n>>\n>> I'll have a look at the new stack log format (my main worry) this\n>> week but the other patches look OK.\n>\n> Heh. It's _always_ your main worry. But rightly so, since mistakes\n> could be costly. Thanks for spending time on this with me.\n\nI'm usually worried about performance but will give it a try with a\nLinux kernel and real patches. Have you done any tests to compare it\nwith my master branch?\n\nWould we even need to prune the stack history? It might get pretty\nlarge after about 1-2 years of usage.\n\n-- \nCatalin\n"},{"id":"86330","messageId":"20080806101813.GC18336@diana.vm.bytemark.co.uk","threadId":"14667","inReplyTo":"b0943d9e0808051433i667f6a05iff1a5220e37602e7@mail.gmail.com","subject":"Re: StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-08-06T10:18:13Z","receivedAt":"2008-08-06T10:18:13Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-08-05 22:33:57 +0100, Catalin Marinas wrote:\n\n> 2008/8/1 Karl Hasselström :\n>\n> > Heh. It's _always_ your main worry. But rightly so, since mistakes\n> > could be costly. Thanks for spending time on this with me.\n>\n> I'm usually worried about performance but will give it a try with a\n> Linux kernel and real patches. Have you done any tests to compare it\n> with my master branch?\n\nYes. I posted the benchmark results a while back -- as I recall, the\nperformance was about the same for large uncommit and rebase\noperations.\n\nAlso, I'm currently investigating some possible optimizations. Will\npost new bechmarks afterwards, if I get something working.\n\n> Would we even need to prune the stack history? It might get pretty\n> large after about 1-2 years of usage.\n\nYes, it's growing without bound, so eventually one would have to prune\nit.\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"}]}