gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
226 commits 1 branch 0 tags 10 MiB
Commit graph

116 commits

Author SHA1 Message Date
Marius Vollmer
1658e50c0d Only show the first line of a section when hiding it, not the whole header. 2008-08-30 22:32:30 +03:00
Marius Vollmer
45055cdf3e Real cherry picking. 
* magit.el (magit-mode-map): Bind it to 'A'.
(magit-cherry-pick): New.
(magit-apply-item): Use diff and apply instead of cherry-pick so that
we can change a unclean work tree.
 2008-08-30 21:37:01 +03:00
Marius Vollmer
45bff9c642 Pre-fill the log-edit buffer for reverts and cherry-picks. 
* magit.el (magit-append-to-log-edit, magit-escape-for-shell,
magit-format-commit): New.
(magit-apply-item, magit-revert-item): Use them.
 2008-08-30 21:15:02 +03:00
Marius Vollmer
226ad5a956 More discarding. 
* magit.el (magit-apply-hunk-item): New.
(magit-stage-item, magit-unstage-item): Use it instead of explicit code.
(magit-discard-item): Handle hunks and diffs.
 2008-08-30 20:54:51 +03:00
Marius Vollmer
1161d292f6 Goto "Unstaged changed" when creating status buffer. 
* magit.el (magit-update-status): Goto first unstaged change when
point is still at beginning of buffer.
 2008-08-30 20:37:44 +03:00
Marius Vollmer
4916b98e4a Use *magit-log-edit* as buffer name. 2008-08-29 01:39:01 +03:00
Marius Vollmer
670cbf80e5 Use dim gray for dark background color classes. 
Thanks to Phil Hagelberg!
 2008-08-24 05:37:13 +03:00
Marius Vollmer
20c9eccccf Rewrite apply and revert using magit-item-case. 2008-08-24 05:28:38 +03:00
Marius Vollmer
7bbde7724d Oops. 2008-08-24 05:26:21 +03:00
Marius Vollmer
1d5385b782 Rewritten sections. Initial hide/show of sections. 2008-08-24 05:21:36 +03:00
Marius Vollmer
f6b57a77dc Bugfix. 
* magit.el (magit-visit-item): Pass commit to magit-show-commit, as required.
 2008-08-24 03:33:24 +03:00
Marius Vollmer
8b4b909821 Improve visiting and scroll the other window. 
* magit.el (magit-show-commit): Made non-interactive.  Scroll window
when requested and appropriate.
(magit-visit-item): Select *magit-commit* buffer when visiting a commit.
(magit-show-item-or-scroll-up, magit-show-item-or-scroll-down): New.
(magit-mode-map): Bind them to SPC and DEL.
 2008-08-24 03:01:29 +03:00
Marius Vollmer
322208708e Nicer dispatching on item types. 
* magit.el (magit-item-case): New.
(magit-stage-item, magit-unstage-item, magit-ignore-item,
magit-discard-item, magit-visit-item): Use it.
 2008-08-24 02:31:49 +03:00
Marius Vollmer
358ed0abd0 Garbage collection. 2008-08-24 02:30:26 +03:00
Marius Vollmer
dc371ff868 Make status buffer names special. Thanks to John Wiegley! 
* magit.el (magit-status): Use a name of the form "*magit: foo*
instead of just "foo".
 2008-08-24 00:59:10 +03:00
Marius Vollmer
ea626dbb0e Fix two bugs from introducing the item abstraction. 
* magit.el (magit-unstage-item): It's magit-diff-or-hunk-item-file,
not magit-diffor-hunk-item-file, stupid.
(magit-visit-item): magit-diff-item-position does not exist, use nil
instead.
 2008-08-21 22:58:33 +03:00
Marius Vollmer
52abed7629 Discarding items. 
* magit.el (magit-discard-item): New.
(magit-mode-map): Bind it to 'k'.
 2008-08-21 02:41:43 +03:00
Marius Vollmer
909c793cf2 Add finished indication to process buffer. 
* magit.el (magit-process-sentinel): Simplified.  Add event to process buffer.
 2008-08-21 02:34:05 +03:00
Marius Vollmer
d4aacdbd73 * magit.el (magit-write-hunk-item-patch): Corrected 'info' argument to 'item'. 
Damn dynamic scope covered this up for us.
 2008-08-21 02:25:57 +03:00
Marius Vollmer
23bdc84c46 Removed magit-diff-or-hunk-item-position. 2008-08-21 02:23:08 +03:00
Marius Vollmer
51c54a329e Replaced horrible magit-info with nice Item abstraction. 2008-08-21 02:19:58 +03:00
Marius Vollmer
e54ab875e3 Use quit-window instead of magit-quit. 
Thanks to Phil Hagelberg!
 2008-08-21 00:29:50 +03:00
Marius Vollmer
022463442b Bind magit-unstage-all to 'U'. 
* magit.el (magit-unstage-all): New.
 2008-08-21 00:19:15 +03:00
Marius Vollmer
151ae0a8a3 Redone key bindings for pulling, leaving 'U' free for unstage-all. 2008-08-21 00:18:04 +03:00
Marius Vollmer
52f61d6107 Better defaults for 'x'. 
* magit.el (magit-reset-head): Default to "HEAD^" when there is no
commit at point.
 2008-08-20 23:57:51 +03:00
