1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Commit Graph

56 Commits

Author SHA1 Message Date
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
e98a0cab3f (vc-arch-diff-switches): New option, for consistency with other backends.
(vc-arch-diff): Apply switches.
2008-12-03 07:35:14 +00:00
Glenn Morris
e94851d3ca (vc-arch-program): Rename from vc-arch-command, for
consistency with other backends.  Make it a defcustom.
(vc-arch-command, vc-arch-trim-revlib): Adapt for above change.
2008-11-22 03:30:22 +00:00
Magnus Henoch
b4a7be3810 * vc-arch.el (vc-arch-dir-status): New function.
(vc-arch-after-dir-status): New function.
2008-10-16 11:48:42 +00:00
Stefan Monnier
e87c4c6e9a (vc-arch-trim-make-sentinel): Use a closure.
(vc-arch-trim-one-revlib): Delete temp directories as well.
2008-07-22 17:16:52 +00:00
Eric S. Raymond
2888a97eb5 Remove assumption about what nil means as a first arument to vc-do-command. 2008-05-10 13:27:16 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Eric S. Raymond
70e2f6c752 Clean up vc*-revision-granularity and vc*-checkout-model. 2008-05-02 17:47:25 +00:00
Eric S. Raymond
caf37b1f19 Fix some comments to remove references to vc-dired. 2008-05-02 07:38:11 +00:00
Eric S. Raymond
3702367bce Change 'needs-patch to 'needs-update. 2008-05-01 19:13:16 +00:00
Miles Bader
1bad168e59 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1006
2008-01-22 23:53:46 +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
54648b5c23 * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
after-save-hook so that it is not called multiple times.

