1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-23 18:47:57 +00:00
Commit Graph

21 Commits

Author SHA1 Message Date
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
Masatake YAMATO
b32ce4c33a * vc-bzr.el (vc-bzr-root): Cache the output of shell command execution. 2007-06-15 19:40:47 +00:00
Stefan Monnier
b6e0e86c93 *** empty log message *** 2007-06-11 20:00:35 +00:00