1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Commit Graph

597 Commits

Author SHA1 Message Date
Stefan Monnier
39a7428bf5 (vc-dir): Use pop-to-buffer, so it can be customized. 2008-04-21 20:40:51 +00:00
Dan Nicolaescu
d48c50ae86 *** empty log message *** 2008-04-21 05:17:34 +00:00
Dan Nicolaescu
b54462764d * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
(vc-check-master-templates, vc-file-not-found-hook)
(vc-kill-buffer-hook):
* vc.el (vc-process-sentinel, vc-exec-after, vc-do-command)
(vc-find-position-by-context, vc-buffer-context)
(vc-restore-buffer-context, vc-responsible-backend)
(vc-expand-dirs, vc-ensure-vc-buffer, vc-buffer-sync)
(vc-next-action, vc-register, vc-register-with, vc-steal-lock)
(vc-finish-logentry, vc-coding-system-for-diff, vc-switches)
(vc-version-diff, vc-diff, vc-insert-headers)
(vc-dired-buffers-for-dir, vc-dired-resynch-file)
(vc-snapshot-precondition, vc-create-snapshot, vc-print-log)
(vc-revert, vc-rollback, vc-version-backup-file)
(vc-rename-master, vc-delete-file, vc-rename-file)
(vc-branch-part, vc-default-retrieve-snapshot)
(vc-annotate-display-autoscale, vc-annotate-display-select)
(vc-annotate, vc-annotate-warp-revision, vc-annotate-difference)
(vc-annotate-lines, vc-file-tree-walk-internal): Use when instead of if.
(vc-dir-update): Handle directories.
(vc-default-status-printer): Simplify.
2008-04-21 05:11:56 +00:00
Sam Steingold
d63aa41fa8 (vc-dir-menu-map, vc-dir-mode-map, vc-dir-tool-bar-map):
Use quit-window instead of bury-buffer.
2008-04-18 14:24:50 +00:00
Dan Nicolaescu
eb320d93d1 (vc-dir-kill-query): Fix thinko. 2008-04-16 04:58:35 +00:00
Stefan Monnier
e1aec6fbf1 Rename vc-status to vc-dir and the vc-status var to vc-ewoc. 2008-04-16 00:57:12 +00:00
Dan Nicolaescu
e8847be332 (vc-status-fileinfo): Add new member directoryp.
(vc-default-status-printer): Print directories.
(vc-status-update): Sort files before subdirectories.
2008-04-15 07:28:31 +00:00
Stefan Monnier
010d97291d (vc-status-update): Set needs-update.
(vc-status-refresh): η-reduce.
2008-04-14 16:36:32 +00:00
Stefan Monnier
fc6dcd067d (vc-status-update): Fix typo. 2008-04-14 16:21:23 +00:00
Alexandre Julliard
1f3e0cb5d2 (vc-status-update): Undo the previous revert. 2008-04-14 15:22:47 +00:00
Dan Nicolaescu
9eef6650a5 (vc-status-kill-query): New function.
(vc-status-mode): Add it to kill-buffer-query-functions.
(vc-status-show-fileentry): New function.
(vc-status-menu-map): Bind it.  Bind vc-next-action.
2008-04-14 08:59:41 +00:00
Alexandre Julliard
fb0ac090cc (vc-status-update): Revert an incorrect rewrite. Add some
comments.
(vc-status-refresh-files): New function.
(vc-status-refresh): Use `vc-status-refresh-files' to refresh the
state of up-to-date files.
(vc-default-dir-status-files): New function.
2008-04-13 18:06:35 +00:00
Stefan Monnier
c1b513745f Change `dir-status' to not take (and pass) status-buffer.
(vc-status-create-fileinfo): Make `extra' optional.
(vc-status-busy): New fun.
(vc-status-menu-map): Use it.
(vc-status-crt-marked): Remove.
(vc-status-update): Rename from vc-status-add-entries.
Add argument so as to prevent addition of entries.  Rewrite.
(vc-update-vc-status-buffer): Remove.
(vc-status-refresh): Don't remove old entries, set them to
up-to-date instead.  Also do it after the update is complete.
(vc-status-marked-files): η-reduce.
2008-04-11 15:17:59 +00:00
Dan Nicolaescu
7fbb47976e * vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.

* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.

* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
2008-04-10 07:32:25 +00:00
Alexandre Julliard
beac4378aa (vc-status-add-entries): New function.
(vc-status-add-entry): Removed.
(vc-update-vc-status-buffer, vc-status-mark-buffer-changed): Use
vc-status-add-entries.
2008-04-09 18:52:20 +00:00
Jan Djärv
44a1781296 (vc-status-tool-bar-map): Add vc-print-log to tool bar. 2008-04-09 10:36:14 +00:00
Dan Nicolaescu
4dc2220833 (vc-status-prepare-status-buffer):
Reset vc-parent-buffer-name.
2008-04-06 17:30:40 +00:00
Dan Nicolaescu
d926e68f19 *** empty log message *** 2008-04-04 23:53:00 +00:00
Dan Nicolaescu
5a84a93714 (vc-default-status-fileinfo-extra): New function.
(vc-status-mark-buffer-changed): Use it.
(vc-update-vc-status-buffer): Allow for partial updates.
2008-04-04 22:27:26 +00:00
Dan Nicolaescu
1b3f2d4ec6 * vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.
(vc-status-mark-buffer-changed): Handle the extra field.

* vc-bzr.el (vc-bzr-after-dir-status):
* vc-cvs.el (vc-cvs-after-dir-status):
* vc-hg.el (vc-hg-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status): Return a list not a cons.
2008-03-31 15:36:56 +00:00
Dan Nicolaescu
400fc6ede0 Add todo entries. 2008-03-31 15:06:25 +00:00
Dan Nicolaescu
58f10bffac Allow backends to display backend specific information in
the vc-status listing.
(vc-status-fileinfo): Add a field for backend specific information.
(vc-status-printer): Rename to ...
(vc-default-status-printer): ... this.
(vc-status-printer): New function.
(vc-update-vc-status-buffer): Set the backend specific file info
if provided.
2008-03-30 15:29:35 +00:00
Dan Nicolaescu
115c006177 * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
(vc-status-refresh): Create a temporary buffer and call the
`dir-status' backend function from that buffer.

