1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-22 13:40:44 -08:00
Commit graph

864 commits

Author SHA1 Message Date
Dmitry Gutov
01b97f9df2 Move VC diff ASYNC argument to the fifth position
* lisp/vc/vc-svn.el (vc-svn-diff):
* lisp/vc/vc-src.el (vc-src-diff):
* lisp/vc/vc-sccs.el (vc-sccs-diff):
* lisp/vc/vc-rcs.el (vc-rcs-diff):
* lisp/vc/vc-mtn.el (vc-mtn-diff):
* lisp/vc/vc-hg.el (vc-hg-diff):
* lisp/vc/vc-git.el (vc-git-diff):
* lisp/vc/vc-dav.el (vc-dav-diff):
* lisp/vc/vc-cvs.el (vc-cvs-diff):
* lisp/vc/vc-bzr.el (vc-bzr-diff):
* lisp/obsolete/vc-arch.el (vc-arch-diff): Move ASYNC argument to the end.

* lisp/vc/vc.el (vc-diff-internal): Pass `async' argument to the
backend `diff' command in the last position.
2014-12-14 12:49:08 +02:00
Eric S. Raymond
3c07d7f047 Fix wrong humber arguments passed to vc-svn-diff.
* vc/vc-svn.el (vc-svn-diff): Fix bug #19312.
2014-12-13 06:15:33 -05:00
Paul Eggert
d19bf72ac9 Spelling fixes 2014-12-12 18:42:57 -08:00
Eric S. Raymond
be6dff68be latest-on-branch-p is no longer a public method
* vc/vc-dav.el, vc/vc-git.el, vc/vc-hg.el, vc/vc-src.el, vc/vc.el:
latest-on-branch-p is no longer a public method.
2014-12-11 23:29:41 -05:00
Eric S. Raymond
ea8b9df12e Remove VC rollback method.
* vc/vc.el, vc/vc-hg.el, vc/vc-git.el, vc/vc-hooks.el,
vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el, vc/vc-src.el: rrollback
method removed, to be replaced in the future by uncommit.
2014-12-11 22:44:32 -05:00
Michael Albinus
452921cfc1 * vc/vc-hg.el (vc-hg-state): Make FILE absolute. Handle the case
that there is empty output.
2014-12-11 11:12:13 +01:00
Eric S. Raymond
8bc7ac5c25 Righteous featurectomy of vc-keep-workfiles - always do it.
* vc/vc-dispatcher.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el,
vc/vc.el: Righteous featurectomy of vc-keep-workfiles, it's a
shoot-self-in-foot archaism.  Workfiles are always kept.
2014-12-10 12:33:26 -05:00
Eric S. Raymond
baab20d73e vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument list
* vc/vc-src.el (vc-src-do-comand): Prepend -- to file argument list,
avoids problems witth names containing hyphens.
2014-12-09 06:59:34 -05:00
Dmitry Gutov
5872f843ff Fix bug#19304
Fixes: debbugs:19304

* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files
when FILES is non-nil.
2014-12-08 18:24:07 +02:00
Eric S. Raymond
7fb8fc35eb vc/vc-arch.el: Moved to obsolete directory...
...so a test framework won't trip over bit-rot in it.  There has been no
Arch snapshot for nine years.
2014-12-08 06:11:49 -05:00
Michael Albinus
7d043d590d Fix minor bugs in vc.
* vc/vc-mtn.el (vc-mtn-root):
* vc/vc-svn.el (vc-svn-registered): Make FILE absolute.
2014-12-05 21:36:47 +01:00
Stefan Monnier
be307485f7 * lisp: Prefer inlinable functions to macros.
* lisp/fringe.el (fringe-bitmap-p): Make it a plain function.

* lisp/tooltip.el (tooltip-region-active-p): Remove.

* lisp/net/shr.el (shr-char-breakable-p, shr-char-kinsoku-bol-p)
(shr-char-kinsoku-eol-p, shr-char-nospace-p): Use define-inline.

* lisp/url/url-future.el (url-future-done-p, url-future-completed-p)
(url-future-errored-p, url-future-cancelled-p):
* lisp/url/url-dav.el (url-dav-http-success-p): Use define-inline.

