Commit graph

2973 commits

Author SHA1 Message Date
Marius Vollmer
417dd46093 Elpanized.
From Tom Tromey.  Thanks!

* Makefile.am (elpa): New target to create elpa tarball.
* magit-pkg.el.in: New.
* configure.ac: Create magit-pkg.el from it.
* magit.el: Added autoload for magit-status.
2009-03-09 22:15:07 +02:00
Marius Vollmer
abd643c681 Prepare 0.8. Removed debian/ bits. 2009-03-08 20:31:41 +02:00
Marius Vollmer
20f35de127 Released 0.7. 2009-03-08 18:51:35 +02:00
Marius Vollmer
5c7b6b2efe Make 'i' toggle the ignore flag for wazzup.
* magit.el (magit-write-file-lines): New.
(magit-wazzup-toggle-ignore): New, use it instead of magit-wazzup-ignore.
* magit.texi: Document it.
2009-03-08 14:42:55 +02:00
Marius Vollmer
d9f86642ec Merge commit 'remi/master' 2009-03-08 03:50:29 +02:00
Marius Vollmer
e57887dc2e Cache Git configuration per buffer, not globally.
Thanks to Alexey Voinov and Marcin Bachry!
2009-03-08 03:43:44 +02:00
Marius Vollmer
a868715885 Select the proper name for the svn branch.
Thanks to Travis B. Hartwell!

* magit.el (magit-get-svn-branch-name): New.
(magit-insert-unpulled-svn-commits, magit-insert-unpushed-svn-commits,
magit-svn-enabled): Use it.
2009-03-08 03:27:19 +02:00
Rémi Vanicat
6d2c6b7d98 in interactive merge, rename ours to current and their to merged.
When rebasing it's not clear which commit is ours, and which is
theirs, the new name should be clearer.
2009-03-02 10:43:56 +01:00
Marius Vollmer
07e316777f Make it work with tramp some more.
* magit.el (magit-shell-lines): Use magit-shell-command-to-string
instead of shell-command-to-string.
2009-03-01 21:45:02 +02:00
Marius Vollmer
a2d08222c6 Make standard options customizable.
* magit.el (magit-git-standard-options): Here, by using defcustom.
2009-03-01 21:35:44 +02:00
Marius Vollmer
3857ce227a Allow ignoring of branches in the Wazzup view.
* magit.el (magit-wazzup-ignore): New.
(magit-refresh-wazzup-buffer): Read wazzup-exclude and optionally omit
the branches listed in it.  Added 'all' parameter to control this.
(magit-wazzup): Show all branches with prefix.
(magit-ignore-item): Call magit-wazzup-ignore for wazzup branches.
* magit.texi: Document it.
2009-03-01 21:29:08 +02:00
Marius Vollmer
2fcdd916b9 Don't run shell for magit-file-lines.
* magit.el (magit-file-lines): Read contents into temporary buffer and
split into lines using split-string.
2009-03-01 20:59:44 +02:00
Marius Vollmer
67a0c1ada7 Document C-c C-k in the *magit-log-edit* buffer. 2009-03-01 15:15:23 +02:00
Marius Vollmer
e6a1fd4e70 Tell people that they are going to do a hard reset.
* magit.el (magit-reset-head): Reflect it in the prompt whether this
is going to be a hard reset or not.  Added optional argument instead
of using current-prefix-arg directly.
* magit.texi: Document it.
2009-03-01 15:09:39 +02:00
Rémi Vanicat
1eac6b70c6 Use ediff interactive merge to help conflict resolution.
Idea from smerge code, adapted to git, new key binding on "e"
2009-03-01 13:01:19 +01:00
Rémi Vanicat
5cd62fa9ac Removing one of the two "i" bindings 2009-03-01 13:01:19 +01:00
Jesse Alama
44763451f1 Permit cancelling log edits.
* magit.el: Permit cancelling log edits.

