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>
Catalin Marinas [Wed, 16 Sep 2009 12:59:47 +0000 (13:59 +0100)]
Remove the 'fail_dump' argument to git.apply_patch()
Since we have a 'reject' argument, there is no need for the failed diff
to be dumped.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Sun, 13 Sep 2009 15:17:53 +0000 (16:17 +0100)]
Generate binary diffs by default
This patch modifies the Repository.diff_tree() function to generate
binary diffs by default. This way commands like 'export' would generate
patches containing the full information.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Catalin Marinas [Fri, 11 Sep 2009 23:04:07 +0000 (00:04 +0100)]
Preserve the given author date during import
The import has two stages - one for creating the initial empty commit
with the patch description followed by a refresh once the diff was
successfully applied. The second refresh resets the author date to the
current one. This patch passes the given author date to the
refresh_patch function.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Catalin Marinas [Tue, 8 Sep 2009 21:07:35 +0000 (22:07 +0100)]
Add import -p option
This patch renames some of the existing import options and adds the -p
(--strip) option which allows stripping the leading slashes of the diff
paths.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Catalin Marinas [Tue, 8 Sep 2009 20:41:19 +0000 (21:41 +0100)]
Merge commit 'kha/safe'
David Kågedal [Thu, 3 Sep 2009 16:24:21 +0000 (18:24 +0200)]
Escape patch name when creating regexp
Signed-off-by: David Kågedal <david@virtutech.com>
Signed-off-by: Karl Wiberg <kha@treskal.com>
Catalin Marinas [Wed, 2 Sep 2009 17:01:26 +0000 (18:01 +0100)]
Import git show output easily
This patch modifies the import command to check for standard 'git show'
output and parse it accordingly.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Wed, 2 Sep 2009 08:48:38 +0000 (09:48 +0100)]
Merge commit 'kha/safe'
Catalin Marinas [Wed, 2 Sep 2009 08:47:40 +0000 (09:47 +0100)]
Add stg-build, stg-dbg and RELEASENOTES to the MANIFEST.in file
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Karl Wiberg [Mon, 24 Aug 2009 08:28:33 +0000 (10:28 +0200)]
squash: Make commit message editing more convenient
Very often, the commit message you want when squashing is the message
of the first patch. So instead of simply concatenating the messages of
all the patches, put a comment delimiter after the first one, and
ignore everything after the delimiter when reading the message back
in. If the user wants to use any part of the commented-out messages,
she can move text around however she wants, including deleting the
comment delimiter.
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Mon, 24 Aug 2009 08:28:33 +0000 (10:28 +0200)]
When reading a config value, pick the last value, not the first
When reading the config values, we save all values for a given key in
a list, in the order we see them. Then, when asked for one value, we
used to return the _first_ value in the list. But the correct thing to
do in order to allow local configs (like the repository's .git/config)
to override global configs (like ~/.gitconfig) is to return the _last_
value.
Signed-off-by: Karl Wiberg <kha@treskal.com>
Catalin Marinas [Fri, 21 Aug 2009 21:48:53 +0000 (22:48 +0100)]
Add the next/prev commands to the RELEASENOTES file
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Karl Wiberg [Wed, 19 Aug 2009 20:04:58 +0000 (22:04 +0200)]
Tutorial: Use the new StGit repo URL in clone example
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Wed, 19 Aug 2009 20:02:50 +0000 (22:02 +0200)]
Documentation: Rename remaining link macros
The link macro rename in
760a7cfc ("Documentation: Rename link
macros") missed the htmllink and manlink macros, resulting in broken
links in the docs if built with AsciiDoc 8.2.3 or later. This patch
renames manlink to linkman, and replaces htmllink with just link
(which is built-in).
Signed-off-by: Karl Wiberg <kha@treskal.com>
Gustav Hållberg [Wed, 19 Aug 2009 08:12:06 +0000 (10:12 +0200)]
stgit.el: Improve stgit-mode help text slightly
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 18 Aug 2009 12:04:26 +0000 (14:04 +0200)]
stgit.el: Allow "P" to operate on all marked files
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 18 Aug 2009 08:13:47 +0000 (10:13 +0200)]
stgit.el: Make sure "M" retains the order of the patches
Fixes bugs in
7cc45294.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 18 Aug 2009 12:05:32 +0000 (14:05 +0200)]
stgit.el: Consistently use "marked" about marked patches
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 18 Aug 2009 12:23:35 +0000 (14:23 +0200)]
stgit.el: Add flags to stgit-patches-marked-or-at-point
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Karl Wiberg [Mon, 17 Aug 2009 23:34:36 +0000 (01:34 +0200)]
Release notes: Reformat for better legibility, and update
Note to maintainer: Make sure to verify the URLs and replace the text
in square backets before sending out!
Signed-off-by: Karl Wiberg <kha@treskal.com>
Karl Wiberg [Mon, 17 Aug 2009 22:38:11 +0000 (00:38 +0200)]
Release notes: Turn the 0.15-rc1 release notes into 0.15 release notes
Don't talk about the -rc1 release, because that's already happened. We
want this to be the 0.15 sharp release notes.
Signed-off-by: Karl Wiberg <kha@treskal.com>
Catalin Marinas [Mon, 17 Aug 2009 22:29:22 +0000 (00:29 +0200)]
Add release notes file
The idea is that the release announcement for the upcoming version of
StGit is prepared here. That way, the work of putting it together and
polishing it can be shared.
The text added by this patch was taken verbatim from the v0.15-rc1
announcement that Catalin posted to the git mailing list on July 12,
2009. The patch adding it to StGit (including this commit message) is
by Karl Wiberg <kha@treskal.com>.
Karl Wiberg [Mon, 17 Aug 2009 08:50:42 +0000 (10:50 +0200)]
Merge branch 'proposed' of git://github.com/gustavh/stgit
* 'proposed' of git://github.com/gustavh/stgit: (71 commits)
stgit.el: Add menu bar menu
stgit.el: Add stgit-toggle-mark
stgit.el: Verify we're in stgit-mode before running commands
stgit.el: Allow toggle-index on index and work tree
stgit.el: Allow revert on index and work tree
stgit.el: Add +/- to expand/collapse selected patches
stgit.el: Fix some incorrect indentation
stgit.el: Add stgit-new-and-refresh command
stgit.el: Bugfix "P" when point is not on a patch line
stgit.el: Fix problem where standard-output isn't bound correctly
stgit.el: Bugfix of stgit-move-patches to top of stack
stgit.el: Improve use of def{group,custom,face}
stgit.el: Add C-c C-b for stgit-rebase
stgit.el: Add better help text for stgit-mode
stgit.el: Bugfix mode change display
stgit.el: Minor documentation corrections
stgit.el: Allow moving ignored files to index
stgit.el: Move point in sane way after stgit-file-toggle-index on renames
stgit.el: Move point correctly after stgit-revert-file
stgit.el: Abbreviate renames/copies with common prefix/suffix
...
Gustav Hållberg [Fri, 14 Aug 2009 08:54:05 +0000 (10:54 +0200)]
stgit.el: Add menu bar menu
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 14 Aug 2009 08:54:05 +0000 (10:54 +0200)]
stgit.el: Add stgit-toggle-mark
Preparation for upcoming menu bar patch
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 14 Aug 2009 08:54:04 +0000 (10:54 +0200)]
stgit.el: Verify we're in stgit-mode before running commands
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 14 Aug 2009 08:54:04 +0000 (10:54 +0200)]
stgit.el: Allow toggle-index on index and work tree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 14 Aug 2009 08:54:03 +0000 (10:54 +0200)]
stgit.el: Allow revert on index and work tree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 14 Aug 2009 08:54:03 +0000 (10:54 +0200)]
stgit.el: Add +/- to expand/collapse selected patches
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 15 Aug 2009 23:51:12 +0000 (01:51 +0200)]
stgit.el: Fix some incorrect indentation
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
David Kågedal [Fri, 31 Jul 2009 06:33:00 +0000 (08:33 +0200)]
stgit.el: Add stgit-new-and-refresh command
This creates a new patch and fills it with the current changes,
i.e. it is the same as the "N" command followed by "r".
Signed-off-by: David Kågedal <david@virtutech.com>
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 14 Aug 2009 08:45:15 +0000 (10:45 +0200)]
stgit.el: Bugfix "P" when point is not on a patch line
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Hannes Eder [Thu, 13 Aug 2009 22:28:39 +0000 (23:28 +0100)]
Add 'stg prev' and 'stg next'
These commands are related to 'stg top'. They print the patch below
resp. above the topmost patch, given that they exist.
Signed-off-by: Hannes Eder <heder@google.com>
Chris Packham [Mon, 10 Aug 2009 20:50:45 +0000 (08:50 +1200)]
Re-send [StGit BUG/PATCH] config.py: fix unset
Missing invocation of .run() so config.unset('blah') didn't do anything.
Consequently the fact that the next line set the value to 'None' instead of a
list with 1 element i.e. '[None]' was not noticed.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Karl Wiberg [Thu, 13 Aug 2009 22:19:24 +0000 (23:19 +0100)]
Work around performance bug in subprocess.Popen.communicate()
In Python 2.4 (specifically, I tested with 2.4.6 on Ubuntu 9.04),
subprocess.Popen.communicate() seems to take time proportional to the
square of the size of the indata, which makes it ridiculously
expensive to write stack log entries when the diffs are large. Work
around the bug by calling subprocess.Popen.stdin.write() manually
instead of letting communicate() handle the indata.
The performance bug has been fixed in Python 2.6 (I tested with
2.6.2), so with that version this workaround doesn't affect the run
time. I haven't tested with Python 2.5.
This fixes bug 13319.
Signed-off-by: Karl Wiberg <kha@treskal.com>
Catalin Marinas [Fri, 31 Jul 2009 12:01:47 +0000 (13:01 +0100)]
Reverse commit
9876a650 - return the first line from git describe
Also modify the "publish" to strip the output of git describe.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Gustav Hållberg [Wed, 12 Aug 2009 09:27:11 +0000 (11:27 +0200)]
stgit.el: Fix problem where standard-output isn't bound correctly
This fixes errors on M-x eval-buffer in stgit.el.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 12 Aug 2009 12:00:00 +0000 (14:00 +0200)]
stgit.el: Bugfix of stgit-move-patches to top of stack
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 8 Aug 2009 22:24:45 +0000 (00:24 +0200)]
stgit.el: Improve use of def{group,custom,face}
* Reorder calls to defcustom and
defface to be more user-friendly
* Use the :link tag where applicable
* Add a :set handler to reload all stgit buffers when custom values
are set
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 8 Aug 2009 18:59:49 +0000 (20:59 +0200)]
stgit.el: Add C-c C-b for stgit-rebase
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 8 Aug 2009 19:49:26 +0000 (21:49 +0200)]
stgit.el: Add better help text for stgit-mode
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 7 Aug 2009 09:46:19 +0000 (11:46 +0200)]
stgit.el: Bugfix mode change display
Fixes
0de6881a "stgit.el: Refactor file list formatting".
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 5 Aug 2009 21:02:03 +0000 (23:02 +0200)]
stgit.el: Minor documentation corrections
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 5 Aug 2009 20:53:18 +0000 (22:53 +0200)]
stgit.el: Allow moving ignored files to index
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 5 Aug 2009 21:07:46 +0000 (23:07 +0200)]
stgit.el: Move point in sane way after stgit-file-toggle-index on renames
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 5 Aug 2009 13:18:43 +0000 (15:18 +0200)]
stgit.el: Move point correctly after stgit-revert-file
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 5 Aug 2009 12:46:24 +0000 (14:46 +0200)]
stgit.el: Abbreviate renames/copies with common prefix/suffix
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Wed, 5 Aug 2009 13:21:27 +0000 (15:21 +0200)]
stgit.el: Bugfix listing copied/renamed files
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 4 Aug 2009 16:15:39 +0000 (18:15 +0200)]
stgit.el: Default to showing index and work tree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 4 Aug 2009 15:39:13 +0000 (17:39 +0200)]
stgit.el: Verify that we're running on Emacs 22 or later
ewoc-create needs to have the NOSEP argument.
line-number-at-pos doesn't exist in older versions.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 4 Aug 2009 13:57:05 +0000 (15:57 +0200)]
stgit.el: Add stgit-redo as C-c C-_ and C-c C-/
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Tue, 4 Aug 2009 12:39:47 +0000 (14:39 +0200)]
stgit.el: Set patch names to be word syntax throughout
This allows easy selection of the patch name; e.g., by double-clicking.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Mon, 3 Aug 2009 15:30:13 +0000 (17:30 +0200)]
stgit.el: Ignore space in diff with prefix argument
With one C-u, ignore spaces; with two, ignore all spaces.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Mon, 3 Aug 2009 13:35:42 +0000 (15:35 +0200)]
stgit.el: Add "d" for a few diff commands, similar to git.el
"b" shows diff against base
"c" shows combined diff
"o" shows diff against our version
"t" shows diff against their version
"m" runs smerge-ediff
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 20:04:35 +0000 (22:04 +0200)]
stgit.el: Handle unmerged files better
Show unmerged patches with --ours, which works with diff-mode.
Do not show duplicate entries in the work tree for unmerged files.
Open unmerged files with smerge-mode minor mode.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 17:59:31 +0000 (19:59 +0200)]
stgit.el: Rename stgit-expand-find-copies-harder to stgit-find-copies-harder
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 17:32:12 +0000 (19:32 +0200)]
stgit.el: Handle negative argument to stgit-{un,}commit
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 14:04:34 +0000 (16:04 +0200)]
stgit.el: Move point properly after stgit-{file-toggle-index,reload}
After stgit-file-toggle-index, move mark to the old file, leaving
point where it is.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 13:14:36 +0000 (15:14 +0200)]
stgit.el: Add "t i/u" for showing files ignored by or unknown to git
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 15:15:39 +0000 (17:15 +0200)]
stgit.el: Refactor: simplify stgit-patch-pp a bit
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 13:59:55 +0000 (15:59 +0200)]
stgit.el: Fix face "spilling" in some places
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 13:56:13 +0000 (15:56 +0200)]
stgit.el: Refactor: simplify temporary marker handling
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 11:52:56 +0000 (13:52 +0200)]
stgit.el: Allow operating on the end of each line
Extend patch/file properties to the newline at the end of each line,
allowing stgit-select and similar to take effect with point at the end
of line.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 11:13:57 +0000 (13:13 +0200)]
stgit.el: Document stgit-select properly
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 08:55:26 +0000 (10:55 +0200)]
stgit.el: Garbage collect selected patches on reload
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:58:01 +0000 (00:58 +0200)]
stgit.el: Default to expanding index and work tree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 20:46:24 +0000 (22:46 +0200)]
stgit.el: Make it configurable where to show index and work tree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:58:00 +0000 (00:58 +0200)]
stgit.el: Add customizable face for "Index" and "Work tree" titles
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 08:54:14 +0000 (10:54 +0200)]
stgit.el: Forbid stgit-{delete,edit,mark,rename} on index and work tree
Signed-off-by: Gustav Hållberg <gustav+stgit@gmail.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:59 +0000 (00:57 +0200)]
stgit.el: Open the destination file on applied renames or copies
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:58 +0000 (00:57 +0200)]
stgit.el: Allow showing patch on Index and Work tree
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:58 +0000 (00:57 +0200)]
stgit.el: Refactor: add stgit-find-copies-harder-diff-arg helper function
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:57 +0000 (00:57 +0200)]
stgit.el: Refresh from work tree when index is empty
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:57 +0000 (00:57 +0200)]
stgit.el: Add "R" for stgit-resolve-file
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:57 +0000 (00:57 +0200)]
stgit.el: Change key binding for stgit-repair from "R" to "\C-u g"
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:57 +0000 (00:57 +0200)]
stgit.el: Add "U" for stgit-revert-file
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Thu, 30 Jul 2009 22:57:56 +0000 (00:57 +0200)]
stgit.el: Move stgit-{un,}commit to \C-c\C-{u,c}
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Mon, 3 Aug 2009 12:43:58 +0000 (14:43 +0200)]
stgit.el: Add stgit-branch-name-face
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Fri, 31 Jul 2009 09:26:22 +0000 (11:26 +0200)]
stgit new: Do not open editor if --save-template was specified
Fixes side-effect of
e58f264a "Add support for merge-friendly
branches".
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 20:56:48 +0000 (22:56 +0200)]
stgit.el: Make stgit-{index,worktree}-node buffer local
Fixes bugs when multiple stgit buffers have been opened.
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 21:07:43 +0000 (23:07 +0200)]
stgit.el: Bugfix moving symlinks to/from index
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 21:21:13 +0000 (23:21 +0200)]
stgit.el: Run "git rm" with "-q" to reduce spam
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 21:16:13 +0000 (23:16 +0200)]
stgit.el: Refactor: remove unused argument to two functions
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Mon, 3 Aug 2009 12:55:41 +0000 (14:55 +0200)]
stgit.el: Remove unused variable stgit-work-ewoc
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Gustav Hållberg [Sat, 1 Aug 2009 19:31:04 +0000 (21:31 +0200)]
stgit.el: Correct documentation for stgit-insert-patch-files
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
Catalin Marinas [Fri, 31 Jul 2009 12:01:47 +0000 (13:01 +0100)]
Only get the first line from 'git describe --all'
The Repository.describe() function is used by the 'publish' command. We
only need the first line of the description for the commit message
rather than the raw output (which contains a new line).
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Catalin Marinas [Fri, 31 Jul 2009 09:20:08 +0000 (10:20 +0100)]
Improve the description/diff splitting when parsing patches
Some patches don't have any of the separations already in use like ---,
diff - or Index. So look for the first "--- */" line.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
David Kågedal [Wed, 29 Jul 2009 10:05:22 +0000 (12:05 +0200)]
stgit.el: Only refresh the relevant parts when the index or worktree changes
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Mon, 27 Jul 2009 22:09:46 +0000 (00:09 +0200)]
stgit.el: Add stgit-toggle-worktree to toggle visibility of index and working tree
Based on a similar set of patches by Gustav Hållberg.
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Thu, 30 Jul 2009 14:54:50 +0000 (16:54 +0200)]
stgit.el: Add the stgit-file-toggle-index command
Based on a patch from Gustav Hållberg.
Signed-off-by: David Kågedal <david@virtutech.com>
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
David Kågedal [Wed, 29 Jul 2009 14:53:41 +0000 (16:53 +0200)]
stgit.el: Add work tree and index as pseudo-patches
Based on a similar patch by Gustav Hållberg.
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Thu, 30 Jul 2009 15:12:08 +0000 (17:12 +0200)]
stgit.el: Use ewoc to keep track of the file list.
Signed-off-by: David Kågedal <david@virtutech.com>
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>
David Kågedal [Mon, 27 Jul 2009 15:49:10 +0000 (17:49 +0200)]
stgit.el: Refactor file list formatting
Define a struct to contain the information about a file and break out
the file list formatting to a separate function.
Signed-off-by: David Kågedal <david@virtutech.com>
David Kågedal [Mon, 27 Jul 2009 15:26:47 +0000 (17:26 +0200)]
stgit.el: Get rid of the stgit-patchsym property
Signed-off-by: David Kågedal <david@virtutech.com>