* vc-bzr.el (vc-bzr-dir-status): Don't create a buffer.
(vc-bzr-after-dir-status): Don't kill the buffer.

* vc-cvs.el (vc-cvs-dir-status): Don't create a buffer.
(vc-cvs-after-dir-status): Don't kill the buffer.

* vc-git.el (vc-git-dir-status): Don't create a buffer.
(vc-git-after-dir-status-stage2): Don't kill the buffer.

* vc-hg.el (vc-hg-dir-status): Don't create a buffer.
(vc-hg-after-dir-status): Don't kill the buffer.

* vc-svn.el (vc-svn-dir-status): Don't create a buffer.
(vc-svn-after-dir-status): Don't kill the buffer.
2008-03-29 05:34:52 +00:00
Dan Nicolaescu
c6ea7ec62c (vc-status-mode-map, vc-status-menu-map): Bind vc-update and vc-print-log. 2008-03-29 00:43:56 +00:00
Dan Nicolaescu
20f95df210 (vc-update): Check if the buffer is unsaved only if it
actually exists.
(vc-status-mode-map, vc-status-menu-map): Bind vc-update.
2008-03-29 00:17:54 +00:00
Dan Nicolaescu
fc30d54425 Reshuffle TODOs. 2008-03-28 19:32:47 +00:00
Dan Nicolaescu
0cc8ac2b92 *** empty log message *** 2008-03-28 18:42:02 +00:00
Dan Nicolaescu
d05665bc59 Update TODO. 2008-03-28 18:29:38 +00:00
Dan Nicolaescu
6b2d7cf254 (ring): Don't require it, not used. 2008-03-28 18:22:15 +00:00
Dan Nicolaescu
f56d71a596 (vc-status-kill-dir-status-process): Simplify.
(vc-status-refresh): Make sure the buffer is live.
2008-03-28 18:16:09 +00:00
Dan Nicolaescu
15c5c97086 * vc.el: Add new backend function 'status-extra-headers.
(vc-default-status-extra-headers): New function.
(vc-status-headers): Call 'status-extra-headers.  Add colors.