magit-log-edit-confirm-cancellation: New defcustom.
magit-log-edit-map: New keybinding: C-c C-k to cancel the log.
magit-log-edit-cancel-log-message: New function.
magit-pop-to-log-edit: Indicate that cancellation is possible.
2009-03-01 05:10:41 -04:00
John Wiegley
5c42f45f53 'C-u x' will do a hard reset 2009-03-01 05:10:41 -04:00
John Wiegley
8583b8c39d Made git-svn support usable for the average user
Previously it was insisting on a branch named "git-svn", but I'm not
sure if this is ever created by default.  Also, there is no need to call
"remote update", and if it is called asynchronously, it blocks the
subsequent call to svn fetch.
2009-03-01 05:10:40 -04:00
Marius Vollmer
63e78891d8 Only try to fit current section into window when it is not hidden.
* magit.el (magit-goto-next-section): Here.
2009-03-01 03:02:19 +02:00
Marius Vollmer
5c3ac91e0f Documentation updates. 2009-03-01 03:00:23 +02:00
Ian Eure
e4032c3d17 Allow magit to work with Tramp. 2009-02-28 19:29:41 +02:00
Marius Vollmer
549a2cb836 No idea how to present tags in the UI. 2009-02-28 19:25:20 +02:00
Marius Vollmer
5a1039cd6f Show correct filenames in the "Pending changes" section.
* magit.el (magit-diff-line-file): Don't insist on "a/..." being the
first file.
2009-02-28 19:22:22 +02:00
Marius Vollmer
8652dc979c Make it an option to stage everything on magit-log-edit.
* magit.el (magit-commit-all-when-nothing-staged): Added ask-stage choice.
(magit-log-edit): Implement it.
2009-02-28 19:16:31 +02:00
Marius Vollmer
144716f26e Tentative plan for 0.7. 2009-02-28 17:05:02 +02:00
Steve Purcell
99d518bba7 Show unpushed/pulled commits from a git-svn remote in magit-status 2009-02-28 17:01:16 +02:00
Marius Vollmer
24a0985910 Unbreak magit-remote-update for git-svn users.
* magit.el (magit-remote-update): Don't try to run two git commands
asynchronously at the same time, stupid.
2009-02-28 16:49:23 +02:00
Marius Vollmer
76458ff5ce Added link to mailing list. 2009-02-27 02:21:31 +02:00
Marius Vollmer
27d53bd39e Document new behavior of 'c'. 2009-02-20 01:25:30 +02:00
Marius Vollmer
ef479d6b5a Made "git commit --all" more explicit.
* magit.el (magit-log-edit-get-field): New.
(magit-commit-all-when-nothing-staged): New.
(magit-log-edit): Set 'commit-all field accordingly.
(magit-log-edit-commit): Use that field to control "--all" option.
2009-02-20 01:17:37 +02:00
Marius Vollmer
a78f8b6019 Allow '-' and '_' in log-edit field names.
* magit.el (magit-log-header-end, magit-log-edit-get-fields): Here.
2009-02-20 01:15:26 +02:00
David Wallin
3efeed124e magit-goto-next-section: when moving down to the next section, try to fit the
whole hunk in the window
2009-02-19 23:09:26 +02:00
Marius Vollmer
043c90e740 Build-Depend on emacsen instead of on emacs.
Thanks Darren Hoo!
2009-02-19 23:03:25 +02:00
John Wiegley
b991100ce6 Several improvements to the whazzup command
1. Don't report a branch if it has no commit in common with HEAD.  This
   is for people who keep alternate histories in their repositories.

2. Don't report a branch if another branch with the same basename and
   commit as HEAD has already been reported.  Thus, if a branch "foo"
   with 5 unpulled commits was pushed to origin, don't display both
   "foo" and "origin/foo" in the whazzup buffer, since they reflect the
   same thing.
2009-02-19 15:01:32 -04:00
Marius Vollmer
e9bed9b1e2 Fixlet to make magit-status work again when called from a non-Git dir.
* magit.el (magit-get-top-dir): It's default-directory not
default-dir, stupid.
2009-02-19 13:44:41 +02:00
Marius Vollmer
47cffef546 Fixlet to make the log work again.
* magit.el (magit-configure-have-graph): Removed leftover %s from
format string.
2009-02-18 17:53:54 +02:00
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