1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Commit Graph

52 Commits

Author SHA1 Message Date
Dan Nicolaescu
6efbb10c5b (vc-bzr-state): Use when instead of if. 2008-04-04 22:29:02 +00:00
Stefan Monnier
882e82db4d (vc-bzr-previous-revision, vc-bzr-next-revision): New funs. 2008-04-03 13:34:34 +00:00
Stefan Monnier
5a3b79c471 (vc-bzr-checkout): Simplify. 2008-04-03 02:21:33 +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
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
Stefan Monnier
769087cead (vc-bzr-state-heuristic): Fix last change for when there are conflicts. 2008-03-29 01:09:45 +00:00
Stefan Monnier
82eb83ffdb (vc-bzr-sha1): New fun.
(vc-bzr-state-heuristic): New fun, extracted from vc-bzr-registered.
(vc-bzr-registered): Use it.
2008-03-28 19:51:21 +00:00
Stefan Monnier
5a07b0f024 (vc-bzr-print-log, vc-bzr-diff): Do it asynchronously. 2008-03-24 19:52:29 +00:00
Dan Nicolaescu
49546869f3 * vc-hg.el (vc-hg-after-dir-status):
* vc-bzr.el (vc-bzr-after-dir-status): Detect missing files.
2008-03-24 08:47:06 +00:00
Dan Nicolaescu
54bf37044b (vc-bzr-state): Return 'removed for removed files and
'unregistered for unregistered files.
2008-03-23 20:50:52 +00:00
Dan Nicolaescu
6a3f9bb72d * vc-hg.el (vc-hg-state):
* vc-git.el (vc-git-state):
* vc-cvs.el (vc-cvs-parse-status):
* vc-bzr.el (vc-bzr-state): Return 'added when the file is in that
state.
2008-03-21 05:53:48 +00:00
Dan Nicolaescu
a676223563 Revert unintended change. 2008-03-17 21:58:19 +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
Stefan Monnier
39f4444267 (vc-bzr-diff): Use a faster invocation when possible.
(vc-bzr-complete-with-prefix, vc-bzr-revision-completion-table): New functions.
2008-03-15 19:37:17 +00:00
Dan Nicolaescu
ac51b1513d (vc-bzr-print-log): Insert a file marker. Run the log
for each file in the list.
(vc-bzr-log-view-mode): Recognize the file marker.
2008-03-14 16:12:31 +00:00
Dan Nicolaescu
f392f8b441 (vc-bzr-log-view-mode): "." can be part of a revno.
(vc-bzr-show-log-entry): Make regexp match more cases.
(vc-diff-switches-list): Remove autoload, not needed.
2008-03-14 01:52:59 +00:00
Stefan Monnier
b0a08954d5 (vc-bzr-resolve-when-done, vc-bzr-find-file-hook): New functions. 2008-03-06 22:08:21 +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
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Romain Francoise
f36e650b8b 2008-01-05 Sven Joachim <svenjoac@gmx.de>
* vc-bzr.el: Fix typo in header.
2008-01-05 18:11:25 +00:00
Stefan Monnier
f4d0cf2342 Copyright and version headers update.
Remove some outdated comments through the whole file.
(vc-bzr-program-args): Remove because unused.
(vc-bzr-log-switches): New customization option.
(vc-bzr-command): Use LC_MESSAGES=C instead of LC_ALL=C.  No longer
use `vc-bzr-program-args'.
(vc-bzr-register): Fix for working with both 22.1 and CVS version of
`vc-find-root' (patch by Andreas Hoenen).
(vc-bzr-status): Update regex to match latest Bzr output.
Remove redundant test.
(vc-bzr-init-version): New function.
(vc-bzr-unregister): Must not delete file.
(vc-bzr-find-version): New function.
(vc-bzr-checkout): Argument `rev' is explicit revision only if it's
a non-empty string, otherwise take head revision.
(vc-bzr-print-log): Pass `vc-bzr-log-switches' to "bzr log".
(vc-bzr-diff): Simpler build of the revision spec string.
(vc-annotate-convert-time, vc-bzr-annotate-difference):
Remove: compatibility hacks for Emacs21, not needed in Emacs 22.
(vc-bzr-dir-state): Add code comments.  Removed redundant statement.
(vc-bzr-dired-state-info): Only provide custom strings for
overloaded VC state 'edited; otherwise fallback to
`vc-default-dired-state-info'.
2008-01-04 19:20:59 +00:00
Dan Nicolaescu
b38f5e6fea * mouse.el (mouse-popup-menubar): Fix typo.
* emacs-lisp/bytecomp.el (byte-compile-from-buffer): Move one more
form inside with-current-buffer.

* progmodes/antlr-mode.el (provide): Move to the end of file.
(require): Don't require font-lock and compile.
(outline-level, imenu-use-markers, imenu-create-index-function):
Move declarations to top level.
(cond-emacs-xemacs-macfn): Declare for compiler.

* vc-bzr.el (vc-bzr-root):
* vc-arch.el (vc-arch-root): Only set a property if the file is
managed by this backend.

* vc-hg.el (vc-hg-state): Support the new status code for
up-to-date.
2008-01-04 08:34:15 +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
18e1f24981 * vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:
Modify all instances of the dir-state back-end method to suppress
keeping undo lists on the buffers holding astatus output, which
csn get extremely large.
2007-12-28 08:59:50 +00:00
Eric S. Raymond
cdce374aed *** empty log message *** 2007-12-26 23:24:08 +00:00
Stefan Monnier
54a2247d6e * vc-bzr.el (vc-bzr-diff-tree):
* vc-git.el (vc-git-diff-tree):
* vc-hg.el (vc-hg-diff-tree):
* vc-mcvs.el (vc-mcvs-diff-tree):
* vc-mtn.el (vc-mtn-diff-tree):
* vc-svn.el (vc-svn-diff-tree): Remove.
2007-10-20 01:28:35 +00:00
Eric S. Raymond
5b5afd508a Carry through today's big terminology change to a few places where I
missed it in the back ends.
2007-10-10 19:39:23 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Stefan Monnier
6e98ad29a9 (vc-bzr-admin-lastrev): New constant.
(vc-bzr-file-name-relative): Use 'when' instead of 'and'.
(vc-bzr-status): Fix shadowing of variable 'status'.
(vc-bzr-workfile-version): Use correct path to 'last-revision' file.
Use `expand-file-name' instead of `concat'.
(vc-bzr-annotate-command): Use option name '--long' instead of '-l'.
Update annotation line regexp.  Fixes launchpad.net [Bug 137435].
2007-09-07 01:26:58 +00:00
Romain Francoise
12451866c7 (vc-bzr-admin-lastrev): New defconst.
(vc-bzr-workfile-version): Use it.
2007-09-06 19:46:17 +00:00
Miles Bader
bdaf8a62d5 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 93-96)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 245)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-856
2007-08-21 04:51:30 +00:00
Stefan Monnier
fba500b6f1 Don't fiddle with vc-handled-backend.
(vc-bzr-registered): Don't redundantly protect against
file-error.  Actually use the format-specific code.
(vc-bzr-buffer-nonblank-p): Remove.
(vc-bzr-status): Change `kindchange' -> `kindchanged'.
2007-08-15 21:10:46 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Stefan Monnier
33e5d7d4c9 (vc-bzr-registered): Use \0 instead of literal NULs.
(vc-bzr-state-words): Add "kind changed" state word.
(vc-bzr-status): New function.  Return Bzr idea of file status,
which is different from VC's.
(vc-bzr-state): Use vc-bzr-status.
(vc-workfile-unchanged-p): Use vc-bzr-status.
(vc-bzr-revert): Use synchronous process; expect exitcode 0.
(vc-dired-state): Process "kind changed" state word.
2007-08-09 14:57:45 +00:00
Stefan Monnier
a460c94c17 Remove comments about vc-bzr.el being a modified unofficial version.
(vc-bzr-command): Remove redundant setting of process-connection-type.
(vc-bzr-admin-checkout-format-file): Add autoload.
(vc-bzr-root-dir): Remove in favor of vc-bzr-root.
(vc-bzr-root): Switch to implementation of vc-bzr-root-dir.
(vc-bzr-registered): Compare dirstate format tag with known good
value, abort parsing if match fails.  Warn user in docstring.
(vc-bzr-workfile-version): Case for different Bzr branch formats.
See bzrlib/branch.py in Bzr sources.
(vc-bzr-diff): First argument FILES may be a string rather than a list.
(vc-bzr-shell-command): Remove in favor of
vc-bzr-command-discarding-stderr.
(vc-bzr-command-discarding-stderr): New function.
2007-08-07 04:23:50 +00:00
Stefan Monnier
b6e6e09ac1 (vc-bzr-registered): Gracefully handle missing "bzr"
program, and return nil
(vc-bzr-state): Gracefully handle missing "bzr" program, and return nil.
(vc-bzr-state): Look for path names relative to the repository
root after status keyword.
(vc-bzr-file-name-relative): New function.
(vc-bzr-admin-dirname): Reinstate, as other vc-bzr-admin-... paths
depend on it.
(vc-bzr-admin-dirname, ...-checkout-format-file)
(...-branch-format-file, ...-revhistory): Paths to some Bzr internal
files that we now parse directly for speed.
(vc-bzr-root-dir): Use `vc-bzr-admin-checkout-format-file' as witness.
(vc-bzr-registered): Only parse vc-bzr-admin-dirstate file if it exists.
(vc-bzr-state): "bzr status" successful only if exitcode is 0
(vc-bzr-root): Use `vc-bzr-shell-command'.  Stderr may contain
Bzr warnings, so we must discard it.
(vc-bzr-workfile-version): Speedup counting lines from
`vc-bzr-admin-revhistory' file, but fallback to spawning "bzr revno"
if that file doesn't exist.
(vc-bzr-responsible-p): Use `vc-bzr-root' instead of
`vc-bzr-root-dir' for speed.
add `vc-bzr-admin-dirname' (not ".bzr"!) to `vc-directory-exclusion-list'
(vc-bzr-shell-command): New function.
2007-08-06 21:17:34 +00:00
Miles Bader
5716cebdd0 Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-87
2007-08-03 05:09:21 +00:00
Miles Bader
4211679b08 Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-842
2007-08-03 04:57:05 +00:00
Stefan Monnier
51f6595da7 (vc-bzr-admin-dirstate): Rename from `...-dirname'.
Make it more discriminating and more useful.
(vc-bzr-root-dir): Use new name.
(vc-bzr-registered): Use new name and look at the dirstate file to
determine if it's registered or not without running `bzr'.
2007-08-02 17:08:53 +00:00
Stefan Monnier
a0e5e0759c * vc-bzr.el: New file (copied from the trunk).
* vc-hooks.el (vc-handled-backends): Add BZR.
2007-07-31 15:26:05 +00:00
Glenn Morris
64be3a425a Switch license to GPLv3 or later. 2007-07-27 07:19:16 +00:00
Dan Nicolaescu
a6ea7ffc20 * vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
(vc-hg-registered): Replace if with when.
(vc-hg-state): Deal with nonexistent files and handle removed
files.
(vc-hg-dir-state, vc-hg-dired-state-info): New functions.
(vc-hg-checkout): Re-enable.
(vc-hg-create-repo): Fix typos.

