{"thread":{"id":"14469","subject":"StGit: kha/{stable,safe,experimental} updated","startedAt":"2008-07-15T19:58:36Z","lastAt":"2008-07-15T19:58:36Z","messageCount":1,"participants":["Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"83426","messageId":"20080715195836.GA24378@diana.vm.bytemark.co.uk","threadId":"14469","inReplyTo":null,"subject":"StGit: kha/{stable,safe,experimental} updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-07-15T19:58:36Z","receivedAt":"2008-07-15T19:58:36Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"It's been a while since I sent one of these updates.\n\nCatalin, you probably want to pull stable and safe, to get Miklos's\nsetup.py fixes (I backported them to stable, and then merged back to\nthe main branch). (The stable branch has a handful of fixes since\n0.14.3; it might be time for 0.14.4?)\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\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.py |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\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\nKarl Hasselström (1):\n      Merge branch 'stable'\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.py |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\n\n                                 -+-\n\n\nThe following changes since commit d8461a9dfb9a34e582019de5a67798fad44f42c7:\n  Karl Hasselström (1):\n        Merge branch 'stable'\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git experimental\n\nKarl Hasselström (21):\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      Write to a stack log when stack is modified\n      Add utility function for reordering patches\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             |  348 +++++++++++++++++++++++-----\n stgit/lib/log.py             |  537 ++++++++++++++++++++++++++++++++++++++++++\n stgit/lib/stack.py           |   25 ++\n stgit/lib/transaction.py     |  139 ++++++++---\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/t3100-reset.sh             |  151 ++++++++++++\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 58 files changed, 2179 insertions(+), 660 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"}]}