1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-02 11:21:42 +00:00
Commit Graph

556 Commits

Author SHA1 Message Date
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
Dan Nicolaescu
d3201e0b10 (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.
2008-02-22 04:51:39 +00:00
Dan Nicolaescu
8bb38e8764 (vc-status-mark, vc-status-unmark): New functions.
(vc-status-mode-map, vc-status-mode-menu): Mark them instead for
vc-status-mark-file and vc-status-unmark-file.
(vc-status-mark-unmark): New function.
(vc-status-previous-line, vc-status-mark-all-files): No longer
interactive.
2008-02-21 08:26:00 +00:00
Thien-Thi Nguyen
f4263e475d Explain vc-BACKEND-root in Commentary; nfc. 2008-02-20 18:11:15 +00:00
Dan Nicolaescu
00ca5ce2ea (dir-status): Add a brief description. 2008-02-19 15:44:45 +00:00
Dan Nicolaescu
6656ecaa46 * vc.el (vc-status-menu, vc-status-menu-map-filter): New functions.
(vc-status-mode-menu): Add a :filter.
(vc-status-printer): Add faces.

* vc-hg.el (vc-hg-extra-status-menu): New function.
(vc-hg-dir-status): Clean up the buffer before using it.
2008-02-19 07:10:33 +00:00
Dan Nicolaescu
df04e22c44 (vc-status-mode-menu): New menu for vc-status. 2008-02-18 19:53:25 +00:00
Dan Nicolaescu
bae9f9e311 (vc-annotate): Add new argument.
(vc-annotate-warp-revision): Pass the current line to vc-annotate.
2008-02-16 15:54:37 +00:00
Dan Nicolaescu
f3ff0fe9ac (vc-annotate-find-revision-at-line): New function.
(vc-annotate-mode-map): Bind it.
(vc-annotate-mode-menu): Add a menu entry for it.  Add :help for
some entries.
2008-02-14 07:37:51 +00:00
Thien-Thi Nguyen
1d5b214902 Make vc-diff-internal messages consistent across many cases.
(vc-exec-after): Append CODE to previous fragments.
(vc-diff-finish): Take BUFFER directly, not BUFFER-NAME;
take MESSAGES instead of VERBOSE; use it when non-nil.
(vc-diff-internal): Compute messages once; use them;
update call to vc-diff-finish.
2008-02-09 12:32:57 +00:00
Thien-Thi Nguyen
cea93de37d (vc-update): Fix bug: Specify branch tip as vc-checkout REVISION. 2008-02-01 05:52:21 +00:00
Dan Nicolaescu
3f08440f1d Add TODO item about not defaulting to RCS. 2008-01-27 16:31:09 +00:00
Thien-Thi Nguyen
832ffa7c8e (vc-exec-after): For mode-line-process highlighting, if feature
`compile' is not available, fall back to font-lock-warning-face.
2008-01-26 20:04:49 +00:00
Michael Albinus
65b014077a * vc.el (vc-directory, vc-update-change-log): Remove check for
Tramp.  Both functions work for it, though pretty slow
(`vc-directory').  Maybe the implementation can be optimized.
2008-01-26 14:53:55 +00:00
Thien-Thi Nguyen
845ec007da (vc-diff-finish): Search all frames for the buffer's window. 2008-01-24 15:09:24 +00:00
Thien-Thi Nguyen
d36122a23e (vc-next-action): Fix two instances of "free-var file" bug:
In both cases, convert single call to one wrapped in dolist.
2008-01-24 13:09:13 +00:00
Thien-Thi Nguyen
fddde1f0b5 Handle dead buffers in async filters/sentinels.
(vc-process-filter): Do nothing if buffer not live.
(vc-diff-finish): Rename from vc-diff-sentinel.
No longer take REV1-NAME and REV2-NAME.
Instead, take BUFFER-NAME.  Do nothing if buffer not live.
Don't do window resize if no window displays buffer.
(vc-diff-internal): Use vc-diff-finish.
2008-01-24 08:54:00 +00:00
Thien-Thi Nguyen
2ee455eaa3 Delete eol whitespace; nfc. 2008-01-24 08:48:42 +00:00
Dan Nicolaescu
4ac7bfcf33 Add a TODO item about missing files.
(vc-exec-after): Add a tooltip to the new mode-line item.
2008-01-24 08:01:54 +00:00
Dan Nicolaescu
3b3cb33695 Add TODO items. 2008-01-23 16:35:18 +00:00
Glenn Morris
f52749ed49 (vc-diff-sentinel): Do not write a footer if there were differences. 2008-01-22 06:39:44 +00:00
Thien-Thi Nguyen
b49fd377e8 (vc-process-sentinel): After calling the
previous sentinel, do nothing if the process' buffer is not live.
2008-01-21 14:03:09 +00:00
Thien-Thi Nguyen
3c2e52cde9 (vc-process-sentinel): Fix bug introduced in last change:
Set mode-line-process with P's buffer made temporarily current.
2008-01-20 20:29:47 +00:00
Thien-Thi Nguyen
d048f3bf74 (vc-process-sentinel): Set mode-line-process.
(vc-exec-after): Likewise, for the `run' process status.
2008-01-20 20:23:04 +00:00
Dan Nicolaescu
5ab612e823 * vc.el: Make vc-status asynchronous.
(vc-update-vc-status-buffer): New function broken out of ...
(vc-status-refresh): ... here. Pass vc-update-vc-status-buffer to
the dir-status backend function.

* vc-hg.el (vc-hg-dir-status): Compute the status asynchronously.
Move the output processing to ...
(vc-hg-after-dir-status): ... here.  Call the function passed as
an argument with the results.
2008-01-18 23:32:58 +00:00
Dan Nicolaescu
e166638d11 Add a TODO note about vc-state.
(vc-next-action): Register 'unregistered and 'ignored files.  Use
when and unless instead of if where appropriate.
(vc-start-entry): Fix typo.
(vc-status): Autoload it.
2008-01-18 14:12:44 +00:00
Dan Nicolaescu
28e4e2b434 * smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.

* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
2008-01-16 06:22:59 +00:00
Dan Nicolaescu
ba463d9eca * smerge-mode.el (smerge-auto): New function.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook):
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Use it instead of vc-mode.
(top-level): Add a Todo list.
2008-01-14 07:38:05 +00:00
Dan Nicolaescu
c6a234ac6c * vc.el (vc-update): Resolve conflicts if necessary instead of
just updating the buffer.

* vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
update command so that we can parse the output.
2008-01-13 20:03:35 +00:00
Dan Nicolaescu
b6fe5b19b1 * vc.el (vc-status-unmark-all-files): New function.
(vc-status-unmark-all-files): Likewise.
(vc-status-mode-map): Add bindings.
2008-01-10 07:51:25 +00:00
Dan Nicolaescu
e11c1d937f (vc-deduce-fileset): Return the currently selected file if
no files are selected when using vc-status.
2008-01-09 07:21:08 +00:00
Dan Nicolaescu
ca8dfeda7c * vc.el (vc-status-headers): Rename from
vc-status-insert-headers.  Just return header.
(vc-status-move-to-goal-column): New function.
(vc-status-mode-map): Define more keys.
(vc-status-mode): Use vc-status-refresh.  Now 'special.
(vc-status-refresh): New function.
(vc-status-next-line): Likewise.
(vc-status-previous-line): Likewise.
(vc-status-mark-file): Use vc-status-next-line.
(vc-status-unmark-file): Use vc-status-previous-line.
(vc-status-unmark-file-up): New function.
(vc-status-register): Likewise.
(vc-status-find-file): Likewise.
(vc-status-find-file-other-window): Likewise.
(vc-status-current-file): Likewise.
(vc-ensure-vc-buffer): Understand vc-status mode.
2008-01-09 05:19:04 +00:00
Stefan Monnier
cc72026bca (vc-ensure-vc-buffer): Check liveness of vc-parent-buffer. 2008-01-06 16:02:38 +00:00
Dan Nicolaescu
8fcaf22f90 * vc.el (vc-status-fileinfo): New defstruct.
(vc-status): New defvar
(vc-status-insert-headers, vc-status-printer, vc-status)
(vc-status-mode-map, vc-status-mode, vc-status-mark-file)
(vc-status-unmark-file, vc-status-marked-files): New functions.

* vc-hg.el (vc-hg-dir-status): New function.
2008-01-06 10:20:26 +00:00
Juanma Barranquero
df49d02eba Fix typo in comment. Reported by Tom Tromey <tromey@redhat.com>. 2008-01-06 03:18:08 +00:00
Stefan Monnier
f605fc58e2 (vc-process-sentinel): Fix apparent typo.
(vc-do-command): Forcefully kill any left over process.
Use start-file-process.
(vc-annotate-get-time-set-line-props): Check we don't move backward.
2008-01-05 05:25:13 +00:00
Eric S. Raymond
c59a24425b * vc.el (vc-dired-hook): Speed tuning. Replace a vc-backend call
with vc-state.
2008-01-01 11:17:37 +00:00
Dan Nicolaescu
55adbcc236 State that dir-state is required to set the vc-state and
vc-backend properties.
2007-12-31 19:14:24 +00:00
Eric S. Raymond
484c1b1f14 * vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
and 'unregistered states.

* vc-hooks.el (vc-state): Added 'removed state to documentation.

* vc-hg (vc-hg-parse-status): Recognize 'added, 'removed,  and
'up-to-date state.  Deal with the possibility that C for clean
might change to "=" in the next point release.

* vc-git.el (vc-git-parse-status): Recognize 'removed.

* vc.el (header comment): Better description of new dir-state.
(vc-compatible-state): Defines which states are mutually
compatible; usable with 'edited as a test for which can be committed on.
(vc-dired-hook): Turn off undo in the VC-Dired buffer, a speed tweak.
(vc-default-dired-state-info): Display 'removed state.

* vc-bzr.el (vc-bzr-dir-state): Recognize 'added.
2007-12-29 13:20:49 +00:00
Eric S. Raymond
722f037fc8 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
states. and the new return-value convention.  These are not
	actually used yet, just set.

	* vc-svn.el (vc-svn-parse-status): Set 'ignored and 'unregistered
	states when appropriate.

	* vc-hg.el (vc-hg-state,vc-hg-dir-state): Set 'ignored and
	'unregistered' when appropriate.

	* vc-git.el: Document that we don't set the new states yet.

	* vc.el (vc-dired-state-info): Display 'unregistered and
	'ignored states.

	* vc-cvs.el (vc-cvs-parse-status): Set the 'ignored state when
	appropriate.

	* vc-bzr.el (vc-bzr-dir-state): Set 'ignored and
	'unregistered' when appropriate.
2007-12-28 18:16:55 +00:00
Eric S. Raymond
0f67cc71b4 * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
functions so they don't do work that the default one can do instead
2007-12-28 16:24:31 +00:00
Eric S. Raymond
9c4b89d5a4 * vc-hooks.el, vc.el: Move vc-directory-exclusion-list from vc.el
to vc-hooks.el so it will be available to other modes, such as
speedbar.el.  Also, teach it to recognize monotine state directories.

* speedbar.el: Remove this mode's fragile assumptions about
version-control systems.  Instead, make it use logic from
vc-hooks.el so it will become smarter whenever VC mode does.

* vc-hooks.el: 'added is a real state, not a future hypothetical
one. Fix the documentation.
2007-12-28 13:29:41 +00:00