* vc.el: Fix typo.

* vc-mcvs.el (vc-mcvs-create-repo): Fix typos.

* vc-bzr.el (vc-bzr-create-repo): New function.
2007-07-20 00:09:17 +00:00
Eric S. Raymond
8cdd17b444 Put the lower half (the back-end) of NewVC in place. This commit
makes only the minimum changes needed to get the old vc.el logic
working with the new back ends.
2007-07-18 16:32:40 +00:00
Stefan Monnier
8c58e784d8 (vc-bzr-version, vc-bzr-at-least-version, vc-bzr-post-command-function):
Remove.  Version 0.8 is already old nowadays, and by the time Emacs-23 comes
out, nobody will even remember it has ever existed.
2007-07-17 05:33:17 +00:00
Stefan Monnier
360cf7bc88 (vc-functions): Clear up the cache when reloading the file.
(vc-bzr-workfile-version, vc-bzr-could-register): Don't hardcode point-min == 1.
2007-06-28 02:01:54 +00:00
Dan Nicolaescu
5ec0577963 (vc-bzr-log-view-mode): Add + to the email address
regexp.
2007-06-22 02:46:04 +00:00
Stefan Monnier
37320a581f (vc-bzr-dir-state): Use setq rather than set.
Use vc-bzr-command rather than the ill defined vc-bzr-command*.
(vc-bzr-command*): Remove both (incompatible) versions.
(vc-bzr-do-command*): Remove.
(vc-bzr-with-process-environment, vc-bzr-std-process-invocation):
Remove by folding into its only caller vc-bzr-command.
(vc-bzr-command): Always set the environment, even when ineffective.
(vc-bzr-version): Minor fix up.
(vc-bzr-admin-dirname): New var.
(vc-bzr-bzr-dir): Remove.
(vc-bzr-root-dir): New fun.
(vc-bzr-registered): Use it.  Add an autoloaded version.
(vc-bzr-responsible-p): Use vc-bzr-root-dir as well.
(vc-bzr-view-log-function): Remove.
(vc-bzr-log-view-mode): New major mode to replace it.
(vc-bzr-print-log): Only activate the old hack if needed.
2007-06-20 18:18:54 +00:00
Stefan Monnier
77b5d45811 (vc-bzr-with-process-environment, vc-bzr-std-process-invocation): New macros.
(vc-bzr-command, vc-bzr-command*): Use them.
(vc-bzr-with-c-locale): Remove.
(vc-bzr-dir-state): Replace its use with vc-bzr-command.
(vc-bzr-buffer-nonblank-p): New function.
(vc-bzr-state-words): New const.
(vc-bzr-state): Look for `bzr status` keywords in output.
Display everything else as a warning message to the user.
Fix status report with bzr >= 0.15.
2007-06-20 06:44:35 +00:00