* vc-git.el (vc-git-status-extra-headers): New function.
2008-03-28 03:50:26 +00:00
Stefan Monnier
f42d59a5d7 (vc-do-command): Don't pop to the buffer if it's an internal temp buffer. 2008-03-27 03:40:36 +00:00
Dan Nicolaescu
d6f47dff59 (vc-status-printer): Use a different face for missing files.
(vc-status-hide-up-to-date): Rename from
vc-status-remove-up-to-date.  Update all callers.
(vc-status-mode-map): Bind C-m.
2008-03-24 08:35:33 +00:00
Dan Nicolaescu
484c309251 (vc-status-mark-buffer-changed): Add an optional file parameter.
(vc-resynch-buffer): Use it.
(vc-delete-file): Expand the file name before using it.  Be
careful to not create a new buffer with the old file contents.
Update the VC state after performing the operation.
2008-03-23 21:05:32 +00:00
Dan Nicolaescu
d39730b895 (vc-status-prepare-status-buffer): Fix thinko.
(vc-status-menu-map): Add binding for
vc-status-kill-dir-status-process.  Add :enable for vc-status-refresh.
(vc-status-menu-map-filter): Remove vc-ignore-menu-filter test.
(vc-status-tool-bar-map): Add binding for vc-status-kill-dir-status-process.
Don't test display-graphic-p and don't bind vc-ignore-menu-filter.
(vc-update-vc-status-buffer, vc-status-kill-dir-status-process):
Reset vc-status-process-buffer.
(vc-status-refresh): Don't run two refreshes at a time.
(vc-status): If the buffer is already in vc-status-mode only refresh.
2008-03-23 18:12:18 +00:00
Dan Nicolaescu
e9e065e5b3 (vc-status-prepare-status-buffer): New function.
(vc-status): Use it.
2008-03-22 20:32:10 +00:00
Stefan Monnier
45b24b4de6 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
* vc.el (vc-default-dired-state-info): Use just "modified".
* vc-cvs.el (vc-cvs-state-heuristic): Turn rev 0 into `added'.
(vc-cvs-mode-line-string): Make use of the better default.
(vc-cvs-parse-entry): Use the new `added'.
(vc-cvs-dired-state-info): Remove.
* vc-svn.el (vc-svn-dired-state-info): Remove.
* vc-hg.el (vc-hg-dired-state-info): Remove.
* vc-git.el (vc-git-dired-state-info): Remove.
2008-03-21 17:53:04 +00:00
Dan Nicolaescu
21f3a27763 (vc-status-mark-buffer-changed): Better deal with files in
the 'added state.
(vc-status-remove-up-to-date): New function.
(vc-status-mode-map, vc-status-menu-map): Bind it.
(vc-status-printer): Use a different face up-to-date files.
(vc-resynch-buffer): Update the vc-status buffer if it exists.
(Todo): Remove solved entries.
2008-03-21 06:02:51 +00:00
Dan Nicolaescu
9f7ddd67c0 (vc-status-mark-buffer-changed): New function to implement
updating of the *vc-status* buffer when a buffer is saved.
(vc-status-mode): Use it for after-change-hook.
(vc-add-to-vc-status-buffer): Rename to ...
(vc-status-add-entry): ... this.
(Todo): Add new entry.
2008-03-20 15:51:45 +00:00
Stefan Monnier
14b7a0b527 (vc-annotate-background): Fix custom type. 2008-03-19 01:44:34 +00:00
Dan Nicolaescu
7ee8e7eb0f * vc-bzr.el (vc-bzr-dir-status, vc-bzr-after-dir-status):
New functions to implement vc-status support.

