Catalin Marinas [Sat, 15 May 2010 11:04:35 +0000 (12:04 +0100)]
Restore the original applied patches during 'commit'
If committing a patch in the middle of a series, the resulting stack
doesn't have any patches applied. The trans.pop_patches() function only
returns the additional patches that had to be popped rather than all
popped patches. The patch also adds some tests for the 'commit' command.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Reported-by: Jeenu Viswambharan <Jeenu.Viswambharan@arm.com>
Cc: Karl Hasselström <kha@treskal.com>
Karl Wiberg [Wed, 5 May 2010 10:45:07 +0000 (12:45 +0200)]
Merge remote branch 'gustav/proposed'
* gustav/proposed: (22 commits)
stgit.el: Make ! with prefix argument prompt for git command
stgit.el: Make ! sort patches when building command line
stgit.el: Add visual feedback (a message) when toggling view flags
stgit.el: Add stgit-inhibit-messages
stgit.el: Add support for showing git-svn information
stgit.el: Remove useless defvars
stgit.el: Use forward-line instead of goto-line non-interactively
stgit.el: Make stgit-toggle-* behave as documented
stgit.el: Make "C-u r" raise error if run with prefix argument without a patch
stgit.el: Make stgit-reload move point more intuitively when a patch disappears
stgit.el: Allow showing recent historical (committed) commits as well
stgit.el: Add stgit-line-format
stgit.el: Minor improvements of stgit{,-noname}-patch-line-format documentation
stgit.el: Delay automatic refresh of stgit buffers a bit
stgit.el: Refresh stgit buffer after dired-delete-file
stgit.el: Refactor: use mapc to set all local variables in stgit-mode
stgit.el: Add stgit-default-show-{ignored,unknown}
stgit.el: Fix so "t u" and "t i" only operate on the current buffer
stgit.el: Move to goal column after expanding unknown directory
stgit.el: Ask for branch point when creating new branch
...
Gustav Hållberg [Thu, 29 Apr 2010 15:20:48 +0000 (17:20 +0200)]
stgit.el: Make ! with prefix argument prompt for git command
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Thu, 29 Apr 2010 15:20:45 +0000 (17:20 +0200)]
stgit.el: Make ! sort patches when building command line
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Fri, 23 Apr 2010 10:09:31 +0000 (12:09 +0200)]
stgit.el: Add visual feedback (a message) when toggling view flags
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Fri, 23 Apr 2010 14:18:34 +0000 (16:18 +0200)]
stgit.el: Add stgit-inhibit-messages
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Mon, 26 Apr 2010 11:26:28 +0000 (13:26 +0200)]
stgit.el: Add support for showing git-svn information
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Mon, 26 Apr 2010 11:26:28 +0000 (13:26 +0200)]
stgit.el: Remove useless defvars
These defvars are no longer needed as they are defined as buffer-local
in stgit-mode.
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Mon, 19 Apr 2010 14:43:21 +0000 (16:43 +0200)]
stgit.el: Use forward-line instead of goto-line non-interactively
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Mon, 19 Apr 2010 11:55:10 +0000 (13:55 +0200)]
stgit.el: Make stgit-toggle-* behave as documented
Add macro stgit-define-toggle-view to implement these functions.
Repair prefix argument behavior.
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Sat, 17 Apr 2010 16:04:15 +0000 (18:04 +0200)]
stgit.el: Make "C-u r" raise error if run with prefix argument without a patch
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Thu, 15 Apr 2010 14:36:16 +0000 (16:36 +0200)]
stgit.el: Make stgit-reload move point more intuitively when a patch disappears
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Sat, 17 Apr 2010 16:04:49 +0000 (18:04 +0200)]
stgit.el: Allow showing recent historical (committed) commits as well
This is controlled with the "t h" command.
Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Thu, 15 Apr 2010 15:21:41 +0000 (17:21 +0200)]
stgit.el: Add stgit-line-format
This function will be used in the following patch.
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Wed, 14 Apr 2010 12:24:30 +0000 (14:24 +0200)]
stgit.el: Minor improvements of stgit{,-noname}-patch-line-format documentation
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Sun, 25 Apr 2010 21:18:20 +0000 (23:18 +0200)]
stgit.el: Delay automatic refresh of stgit buffers a bit
This prevents multiple consecutive refreshes when several
refresh-causing operations are done after each other, which happens
when one does recursive deletes.
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Wed, 14 Apr 2010 09:19:12 +0000 (11:19 +0200)]
stgit.el: Refresh stgit buffer after dired-delete-file
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Tue, 13 Apr 2010 09:33:15 +0000 (11:33 +0200)]
stgit.el: Refactor: use mapc to set all local variables in stgit-mode
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Wed, 7 Apr 2010 14:29:47 +0000 (16:29 +0200)]
stgit.el: Add stgit-default-show-{ignored,unknown}
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Mon, 29 Mar 2010 15:27:25 +0000 (17:27 +0200)]
stgit.el: Fix so "t u" and "t i" only operate on the current buffer
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Mon, 29 Mar 2010 15:25:17 +0000 (17:25 +0200)]
stgit.el: Move to goal column after expanding unknown directory
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Gustav Hållberg [Thu, 29 Apr 2010 22:20:20 +0000 (00:20 +0200)]
stgit.el: Ask for branch point when creating new branch
This makes sure git-config branch.<branch>.parentbranch is set correctly.
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Catalin Marinas [Mon, 29 Mar 2010 09:48:16 +0000 (10:48 +0100)]
publish: Add '--last' option to show the last published patch
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 26 Mar 2010 09:18:56 +0000 (09:18 +0000)]
Strip leading or trailing '-' when generating patch names
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Thu, 25 Mar 2010 11:25:45 +0000 (11:25 +0000)]
publish: Add the --unpublished options to list not yet published patches
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Gustav Hållberg [Fri, 26 Feb 2010 15:54:09 +0000 (16:54 +0100)]
stgit.el: Use comint-carriage-motion in output from "!"
This makes carriage return and similar be handled correctly, which is
important as some git commands use those.
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Catalin Marinas [Wed, 24 Mar 2010 15:46:05 +0000 (15:46 +0000)]
mail: Add 'snumber' template parameter equivalent to stripped 'number'
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Mon, 22 Mar 2010 16:16:35 +0000 (16:16 +0000)]
pick --revert wasn't using the correct author
The author should be the one reverting the patch rather than the creator
of the reverted commit. The patch also improves the revert message to
contain the description of the reverted commit.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Tue, 9 Mar 2010 10:05:58 +0000 (10:05 +0000)]
Allow interactive merging via StackTransaction.reorder_patches()
This way other commands like sink and pop can use the interactive
mergetool.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 12 Feb 2010 15:36:37 +0000 (15:36 +0000)]
mail: Use space rather than tab for long subject header folding
The default Python implementation (at least 2.5 and earlier) fold long
e-mail header lines by inserting "\n\t". This causes issues with some
e-mail clients that remove both "\n\t". The RFC2822 shows that folding
should be done with "\n ". The Python workaround is to use a Header
object instead of a string when setting the message headers.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Gustav Hållberg [Fri, 26 Feb 2010 15:54:09 +0000 (16:54 +0100)]
stgit.el: Do not use suppress-keymap for prefix keymaps
Signed-off-by: Gustav Hållberg <gustav@gmail.com>
Catalin Marinas [Fri, 12 Feb 2010 16:34:36 +0000 (16:34 +0000)]
mail: Ask for the SMTP credentials before sending the messages
The original implementation was asking for the SMTP password on every
patch sent. This patch only asks the password once before sending or
even editing the cover message and patches.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Cc: Pavel Roskin <proski@gnu.org>
Cc: Alex Chiang <achiang@hp.com>
Catalin Marinas [Wed, 10 Feb 2010 15:14:27 +0000 (15:14 +0000)]
Fix _command_list() function for empty command sets
The alias commands are not real StGit commands and the corresponding set
(kind) defined in stgit/commands/__init__.py is empty. This leads to a
KeyError in the _command_list() function. The patch ignores empty sets.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 5 Feb 2010 13:45:02 +0000 (13:45 +0000)]
Replace some git commands with stg aliases in test scripts
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 5 Feb 2010 13:45:01 +0000 (13:45 +0000)]
Add support for command aliases
This patch introduces support StGit command aliases with a few defaults:
stg add -> git add
stg rm -> git rm
stg mv -> git mv
stg resolved -> git add
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 5 Feb 2010 13:45:01 +0000 (13:45 +0000)]
Populate the cached config options with the defaults
The patch pre-populates the cached config options with the default
values. It also removes an unused option (stgit.extensions).
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 5 Feb 2010 13:45:00 +0000 (13:45 +0000)]
Pass the --in-reply-to and --no-thread options to git send-email
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 5 Feb 2010 13:44:59 +0000 (13:44 +0000)]
Rename the mail --refid and --noreply options to match Git
The new option names are --in-reply-to and --no-thread.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 5 Feb 2010 13:44:59 +0000 (13:44 +0000)]
Record a single transaction for conflicting push operations
StGit commands resulting in a conflicting patch pushing record two
transactions in the log (with one of them being inconsistent with HEAD
!= top). Undoing such operations requires two "stg undo" (possibly with
--hard) commands which is unintuitive. This patch changes such
operations to only record one log entry and "stg undo" reverts the stack
to the state prior to the operation.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Cc: Gustav Hållberg <gustav@virtutech.com>
Cc: Karl Wiberg <kha@treskal.com>
Alex Chiang [Fri, 5 Feb 2010 13:44:58 +0000 (13:44 +0000)]
stg mail: don't parse To/Cc/Bcc in --git mode
When using stg mail in --git mode, do not parse command-line To/Cc/Bcc
addresses.
Instead, we pass them directly to git send-email.
This allows us to leverage git send-email's support for email aliases.
Cc: Karl Wiberg <kha@treskal.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Alex Chiang [Fri, 5 Feb 2010 13:44:57 +0000 (13:44 +0000)]
stg mail: add basic support for git send-email
This is the first step in turning stg mail into a wrapper for
git send-email. It requires passing the --git option to stg mail
for now.
Only a few basic options are supported for now, namely To/Cc/Bcc.
git send-email options used:
--suppress-cc=self prevent further information prompts
--quiet reduce git send-email output
Cc: Karl Wiberg <kha@treskal.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Alex Chiang [Fri, 5 Feb 2010 13:44:57 +0000 (13:44 +0000)]
stg mail: factor out __update_header
Factor __update_header out of __build_address_headers.
Headers like Reply-To, Mail-Reply-To, and Mail-Followup-To are now
handled in __build_extra_headers.
We make this change because in the future, we do not want to call
__build_address_headers if using git send-email but we will always
want to call __build_extra_headers.
Cc: Karl Wiberg <kha@treskal.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Alex Chiang [Fri, 5 Feb 2010 13:44:56 +0000 (13:44 +0000)]
stg mail: make __send_message do more
Factor out the common code required to send either a cover mail
or patch, and implement it in __send_message.
WRY? DRY.
Cc: Karl Wiberg <kha@treskal.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Alex Chiang [Fri, 5 Feb 2010 13:44:55 +0000 (13:44 +0000)]
stg mail: reorder __build_[message|cover] parameters
Reorder the argument lists for both __build_cover and __build_message.
This change will aid readability of a subsequent refactoring patch.
Cc: Karl Wiberg <kha@treskal.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Alex Chiang [Fri, 5 Feb 2010 13:44:54 +0000 (13:44 +0000)]
stg mail: Refactor __send_message and friends
Instead of passing all the various smtp* args to __send_message
individually, let's just pass the options list instead.
The main motivation is for future patches. The end goal is to
thin out stg mail's implementation and make it a minimal wrapper
around git send-email. By passing the options list to __send_message
we prepare to pass options directly to git send-email.
As a bonus, this change results in a cleaner internal API.
Finally, it also pushes the smtp logic where it belongs, viz. into
__send_message_smtp, instead of cluttering up the main body of
mail.func().
Cc: Karl Wiberg <kha@treskal.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
David Kågedal [Wed, 3 Feb 2010 09:09:58 +0000 (10:09 +0100)]
stgit.el: Add the stgit-execute command and bind it to "!"
Signed-off-by: David Kågedal <david@virtutech.com>
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 29 Jan 2010 14:48:22 +0000 (15:48 +0100)]
improve "usage" strings to include optional "--"
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 29 Jan 2010 11:55:44 +0000 (12:55 +0100)]
stgit.el: Handle patch and branch names starting with hyphen
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 29 Jan 2010 10:55:50 +0000 (11:55 +0100)]
stgit.el: Made a few wide lines more narrow
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Mon, 25 Jan 2010 10:17:58 +0000 (11:17 +0100)]
stgit.el: Run "git update-index --refresh" before redrawing work tree status
This prevents unchanged files from showing up as "Modified" in the
work tree.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 22 Jan 2010 14:41:41 +0000 (15:41 +0100)]
stgit.el: Advise non-stgit git functions to update stgit buffers
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 14 Jan 2010 13:47:12 +0000 (14:47 +0100)]
Tutorial: Add stgit.el section
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Gustav Hållberg [Thu, 14 Jan 2010 13:46:54 +0000 (14:46 +0100)]
stgit.el: Prevent stgit-applied-patches from moving point
This stops stgit-diff-range from moving point.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Gustav Hållberg [Thu, 14 Jan 2010 13:18:54 +0000 (14:18 +0100)]
stgit.el: Annotate stgit-capture-output macro for edebug
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Wed, 13 Jan 2010 10:27:12 +0000 (11:27 +0100)]
stgit.el: Add command for showing diff for a range of patches
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Wed, 13 Jan 2010 10:27:12 +0000 (11:27 +0100)]
stgit.el: Optionally allow duplicates when sorting patches
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Wed, 13 Jan 2010 10:27:12 +0000 (11:27 +0100)]
stgit.el: Break out diff whitespace arg handling to separate function
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Fri, 22 Jan 2010 13:57:06 +0000 (14:57 +0100)]
Merge gustav/proposed
stgit.el: Make "G" work before/after the tree
stgit.el: Repair how patches with empty descriptions are shown
Catalin Marinas [Thu, 17 Dec 2009 23:31:50 +0000 (23:31 +0000)]
Merge branch 'stable'
Catalin Marinas [Thu, 17 Dec 2009 23:31:23 +0000 (23:31 +0000)]
Fix "stg applied" usage in contrib/stg-dispatch
This command was replaced by "stg series --applied" but the above shell
script hasn't been changed. This is a fix for bug #557475.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Gustav Hållberg [Wed, 16 Dec 2009 15:57:56 +0000 (16:57 +0100)]
stgit.el: Make "G" work before/after the tree
Gustav Hållberg [Sun, 6 Dec 2009 19:30:43 +0000 (20:30 +0100)]
stgit.el: Repair how patches with empty descriptions are shown
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:03 +0000 (08:55 +0100)]
stgit.el: Do not emit trailing whitespace
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:03 +0000 (08:55 +0100)]
stgit.el: Get default rebase branch from git-config in stg-rebase
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:02 +0000 (08:55 +0100)]
stgit.el: Allow "B" to create new branches
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:02 +0000 (08:55 +0100)]
stgit.el: Make stg undo/redo --hard ask for confirmation with dirty index/worktree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:02 +0000 (08:55 +0100)]
stgit.el: Do not recurse into unknown directories after "t u"
Let RET on unexpanded directories expand the directory.
This is similar to how git-status does it.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:02 +0000 (08:55 +0100)]
stgit.el: Use "->" for defstruct field accessors
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:02 +0000 (08:55 +0100)]
stgit.el: Disable undo information in stgit output capture buffers
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 4 Dec 2009 07:55:02 +0000 (08:55 +0100)]
new: Allow empty messages with --message and --file
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
David Kågedal [Fri, 4 Dec 2009 07:55:01 +0000 (08:55 +0100)]
stgit.el: Make the patch name optional
Introduce an "alternate" patch line format and make "t n" toggle
between the two.
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Fri, 4 Dec 2009 07:55:01 +0000 (08:55 +0100)]
stgit.el: Use format-spec when formatting file information
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Fri, 4 Dec 2009 07:55:01 +0000 (08:55 +0100)]
stgit.el: Use format-spec when formatting patch lines
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Fri, 4 Dec 2009 07:55:01 +0000 (08:55 +0100)]
stgit.el: Move defcustom definitions to the top
Signed-off-by: David Kågedal <david@virtutech.com>
Catalin Marinas [Thu, 3 Dec 2009 22:37:04 +0000 (22:37 +0000)]
Merge commit 'kha/safe'
Catalin Marinas [Thu, 3 Dec 2009 22:35:28 +0000 (22:35 +0000)]
Merge branch 'stable'
Catalin Marinas [Thu, 3 Dec 2009 22:35:10 +0000 (22:35 +0000)]
Update the tutorial for the conflict situations
This is a fix for bug #14672.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Gustav Hållberg [Mon, 23 Nov 2009 09:19:42 +0000 (10:19 +0100)]
undo: Add test that "stg undo --hard" leaves the stgit tree in a consistent state
The test currently fails.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Catalin Marinas [Wed, 28 Oct 2009 22:05:34 +0000 (22:05 +0000)]
Merge branch 'stable'
Catalin Marinas [Wed, 28 Oct 2009 21:06:54 +0000 (21:06 +0000)]
Fix setup.py to generate the needed files
StGit was relying on Makefile to generate some files but this breaks
using setup.py directly for targets like rpm.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Gustav Hållberg [Wed, 28 Oct 2009 11:22:51 +0000 (12:22 +0100)]
stgit.el: Position point at beginning of buffer before editing messages
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Gustav Hållberg [Wed, 28 Oct 2009 11:21:28 +0000 (12:21 +0100)]
fold/import: Remove requirement on git 1.6.2
Send "-p<N>" flag to "git apply" rather than "-p <N>".
This removes dependency on git 1.6.2, commit:
f26c494 parse-opt: migrate builtin-apply.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Gustav Hållberg [Wed, 28 Oct 2009 11:21:20 +0000 (12:21 +0100)]
push/pop: Allow "-n0" to do nothing
Also document what "-n<negative>" does.
Added some push tests to t1203-pop.sh and renamed it t1208-push-and-pop.sh.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Gustav Hållberg [Wed, 28 Oct 2009 11:21:07 +0000 (12:21 +0100)]
stgit.el: Improve help text on stgit-goto
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Catalin Marinas [Sat, 24 Oct 2009 21:45:35 +0000 (22:45 +0100)]
Slightly modify the "publish" command description
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Tue, 20 Oct 2009 10:00:43 +0000 (11:00 +0100)]
Pick --revert option (formerly --reverse)
This patch renames --reverse to --revert and sets the picked patch
message similar to the "git revert" command.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Mon, 19 Oct 2009 16:14:50 +0000 (17:14 +0100)]
The '--file' option for 'new' should show 'FILE' rather than 'MESSAGE'
The patch sets a metavar for this option's definition.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Sun, 18 Oct 2009 22:29:09 +0000 (23:29 +0100)]
Update the RELEASENOTES file with latest changes
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Sun, 18 Oct 2009 22:04:50 +0000 (23:04 +0100)]
Do not use stdout instead of stderr
The MessagePrinter constructor redirects stderr to stdout if the output
is not a file. This makes it difficult for tools needing to filter the
error output (like Documentation/Makefile building the COMMANDS
variable).
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Sat, 17 Oct 2009 21:52:33 +0000 (22:52 +0100)]
Ignore the git-config exit code
The stgit.config code dumps a stack trace if git-config returns an error
(when, for example, there is no ~/.gitconfig file).
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Sat, 17 Oct 2009 21:34:10 +0000 (22:34 +0100)]
Do not delete the builtin_version.py file after setup
If setup is run in a directory without .git, setup.py deletes the
stgit/builtin_version.py file and subsequent commands no longer have a
version. See bug #14480.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Jakob Stoklund Olesen [Sat, 2 May 2009 07:42:31 +0000 (09:42 +0200)]
Never skip rebase
This is important if we have a custom rebase command (like "git svn
rebase").
Signed-off-by: Jakob Stoklund Olesen <stoklund@2pi.dk>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 30 Sep 2009 20:52:35 +0000 (21:52 +0100)]
Fast-forward the published head when possible
This is to avoid a merge commit when fast-forwarding is possible.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 30 Sep 2009 20:51:19 +0000 (21:51 +0100)]
Delete the hidden patches as well when deleting a branch
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 30 Sep 2009 20:50:14 +0000 (21:50 +0100)]
Allow 'stg diff ..<commit>'
If the first part of the range is missing, stgit was not assuming HEAD.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 30 Sep 2009 20:47:31 +0000 (21:47 +0100)]
Allow importing of 'application/octet-stream' attachments
Some mail clients use this MIME type rather than text/plain.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 16 Sep 2009 13:20:21 +0000 (14:20 +0100)]
Autosign imported patches
If stgit.autosign configuration is set, allow the automatic signing of
the imported patches, similar to the 'new' command.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 16 Sep 2009 13:13:13 +0000 (14:13 +0100)]
Add the -p option to fold
This option was added to import, so it makes sense for fold to have it
as well.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 16 Sep 2009 13:04:26 +0000 (14:04 +0100)]
Do not create an empty patch if import failed without --reject
If the import failed, do not leave an empty patch on the stack. If this
is required, the --reject option should be passed. The patch also fixes
a lowercase typo in the --reject option description.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 16 Sep 2009 13:00:34 +0000 (14:00 +0100)]
Add the --reject option to fold
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>