{"thread":{"id":"21346","subject":"[ANNOUNCE] Stacked Git 0.15","startedAt":"2009-10-24T22:41:22Z","lastAt":"2009-11-02T10:05:31Z","messageCount":7,"participants":["Catalin Marinas","Jakub Narebski","Karl Wiberg","Felipe Contreras"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"125862","messageId":"b0943d9e0910241541n7b1091ecp6b21fa896405afa0@mail.gmail.com","threadId":"21346","inReplyTo":null,"subject":"[ANNOUNCE] Stacked Git 0.15","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2009-10-24T22:41:22Z","receivedAt":"2009-10-24T22:41:22Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"StGit is a Python application providing functionality similar to Quilt\n(i.e. pushing/popping patches to/from a stack) on top of Git. These\noperations are performed using Git commands, and the patches are\nstored as Git commit objects, allowing easy merging of the StGit\npatches into other repositories using standard Git functionality.\n\n  Download:         http://download.gna.org/stgit/stgit-0.15.tar.gz\n  Main repository:  git://repo.or.cz/stgit.git\n  Project homepage: http://www.procode.org/stgit/\n  Mailing list:     git@vger.kernel.org (please use \"StGit\" in the subject)\n  Bug tracker:      https://gna.org/bugs/?group=stgit\n\nThe main changes since release 0.14.3 are\n\n  - New core infrastructure for repository operations, including\n\n      + Infinite undo/redo operations and corresponding commands.\n\n      + Automatic rollback of changes following a failed operation\n        (using transactions)---this ensures that StGit commands either\n        succeed or do nothing. Previously, every commands had its own\n        ad hoc implementation of this.\n\n  - Some commands were added, including\n\n      + \"stg squash\", for combining two or more patches into one.\n\n      + \"stg publish\", for maintaining merge-friendly branches (which\n        are not rebased).\n\n      + \"stg prev/next\" for printing the name of the previous or next\n        patch in the series.\n\n  - The commands \"stg add\", \"stg rm\", \"stg cp\", and \"stg resolved\"\n    were removed, since there are corresponding Git equivalents.\n\n  - The \"stg import\" and \"stg fold\" commands support the \"-p N\" option\n    for stripping leading slashes from diff paths.\n\n  - The \"stg import\" and \"stg fold\" commands support the \"--reject\"\n    option for leaving rejected hunks in corresponding *.rej files.\n\n  - New patch identification syntax: <branch>:<patch> (see\n    documentation for the \"stg id\" command).\n\n  - Autosigning of imported patches when \"sign.autosign\" configuration\n    option is set.\n\n  - A powerful Emacs mode for StGit was added to the \"contrib\"\n    directory. It displays the patch stack in an Emacs buffer, and can\n    handle all common StGit tasks.\n\n  - Improved bash tab-completion, automatically generated from the stg\n    command definitions.\n\n  - Man pages and an improved tutorial.\n\nSpecial thanks go to Karl Wiberg for the hard work done on the new\nStGit features, to Catalin Marinas for many new features and bugfixes,\nand to David Kågedal and Gustav Hållberg for the Emacs mode.\n\n\nCredits:\n\nKarl Wiberg (192):\n      Let parse_patch take a string instead of a file parameter\n      Make generic --message/--file/--save-template flags\n      Name the exit codes to improve legibility\n      Emacs mode: Show keybindings when user presses \"h\" or \"?\"\n      Emacs mode: Add an explanatory header\n      Emacs mode: Makefile for building stgit.el\n      Emacs mode: push/pop next patch, not patch at point\n      Emacs mode: Let \"P\" push or pop patch at point\n      Emacs mode: Bind \"G\" to \"stg goto\"\n      Emacs mode: show patches' short description\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      Remove \"stg add\"\n      Remove \"stg rm\"\n      Remove \"stg cp\"\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      Expose transaction abort function\n      stg coalesce: Support --file and --save-template\n      Set exit code to 3 on merge conflict\n      Convert \"stg commit\" to new infrastructure\n      Make \"stg commit\" fancier\n      Test that \"stg goto\" can be called from a subdirectory\n      Make \"stg goto\" subdirectory safe\n      Don't keep old committer when rewriting a commit\n      Homogenize buffer names\n      Remove unused default values\n      Refactor --diff-opts handling\n      Create index and worktree objects just once\n      Wrap excessively long line\n      Eliminate temp variable that's used just once\n      Simplify editor selection logic\n      Let the caller supply the diff text to diffstat()\n      Don't clean away patches with conflicts\n      Don't check out files if we don't have index+workdir\n      Make documentation less confusing\n      Reduce number of backslashes by using raw strings\n      Let \"stg show\" use the unified --diff-opts handling\n      Read default diff options from the user's config\n      Teach new infrastructure about the default author and committer\n      Teach new infrastructure to apply patches\n      Teach new infrastructure to diff two trees\n      Parse the date instead of treating it as an opaque string\n      Convert \"stg edit\" to the new infrastructure\n      Emacs mode: It's possible to edit unapplied patches now\n      Remove unused data field\n      Emacs mode: change \"stg repair\" binding\n      Use a special exit code for bugs\n      Make sure patches with no parents have an empty list of parents\n      Try uncommitting a commit with not exactly one parent\n      Make sure that we only uncommit commits with exactly one parent\n      New test: conflicting push in dirty worktree\n      Handle failed pushes differently depending on cause\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      If a patch is not changed when pushing, reuse the same commit object\n      Handle commandline parsing errors gracefully\n      Use hardcoded author and committer names in tests\n      Steal more test-lib.sh updates from git\n      Get rid of backticks in test-lib.sh\n      Use test_cmp instead of diff -u in the test suite\n      Remove \"stg\" from start of log messages\n      Import version to a separate namespace\n      Better StGit version tracking\n      Emacs mode: automatically cd up to root of worktree\n      Try the built-in version string before git-describe\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      Prevent most commands from running when there are conflicts\n      Add property with a list of all patch names\n      Merge branch 'stable' into stable-master-merge\n      Wrap the text of error messages\n      Some API documentation for the new infrastructure\n      Fix typo\n      Try \"stg sink\" without applied patches\n      Fix \"stg sink\" with no applied patches (bug 11887)\n      Merge branch 'stable' into stable-master-merge\n      Test \"stg status\" with renames\n      Don't allow extra diff options with \"stg status\"\n      Merge branch 'stable'\n      Test \"stg status\" with -M in stgit.diff-opts\n      Test for specific exit code\n      Test for \"stg edit\"\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      Add some tests of refreshing removed files\n      Fix some remaining old-style stg id calls\n      Don't use the dashed for of git commands\n      Merge branch 'stable'\n      Remove unneeded import\n      Refactoring: move shared options to their own module\n      Auto-generate man pages for all StGit commands\n      asciidoc.conf: Steal updates from git\n      Generate command lists automatically\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      Test that stg coalesce handles head != top gracefully\n      Check for top == head at the start of every transaction\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      Invoke the correct interactive editor\n      Implement \"stg refresh --edit\" again\n      Automatic bash completion\n      Untabify\n      Add myself to the AUTHORS file\n      Remove misleading \"stg delete\" documentation\n      Add a new flag, --spill, to stg delete\n      Test the new stg delete --spill flag\n      Fix typo\n      Merge branch 'stable'\n      Remove unused variable\n      Remove TODO items that have already been addressed\n      We're half-way there with the separate indexes\n      Add 1.0 TODO items from recent discussion by private mail\n      Refresh the main stg man page\n      Refresh and expand the tutorial (not finished)\n      Tutorial: Talk about conflicts when introducing StGit\n      Tutorial: Explain diffs a little bit better\n      Tutorial: Cover \"stg mail\"\n      Tutorial: Write about rebasing\n      Tutorial: Importing patches\n      stg series: Explain the list format better\n      stg files: Don't write just an empty line\n      Steal Documentation/SubmittingPatches from Git\n      SubmittingPatches: adapt to StGit\n      Return None instead of crashing on undefined integer config items\n      Merge branch 'stable'\n      Rename \"stg coalesce\" to \"stg squash\"\n      stg squash: Improve documentation\n      Documentation: Ignore generated .xml files\n      Documentation: Rename link macros\n      Newer gits return 128 when git config --{rename,remove}-section fails\n      Transaction.push_patch(): Set self.head only when we have a merge conflict\n      Pass \"git config\" flags in the right order\n      Karl got married\n      t2800: Adapt to changes in git's conflict markers\n      Work around performance bug in subprocess.Popen.communicate()\n      Merge branch 'proposed' of git://github.com/gustavh/stgit\n      Release notes: Turn the 0.15-rc1 release notes into 0.15 release notes\n      Release notes: Reformat for better legibility, and update\n      Documentation: Rename remaining link macros\n      Tutorial: Use the new StGit repo URL in clone example\n      When reading a config value, pick the last value, not the first\n      squash: Make commit message editing more convenient\n\nCatalin Marinas (131):\n      Re-add the interactive merge\n      Don't assume there is always a stage 2 in git.get_conflicts\n      Remove multiple stages returned by git.ls_files\n      Remove unused git functions like add, rm, copy\n      Remove a newline from the e-mail template\n      Don't set the default authdate if none specified\n      Allow pick to import multiple patches\n      Check for unnecessary push/pop in 'float'\n      Allow the synchronisation of the unapplied patches\n      Modify 'series' to use '#' instead of '|'\n      Set umask to 0022 during the setup.py execution\n      Refuse to send empty patches\n      Add a boundary to parse_patches in pick.py\n      Fix sync to push the popped patches back after sync'ing\n      Remove the reordering side-effect of the latter sync changes\n      Allow picking of one commit id\n      Merge branch 'stable'\n      Merge branch 'stable'\n      Merge branch 'stable'\n      Merge branch 'stable'\n      Refactor the Commitdata class to CommitData\n      Rewrite the \"series\" command for the new infrastructure\n      Allow the Repository.get_stack() to get a default argument\n      Fix error in status.py when calling git.resolved\n      Convert \"top\" to the new infrastructure\n      Convert \"export\" to the new infrastructure\n      Merge branch 'stable'\n      Merge commit 'kha/safe'\n      Fix the parse_patches() function to work with tuples\n      Allow stack.patchorder.all to return hidden patches\n      Rename Repository.head to Repository.head_ref\n      Create a git.Branch class as ancestor of stack.Stack\n      Add stack creation and initialisation support to lib.Stack\n      Convert \"init\" to the new StGIT infrastructure\n      Add test_patches target to Makefile\n      Merge branch 'stable'\n      Fix export error introduced by recent convertion\n      Allow e-mails to be sent with the Unix sendmail tool\n      Implement a new patch identification scheme and id command\n      Convert git_id() to the new id format\n      Remove the applied/unapplied commands\n      Remove the duplicate utils.strip_leading function\n      Fix the importing of config in series.py\n      Fix import to work properly in subdirectories\n      Merge branch 'stable'\n      Do not crash if a patch log ref is missing\n      Autosign newly created patches\n      Fix the sink command for various test cases\n      Merge branch 'stable'\n      Use --diff rather than --patch in log.py\n      Fix \"show\" to allow multiple branch:patch arguments\n      Change e-mail user agent header to StGit\n      Add parse_patches boundary in the delete.py file\n      Remove the --committer options\n      Remove e-mail address duplicates\n      Refresh of remove-e-mail-address-duplicat\n      Allow pick --fold to work without applied patches\n      Generate a different patch name if it already exists\n      Add 'pick' test script\n      Merge branch 'proposed'\n      Display (empty) when appropriate for the goto command\n      Fix the HEAD updating during a conflicting push (bug #12609)\n      s/GIT/Git/ in the README\n      Add \"tags\" target to Makefile\n      Do not append a new line to the backwards compat files (bug #12656)\n      Print conflict details with the new infrastructure (bug #11181)\n      Merge branch 'proposed'\n      Fix the patch argument parsing for the \"show\" command\n      Pass the diff flags when statistics are required\n      Merge branch 'stable'\n      Add --file option to pick\n      Check for local changes with \"goto\"\n      Add mergetool support to the classic StGit infrastructure\n      Add automatic git-mergetool invocation to the new infrastructure\n      Convert \"sink\" to the new infrastructure\n      Convert \"float\" to the lib infrastructure\n      Use a default \"hidden\" argument in StackTransaction.reorder_patches\n      Add the --merged option to goto\n      Convert \"pop\" to the lib infrastructure\n      Convert \"push\" to the lib infrastructure\n      Show \"Pushing <patch>...done\" when pushing a patch\n      Show some progress information when checking for upstream merges.\n      Do not sleep after the last patch sent by e-mail\n      Convert 'clone' to the use stgit.lib\n      Convert 'hide' to the lib infrastructure\n      Convert 'unhide' to the lib infrastructure\n      Reinstate the --annotate option for refresh\n      Add the log --clear option\n      Add support for merge-friendly branches\n      Add \"stg id\" support for \"{public}\" ref\n      Use the default git colouring scheme rather than specific scripts\n      Remove the resolved command\n      Improve the \"publish\" merge message to give slightly more information\n      Only allow publishing to refs/heads/*\n      Rename out.start() to out.inf() in the publish command\n      Add --reject option to import\n      Add --stat option to show\n      Do not replace '-' with '.' in the version string\n      Merge commit 'kha/safe'\n      Set the LESS environment if the pager is 'less'\n      Fix the import --url command\n      Merge commit 'kha/safe'\n      Handle multi-line Subject header better\n      Improve the description/diff splitting when parsing patches\n      Only get the first line from 'git describe --all'\n      Reverse commit 9876a650 - return the first line from git describe\n      Add release notes file\n      Add the next/prev commands to the RELEASENOTES file\n      Add stg-build, stg-dbg and RELEASENOTES to the MANIFEST.in file\n      Merge commit 'kha/safe'\n      Import git show output easily\n      Merge commit 'kha/safe'\n      Add import -p option\n      Preserve the given author date during import\n      Generate binary diffs by default\n      Remove the 'fail_dump' argument to git.apply_patch()\n      Add the --reject option to fold\n      Do not create an empty patch if import failed without --reject\n      Add the -p option to fold\n      Autosign imported patches\n      Allow importing of 'application/octet-stream' attachments\n      Allow 'stg diff ..<commit>'\n      Delete the hidden patches as well when deleting a branch\n      Fast-forward the published head when possible\n      Do not delete the builtin_version.py file after setup\n      Ignore the git-config exit code\n      Do not use stdout instead of stderr\n      Update the RELEASENOTES file with latest changes\n      The '--file' option for 'new' should show 'FILE' rather than 'MESSAGE'\n      Pick --revert option (formerly --reverse)\n      Slightly modify the \"publish\" command description\n\nGustav Hållberg (101):\n      stgit.el: Compact code for populating stgit-mode-map\n      stgit.el: Add 'q' for stgit-quit\n      stgit.el: Add 'm' as alias for stgit-mark\n      stgit.el: Add stgit-unmark-down\n      stgit.el: Fix some indentation\n      stgit.el: Add stgit-git-status\n      stgit.el: Fix working directory bug in stgit-new\n      stgit.el: Unify help text formatting\n      stgit.el: Add flag to signal errors in stgit-patch-at-point\n      stgit.el: Automatically update git-status buffer when necessary\n      stgit.el: Add support for showing which files are affected by a patch\n      stgit.el: Add an stgit customization group\n      stgit.el: Use 'git diff-stat' to show files in a patch\n      Add '--help' to tab completion for all commands\n      stg mail: Improve error message for unknown sender identity\n      stgit.el: Also show mode and type changes of files in patches\n      man pages: Bugfixed man pages for --sign and --ack flags; e.g.,\nfor stg-new\n      stgit.el: Make prefix argument to stgit-new add a Signed-off-by: line\n      stgit.el: Bugfix stgit-unmark-down on the last patch\n      stgit.el: Fix some too wide lines\n      stgit.el: Add some missing help texts\n      stgit.el: Canonicalize some error messages\n      stgit.el: Consistently use symbols rather than strings for patch names\n      stgit.el: Make single file diff buffer read-only\n      stgit.el: Include stat summary in patch diff\n      stgit.el: Add message when there are no patches in the series\n      stgit.el: Indicate empty patches\n      stgit.el: Minor beautification\n      stgit.el: Add optional count argument to stgit-commit\n      stgit.el: make stgit-delete with prefix argument spill patch\ncontents to index\n      stgit.el: Add \"B\" for stgit-branch\n      stgit.el: Manually draw/erase the mark in stgit-{add,remove}-mark\n      stgit.el: Clarify documentation of stgit-capture-output\n      stgit.el: Add \"M\" for stgit-move-patches\n      stgit.el: Run 'git show' with -M to detect renames when showing\nentire patch\n      stgit.el: Break out stgit-sort-patches to a separate function\nfor future reuse\n      stgit.el: Sort patches correctly before merging them in stgit-squash\n      stgit.el: Handle errors in first phase of stgit squash\n      stgit.el: Bind line movement keys in a sane way\n      stgit.el: Correct documentation for stgit-insert-patch-files\n      stgit.el: Remove unused variable stgit-work-ewoc\n      stgit.el: Refactor: remove unused argument to two functions\n      stgit.el: Run \"git rm\" with \"-q\" to reduce spam\n      stgit.el: Bugfix moving symlinks to/from index\n      stgit.el: Make stgit-{index,worktree}-node buffer local\n      stgit new: Do not open editor if --save-template was specified\n      stgit.el: Add stgit-branch-name-face\n      stgit.el: Move stgit-{un,}commit to \\C-c\\C-{u,c}\n      stgit.el: Add \"U\" for stgit-revert-file\n      stgit.el: Change key binding for stgit-repair from \"R\" to \"\\C-u g\"\n      stgit.el: Add \"R\" for stgit-resolve-file\n      stgit.el: Refresh from work tree when index is empty\n      stgit.el: Refactor: add stgit-find-copies-harder-diff-arg helper function\n      stgit.el: Allow showing patch on Index and Work tree\n      stgit.el: Open the destination file on applied renames or copies\n      stgit.el: Forbid stgit-{delete,edit,mark,rename} on index and work tree\n      stgit.el: Add customizable face for \"Index\" and \"Work tree\" titles\n      stgit.el: Make it configurable where to show index and work tree\n      stgit.el: Default to expanding index and work tree\n      stgit.el: Garbage collect selected patches on reload\n      stgit.el: Document stgit-select properly\n      stgit.el: Allow operating on the end of each line\n      stgit.el: Refactor: simplify temporary marker handling\n      stgit.el: Fix face \"spilling\" in some places\n      stgit.el: Refactor: simplify stgit-patch-pp a bit\n      stgit.el: Add \"t i/u\" for showing files ignored by or unknown to git\n      stgit.el: Move point properly after stgit-{file-toggle-index,reload}\n      stgit.el: Handle negative argument to stgit-{un,}commit\n      stgit.el: Rename stgit-expand-find-copies-harder to\nstgit-find-copies-harder\n      stgit.el: Handle unmerged files better\n      stgit.el: Add \"d\" for a few diff commands, similar to git.el\n      stgit.el: Ignore space in diff with prefix argument\n      stgit.el: Set patch names to be word syntax throughout\n      stgit.el: Add stgit-redo as C-c C-_ and C-c C-/\n      stgit.el: Verify that we're running on Emacs 22 or later\n      stgit.el: Default to showing index and work tree\n      stgit.el: Bugfix listing copied/renamed files\n      stgit.el: Abbreviate renames/copies with common prefix/suffix\n      stgit.el: Move point correctly after stgit-revert-file\n      stgit.el: Move point in sane way after stgit-file-toggle-index on renames\n      stgit.el: Allow moving ignored files to index\n      stgit.el: Minor documentation corrections\n      stgit.el: Bugfix mode change display\n      stgit.el: Add better help text for stgit-mode\n      stgit.el: Add C-c C-b for stgit-rebase\n      stgit.el: Improve use of def{group,custom,face}\n      stgit.el: Bugfix of stgit-move-patches to top of stack\n      stgit.el: Fix problem where standard-output isn't bound correctly\n      stgit.el: Bugfix \"P\" when point is not on a patch line\n      stgit.el: Fix some incorrect indentation\n      stgit.el: Add +/- to expand/collapse selected patches\n      stgit.el: Allow revert on index and work tree\n      stgit.el: Allow toggle-index on index and work tree\n      stgit.el: Verify we're in stgit-mode before running commands\n      stgit.el: Add stgit-toggle-mark\n      stgit.el: Add menu bar menu\n      stgit.el: Add flags to stgit-patches-marked-or-at-point\n      stgit.el: Consistently use \"marked\" about marked patches\n      stgit.el: Make sure \"M\" retains the order of the patches\n      stgit.el: Allow \"P\" to operate on all marked files\n      stgit.el: Improve stgit-mode help text slightly\n\nDavid Kågedal (49):\n      Added --save-template flag to edit command\n      Treat filename '-' as stdin/stdout in edit\n      Add an StGit mode for emacs\n      Emacs mode: Improve the output buffer state\n      Emacs mode: Bind n and p\n      Emacs mode: add stgit-repair\n      Emacs mode: added stgit-commit and stgit-uncommit\n      Emacs mode: Add stgit-edit command\n      Emacs mode: added fontification\n      Emacs mode: Added stgit-new\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      Emacs mode: Add mark command\n      Emacs mode: coalesce command\n      Add support for initializing a branch for stgit from Emacs.\n      stgit.el: Add numeric prefix argument to push and pop commands.\n      stgit.el: Adapt to new output from stg series.\n      stgit.el: Add undo command\n      stgit.el: Try to make the point stay on the coalesced patch\n      stgit.el: Rename stgit-refresh to stgit-reload\n      stgit.el: Move stgit-rename to C-c C-r\n      stgit.el: Add the stgit-refresh command\n      stgit.el: Show running commands\n      Use separate column for zero in output of stg series -e\n      stgit.el: Expand or collapse only the patch at point, instead of\nrerunning stg-reload.\n      Add a --set-tree flag to stg push\n      stgit.el: Use declare to hint the debugger and indentation\n      stgit.el: Remove the unused allow-file parameter to stgit-patch-at-point\n      stgit.el: Rename stgit-toggle-patch-file-list to stgit-select-patch\n      stgit.el: Use an 'entry-type text property\n      stgit.el: Use a defstruct to store patch data\n      stgit.el: Use ewoc to keep track of the patch list.\n      stgit.el: Invalidate ewoc node when marking or unmarking instead\nof modifying buffer directly\n      stgit.el: Get rid of the stgit-patchsym property\n      stgit.el: Refactor file list formatting\n      stgit.el: Use ewoc to keep track of the file list.\n      stgit.el: Add work tree and index as pseudo-patches\n      stgit.el: Add the stgit-file-toggle-index command\n      stgit.el: Add stgit-toggle-worktree to toggle visibility of\nindex and working tree\n      stgit.el: Only refresh the relevant parts when the index or\nworktree changes\n      stgit.el: Add stgit-new-and-refresh command\n      Escape patch name when creating regexp\n\nDaniel White (11):\n      Fixed default install location\n      Fix Makefile to correctly pass prefix option\n      Remove variables regarding section 7 man pages\n      Fix default install location for manpages\n      Add install-doc target to makefile\n      Add install-html target to makefile\n      Remove installation of documentation from setup.py\n      Updated INSTALL with documentation of Makefile\n      debian/rules: take advantage of new build targets\n      Remove dashed form of git command still in comment\n      Fixes for auto-generation of man pages\n\nSamuel Tardieu (4):\n      Find CmdException in common\n      Do not insert an empty line before the diffstat info\n      Do not mess-up with commit message formatting when sending email\n      Load the whole config at once and cache it for future use\n\nClark Williams (3):\n      Patch to allow import from compressed files (gzip and bzip2)\n      Ignore compiled elisp files\n      Teach \"stg import\" to import patch series from tar archives\n\nPeter Oberndorfer (3):\n      Don't mention removed \"stg refresh\" options\n      replace \"git repo-config\" usage by \"git config\"\n      Add an --index option to \"stg refresh\"\n\nAlex Chiang (2):\n      Better \"stg rebase\" help text\n      fix stg mail %(shortlog)s order\n\nDan Williams (2):\n      mail: add some commonly used tags to --auto\n      fix export -s\n\nHannes Eder (2):\n      fix \"stg float -s FILE\" for FILE != \"-\"\n      Add 'stg prev' and 'stg next'\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\nOnno Kortmann (2):\n      Simple rename of top-most patch\n      Test the 'stg rename' command\n\nPavel Roskin (2):\n      Fix \"stg edit --sign\"\n      Add test to ensure that \"stg clean\" preserves conflicting patches\n\nShinya Kuribayashi (2):\n      diffcol.sh: Use /bin/bash explicitly\n      stgit-completion.bash: Remove add/applied/cp/rm/unapplied\n\nTed Pavlic (2):\n      Modify bash completion to support help, version, and copyright.\n      Make bash completion fail to bashdefault before default completion.\n\nAngus Salkeld (1):\n      stg mail crashes when there is no patch description\n\nChris Packham (1):\n      Re-send [StGit BUG/PATCH] config.py: fix unset\n\nJakob Stoklund Olesen (1):\n      Never skip rebase\n\nJason Green (1):\n      Patch to clarify the \"unsolved conflicts\" message in Stacked Git\n\nPete Wyckoff (1):\n      stgit.namelength is an integer\n\nToby Allsopp (1):\n      Fix \"stg branch --delete\" on a nonexistent branch\n\n-- \nCatalin\n"},{"id":"125863","messageId":"m34opoe5t6.fsf@localhost.localdomain","threadId":"21346","inReplyTo":"b0943d9e0910241541n7b1091ecp6b21fa896405afa0@mail.gmail.com","subject":"Re: [ANNOUNCE] Stacked Git 0.15","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-10-24T23:20:30Z","receivedAt":"2009-10-24T23:20:30Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Catalin Marinas <catalin.marinas@gmail.com> writes:\n\n> StGit is a Python application providing functionality similar to Quilt\n> (i.e. pushing/popping patches to/from a stack) on top of Git. These\n> operations are performed using Git commands, and the patches are\n> stored as Git commit objects, allowing easy merging of the StGit\n> patches into other repositories using standard Git functionality.\n> \n>   Download:         http://download.gna.org/stgit/stgit-0.15.tar.gz\n>   Main repository:  git://repo.or.cz/stgit.git\n>   Project homepage: http://www.procode.org/stgit/\n>   Mailing list:     git@vger.kernel.org (please use \"StGit\" in the subject)\n>   Bug tracker:      https://gna.org/bugs/?group=stgit\n\nIs there RPM or SRPM (src.rpm) available somewhere? Or does tarball\ninclude *.spec file, or an rpm target?\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"125903","messageId":"b0943d9e0910251013v19fb39b7we412e7f734c2755f@mail.gmail.com","threadId":"21346","inReplyTo":"m34opoe5t6.fsf@localhost.localdomain","subject":"Re: [ANNOUNCE] Stacked Git 0.15","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2009-10-25T17:13:03Z","receivedAt":"2009-10-25T17:13:03Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2009/10/25 Jakub Narebski <jnareb@gmail.com>:\n> Catalin Marinas <catalin.marinas@gmail.com> writes:\n>\n>> StGit is a Python application providing functionality similar to Quilt\n>> (i.e. pushing/popping patches to/from a stack) on top of Git. These\n>> operations are performed using Git commands, and the patches are\n>> stored as Git commit objects, allowing easy merging of the StGit\n>> patches into other repositories using standard Git functionality.\n>>\n>>   Download:         http://download.gna.org/stgit/stgit-0.15.tar.gz\n>>   Main repository:  git://repo.or.cz/stgit.git\n>>   Project homepage: http://www.procode.org/stgit/\n>>   Mailing list:     git@vger.kernel.org (please use \"StGit\" in the subject)\n>>   Bug tracker:      https://gna.org/bugs/?group=stgit\n>\n> Is there RPM or SRPM (src.rpm) available somewhere? Or does tarball\n> include *.spec file, or an rpm target?\n\nLate last night when running my release script I realised that\nsetup.py no longer accepts the --prefix=/usr option I used for RPMs.\nI'll try to build one in the next couple of days (I wasn't even sure\nanyone was using it).\n\n-- \nCatalin\n"},{"id":"125927","messageId":"b0943d9e0910260332x1ca40f97r351e94f5baeb1c6b@mail.gmail.com","threadId":"21346","inReplyTo":"b0943d9e0910251013v19fb39b7we412e7f734c2755f@mail.gmail.com","subject":"Re: [ANNOUNCE] Stacked Git 0.15","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2009-10-26T10:32:07Z","receivedAt":"2009-10-26T10:32:07Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2009/10/25 Catalin Marinas <catalin.marinas@gmail.com>:\n> 2009/10/25 Jakub Narebski <jnareb@gmail.com>:\n>> Catalin Marinas <catalin.marinas@gmail.com> writes:\n>>\n>>> StGit is a Python application providing functionality similar to Quilt\n>>> (i.e. pushing/popping patches to/from a stack) on top of Git. These\n>>> operations are performed using Git commands, and the patches are\n>>> stored as Git commit objects, allowing easy merging of the StGit\n>>> patches into other repositories using standard Git functionality.\n>>>\n>>>   Download:         http://download.gna.org/stgit/stgit-0.15.tar.gz\n>>>   Main repository:  git://repo.or.cz/stgit.git\n>>>   Project homepage: http://www.procode.org/stgit/\n>>>   Mailing list:     git@vger.kernel.org (please use \"StGit\" in the subject)\n>>>   Bug tracker:      https://gna.org/bugs/?group=stgit\n>>\n>> Is there RPM or SRPM (src.rpm) available somewhere? Or does tarball\n>> include *.spec file, or an rpm target?\n>\n> Late last night when running my release script I realised that\n> setup.py no longer accepts the --prefix=/usr option I used for RPMs.\n> I'll try to build one in the next couple of days (I wasn't even sure\n> anyone was using it).\n\nThe problem was a bit more complicated than this. Some files are\ngenerated by the Makefile rather than setup.py so using the latter\ndirectly fails to build anything.\n\nSo it's time for 0.15.1 this week with the fix below (in my \"proposed\"\nbranch). I cc'ed Karl as well in case he has time to have a quick\nlook.\n\nFix setup.py to generate the needed files\n\nFrom: Catalin Marinas <catalin.marinas@gmail.com>\n\nStGit was relying on Makefile to generate some files but this breaks\nusing setup.py directly for targets like rpm.\n\nSigned-off-by: Catalin Marinas <catalin.marinas@gmail.com>\n---\n Makefile  |   20 +++++---------------\n setup.cfg |    2 +-\n setup.py  |   17 ++++++++++++++---\n 3 files changed, 20 insertions(+), 19 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 0fa5c6a..5f88f7d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -4,20 +4,10 @@ PYTHON\t?= python\n\n TEST_PATCHES ?= ..\n\n-all: build\n+all:\n \t$(PYTHON) setup.py build\n\n-build: stgit/commands/cmdlist.py stgit-completion.bash\n-\n-ALL_PY = $(shell find stgit -name '*.py')\n-\n-stgit/commands/cmdlist.py: $(ALL_PY)\n-\t$(PYTHON) stg-build --py-cmd-list > $@\n-\n-stgit-completion.bash: $(ALL_PY)\n-\t$(PYTHON) stg-build --bash-completion > $@\n-\n-install: build\n+install:\n \t$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) --force\n\n doc:\n@@ -29,10 +19,10 @@ install-doc:\n install-html:\n \t$(MAKE) -C Documentation install-html\n\n-test: build\n+test:\n \tcd t && $(MAKE) all\n\n-test_patches: build\n+test_patches:\n \tfor patch in $$(stg series --noprefix $(TEST_PATCHES)); do \\\n \t\tstg goto $$patch && $(MAKE) test || break; \\\n \tdone\n@@ -53,5 +43,5 @@ tags:\n TAGS:\n \tctags -e -R stgit/*\n\n-.PHONY: all build install doc install-doc install-html test test_patches \\\n+.PHONY: all install doc install-doc install-html test test_patches \\\n \tclean tags TAGS\ndiff --git a/setup.cfg b/setup.cfg\nindex 4359033..1eb8e9b 100644\n--- a/setup.cfg\n+++ b/setup.cfg\n@@ -1,2 +1,2 @@\n [install]\n-prefix: ~\n+prefix: /usr\ndiff --git a/setup.py b/setup.py\nindex 3f5ccb2..12ed1db 100755\n--- a/setup.py\n+++ b/setup.py\n@@ -4,6 +4,7 @@ import sys, glob, os\n from distutils.core import setup\n\n from stgit import version\n+from stgit import commands, completion\n\n def __version_to_list(version):\n     \"\"\"Convert a version string to a list of numbers or strings\n@@ -63,14 +64,24 @@ def __run_setup():\n             ])\n\n # Check the minimum versions required\n-if sys.argv[1] in ['install', 'build']:\n-    __check_python_version()\n-    __check_git_version()\n+__check_python_version()\n+__check_git_version()\n\n # ensure readable template files\n old_mask = os.umask(0022)\n\n version.write_builtin_version()\n+\n+# generate the python command list\n+f = file('stgit/commands/cmdlist.py', 'w')\n+commands.py_commands(commands.get_commands(allow_cached = False), f)\n+f.close()\n+\n+# generate the bash completion script\n+f = file('stgit-completion.bash', 'w')\n+completion.write_completion(f)\n+f.close()\n+\n __run_setup()\n\n # restore the old mask\n\n\n\n-- \nCatalin\n"},{"id":"125930","messageId":"20091026134915.GA1565@diana.vm.bytemark.co.uk","threadId":"21346","inReplyTo":"b0943d9e0910260332x1ca40f97r351e94f5baeb1c6b@mail.gmail.com","subject":"Re: [ANNOUNCE] Stacked Git 0.15","fromName":"Karl Wiberg","fromEmail":"kha@treskal.com","sentAt":"2009-10-26T13:49:15Z","receivedAt":"2009-10-26T13:49:15Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2009-10-26 10:32:07 +0000, Catalin Marinas wrote:\n\n> The problem was a bit more complicated than this. Some files are\n> generated by the Makefile rather than setup.py so using the latter\n> directly fails to build anything.\n>\n> So it's time for 0.15.1 this week with the fix below (in my\n> \"proposed\" branch). I cc'ed Karl as well in case he has time to have\n> a quick look.\n\nI don't have any objections, except ...\n\n> diff --git a/Makefile b/Makefile\n> index 0fa5c6a..5f88f7d 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -4,20 +4,10 @@ PYTHON\t?= python\n> \n>  TEST_PATCHES ?= ..\n> \n> -all: build\n> +all:\n>  \t$(PYTHON) setup.py build\n> \n> -build: stgit/commands/cmdlist.py stgit-completion.bash\n> -\n> -ALL_PY = $(shell find stgit -name '*.py')\n> -\n> -stgit/commands/cmdlist.py: $(ALL_PY)\n> -\t$(PYTHON) stg-build --py-cmd-list > $@\n> -\n> -stgit-completion.bash: $(ALL_PY)\n> -\t$(PYTHON) stg-build --bash-completion > $@\n> -\n> -install: build\n> +install:\n>  \t$(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) --force\n> \n>  doc:\n> @@ -29,10 +19,10 @@ install-doc:\n>  install-html:\n>  \t$(MAKE) -C Documentation install-html\n> \n> -test: build\n> +test:\n>  \tcd t && $(MAKE) all\n\n... don't we need to run \"setup.py build\" here in order to not change\nthe behavior?\n\n-- \nKarl Wiberg, kha@treskal.com\n    www.treskal.com/kalle\n"},{"id":"125933","messageId":"b0943d9e0910260923v77c457f8w2d56d8c06f71e965@mail.gmail.com","threadId":"21346","inReplyTo":"20091026134915.GA1565@diana.vm.bytemark.co.uk","subject":"Re: [ANNOUNCE] Stacked Git 0.15","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2009-10-26T16:23:06Z","receivedAt":"2009-10-26T16:23:06Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"2009/10/26 Karl Wiberg <kha@treskal.com>:\n> On 2009-10-26 10:32:07 +0000, Catalin Marinas wrote:\n>> The problem was a bit more complicated than this. Some files are\n>> generated by the Makefile rather than setup.py so using the latter\n>> directly fails to build anything.\n>>\n>> So it's time for 0.15.1 this week with the fix below (in my\n>> \"proposed\" branch). I cc'ed Karl as well in case he has time to have\n>> a quick look.\n>\n> I don't have any objections, except ...\n[...]\n>> -test: build\n>> +test:\n>>       cd t && $(MAKE) all\n>\n> ... don't we need to run \"setup.py build\" here in order to not change\n> the behavior?\n\nGood point. I updated the patch in the \"proposed\" branch.\n\nThanks.\n\n-- \nCatalin\n"},{"id":"126579","messageId":"94a0d4530911020205x355d4655n4de6e34d1d5b08e5@mail.gmail.com","threadId":"21346","inReplyTo":"b0943d9e0910241541n7b1091ecp6b21fa896405afa0@mail.gmail.com","subject":"Re: [ANNOUNCE] Stacked Git 0.15","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2009-11-02T10:05:31Z","receivedAt":"2009-11-02T10:05:31Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sun, Oct 25, 2009 at 12:41 AM, Catalin Marinas\n<catalin.marinas@gmail.com> wrote:\n> StGit is a Python application providing functionality similar to Quilt\n> (i.e. pushing/popping patches to/from a stack) on top of Git. These\n> operations are performed using Git commands, and the patches are\n> stored as Git commit objects, allowing easy merging of the StGit\n> patches into other repositories using standard Git functionality.\n>\n>  Download:         http://download.gna.org/stgit/stgit-0.15.tar.gz\n>  Main repository:  git://repo.or.cz/stgit.git\n>  Project homepage: http://www.procode.org/stgit/\n>  Mailing list:     git@vger.kernel.org (please use \"StGit\" in the subject)\n>  Bug tracker:      https://gna.org/bugs/?group=stgit\n>\n> The main changes since release 0.14.3 are\n>\n>  - New core infrastructure for repository operations, including\n>\n>      + Infinite undo/redo operations and corresponding commands.\n>\n>      + Automatic rollback of changes following a failed operation\n>        (using transactions)---this ensures that StGit commands either\n>        succeed or do nothing. Previously, every commands had its own\n>        ad hoc implementation of this.\n>\n>  - Some commands were added, including\n>\n>      + \"stg squash\", for combining two or more patches into one.\n>\n>      + \"stg publish\", for maintaining merge-friendly branches (which\n>        are not rebased).\n>\n>      + \"stg prev/next\" for printing the name of the previous or next\n>        patch in the series.\n>\n>  - The commands \"stg add\", \"stg rm\", \"stg cp\", and \"stg resolved\"\n>    were removed, since there are corresponding Git equivalents.\n>\n>  - The \"stg import\" and \"stg fold\" commands support the \"-p N\" option\n>    for stripping leading slashes from diff paths.\n>\n>  - The \"stg import\" and \"stg fold\" commands support the \"--reject\"\n>    option for leaving rejected hunks in corresponding *.rej files.\n>\n>  - New patch identification syntax: <branch>:<patch> (see\n>    documentation for the \"stg id\" command).\n>\n>  - Autosigning of imported patches when \"sign.autosign\" configuration\n>    option is set.\n>\n>  - A powerful Emacs mode for StGit was added to the \"contrib\"\n>    directory. It displays the patch stack in an Emacs buffer, and can\n>    handle all common StGit tasks.\n>\n>  - Improved bash tab-completion, automatically generated from the stg\n>    command definitions.\n>\n>  - Man pages and an improved tutorial.\n>\n> Special thanks go to Karl Wiberg for the hard work done on the new\n> StGit features, to Catalin Marinas for many new features and bugfixes,\n> and to David Kågedal and Gustav Hållberg for the Emacs mode.\n\nI don't know why, but the announcement RSS feed breaks exactly here\ndue to some UTF-8 miss-match or something:\nwget http://gitrss.q42.co.uk/announce.rss\n\n-- \nFelipe Contreras\n"}]}