Commit graph

3236 commits

Author SHA1 Message Date
Marius Vollmer
3300960cad Merge commit 'jwiegley/master' 2009-02-16 23:59:54 +02:00
John Wiegley
bcb59cac51 Made behavior of M-H and M-h consistent for diffs 2009-02-15 21:38:44 -04:00
John Wiegley
c87154d7f6 Use display-buffer, not pop-to-buffer, when showing magit-process after a delay 2009-02-15 21:08:57 -04:00
Marius Vollmer
cdc036915f Fix mode line process status.
* magit.el (magit-prefix-p): Compare components with equal so that it
works for strings.
(magit-process-indicator-from-command): Take
magit-git-standard-options into account when choping off the head.
2009-02-16 00:29:45 +02:00
Marius Vollmer
bded317bc8 Use Git cherry-pick also for 'a' and Git revert for 'v'.
* magit.el (magit-cherry-pick-commit): Removed, replaced with
magit-apply-item.
(magit-revert-commit): Likewise.
(magit-apply-commit): Use git cherry pick and optionally do everything
magit-cherry-pick-commit and magit-revert-commit could do.
2009-02-15 23:58:46 +02:00
Marius Vollmer
1e3f94437e Pass "--no-pager" to Git.
* magit.el (magit-git-standard-options): New.  Changed almost all uses
of magit-git-executable to also pass magit-git-standard-options.
2009-02-15 23:58:43 +02:00
Marius Vollmer
35ea9ab265 Improve message when discarding changes in a region.
* magit.el (magit-discard-item): Here.
2009-02-15 20:15:46 +02:00
Marius Vollmer
b523d9c15e Don't use dynamic scoping.
* magit.el (magit-refresh-status, magit-insert-staged-changes):
Explicitly pass no-comment parameter.
* magit.el (magit-show-stash): Use 'stash', not 'info.
2009-02-15 20:13:13 +02:00
Marius Vollmer
2913ea0220 Make 'sure' that taking a snapshot does not revert buffers wrongly.
* magit.el (magit-stash-snapshot): Wrap calls to magit-run in one
magit-with-refresh so that magit-revert-files is only called once.
Calling it twice within one second does not work.
2009-02-15 20:00:35 +02:00
John Wiegley
c97fa1a0c3 If SPC and DEL are used within a normal text region, just scroll up/down. 2009-02-14 23:58:29 -04:00
Marius Vollmer
c6f796de04 Ignore PDF and PS output. 2009-02-15 05:14:34 +02:00
Marius Vollmer
d7ae65a579 Distinguish "new file" and "new mode".
* magit.el (magit-wash-diff): Here.
2009-02-15 03:28:31 +02:00
Marius Vollmer
24677b0c7a Put stashes into *magit-stash* so that magit-currently-shown-stash works. 2009-02-15 03:23:45 +02:00
Marius Vollmer
2958f9cfd4 Pass -U arg to diff correctly.
* magit.el (magit-refresh-diff-buffer): Don't cons U arg onto 'args'.
2009-02-15 03:23:17 +02:00
Marius Vollmer
b1eec95572 Fix applying parts of patches in reverse.
* magit.el (magit-insert-hunk-item-region-patch): Pass through "+"
lines for reverse patches.
(magit-apply-hunk-item*): New, factored out of magit-apply-hunk-item
and magit-apply-hunk-item-reverse.
(magit-apply-hunk-item-reverse): New.  Use it instead of passing
"--reverse" to magit-apply-hunk-item so that
magit-insert-hunk-item-region-patch knows whether we are applying in
reverse or not.
2009-02-15 03:11:43 +02:00
Marius Vollmer
87a533d3d6 More docs. 2009-02-15 02:38:19 +02:00
Marius Vollmer
a080ca01c1 Clean up the messages produced by magit-init a bit.
* magit.el (magit-init): Message fixes.  Use yes-or-no-p for
potentially destructive operations.
(magit-status): Message fixes.
2009-02-15 02:26:21 +02:00
Marius Vollmer
e6167b8080 Document that magit-status can create new Git repos. 2009-02-15 02:19:57 +02:00
Marius Vollmer
b670b16b33 Merge 'voins/init'. 2009-02-15 02:11:06 +02:00
Marius Vollmer
401c548dc5 More info for '?'.
* magit.el (magit-describe-item): Add magit-section-context-type.
2009-02-15 02:06:53 +02:00
Marius Vollmer
1b4094e3de Removed binding for 'K', run git clean when hitting 'k' on the section title.
* magit.el (magit-discard-item): Run git clean when point is on the
"Untracked files" section title.
* magit.texi: Document this.
2009-02-15 02:06:06 +02:00
Marius Vollmer
b627c9203a Merge commit 'voins/diff' 2009-02-15 01:53:00 +02:00
Marius Vollmer
9fc7465d61 Do not use '-x' with git clean.
I am afraid that would surprise to many people since "removing
untracked files" means removing the ones listed in the status buffer.
2009-02-15 01:50:11 +02:00
Marius Vollmer
62d9f73aea Merge commit 'voins/clean' 2009-02-15 01:47:44 +02:00
Marius Vollmer
ff1e5bcd5b I like semicoli. 2009-02-15 01:39:05 +02:00
Marius Vollmer
45c6d95da4 Document M-s, M-S, M-h, and M-H. 2009-02-15 01:37:21 +02:00
John Wiegley
d38c05a5ac M-h and M-H now hides the whole current file/buffer, and M-s/S shows it. 2009-02-15 01:15:55 +02:00
John Wiegley
7910b4c3dd When popping to the magit-process after a delay, goto point-max. 2009-02-15 01:14:50 +02:00
John Wiegley
efdd97b0b0 For git-svn repositories, 'f' runs git svn fetch in addition to remote update. 2009-02-15 01:09:54 +02:00
Marius Vollmer
743987a30d Update acknowledgements. 2009-02-15 01:05:09 +02:00
Marius Vollmer
e7ef2256e2 Optionally popup the process buffer for asynchronous commands.
From John Wiegly.

