1. 08 Feb, 2019 1 commit
    • Eli Zaretskii's avatar
      Fix failures of vc-find-revision with non-ASCII file names · 459b669b
      Eli Zaretskii authored
      * 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)
      459b669b
  2. 01 Jan, 2019 1 commit
  3. 14 Jun, 2018 1 commit
  4. 17 Feb, 2018 1 commit
    • Charles A. Roelli's avatar
      lisp/vc/: documentation fixes · e5a29330
      Charles A. Roelli authored
      * lisp/vc/vc.el (vc-region-history): Clarify documentation.
      * lisp/vc/add-log.el (change-log-get-method-definition):
      Indent documentation.
      e5a29330
  5. 13 Feb, 2018 2 commits
  6. 17 Jan, 2018 1 commit
  7. 03 Jan, 2018 1 commit
  8. 01 Jan, 2018 1 commit
  9. 31 Oct, 2017 1 commit
    • Charles A. Roelli's avatar
      ; Doc fixes · 460fe4a1
      Charles A. Roelli authored
      * 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.
      460fe4a1
  10. 13 Sep, 2017 1 commit
    • Paul Eggert's avatar
      Prefer HTTPS to FTP and HTTP in documentation · bc511a64
      Paul Eggert authored
      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.
      bc511a64
  11. 06 Jun, 2017 1 commit
  12. 25 Feb, 2017 1 commit
    • Tom Tromey's avatar
      Add more branch support to vc-dir · 9e9d381f
      Tom Tromey authored
      Bug#25859:
      * lisp/vc/vc-dir.el (vc-dir-mode-map) Add "B" bindings.
      * lisp/vc/vc.el (vc-revision-history): New defvar.
      (vc-read-revision): Use vc-revision-history.
      (vc-print-branch-log): New function.
      * doc/emacs/maintaining.texi (VC Directory Commands): Document new
      bindings.
      * etc/NEWS: Mention new vc-dir bindings.
      9e9d381f
  13. 22 Feb, 2017 1 commit
  14. 20 Feb, 2017 1 commit
    • Tom Tromey's avatar
      vc-log-outgoing fixes for git; add binding to vc-dir · 0a670690
      Tom Tromey authored
      * lisp/vc/vc-dir.el (vc-dir-mode-map): Bind "O" to vc-log-outgoing.
      * lisp/vc/vc-git.el (vc-git-log-outgoing, vc-git-log-incoming): Use
      async execution.
      (vc-git-log-view-mode): Also truncate lines for log-outgoing and
      log-incoming.
      * lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Don't pass nil
      as remote-location argument.
      0a670690
  15. 17 Feb, 2017 1 commit
  16. 01 Jan, 2017 1 commit
  17. 04 Nov, 2016 1 commit
    • Hong Xu's avatar
      Clarify documentation of 'vc-responsible-backend' wrt symlinks · 23570fd9
      Hong Xu authored
      * lisp/vc/vc.el (vc-responsible-backend): Clarify that symlinks
      are not resolved when the VC backend is reported.
      
      * doc/lispref/files.texi (Truenames): Document
      'vc-responsible-backend'.  (Bug#23436)
      * doc/emacs/maintaining.texi (Version Control Systems): Fix a
      typo.
      23570fd9
  18. 20 Oct, 2016 1 commit
  19. 25 May, 2016 2 commits
  20. 01 Jan, 2016 1 commit
  21. 26 Dec, 2015 1 commit
    • Eli Zaretskii's avatar
      Improve documentation of 'vc-push' · 78744677
      Eli Zaretskii authored
      * doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
      improve the documentation of 'vc-push'.
      
      * lisp/vc/vc.el (vc-pull, vc-push): Doc fix.
      78744677
  22. 19 Nov, 2015 1 commit
  23. 17 Nov, 2015 1 commit
    • Paul Eggert's avatar
      Fix docstring quoting problems with ‘ '’ · ac16149b
      Paul Eggert authored
      Problem reported by Artur Malabarba in:
      http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
      Most of these fixes are to documentation; many involve fixing
      longstanding quoting glitches that are independent of the
      recent substitute-command-keys changes.  The changes to code are:
      * lisp/cedet/mode-local.el (mode-local-augment-function-help)
      (describe-mode-local-overload):
      Substitute docstrings before displaying them.
      * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
      Quote the generated docstring for later substitution.
      ac16149b
  24. 10 Nov, 2015 1 commit
    • Paul Eggert's avatar
      Spelling fixes · c92dbd6d
      Paul Eggert authored
      * lisp/net/soap-inspect.el (soap-inspect-xs-simple-type):
      Fix misspelling in output.
      c92dbd6d
  25. 09 Nov, 2015 2 commits
    • Karl Fogel's avatar
      When VC detects a conflict, specify which file · 3c3aad73
      Karl Fogel authored
      * lisp/vc/vc.el (vc-message-unresolved-conflicts): New function.
      * lisp/vc/vc-svn.el (vc-svn-find-file-hook):
      * lisp/vc/vc-hg.el (vc-hg-find-file-hook):
      * lisp/vc/vc-bzr.el (vc-bzr-find-file-hook):
      * lisp/vc/vc-git.el (vc-git-find-file-hook): Use above new function
        to display a standard message that specifies the conflicted file.
      
      Before this change, the message VC used for indicating a conflicted
      file was just "There are unresolved conflicts in this file" without
      naming the file (and this language was duplicated in several places).
      After this change, it's "There are unresolved conflicts in file FOO"
      (and this language is now centralized in one function in vc.el).
      
      Justification: It's important for the message to name the conflicted
      file because the moment when VC realizes a file is conflicted does not
      always come interactively.  For example, some people automatically
      find a set of Org Mode files on startup, and may keep those .org files
      under version control.  If any of the files are conflicted, the user
      just sees some messages fly by, and might later check the "*Messages*"
      buffer to find out what files were conflicted.  I'm not saying this
      happened to me or anything; it's a purely hypothetical example.
      3c3aad73
    • Dmitry Gutov's avatar
      Make sure that the ignore file exists · e4c190b2
      Dmitry Gutov authored
      * lisp/vc/vc.el (vc-default-ignore-completion-table):
      Make sure that the ignore file exists.
      e4c190b2
  26. 19 Sep, 2015 1 commit
    • Eli Zaretskii's avatar
      Resurrect the ability to specify a revision in vc-next-action · 9ea6c4df
      Eli Zaretskii authored
      * lisp/vc/vc-bzr.el (vc-bzr-checkin):
      * lisp/vc/vc-dav.el (vc-dav-checkin):
      * lisp/vc/vc-git.el (vc-git-checkin):
      * lisp/vc/vc-hg.el (vc-hg-checkin):
      * lisp/vc/vc-mtn.el (vc-mtn-checkin): Accept and silently ignore
      an additional optional argument, the revision to checkin.
      
      * lisp/vc/vc-sccs.el (vc-sccs-checkin):
      * lisp/vc/vc-cvs.el (vc-cvs-checkin):
      * lisp/vc/vc-rcs.el (vc-rcs-checkin): Allow to optionally specify
      a revision to checkin.
      
      * lisp/vc/vc.el (vc-next-action): Allow to optionally specify the
      revision when checking in files.
      
      See http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00688.html
      for the details.
      9ea6c4df
  27. 17 Sep, 2015 1 commit
    • Paul Eggert's avatar
      Backslash cleanup in Elisp source files · 284c470e
      Paul Eggert authored
      This patch should not change behavior.  It typically omits backslashes
      where they are redundant (e.g., in the string literal "^\$").
      In a few places, insert backslashes where they make regular
      expressions clearer: e.g., replace "^\*" (equivalent to "^*") with
      "^\\*", which has the same effect as a regular expression.
      Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs,
      and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with
      RCS IDs, as that makes it clearer that the backslash is intended.
      284c470e
  28. 12 Jul, 2015 1 commit
    • Dmitry Gutov's avatar
      Add `project-ignores' · 62d5d465
      Dmitry Gutov authored
      * lisp/progmodes/project.el (project-ignores): New generic
      function, and an implementation for the	VC project type.
      
      * lisp/progmodes/xref.el (xref--rgrep-command): Split, as a
      variant of rgrep-default-command that handles a generic list of
      ignores.
      (xref-collect-matches): Use it, and pass through to it the value
      of the newly added argument.
      (xref-find-regexp): Handle ignored paths within the project.
      Remove outdated comment.
      
      * lisp/vc/vc.el (vc-default-ignore-completion-table):
      Skip the comments and the empty lines.
      62d5d465
  29. 18 May, 2015 1 commit
    • Dmitry Gutov's avatar
      Improve handling of the first Git revision · 69d24b40
      Dmitry Gutov authored
      * lisp/vc/log-view.el (log-view-toggle-entry-display): When
      there's no next entry, delete until the end of the buffer.
      (log-view-end-of-defun-1): Stop at eob.
      
      * lisp/vc/vc-annotate.el
      (vc-annotate-show-diff-revision-at-line-internal): Don't give up
      when previous-revision is nil.
      
      * lisp/vc/vc-git.el (vc-git-expanded-log-entry): End the arguments
      with `--' to avoid ambiguity.
      (vc-git-annotate-extract-revision-at-line): Exclude `^' from the
      returned revision string.
      (vc-git-annotate-time): Expect `^' before the first revision.
      
      * lisp/vc/vc-git.el (vc-git-diff): Diff against an empty tree if
      REV1 is nil, and REV2 is not.
      
      * lisp/vc/vc.el: Update the description of the `diff' function.
      69d24b40
  30. 13 May, 2015 1 commit
    • Glenn Morris's avatar
      Add basic VC push support. · 660c30cc
      Glenn Morris authored
      * lisp/vc/vc.el (vc-push): New autoloaded command.
      * lisp/vc/vc-hooks.el (vc-prefix-map, vc-menu-map): Add vc-push.
      * lisp/vc/vc-bzr.el (vc-bzr--pushpull): New, factored from vc-bzr-pull.
      (vc-bzr-pull): Reimplement using vc-bzr--pushpull.
      (vc-bzr-push): New.
      * lisp/vc/vc-git.el (vc-git--pushpull): New, factored from vc-git-pull.
      (vc-git-pull): Reimplement using vc-git--pushpull.
      (vc-git-push): New.
      * lisp/vc/vc-hg.el (vc-hg--pushpull): New, factored from vc-hg-pull.
      (vc-hg-pull, vc-hg-push): Reimplement using vc-hg--pushpull.
      * doc/emacs/maintaining.texi (Pulling / Pushing):
      Rename from "VC Pull".  Mention pushing.
      (VC With A Merging VCS, VC Change Log): Update xrefs.
      (Branches): Update menu.
      * doc/emacs/emacs.texi: Update menu.
      * etc/NEWS: Mention this.
      660c30cc
  31. 03 May, 2015 1 commit
    • Dmitry Gutov's avatar
      Stop vc-print-log from jumping to the top · 27036297
      Dmitry Gutov authored
      * lisp/vc/vc.el (vc-print-log-internal): Pass nil
      GOTO-LOCATION-FUNC to vc-log-internal-common when WORKING-REVISION
      is not specified.
      (vc-incoming-outgoing-internal): Always pass nil.
      (vc-log-internal-common): When GOTO-LOCATION-FUNC is nil, don't
      call it, and don't set vc-sentinel-movepoint (bug#15322).
      (vc-print-root-log): Don't fetch the root working revision, nor
      pass it to vc-print-log-internal.
      27036297
  32. 02 Mar, 2015 1 commit
  33. 26 Feb, 2015 1 commit
    • Oscar Fuentes's avatar
      Use vc-switches on vc-*-annotate-command · b5a0603e
      Oscar Fuentes authored
      This also removes switch "-C -C" from vc-git-annotate-command.
      
      Fixes: debbugs:17945
      
      * vc/vc.el (vc-annotate-switches): New defcustom.
      * vc/vc-bzr.el (vc-bzr-annotate-switches): New defcustom.
      (vc-bzr-annotate-command): Use it.
      * vc/vc-cvs.el (vc-cvs-annotate-switches): New defcustom.
      (vc-cvs-annotate-command): Use it.
      * vc/vc-git.el (vc-git-annotate-switches): New defcustom.
      (vc-git-annotate-command): Use it.
      * vc/vc-hg.el (vc-hg-annotate-switches): New defcustom.
      (vc-hg-annotate-command): Use it.
      * vc/vc-mtn.el (vc-mtn-annotate-switches): New defcustom.
      (vc-mtn-annotate-command): Use it.
      * vc/vc-svn.el (vc-svn-annotate-switches): New defcustom.
      (vc-svn-annotate-command): Use it.
      b5a0603e
  34. 01 Jan, 2015 2 commits
  35. 17 Dec, 2014 1 commit
  36. 14 Dec, 2014 1 commit
    • Dmitry Gutov's avatar
      Move VC diff ASYNC argument to the fifth position · 01b97f9d
      Dmitry Gutov authored
      * 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.
      01b97f9d