* vc.el (vc-default-extra-status-menu)
(vc-add-to-vc-status-buffer): New functions.
2008-03-17 16:25:13 +00:00
Glenn Morris
c2062c3b91 (vc-set-mode-line-busy-indicator): Use mode-line-emphasis face. 2008-03-11 02:59:11 +00:00
Jan Djärv
934b91bf63 (vc-status-menu-map-filter): Return orig-binding if
boundp 'vc-ignore-menu-filter.
(vc-status-tool-bar-map): Make it defvar.
(vc-status-mode): vc-status-tool-bar-map now variable.
(vc-status-toggle-mark): toggle-mark-file => vc-status-toggle-mark-file.
2008-03-07 10:37:56 +00:00
Jan Djärv
64db3a9033 (vc-status-tool-bar-map, vc-status-toggle-mark-file)
(vc-status-toggle-mark): New functions.
(vc-status-mode): Set tool bar map.
2008-03-06 10:58:48 +00:00
Nick Roberts
14b7b2c492 (vc-set-mode-line-busy-indicator): Use shorter message
and quieter face (not a warning).
2008-02-29 22:09:56 +00:00
Dan Nicolaescu
9b7b3814df * vc.el (vc-status-crt-marked): New variable.
(vc-status-mode): Make it local.
(vc-status-refresh): Use it to save the marked files.
(vc-update-vc-status-buffer): Use it to restore the marked files.

* vc-svn.el (vc-svn-after-dir-status):
* vc-hg.el (vc-hg-after-dir-status): Clean up the temporary buffer.
2008-02-29 19:13:54 +00:00
Dan Nicolaescu
a7aa113743 *** empty log message *** 2008-02-28 03:37:40 +00:00
Dan Nicolaescu
76cdeb7d29 * progmodes/hideshow.el (hs-minor-mode-menu): Add some options to
the menu.

* vc.el (vc-deduce-fileset, vc-next-action, vc-start-entry)
(vc-finish-logentry): Check for vc-status-mode, not only for
vc-dired-mode.
2008-02-28 03:35:22 +00:00
Dan Nicolaescu
25a4ea6de0 * vc.el (vc-find-revision): Make vc-parent-buffer local before
setting it.
(vc-status-menu-map): Do not define using easy-menu.
(vc-status-menu-map): New defalias.
(vc-status-mode-map): Hook up the menu.
(top-level): Update TODO.

* vc-hg.el (vc-hg-extra-status-menu): Return a keymap.

* vc-bzr.el (vc-bzr-init-version): Rename to ...
(vc-bzr-init-revision): ... this.
2008-02-23 06:32:12 +00:00
Dan Nicolaescu
751c9f0042 * vc.el (vc-exec-after): Move setting mode-line-process in the
busy case ...
(vc-set-mode-line-busy-indicator): ... in this new function.
(vc-status-refresh): Call vc-set-mode-line-busy-indicator.
(vc-update-vc-status-buffer): Reset mode-line-process.
(vc-status-mark-all-files, vc-status-unmark-all-files): Change to
mark/unmark all the files with the same state as the current one.
With a prefix argument mark/unmark all files.
(vc-status-mode-menu): Adjust strings.
(vc-update-vc-status-buffer): Only do something when the argument
is not nil.
(vc-status-kill-dir-status-process): New function.
(vc-status-mode-map): Bind it.
(vc-status-process-buffer): New variable.
(vc-status-mode): Make it local.
(vc-status-refresh): Set it.

* vc-hg.el (vc-hg-dir-status):
* vc-git.el (vc-git-dir-status):
* vc-svn.el (vc-svn-dir-status): Return the buffer in which the
command is run.
2008-02-22 07:44:08 +00:00