Marius Vollmer
822adda331 Omit empty sections. 
* magit.el (magit-insert-section): Insert final newline only when
inserted output is not empty.  Delete title when it is.
 2008-08-20 23:57:07 +03:00
Marius Vollmer
cb3b44282d Bind 'q' to magit-quit. 2008-08-20 01:21:50 +03:00
Marius Vollmer
5421e52262 Fix untracked files. 
* magit.el (magit-wash-other-files): Skip empty lines.
 2008-08-20 01:05:21 +03:00
Marius Vollmer
4c9659405b Hightlight current item. 
* magit.el (magit-put-line-property): Don't use line-end-position, use
line-beginning-position of next line instead.
 2008-08-20 00:58:34 +03:00
Marius Vollmer
b1a3cf9a07 Remove outdated comment. 2008-08-20 00:56:11 +03:00
Marius Vollmer
9189074037 Removed "-face" suffix from face names. 
As recommended by the Elisp Manual.
 2008-08-20 00:55:42 +03:00
Marius Vollmer
e227560477 Faces. 
From Linh Dang.
 2008-08-19 23:43:34 +03:00
Marius Vollmer
79239e3ae2 Updated TODO. 2008-08-19 02:06:17 +03:00
Marius Vollmer
5e6ac7730e Move with n and p, like God intended. 
* magit.el (magit-mode-map): Put magit-next-section and
magit-previous-section on 'n' and 'p', respectively.  Put
magit-display-process on '$'.
 2008-08-19 02:06:08 +03:00
Marius Vollmer
a72d0ceec1 Added lost key bindings. 
* magit.el (magit-mode-map): Added bindings for 'a' magit-apply-commit
and 'v' magit-revert-commit.
 2008-08-19 01:34:38 +03:00
Marius Vollmer
601d26bf5a Use named functions for the section jumpers so that the online help 
has something to show.
 2008-08-19 00:42:44 +03:00
Marius Vollmer
4b3fcac93f Better movement. 
* magit.el (magit-next-section, magit-previous-section,
magit-section-jumper): New.
(magit-put-line-property): Include newline.
(magit-mode-map): Don't bind digits by default.  Bind M-n and M-p to
move by sections, and 0, 1, 2, 4 to jump directly to a section
 2008-08-18 23:51:26 +03:00
Marius Vollmer
5a19dcbd8d Removed docstring of magit-mode, it's quite wrong now. 2008-08-18 23:13:16 +03:00
Marius Vollmer
b7c1292701 Always use "git cmd" instead of "git-cmd". 
The latter was deprecated and doesn't work anymore in git 1.6.
 2008-08-18 22:07:00 +03:00
Marius Vollmer
edc4aa78d9 Provide promised default for magit-reset-head. 2008-08-17 02:59:50 +03:00
Marius Vollmer
d530079be5 Remove magit-log-commit. 2008-08-17 02:55:41 +03:00
Marius Vollmer
a88933a1d2 Typo (aka incomplete refactoring). 
* magit.el (magit-automatic-merge): Use rev instead of branch, stupid.
 2008-08-17 02:54:44 +03:00
Marius Vollmer
72819bd451 Make 'd' diff against working tree, not HEAD. 
* magit.el (magit-diff-head, magit-diff-working-tree): Renamed former
to latter.  Use single revision when calling magit-diff.
 2008-08-17 02:38:37 +03:00
Marius Vollmer
bf1c66ce5c Don't be too clever when showing default revisions. 
* magit.el (magit-read-rev): Do not use magit-rev-describe when
formatting the default value for the prompt.  This is misleading since
it might use names of branches etc while in reality we are might be
offering a raw commit.
 2008-08-17 02:38:36 +03:00
Marius Vollmer
6a0b8c83e4 Declare submodes of buffer, now that all of them are in magit-mode. 
* magit.el (magit-mode-init): New.
(magit-status, magit-diff, magit-log): Use it.
(magit-find-buffer, magit-find-status-buffer): Look at magit-submode.
 2008-08-17 02:38:36 +03:00
Marius Vollmer
8b481fb716 Removed magit-checkout-commit. 2008-08-17 02:38:36 +03:00
Marius Vollmer
e82f5da831 Show default when asking for a revision. 
* magit.el (magit-read-rev): Include default in prompt.  Updated all
callers to new prompt rules..
(magit-checkout): Use magit-default-rev interactively.
 2008-08-17 02:38:36 +03:00
Marius Vollmer
b74bb2d2d9 General defaulting for revisions. 
* magit.el (magit-commit-at-point): Added option nil-ok-p argument.
(magit-default-rev): New.
 2008-08-17 02:38:36 +03:00
Marius Vollmer
3c9bf0a0f2 Make magit-reset-working-tree interactive. 
* magit.el (magit-reset-working-tree): Add 'interactive' form.
 2008-08-17 02:38:36 +03:00
Marius Vollmer
7d0da4a5bd Redone diffing, logging, and resetting. 
Provide generic support for revisions and ranges of revisions as
arguments to interactive functions.
 2008-08-17 02:38:36 +03:00