Commit graph

346 commits

Author SHA1 Message Date
Marius Vollmer
fcfc70c136 Avoid some unnecessary refreshes.
* magit.el (magit-refresh-wrapper): Only revert files and refresh
status buffer when there is at least one buffer in need of refresh.
2008-10-02 01:18:25 +03:00
Marius Vollmer
1f74c1b0c1 Improve log editing.
* magit.el (magit-log-fill-paragraph, magit-log-edit-mode): New, for
better paragraph filling.
(magit-log-edit): Use it.
(magit-add-log): Add entries also for diffs.  Be more careful when
inserting new function sub-entries into existing file entries.
2008-10-02 01:12:32 +03:00
Marius Vollmer
e20322754c Speed up construction of buffers with a lot of sections.
* magit.el (magit-new-section): Collect children in reverse.
(magit-with-section): Reverse them when done.
(magit-refresh-log-buffer): Limit to 1000 commits.
(magit-refresh-reflog-buffer): Likewise.
2008-09-30 23:47:16 +03:00
Marius Vollmer
fcd6bfcaf7 Always refresh the status buffer.
* magit.el (magit-refresh-wrapper): Initialize
magit-refresh-needing-buffers with the status buffer.
(magit-need-refresh): Don't add a buffer twice.
2008-09-29 23:35:39 +03:00
Marius Vollmer
e6e3aa1b3a Added menu.
* magit.el (magit-mode-menu): New.
2008-09-28 02:18:01 +03:00
Marius Vollmer
59aac28585 Updated manual and TODO. 2008-09-27 15:26:09 +03:00
Marius Vollmer
d48fd13d27 Handle revs that don't have a name.
* magit.el (magit-name-rev): Return original rev if name-rev returns
"undefined".  Shouldn't happen, but does.  Bug in git?
2008-09-26 16:10:17 +03:00
Marius Vollmer
e5b55cbce0 Merge branch 'master' of zagadka.vm.bytemark.co.uk:git/magit 2008-09-26 15:49:08 +03:00
Marius Vollmer
3b6c739514 Updated TODO. 2008-09-26 15:48:49 +03:00
Marius Vollmer
0e1d9ddbbb Let magit-status always ask for the directory.
* magit.el (magit-read-top-dir): Removed 'prefix' argument.  Always ask.
2008-09-25 23:21:59 +03:00
Marius Vollmer
efc8ae2a6c Rewritten refresh mechanics.
* magit.el (magit-refresh-buffer): Renamed from magit-refresh, made
non-interactive.
(magit-need-refresh): New.  Call it whenever needed and instead of
magit-refresh and magit-revert-buffers.
(magit-with-refresh): New.
(magit-refresh): Reimplemented using these two.
(magit-section-action): New.  Use it instead of magit-section-case in
commands.
(magit-run*, magit-cherry-pick-commit): Removed norefresh argument.
(magit-run, magit-run-shell): Use magit-with-refresh.
2008-09-21 16:09:11 +03:00
Marius Vollmer
87a437fab9 Prefer symbolic names for default revisions.
* magit.el (magit-name-rev): Do nothing when given nil.
(magit-default-rev): Pass commit thru magit-name-rev.
2008-09-15 02:43:36 +03:00
Marius Vollmer
7853395831 Clean up shell escaping.
* magit.el (magit-shell, magit-shell-lines, magit-shell-exit-code,
magit-run-shell) Escape all format arguments when constructing the
command.  Updated all callers.
2008-09-15 02:37:38 +03:00
Marius Vollmer
7419a8b48a Mention non-support for rewriting merge commits in the manual. 2008-09-15 02:27:43 +03:00
Marius Vollmer
e0e9544c09 Updated TODO. 2008-09-15 02:01:58 +03:00
Marius Vollmer
35002f3d31 Refresh buffer when rewrite-finish fails.
* magit.el (magit-rewrite-finish): Refresh after finishing, even when
an error has been thrown.
(magit-rewrite-finish-step): Don't refresh at all.
2008-09-15 01:58:08 +03:00
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