Marius Vollmer
b68b2171cf
Refuse to apply, cherry-pick, or revert a merge commit.
...
* magit.el (magit-commit-parents): New.
(magit-apply-commit, magit-revert-commit): Fail with merge commits.
(magit-cherry-pick-commit): New. Fail with merge commits. Use it everywhere
instead of running git cherry-pick directly.
(magit-cherry-pick, magit-cherry-pick-item): Renamed.
2008-09-15 01:58:01 +03:00
Marius Vollmer
f34fee9759
Keep point where it was across a refresh.
...
* magit.el: Don't move point in refresh functions.
(magit-refresh): Try to keep point where it was.
(magit-run*): Call magit-refresh outside of the save-excursion so that
it can move point.
2008-09-15 00:46:40 +03:00
Marius Vollmer
9214dccd6f
Clean up applying/reverting pending commits a bit.
...
* magit.el (magit-apply-item, magit-cherry-pick, magit-revert-item):
Don't bother to check return value of magit-apply-commit, it either
succeeds or throws an error.
2008-09-15 00:46:40 +03:00
Marius Vollmer
4b3f8fb86a
Keep log-edit message around in case commit fails.
...
* magit.el (magit-log-edit-commit): Erase buffer committing.
2008-09-15 00:46:40 +03:00
Marius Vollmer
d25fb236fe
Merged synchronous and asynchronous command running.
...
* magit.el (magit-execute*, magit-run*): Renamed former to latter.
Added nowait parameter.
(magit-run, magit-run-async): Renamed. Implemented in terms of new
magit-run*.
(magit-execute, magit-run): Renamed.
(magit-execute-shell, magit-run-shell): Renamed.
(magit-revert-files, magit-revert-buffers): Renamed.
(magit-run-command): Removed.
2008-09-15 00:46:40 +03:00
Marius Vollmer
bbcb7747ef
Rebase synchronously.
2008-09-14 02:49:17 +03:00
Marius Vollmer
c835d6d7b1
Doc updates.
2008-09-14 02:42:01 +03:00
Marius Vollmer
bc13e8a06f
Mark pending commits as used/unused only when the apply/revert succeeded.
2008-09-14 02:21:48 +03:00
Marius Vollmer
973f8436c6
Synchronous execution of most commands.
...
* magit.el (magit-execute*, magit-execute-shell, magit-execute): New.
Use them in a ton of places instead of magit-run, etc.
2008-09-14 02:17:47 +03:00
Marius Vollmer
c40915abab
Updated TODO.
2008-09-14 01:18:40 +03:00
Marius Vollmer
dc283dec8f
Revert files when stopping the rewrite at the end of a magit-rewrite-finish.
2008-09-14 01:14:47 +03:00
Marius Vollmer
c66e0c5466
Don't refresh when a run-command continuation is given.
2008-09-14 01:14:46 +03:00
Marius Vollmer
6c6ebd0183
Always refresh the status buffer when a command finishes.
2008-09-14 01:14:46 +03:00
Marius Vollmer
1e68bdaa90
Make status buffer current while committing.
2008-09-14 01:14:46 +03:00
Marius Vollmer
dc12f07f65
Don"t ask whether to stop at the end of magit-rewrite-finish.
...
* magit.el (magit-rewrite-stop): Added optional noconfirm parameter.
(magit-rewrite-finish-step): Use it.
2008-09-14 01:14:46 +03:00
Marius Vollmer
3d80d64b3c
Set pending commit to used only when cherry-pick was successful.
2008-09-14 01:14:46 +03:00
Marius Vollmer
57bc4a786d
Call the run-command continuation with the original buffer current.
2008-09-14 01:14:46 +03:00
Marius Vollmer
42e6d0b07a
Allow arguments to the continuation of magit-run-command.
...
* magit.el (magit-run-command): Changed parameters to allow for
arguments to the continuation. Changed all callers.
(magit-process-sentinel): Allow quitting when calling the
continuation.
(magit-refresh): Added optional buffer parameter.
2008-09-14 01:14:46 +03:00
Marius Vollmer
99dae2441e
Applying and reverting hunks and diffs.
2008-09-14 01:14:46 +03:00
Marius Vollmer
c93e41b5bb
Functions for applying diffs.
...
* magit.el (magit-diff-item-write, magit-apply-diff-item): New.
2008-09-14 01:14:46 +03:00
Marius Vollmer
a2b7afc6b5
Bugfix.
...
* magit.el (magit-toggle-section): Call magit-section-set-hidden with
two args, stupid.
2008-09-14 01:14:46 +03:00
Marius Vollmer
559398acf9
More general refresh machinery.
...
* magit.el (magit-refresh, magit-refresh-all): New. Bind to "g" and
"G". Replaced all calls to magit-update-status with magit-refresh.
(magit-mode-init): Added refresh-func and refresh-args,
remember them for magit-refresh and call magit-refresh at the end.
Updated all users.
(magit-set-mode-line-process): Put process indicator into the mode
line of all magit-mode buffers.
2008-09-14 01:14:46 +03:00
Marius Vollmer
2fdf8c02ef
Updated TODO.
2008-09-14 01:14:46 +03:00
Marius Vollmer
687ea4aef7
Simpler NEWS.
2008-09-11 01:26:12 +03:00
Marius Vollmer
9ce8cb3426
Fixed teh typos.
2008-09-11 01:25:59 +03:00
Marius Vollmer
9785c5a1c9
Updated TODO.
2008-09-11 01:25:30 +03:00
Marius Vollmer
2ff4d8918b
Bugfix magit-apply-commit and magit-revert-commit.
...
* magit.el (magit-apply-commit, magit-revert-commit): The parameter is
called "commit", not "info", stupid.
2008-09-11 01:08:23 +03:00
Marius Vollmer
2733ae2ff2
Document rewriting.
2008-09-11 01:07:17 +03:00
Marius Vollmer
d7f0a8dc5a
Support for marking pending commits used and unused.
...
* magit.el (magit-rewrite-set-used, magit-rewrite-set-unused): New.
(magit-mode-map): Bind them.
2008-09-11 00:09:05 +03:00
Marius Vollmer
bfd8f4baa0
Rewrite finishing.
...
* magit.el (magit-rewrite-finish, magit-rewrite-finish-step,
magit-rewrite-finish-continuation): New.
2008-09-11 00:08:34 +03:00
Marius Vollmer
a91d10c74b
More features for magit-run-command.
...
* magit.el (magit-run-command): Added erase and cont parameters.
Construct logline from cmd and args when nil.
(magit-process-sentinel): Call magit-process-continuation when set.
2008-09-11 00:06:08 +03:00
Marius Vollmer
6089e3b9db
Updated TODO.
2008-09-11 00:03:05 +03:00
Marius Vollmer
bc1836a7b1
Speed up log washing.
...
* magit.el (magit-wash-log): Bind magit-old-top-section to nil while
washing log entries so that no time is wasted looking up the old
visbility state.
2008-09-11 00:03:04 +03:00
Marius Vollmer
666459c85d
Don't propertize used pending commits.
...
The face gets overwritten by the marked commits machinery. (And there
was a typo.)
2008-09-09 01:16:24 +03:00
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