* lisp/vc/ediff-init.el (ediff-odd-p): Remove.
(ediff-background-face): Use cl-oddp instead.
(ediff-buffer-live-p): Make it a defsubst.
2014-12-05 12:49:53 -05:00
Juri Linkov
96e6fd3c15 Compare with the most recently used window by default.
* lisp/vc/compare-w.el (compare-windows-get-window-function):
New defcustom.
(compare-windows-get-recent-window)
(compare-windows-get-next-window): New functions.
(compare-windows, compare-windows-sync-default-function):
Use `compare-windows-get-window-function' instead of `next-window'.
(compare-windows): Add diff/match messages with region boundaries.
Fixes: debbugs:19170
2014-12-05 02:50:41 +02:00
Karl Fogel
b3298507f9 Fix bug whereby saving files hung in VC hook.
Saving a buffer visiting a file under SVN control would hang if the
remote repository were unreachable, because the VC hooks tried to run
"svn status -u" on the file, where the "-u" tells svn to get update
information from the remote repository.
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00174.html

* vc/vc-svn.el (vc-svn-state): Remove optional `localp' argument
  and always pass "-v" to "svn status", never "-u".
2014-12-03 14:23:26 -06:00
Eric S. Raymond
b1a765b3a8 In vc, abolish the dir-status method. 2014-12-02 10:11:48 -05:00
Eric S. Raymond
d4767877ac Eliminate an unuted function argument.
* vc.el, all backends: API simplification: Remove 4th 'default-state'
argument from vc-dir-status files and its backend methods - no backend
method ever set it.  It was used only in the fallback method to to set
a default of 'up-to-date, though a convoluted call chain obscured
this.
2014-12-02 08:01:46 -05:00
Eric S. Raymond
e6fe301afe Another longstanding to-do: bind vc-delete-file. 2014-12-02 05:31:04 -05:00
Eric S. Raymond
92411a0d2e Clean up a longstanding to-do item.
* vc.el (vc-expand-dirs): Now takes a second BACKEND argument,
improving behavior on directories using multiple file-oriented VCSEs.
2014-12-02 04:38:08 -05:00
Eric S. Raymond
2fb8b146f7 Remove clear-headers from VC's public method set.
* vc/vc.el and all backends: API simplification; clear-headers is no
longer a public method.  It is now local to the one place it's used,
in the RCS steal-lock method.
2014-12-01 23:49:35 -05:00
Eric S. Raymond
ea99f8c1ab Fix minor bug introduced in 'Terminate vc-disable-async-diff' 2014-12-01 22:56:01 -05:00
Eric S. Raymond
7d2110560e Update the git backend's header comment. 2014-12-01 20:00:40 -05:00
Eric S. Raymond
b7fd432d56 Remove could-register from the set of public VC backend methods,
* vc/vc.el and all backends: API simplification; could-register
is no longer a public method.  (vc-cvs.el still has a private
implementation.)
2014-12-01 18:54:28 -05:00
Eric S. Raymond
ed6ce56e23 Terminate vc-disable-async-diff with extreme prejudice.
* vc/vc.el, and all backends: API cleanup; the backend diff method
takes an explicit async flag.  This eliminates a particularly ugly
global.
2014-12-01 17:56:41 -05:00
Glenn Morris
ab882ed218 * lisp/vc/vc-svn.el: Remove stray comment char introduced earlier today. 2014-12-01 16:32:04 -05:00
Eric S. Raymond
808699f136 bzr-state randomly/unpredictably fails on non-bzr files. 2014-12-01 14:51:26 -05:00
Stefan Monnier
b34578dd88 * lisp/vc: Fix use of find-conflicted-file in Git.
* lisp/vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
current "project" rather than just the current directory.
* lisp/vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
the file names make sense.
2014-12-01 13:16:54 -05:00
Stefan Monnier
8dac9c34d8 * lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.
* lisp/vc/smerge-mode.el (smerge-swap): New command.
2014-12-01 13:16:53 -05:00
Eric S. Raymond
40ce283460 Test checkin to attempt to tickle a bug reported on the dev list. 2014-12-01 12:06:19 -05:00
Eric S. Raymond
d17bae9039 Refactor VC merging to fix a layer violation.
* vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge'
backend method of RCS/CVS/SVN is now 'merge-file', to contrast with
'merge-branch'. Prompting for merge revisions is pushed down to the
back ends; this fixes a layering violation that caused bad behavior
with SVN.
2014-12-01 11:43:10 -05:00
Eric S. Raymond
cb8ed25555 Small but crucial change for new VC registration API. 2014-12-01 10:59:05 -05:00
Eric S. Raymond
4893831f69 Update some documentation changes and todo items. 2014-12-01 10:57:09 -05:00
Eric S. Raymond
185320a5fe Finish vc-stay-local containment.
* vc/vc.el, vc-hooks.el, and all backends: API simplification;
vc-stay-local-p and repository-hostname are no longer public
methods. Only the CVS and SVN backends used these, and the SVN
support was conditioned out because svn status -v is too slow.
The CVS back end retaiin this machibery and the vc-stay-local
configuration variable now only affects it.
2014-12-01 10:47:27 -05:00
Eric S. Raymond
2a81c5d94d Confine vc-stay-local to CVS, because it was unusable in SVN. 2014-12-01 10:11:42 -05:00
Eric S. Raymond
c108372525 Remove stay-local support in svn back end, because...
...status -v is so slow that it's unusable.
2014-12-01 10:04:10 -05:00
Eric S. Raymond
578d91ac50 Remove vc-state-heuristic from the set of public methods.
* vc/vc.el, vc-hooks.el, and all backends: API simplification;
vc-state-heuristic is no longer a public method, having been removed
where it is redundant, unnecessary, or known buggy. This eliminated
all backends except CVS.  Eliminates bug#7850.
2014-12-01 09:41:54 -05:00
Eric S. Raymond
33b4235db6 The vc-mistrust-permissions configuration variable is gone.
* vc/vc-cvs.el, vc/vc-hooks.el, vc/vc-rcs.el, vc/vc-sccs.el: Eliminate
vc-mistrust-permissions.  It was only relevant to the RCS and SCCS
back ends and defaulted to t. Code now always mistrusts permissions -
by actual measurement the effect on performance is negligible. As a
side effect bug#11490 is now irrelevant.
2014-12-01 09:08:26 -05:00
Eric S. Raymond
f82f3f1f17 API simplification: remove vc-workfile-unchanged-p from pubic methods.
* vc/vc.el, vc-hooks.el, and all backends: API simplification;
vc-workfile-unchanged-p is no longer a public method (but the RCS and
SCCS back ends retain it as a private method used in state
computation). This method was redundant with vc-state and usually
implemented as a trivial call to same. Fixes the failure mode
described in bug#694.
2014-12-01 08:24:27 -05:00
Eric S. Raymond
2532d74a5f Renove duplicate code. 2014-12-01 07:39:15 -05:00
Eric S. Raymond
9e9e3432fa Argument removal inadvertently omitted from my previous commit. 2014-12-01 07:08:40 -05:00
Eric S. Raymond
2f4f920079 VC API simplification: remove ability to set initial revision.
This hasn't made any sense since RCS, and was a dumb stunt then.

* vc/vc.el and all backends: API simplification; init-revision is
gone, and vc-registered functions no longer take an initial-revision
argument.
2014-12-01 06:23:10 -05:00
Glenn Morris
9402d80f25 * lisp/vc/vc-filewise.el: Comment fixes. 2014-11-29 13:38:29 -08:00
Glenn Morris
741f5e15dd * lisp/vc/vc-src.el: Fix copy-pasted :version tags. 2014-11-29 13:34:29 -08:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Ted Zlatanov
ba4502fe14 Merge branch 'emacs-24'
Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
2014-11-26 21:31:11 -05:00
Simon Leinen
4e0f8f7b2d Fix for vc-filewise.el unresolved-call glitch. 2014-11-26 13:22:35 -05:00
Simon Leinen
181b12e7fd Fix up autoloads in vc-rcs.el and vc-sccs.el. 2014-11-26 13:10:26 -05:00
Eric S. Raymond
873bc1329f Minor typo fixes in vc-src.el. 2014-11-25 16:44:02 -05:00
Sam Steingold
27f46ae31c Remove a spurious comma
* lisp/vc/vc-hooks.el (vc-directory-exclusion-list):
Fix a trivial typo (bug#19171).
2014-11-24 15:54:07 -05:00
Stefan Monnier
b3b0b0971d * lisp/vc/vc-hooks.el (vc-state-base-face): Don't override
mode-line-inactive.
2014-11-24 12:26:01 -05:00
Dmitry Gutov
5ceb233b2d Fixes: debbugs:18579
* lisp/vc/vc-hg.el (vc-hg-dir-status-files): Include ignored files.
2014-11-24 04:11:36 +02:00