Commit graph

851 commits

Author SHA1 Message Date
Eli Zaretskii
646d33dbbc Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
* lisp/vc/vc.el (vc-version-diff, vc-version-ediff): Describe
arguments in the doc strings.  (Bug#35019)
2019-04-06 11:48:36 +03:00
Eli Zaretskii
459b669b08 Fix failures of vc-find-revision with non-ASCII file names
* lisp/vc/vc.el (vc-find-revision): Instead of binding
coding-system-for-write, make the buffer-file-coding-system of
the temporary buffer be no-conversion.  This avoids the
unwanted side effect of not encoding the command-line
arguments of the VCS commands invoked by the backend.
(Bug#34350)
2019-02-08 08:59:23 +02:00
Paul Eggert
26bed8ba10 Update copyright year to 2019
Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
2019-01-01 01:01:13 +00:00
Eli Zaretskii
f0531b8e64 Improve documentation of Ediff wordwise commands
* lisp/vc/ediff.el (ediff-windows-wordwise)
(ediff-windows-linewise, ediff-regions-wordwise): Update and
clarify the doc strings.

* doc/misc/ediff.texi (Major Entry Points): Update and clarify
the documentation of 'ediff-windows-wordwise' and
'ediff-regions-wordwise'.  See the discussion starting at
https://lists.gnu.org/archive/html/help-gnu-emacs/2018-11/msg00197.html
for the details.
2018-11-27 10:09:55 +02:00
Dmitry Gutov
93c41ce6aa Remove extra process call from vc-git-find-file-hook
* lisp/vc/vc-git.el (vc-git-find-file-hook): Resolve FIXMEs.
2018-06-28 03:14:56 +03:00
Dmitry Gutov
7ea0873b4f ; Update some commentary
* lisp/vc/vc-git.el (vc-git-state): Remove outdated commentary.
(vc-git-dir-status-goto-stage): Move a TODO here.
(vc-git-conflicted-files): From here.
(vc-git-find-file-hook): Add a FIXME.
2018-06-28 03:05:19 +03:00
Dmitry Gutov
4a7f4232ed Speed up vc-git-dir-status-files
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage): Call 'git
ls-files -u' for the ls-files-conflict stage
(https://lists.gnu.org/archive/html/emacs-devel/2018-06/msg00885.html).
2018-06-28 03:03:36 +03:00
Noam Postavsky
fcd66d059c Keep vc-print-log from putting point at buffer end (Bug#31764)
* lisp/vc/vc.el (vc-print-log-internal): Use `save-excursion' around
`vc-print-log-setup-buttons'.
2018-06-14 19:17:20 -04:00
Sam Steingold
6d4cbe8084 Finish the Bug#11728 work: hg & git
* lisp/vc/vc-git.el (vc-git--pushpull): Make `extra-args' a list.
Do not set `compilation-error-regexp-alist', this is done in
`vc-compilation-mode'.
(vc-git-error-regexp-alist): Tweak the regexp.
* lisp/vc/vc-hg.el (vc-hg-error-regexp-alist): Make non-trivial.
(vc-hg--pushpull): Accept `post-processing' argument.
Call them after the `command'.
(vc-hg-pull): Pass the `post-processing' commands that show which
are to be modified by the `update', and then run `update'.
2018-06-12 21:15:13 +01:00
Sam Steingold
66a491fbec Fix Bug#11728: show files updated by git
* lisp/vc/vc-git.el (vc-git--pushpull): Accept extra-args and set
`compilation-error-regexp-alist' to `vc-git-error-regexp-alist'.
(vc-git-pull): Pass "--stat" as `extra-args' to `vc-git--pushpull'.
(vc-git-push): Pass "" as `extra-args' to `vc-git--pushpull'.
2018-06-12 21:15:02 +01:00
Glenn Morris
7d6c7d0b46 ; Use GNU not Gnu in docs 2018-03-23 16:01:12 -04:00
Charles A. Roelli
758597fb3e * lisp/vc/vc-dir.el (vc-dir-unmark): Fix documentation. 2018-03-12 20:16:53 +01:00
Glenn Morris
d6e78de50b * lisp/vc/add-log.el (add-change-log-entry): Replace obsolete alias. 2018-03-01 17:48:21 -05:00
Charles A. Roelli
e5a29330aa lisp/vc/: documentation fixes
* lisp/vc/vc.el (vc-region-history): Clarify documentation.
* lisp/vc/add-log.el (change-log-get-method-definition):
Indent documentation.
2018-02-17 16:49:02 +01:00
Glenn Morris
66a4e651f3 ; Fix doc typos related to indefinite articles 2018-02-16 15:16:15 -05:00
Eli Zaretskii
a06a8ed5b6 ; * lisp/vc/vc-git.el (vc-git--program-version): Fix last change. 2018-02-16 19:20:29 +02:00
Eli Zaretskii
6ddb4bd39a Fix 'vc-git--program-version'
* lisp/vc/vc-git.el (vc-git--program-version): Fix the function to
work with Git for Windows.
2018-02-16 11:30:29 +02:00
Andreas Schwab
52ca0d1a3e * lisp/vc/vc.el (vc-deduce-backend): Use ignore-errors. 2018-02-13 14:05:49 +01:00
Andreas Schwab
69e804669b Don't signal error in vc-deduce-backend
* lisp/vc/vc.el (vc-deduce-backend): Return nil if
vc-responsible-backend signals an error.
2018-02-13 12:18:25 +01:00
Juri Linkov
c787a49682 * lisp/vc/vc-git.el (vc-git-print-log): Restrict file scope to a single file
when vc-git-print-log-follow is non-nil (bug#19045).
(vc-git-print-log-follow): Doc fix.

* etc/NEWS: Mention 'vc-git-print-log-follow'.
2018-02-04 23:58:37 +02:00
Glenn Morris
74280624b9 ; * lisp/vc/vc.el: Comment fixes. 2018-01-16 20:56:28 -05:00
Eli Zaretskii
f82400798e Fix failures in smerge-mode on MS-Windows
* lisp/vc/smerge-mode.el (smerge--refine-chopup-region): Use
utf-8-emacs-unix, not emacs-internal, to make the forced EOL
convention explicit.
(smerge-refine-regions): Use utf-8-emacs instead of
emacs-internal, to allow decoding of non-Unix EOL conventions.
(Bug#29916)
2018-01-05 11:22:27 +02:00
Stefan Monnier
687af4c8e8 * lisp/vc/vc.el (vc-region-history): log-view-vc-fileset holds a list! 2018-01-03 15:33:08 -05:00
Paul Eggert
5c7dd8a783 Update copyright year to 2018
Run admin/update-copyright.
2018-01-01 00:57:59 -08:00
Glenn Morris
ad17db7964 * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode. 2017-12-15 13:40:06 -05:00
Glenn Morris
5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias. 2017-12-15 13:35:42 -05:00
Glenn Morris
780407cff1 Small fixes prompted by make check-declare
* lisp/frame.el (x-focus-frame): Update declaration.
(ns-mouse-absolute-pixel-position): Fix declaration.
* lisp/vc/diff-mode.el (diff-refine-hunk):
Use smerge-refine-regions rather than obsolete alias.
(smerge-refine-subst): Remove declaration, no longer relevant.
2017-12-14 21:31:28 -05:00
Glenn Morris
541a60108d Fix some custom groups
* lisp/vc/vc-hooks.el (vc-faces): Rename from vc-state-faces.
* lisp/vc/cvs-status.el (cvs-status): Unused, remove.
2017-12-14 21:01:08 -05:00
Glenn Morris
ce31e726ad Fixes for defcustoms, prompted by cus-test-opts
* lisp/files.el (save-some-buffers-default-predicate):
* lisp/time.el (display-time-world-list):
* lisp/gnus/gnus-art.el (gnus-article-show-cursor):
* lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-names):
* lisp/progmodes/verilog-mode.el (verilog-auto-wire-type):
* lisp/textmodes/less-css-mode.el (less-css-output-directory)
(less-css-output-file-name, less-css-input-file-name):
* lisp/vc/emerge.el (emerge-metachars):
* lisp/vc/vc-hg.el (vc-hg-symbolic-revision-styles):
Fix :types.
* lisp/net/newst-backend.el (newsticker-url-list-defaults): Fix url.
2017-12-13 15:29:24 -05:00
Robert Pluim
6067f0c702 Shell-quote wildcards when invoking 'vc-git-grep'
* lisp/vc/vc-git.el (vc-git-grep): Apply shell quoting to
filename wildcards to ensure globbing is done by git rather
than the shell.  (Bug#29303)
2017-11-28 19:46:38 +02:00
Paul Eggert
a89f0b6f33 maint: shorten https://lists.gnu.org/archive/html/... links 2017-11-25 22:48:12 -08:00
Robert Pluim
104f3e51fe Document how to enter whitespace when using grep-read-files
* lisp/progmodes/grep.el (lgrep, rgrep, grep-read-files): Explain
how to enter whitespace when using grep-read-files.  (Bug#29303)
* lisp/progmodes/project.el (project-find-regexp): Likewise.
* lisp/vc/vc-git.el (vc-git-grep): Likewise.
2017-11-17 15:39:02 +02:00
Philipp Stephani
72d07d1950 Ediff: add some missing documentation
* vc/ediff.el (ediff-files, ediff-files3, ediff-buffers)
(ediff-buffers3, ediff-merge-directories)
(ediff-merge-directories-with-ancestor)
(ediff-merge-directory-revisions)
(ediff-merge-directory-revisions-with-ancestor)
(ediff-windows-wordwise, ediff-windows-linewise)
(ediff-regions-wordwise, ediff-regions-linewise)
(ediff-merge-files, ediff-merge-files-with-ancestor)
(ediff-merge-buffers, ediff-merge-buffers-with-ancestor)
(ediff-merge-revisions, ediff-merge-revisions-with-ancestor)
(ediff-patch-file, ediff-revision): Document missing arguments.
(ediff-patch-buffer, ediff-revision): Add second space after
period.
(ediff-files-command, ediff3-files-command, ediff-merge-command)
(ediff-merge-with-ancestor-command, ediff-directories-command)
(ediff-directories3-command, ediff-merge-directories-command): Add
documentation for the command line functions.
2017-11-05 18:53:25 +01:00
Eli Zaretskii
b02c2714c3 Fix typos in ediff-wind.el
* lisp/vc/ediff-wind.el (ediff-setup-windows-multiframe-merge):
Fix typos in commentary.  (Bug#29138)
2017-11-03 21:12:41 +02:00
Charles A. Roelli
460fe4a1bc ; Doc fixes
* lisp/progmodes/xref.el (xref-file-location)
(xref-backend-apropos):
* etc/NEWS (Lisp Changes in Emacs 26.1):
* doc/emacs/msdos.texi (Windows Keyboard):
* lisp/vc/vc.el (vc-print-branch-log):
* src/buffer.c (word-wrap): Doc additions and fixes.
2017-10-31 22:01:34 +01:00
Martin Rudalics
9c8fe0248b Avoid fullscreen ediff control frames by default (Bug#29026)
* lisp/vc/ediff-wind.el (ediff-control-frame-parameters):
Add parameter to avoid fullscreen control frames (Bug#29026).
2017-10-31 08:59:27 +01:00
İ. Göktuğ Kayaalp
5b6e59cfdb Implement vc-default-dir-extra-headers for vc-rcs
Add a do-nothing implementation for vc-rcs to suppress the message which
the default function adds to the vc-dir buffer (Bug#28570).
* lisp/vc/vc-rcs.el (vc-rcs-dir-extra-headers): New function.
2017-10-17 13:38:04 +03:00
Paul Eggert
5d51403ceb ; Typo fixes, mostly repeated words 2017-10-09 22:55:06 -07:00
Paul Eggert
5172fa02cc Prefer HTTPS to HTTP for gnu.org
This fixes some URLs I omitted from my previous pass,
notably those in lists.gnu.org.  Although lists.gnu.org
does not yet support TLS 1.1, TLS 1.0 is better than nothing.
* lisp/erc/erc.el (erc-official-location):
* lisp/mail/emacsbug.el (report-emacs-bug):
Use https:, not http:.
2017-10-01 19:59:01 -07:00
Kaushal Modi
5b45e7e1c3 Bind vc-region-history
* lisp/vc/vc-hooks.el (vc-prefix-map):
Bind `vc-region-history' to 'C-x v h', which was earlier bound to
`vc-insert-headers' (Bug#27644).
* doc/emacs/maintaining.texi (VC Change Log): Mention the new binding.
* doc/emacs/vc1-xtra.texi (Version Headers): Remove the association of
'C-x v h' with `vc-insert-headers'.
(http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00957.html)
2017-09-30 16:01:54 +02:00
Andy Moreton
4a755ed421 Avoid assertions in vc-hg.el on MS-Windows
* lisp/vc/vc-hg.el (vc-hg--pcre-to-elisp-re)
(vc-hg--slurp-hgignore, vc-hg--read-repo-requirements)
(vc-hg-state-fast): Use file-name-absolute-p and directory-name-p
instead of relying on Unix file-name syntax.  This avoids
assertion violations on MS-Windows.
2017-09-30 16:21:39 +03:00
Tom Tromey
066efb8666 Fix log-view-diff-common when point is after last entry
Bug#28466
* lisp/vc/log-view.el (log-view-diff-common): If point is after last
entry, look at the previous revision.
2017-09-18 20:02:01 -06:00
Tom Tromey
9d101376b4 Allow smerge-keep-current to work for empty hunks
Bug#25555
* lisp/vc/smerge-mode.el (smerge-get-current): Allow point to be at
match-end.
* test/lisp/vc/smerge-mode-tests.el: New file.
2017-09-16 21:55:05 -06:00
Tom Tromey
13aba24add Call vc-setup-buffer in vc-git-log-{in,out}going
Bug#28427:
* lisp/vc/vc-git.el (vc-git-log-incoming, vc-git-log-outgoing): Call
vc-setup-buffer.
2017-09-16 21:55:05 -06:00
Paul Eggert
bc511a64f6 Prefer HTTPS to FTP and HTTP in documentation
Most of this change is to boilerplate commentary such as license URLs.
This change was prompted by ftp://ftp.gnu.org's going-away party,
planned for November.  Change these FTP URLs to https://ftp.gnu.org
instead.  Make similar changes for URLs to other organizations moving
away from FTP.  Also, change HTTP to HTTPS for URLs to gnu.org and
fsf.org when this works, as this will further help defend against
man-in-the-middle attacks (for this part I omitted the MS-DOS and
MS-Windows sources and the test tarballs to keep the workload down).
HTTPS is not fully working to lists.gnu.org so I left those URLs alone
for now.
2017-09-13 15:54:37 -07:00
Dmitry Gutov
4bef92e9e0 Call vc-resynch-buffer in vc-git-resolve-when-done
* lisp/vc/vc-git.el (vc-git-resolve-when-done):
Call vc-resynch-buffer on the current file (bug#28121).
Move its autoload to before this function.
2017-09-13 02:31:19 +03:00
Alfred M. Szmidt
9b9c93053a Support SVN files with svn:externals property
* lisp/vc/vc-svn.el (vc-svn-parse-status): Don't ignore files
marked with the svn:externals property.

Copyright-paperwork-exempt: yes
2017-09-08 12:19:24 +03:00
Alfred M. Szmidt
e3476d2937 List locally removed files in vc-dir with SVN back-end
* lisp/vc/vc-svn.el (vc-svn-after-dir-status): List files marked
with ?! as needs-update.

Copyright-paperwork-exempt: yes
2017-09-08 12:14:58 +03:00
Charles A. Roelli
208a3cb05f Fix 'diff-goto-source' when buffer is narrowed (Bug#21262)
* lisp/vc/diff-mode.el (diff-find-file-name): Save the current
narrowing, and widen the buffer before searching for the name of the
file corresponding to the diff.

With thanks to Noam Postavsky.
2017-08-27 14:14:46 +02:00
Stefan Monnier
2d1d54d333 * lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate cases
(smerge--refine-long-words): New var.
(smerge--refine-chopup-region): Use it.
2017-07-27 00:21:35 -04:00