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

3346 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marius Vollmer
d4c263386f Make diff washing work again in commit buffers. 
* magit.el (magit-wash-diffs, magit-wash-log, magit-wash-commit):
Don't go to point-min, it's redundant for magit-insert-section now
and harmful when used in other contexts.
 2008-09-09 01:05:41 +03:00
Marius Vollmer
e4031528aa Use pending commit properties when applying, cherrypicking, and reverting. 2008-09-09 00:55:53 +03:00
Marius Vollmer
ff65089041 Pending commit properties. 2008-09-09 00:55:33 +03:00
Marius Vollmer
95185b0ada Add rewrite key bindings. 2008-09-09 00:55:09 +03:00
Marius Vollmer
998638ff1a Renamed "Unrewritten changes" to "Pending changes". 2008-09-08 23:39:55 +03:00
Marius Vollmer
c9a4735c11 Deal with more than one modified file when showing a commit. 
* magit.el (magit-wash-commit): Call magit-wash-diffs instead of
magit-wash-diff to handle more than one diff.
 2008-09-08 23:32:02 +03:00
Marius Vollmer
0efe4c71b5 Don't hide all diffs by default. 
* magit.el (magit-hide-diffs): New variable.
(magit-wash-diff): Use it for the default hiddenness of diffs.
(magit-insert-unstaged-changes, magit-insert-staged-changes,
(magit-insert-unrewritten-changes): Bind it to t.
 2008-09-08 23:31:12 +03:00
Marius Vollmer
4f8dd6f841 Hide diffs by default. 
* magit.el (magit-new-section): Type rest arg for initializing the new
section structure.
(magit-with-section): Generalize type argument to allow a list of
keyword value pair and pass them to magit-new-section.
(magit-wash-diff): Make diffs hidden by default.
 2008-09-08 23:21:01 +03:00
Marius Vollmer
2bf9c19866 Better handling of hidden sections with 'n' and 'p'. 
* magit.el (magit-goto-next-section, magit-prev-section): Don't
descend into hidden sections.
 2008-09-08 23:19:12 +03:00
Marius Vollmer
246eb467b7 Updated TODO. 2008-09-08 12:19:53 +03:00
Marius Vollmer
c9164c5d0b Deal with empty diffs. 
* magit.el (magit-create-buffer-sections): Create top section if body
hasn't created any.
 2008-09-07 23:42:11 +03:00
Marius Vollmer
993354b867 Unrewritten changes. (R) 2008-09-07 23:35:16 +03:00
Marius Vollmer
1b6133b622 Stopping. (R) 2008-09-07 23:19:10 +03:00
Marius Vollmer
25b0d795af Rewrite starting. (R) 2008-09-07 23:16:56 +03:00
Marius Vollmer
8460d4db78 Rewrite aborting. (R) 2008-09-07 23:12:55 +03:00
Marius Vollmer
8897b0552c Some fundamentals for interactive rewrite. (R) 2008-09-07 23:12:32 +03:00
Marius Vollmer
1017a27bcf Updated manual. 2008-09-07 20:54:40 +03:00
Marius Vollmer
1f252fb554 Updated TODO. 2008-09-07 20:27:16 +03:00
Marius Vollmer
c0938fa2a2 Include untracked files in the unstaged changes section. 2008-09-07 20:24:41 +03:00
Marius Vollmer
d5769cd617 Bugfix. 
* magit.el (magit-prefix-p): Terminate when reaching the end of the list.
 2008-09-07 20:23:52 +03:00
Marius Vollmer
fdee20de6f Properly discard file deletions. 
* magit.el (magit-discard-item): Reset a deleted file before checking
it out.  Otherwise a staged deletion can not be undone.
 2008-09-07 19:47:41 +03:00
Marius Vollmer
d80109e4ef Properly discard new files. 
* magit.el (magit-discard-item): Use git rm to discard new files.
 2008-09-07 17:37:57 +03:00
Marius Vollmer
e4ccc99536 Move unpulled commits before local changes. 2008-09-07 17:24:32 +03:00
Marius Vollmer
72fa30a698 Renamed "unmerged" to "unpulled". 2008-09-07 16:50:30 +03:00
Marius Vollmer
8c09f66694 Experimental showing of unmerged commits. 
* magit.el (magit-insert-unmerged-commits): New.
(magit-update-status): Use it.
 2008-09-07 16:48:44 +03:00
Marius Vollmer
6b839c8df0 Cleanly unstage file deletions. 
* magit.el (magit-unstage-item): Use "-q" to shut up git reset when
unstaging a deletion.  Otherwise it would complain about local
changes.
 2008-09-07 16:45:46 +03:00
Marius Vollmer
0721a4c951 Bug fix. 
* magit.el (magit-visit-item): It's magit-diff-item-file, stupid.
 2008-09-07 16:44:18 +03:00
Marius Vollmer
707d5dbde1 Deleted. 2008-09-07 16:42:18 +03:00
Marius Vollmer
79c901b71a Don't detect renames yet. Record more information for diffs. 2008-09-07 16:32:11 +03:00
Marius Vollmer
6b464fd509 Use "Unmerged" instead of "Unresolved". 2008-09-07 15:38:24 +03:00
Marius Vollmer
ce964ab2e1 Have a stab at detecting unresolved files. 2008-09-07 14:41:14 +03:00
Marius Vollmer
6935045e82 Updated TODO. 2008-09-07 05:27:57 +03:00
Marius Vollmer
e5ec239c31 Indicate deleted and renamed files. 2008-09-07 05:25:35 +03:00
Marius Vollmer
a379bb1e0f Better file status indication. 
* magit.el (magit-wash-diff): Grep diff header for status of file.
 2008-09-07 05:19:11 +03:00
Marius Vollmer
8ca446c4bd Detect renamed files. 
* magit.el (magit-insert-staged-changes): Pass "-M" to git diff.
 2008-09-07 05:12:32 +03:00
Marius Vollmer
5f34a05b3a Refactored magit-update-status. 2008-09-07 03:53:25 +03:00
Marius Vollmer
d045293801 Make sure that there is always a current section. 
* magit.el (magit-current-section): Return magit-top-section when
there is no magit-section property.  This happens at eob.
 2008-09-07 03:24:14 +03:00
Marius Vollmer
4623a798b3 More functions for visibility control. 2008-09-07 03:19:52 +03:00
Marius Vollmer
d6e4c40364 Fix visibility memory. How did this ever work? 
* magit.el (magit-top-section): Make the right variable permanent.
(magit-new-section): Don't fail when there are no old sections.
 2008-09-07 03:15:37 +03:00
Marius Vollmer
0ea2d919c8 Put point at start of log. 
* magit.el (magit-log): Goto point-min.
(magit-reflog): Likewise.
 2008-09-07 02:23:22 +03:00
Marius Vollmer
d100f40298 Remember section visibility across buffer reconstructions. 
* magit.el (magit-new-section): Find old section and inherit hidden
attribute.
(magit-create-buffer-sections): Make old top section available to
magit-new-section.
 2008-09-07 02:15:45 +03:00
Marius Vollmer
c315191639 Big rewrite of the 'section' and 'item' machinery. 2008-09-07 02:00:26 +03:00
Marius Vollmer
6d4414d826 Properfy TODO. 2008-09-04 20:50:17 +03:00
Marius Vollmer
49c2e544cc Make author email and date work as well. 
* magit.el (magit-log-edit-setup-author-env): Cope with setenv
destroying the match data.
 2008-09-03 23:40:42 +03:00
Marius Vollmer
a64949523c Fix process filter. 
* magit.el (magit-process-filter): Use 'position' instead of a regexp
search to find last ^M.  Regexps have trouble with newlines.
 2008-09-02 23:36:33 +03:00
Marius Vollmer
d1f0df38f9 Better handling of running counters in Git output. 
* magit.el (magit-process-filter): New, for dealing with ^M in output.
(magit-run-command): Install it.
 2008-09-02 23:18:23 +03:00
Marius Vollmer
2f4c2eed23 List modified files in a nicer way. 
* magit.el (magit-wash-diff): Insert header line for diffs.  Updated
all functions that know where a diff begins.
 2008-09-02 01:36:06 +03:00
Marius Vollmer
55a7c63c51 TODO 2008-09-01 01:44:11 +03:00
Marius Vollmer
9f6f5b3c19 Enable standard M-n and M-p in log-edit buffer. 
* magit.el (magit-log-edit-push-to-comment-ring): New.
(magit-log-edit-commit): Use it.
(magit-log-edit-map): Bind M-n and M-p to log-edit functions.
 2008-09-01 01:10:07 +03:00
Marius Vollmer
c8cdc5eda1 Manual updates. 2008-08-31 21:50:20 +03:00