Defines a number of seconds, after which magit will automatically
popup the magit-process buffer so the user can see what git is up to.
Off by default.  I use this because sometimes when a commit or push
takes more than an expected amount of time, I start to wonder what
happened.
2009-02-15 00:58:46 +02:00
Marius Vollmer
8b4614b52a Made commits asynchronous, in case there is a long-running pre-commit hook.
* magit.el (magit-run*): Send input to asynchronous processes.
(magit-run-async-with-input): New.
(magit-log-edit-commit): Use it.
2009-02-15 00:50:54 +02:00
John Wiegley
7725bfa2b8 In magit-process-filter, use save-current-buffer instead of save-excursion.
Otherwise, the location of point gets messed up for people watching the
buffer.
2009-02-15 00:39:56 +02:00
John Wiegley
a2e14e528f New command "Z" saves an instant of your index and working in the stash.
This is different from regular stashing because there is no prompting for a
name, and the stash is immediately re-applied.  It's just a way of taking a
quick snapshot of your working tree, so you can come back to later if need
be.

For example, if you had just made a lot of changes to your project, and then
needed to make another sweeping change before you could commit again, this
would let you safely store your changes without having to resort to a branch.
2009-02-15 00:39:38 +02:00
John Wiegley
0836f17507 Always insert the "Git finished" message at the end of the process buffer. 2009-02-15 00:36:34 +02:00
Alexey Voinov
e66d174f68 Allow smaller or larger hunks when diffing
The other day I hacked some file, and all changes obviously split in
two commits logically, but I can't do that because changes from
"different commits" were to close to each other and diff shows them
ina single hunk. There's possibility in git add -i to split current
hunk into smaller ones in such situations. I wanted to do this without
leaving emacs.

Now magit have control over -U<n> option to git-diff.
2009-02-12 14:53:18 +03:00
Marius Vollmer
2e17b9e2f7 Performance hack.
* magit.el (magit-insert-section): Use char-before instead of looking-back.
2009-02-12 01:40:00 +02:00
Alexey Voinov
dad98cea88 Handle fresh empty repository.
It was imposible to see what was staged for a first commit on a fresh
git repository. The only visible lines was fatal error messages from
git. Now diff against null tree object is shown in magit status buffer
if nothing was yet commited to the repository. The cost is 15-byte
object added to the repo, but it shuld disappear on first call to git
gc.
2009-02-11 13:37:16 +03:00
Alexey Voinov
9db7719b96 Support for git init 2009-02-11 13:31:19 +03:00
Alexey Voinov
32d59881a3 Support for git clean 2009-02-11 11:09:18 +03:00
Marius Vollmer
f89a045282 Only ever commit staged changes when amending a commit.
The usual behavior of committing all unstaged changes when there are
no staged changes makes it impossible to amend a commit just to fix
the commit message, which is a quite common thing to do.

* magit.el (magit-log-edit-commit): Do not pass "--all" to git commit
when amending.
2009-02-10 23:31:16 +02:00
Marius Vollmer
8a979172c8 Offer current branch as default when merging in Wazzup buffer.
* magit.el (magit-guess-branch): New.
(magit-manual-merge, magit-automatic-merge): Use it to get the default
rev to merge.
2009-02-09 03:58:47 +02:00
Marius Vollmer
b825b8899c Fixlet.
* magit.el (magit-find-buffer): Don't try to expand the
default-directory when it is nil.
2009-02-09 02:51:57 +02:00
Marius Vollmer
4ec9df0070 Make the Git executable customizable.
* magit.el (magit-git-executable): New.  Replaced all hardcoded uses
of "git" with it.
2009-02-08 23:06:49 +02:00
Marius Vollmer
59bd8eccc7 Use the digits to hide and show sections.
* magit.el (magit-section-lineage, magit-section-show-level, magit-show-level,
magit-define-level-shower-1): New.
(magit-mode-map): Bind the digits and M-digits to magit-show-level-N
and magit-show-level-N-all.
* magit.texi: Document it in a new chapter for Sections.
2009-02-08 01:35:56 +02:00
Marius Vollmer
64d24aa143 Make *magit-process* buffer read-only.
* magit.el (magit-run*, magit-process-sentinel, magit-process-filter):
Set buffer-read-only and inhibit-read-only as appropriate.
2009-02-07 23:03:28 +02:00
Marius Vollmer
2904e79a08 Make magit-status prompt less.
* magit.el (magit-status): Only read the top directory with e prefix
argument or when we are not inside a Git repository.
* magit.texi, NEWS: Document the new behavior.
2009-02-07 22:50:51 +02:00
Marius Vollmer
5f1c91c98d Merge commit 'purcell/run-git-svn-async' 2009-02-07 21:50:09 +02:00
Marius Vollmer
3c6088efce Manual updates. 2009-02-07 21:40:25 +02:00
Marius Vollmer
160dc9e03d Git log seems to forget a final newline sometimes.
* magit.el (magit-insert-section): Make sure the inserted text ends in
a newline.
2009-02-07 21:20:41 +02:00