* vc-svn.el (vc-svn-resolve-when-done): Likewise.
2008-01-15 04:37:20 +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
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
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +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
Dan Nicolaescu
fe1919ab86 * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
* vc-svn.el (vc-svn-print-log, vc-svn-diff):
* vc-mcvs.el (vc-mcvs-print-log, vc-mcvs-annotate-command):
* vc-cvs.el (vc-cvs-print-log, vc-cvs-diff)
(vc-cvs-annotate-command):
* vc-arch.el (vc-arch-diff): Remove test to check if start-process
is bound, it always is.
2007-11-10 05:22:16 +00:00
Stefan Monnier
a44d450b8c (vc-arch-revision-completion-table): Make it work when the
arg is a list of files.
2007-10-20 01:05:50 +00:00
Eric S. Raymond
ac3f4c6f02 Terminology cleanup. 2007-10-10 18:52:45 +00:00
Dan Nicolaescu
793a22023e * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
* vc-hooks.el (vc-menu-entry): New var.
(vc-mode-line-map): Use it so that this menu also uses the extra-menu.
(menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el.
(vc-menu-map): Declare and initialize in one step.

* menu-bar.el (vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.

* vc.el: Document new VC operation `extra-menu'.

* vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New
function.
2007-09-18 01:28:25 +00:00
Stefan Monnier
98a6dc9f68 (vc-arch-checkin): Fix typo. 2007-09-07 19:00:30 +00:00
Stefan Monnier
80d7d79f55 (vc-arch-extra-menu-map): New var and fun.
(vc-arch-find-file-not-found-hook): Remove, it's now the default.
2007-08-21 15:18:06 +00:00
Dan Nicolaescu
eff23ff376 * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Remove.
(vc-git-revision-completion-table): Enable.

* vc-hooks.el (vc-handled-backends): Add GIT and HG.

* vc.el (vc-directory-exclusion-list): Add .git and .hg.

* vc-hg.el (vc-hg-revision-completion-table): Re-enable.

* diff-mode.el (diff-mode-menu): New entries.

* diff-mode.el (diff-beginning-of-file-and-junk): New function.
(diff-file-kill): Use it.
(diff-beginning-of-hunk): Add arg `try-harder' using it.
(diff-restrict-view, diff-find-source-location, diff-refine-hunk):
Use it so they find the hunk even when we're in the file header.

* vc.el: Add new VC operation `revision-completion-table'.
(vc-default-revision-completion-table): New function.
(vc-version-diff, vc-version-other-window): Use it to provide
completion of revision names if the backend provides it.

* vc-arch.el (vc-arch--version-completion-table)
(vc-arch-revision-completion-table): New functions to provide
completion of revision names.

* vc-cvs.el: Require CL.
(vc-cvs-revision-table, vc-cvs-revision-completion-table):
New functions to provide completion of revision names.

* eval.c (init_eval_once): Bump max_lisp_eval_depth to 400.

* vc2-xtra.texi (Customizing VC): Add GIT and HG.
2007-07-30 00:19:06 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Stefan Monnier
f3b8feb4fb (vc-arch-diff): Fix last change. 2007-07-20 20:02:32 +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
ebaba1bd73 (vc-arch-complete): Remove.
(vc-arch-revision-completion-table): Use complete-with-action.
2007-07-10 19:55:12 +00:00
Stefan Monnier
56dada428e (vc-arch-add-tagline): Do a slightly cleaner job.
(vc-arch-complete, vc-arch--version-completion-table)
(vc-arch-revision-completion-table): New functions to provide
completion of revision names.
(vc-arch-trim-find-least-useful-rev, vc-arch-trim-make-sentinel)
(vc-arch-trim-one-revlib, vc-arch-trim-revlib): New functions
to let the user trim the revlib.
2007-06-26 17:59:52 +00:00
Stefan Monnier
b4c4ba4182 (vc-arch-command): Remove bzr. It's a different program. 2007-06-13 18:00:34 +00:00
Sam Steingold
e7053211d6 (vc-arch-command): Also try "baz" and "bzr". 2007-06-12 13:37:56 +00:00
Stefan Monnier
74cb3d2111 (vc-with-current-file-buffer): New macro.
(vc-arch-file-source-p): Use it to avoid infloop.
2007-03-28 01:19:43 +00:00
Richard M. Stallman
e56b4640c2 (vc-arch-file-id): Move with-current-buffer inside the if. 2007-01-28 07:05:42 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Stefan Monnier
544bdc401a (vc-arch-find-version): New function. 2006-12-27 16:26:34 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Thien-Thi Nguyen
0d30b33766 Update years in copyright notice; nfc. 2005-08-06 22:13:43 +00:00
Lute Kamstra
086add1519 Update FSF's address. 2005-07-04 23:32:44 +00:00
Juanma Barranquero
ef5c2ecae7 (vc-arch-checkin, vc-arch-diff): Follow error conventions. 2005-06-14 15:21:33 +00:00
André Spiegel
160a154482 (vc-arch-diff): Don't diff asynchronously if vc-disable-async-diff is
t.
2005-01-09 21:29:27 +00:00
Stefan Monnier
c771f3d67a (vc-arch-workfile-version): Fix last change. 2005-01-02 22:07:52 +00:00
Stefan Monnier
5e39b98a29 (vc-arch-workfile-version): Handle the empty-branch case. 2005-01-02 22:00:07 +00:00
Stefan Monnier
bcabe045db (vc-arch-workfile-version): Don't burp if the patch-log directory is missing. 2004-10-17 23:01:25 +00:00
Stefan Monnier
ef9c4df0c0 (vc-arch-root, vc-arch-registered): Use vc-find-root. 2004-09-13 20:39:59 +00:00
Stefan Monnier
c9cb3a267c (vc-arch-state): Fix parsing for `names' method. 2004-09-08 22:15:34 +00:00
Stefan Monnier
86d660c6c2 (vc-arch-workfile-version): Handle the special case before the first commit. 2004-09-07 04:49:03 +00:00
Kim F. Storm
d30bef6454 (vc-arch-mode-line-rewrite): Add :group 'vc. 2004-06-29 13:00:49 +00:00
Stefan Monnier
f9e66e49d4 (vc-arch-state): Don't assume the file exists. 2004-06-01 00:25:50 +00:00
Stefan Monnier
bf37bf11f9 (vc-arch-diff): Add optional `buffer' arg. 2004-05-28 23:04:07 +00:00