procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
102813 commits 1 branch 0 tags 923 MiB
Commit graph

29 commits

Author SHA1 Message Date
Sergei Organov
a1c9f41b78 * lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past. 
Fixes: debbugs:5181
 2011-07-13 00:58:34 -07:00
Bob Rogers
455e4fa13a * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256). 2011-07-09 21:42:39 -04:00
Lars Magne Ingebrigtsen
ce1438d696 * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log* 
for consistency with the other vc buffers (bug#6197).
(vc-checkin): Ditto.
 2011-07-03 03:15:38 +02:00
Chong Yidong
16f07dd791 * lisp/vc/vc.el (vc-revert-show-diff): Default to t. 2011-06-26 15:34:17 -04:00
Chong Yidong
2afef60a03 New option for showing a diff in vc-revert (Bug#8927). 
* vc/vc.el (vc-revert-show-diff): New defcustom.
(vc-diff-internal): New arg specifying diff buffer.
(vc-revert): Obey vc-revert-show-diff.  If we show a diff, don't
reuse an existing *vc-diff* buffer.
 2011-06-26 00:05:39 -04:00
Juanma Barranquero
80f499c7c1 lisp/vc/vc.el (ediff-vc-internal): Declare function. 2011-04-21 01:34:00 +02:00
Stefan Monnier
024ff1707e * lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since 
we're in VC after all.
 2011-04-20 14:39:39 -03:00
Christoph Scholtes
1c6c854ec7 * lisp/vc/vc.el (vc-diff-build-argument-list-internal) 
(vc-version-ediff, vc-ediff): New functions.
(vc-version-diff): Use vc-diff-build-argument-list-internal.
* doc/emacs/maintaining.texi (Old Revisions): Add paragraph on new function
vc-ediff.
* etc/NEWS: Document new function `vc-ediff'.
 2011-04-20 14:33:09 -03:00
Glenn Morris
7e319d3cc3 vc.el fix for bug#6146. 
* lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
Give an explicit error if failed to make writable.
 2011-03-07 00:56:30 -08:00
Glenn Morris
619f4b625e * lisp/vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt. 2011-03-07 00:39:43 -08:00
Antoine Levitt
7e27ce9cdb Replace many instances of read-file-name with read-directory-name. 
* lisp/files.el (delete-directory, copy-directory, list-directory): Use
read-directory-name.

* lisp/find-file.el (ff-find-the-other-file):
* lisp/net/ange-ftp.el (ange-ftp-make-directory):
* lisp/printing.el (pr-interactive-dir):
* lisp/progmodes/ada-prj.el (ada-prj-load-directory):
* lisp/progmodes/ebnf2ps.el (ebnf-print-directory)
(ebnf-spool-directory, ebnf-eps-directory)
(ebnf-syntax-directory):
* lisp/shell.el (shell):
* lisp/speedbar.el (speedbar-create-directory):
* lisp/vc/emerge.el (emerge-merge-directories):
* lisp/vc/vc-dir.el (vc-dir):
* lisp/vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise.

* lisp/gnus.el (gnus-interactive): Use read-directory-name.

* lisp/gnus-uu.el (gnus-uu-decode-uu-and-save)
(gnus-uu-decode-unshar-and-save, gnus-uu-decode-save)
(gnus-uu-decode-binhex, gnus-uu-decode-yenc)
(gnus-uu-decode-save-view, gnus-uu-decode-postscript-and-save):
Likewise.

* lisp/mh-funcs.el (mh-store-msg, mh-store-buffer):
* lisp/mh-mime.el (mh-mime-save-parts): Use read-directory-name.

* lisp/dired.el: Clarify comment.
 2011-03-05 16:56:00 -05:00
Glenn Morris
92e39d6fbf vc.el fix for bug#4496. 
* lisp/vc/vc.el (vc-default-previous-version):
Remove broken alias that points nowhere.
 2011-02-16 20:57:22 -08:00
Chong Yidong
75d4dcc9d2 Use simple buttons, instead of widget buttons, in vc-log. 
* lisp/vc/vc.el (vc-print-log-setup-buttons): Instead of using the
widget library for buttons, just use button.el.

* lisp/vc/log-view.el (log-view-mode-map): Don't inherit from
widget-keymap.
 2011-02-12 22:07:53 -05:00
Chong Yidong
659114fdba Rudimentary support for vc-pull and vc-merge in Git and Mercurial. 
* lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
the other way around.

* lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
(vc-git-merge-branch): New functions.
(vc-git-history): New var.

* lisp/vc/vc-hg.el (vc-hg-history): New var.
(vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
(vc-hg-merge-branch): New function.
 2011-01-28 22:12:32 -05:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Chong Yidong
3d92f44ea0 Always issue a full prompt in vc-merge-branch operation. 
* vc/vc.el (vc-merge): Remove optional arg PROMPT.  Always prompt
for a merge location.

* vc/vc-bzr.el (vc-bzr-pull): Remove unused var.
(vc-bzr-merge-branch): Always prompt.
(vc-bzr-async-command): Use the full branch filename.
 2010-11-23 10:13:43 -05:00
Chong Yidong
2c3160c54e Initial support for unified DVCS pull and merge. 
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.

* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available.  Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
 2010-11-22 20:15:08 -05:00
Stefan Monnier
ebff325e43 * lisp/vc/vc.el (vc-deduce-backend): Use default-directory in shell-mode 
and compilation-mode.

Fixes: debbugs:7350
 2010-11-12 08:44:46 -05:00
Dan Nicolaescu
82fb8701c2 Make 'g' (AKA revert-buffer) rerun the VC log, log-incoming and 
log-outgoing commands.
* lisp/vc/vc.el (vc-log-internal-common): Add a new argument and use it
to create a buffer local revert-buffer-function variable.
(vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a
revert-buffer-function lambda.
 2010-10-03 17:26:41 -07:00
Glenn Morris
67141a37c1 Remove vc-header-alist, obsolete since 21.1. 
* lisp/vc/vc-hooks.el (vc-header-alist): Remove obsolete variable.
* lisp/vc/vc.el (vc-static-header-alist): Doc fix.
* lisp/vc/vc-cvs.el (vc-cvs-header):
* lisp/vc/vc-rcs.el (vc-rcs-header):
* lisp/vc/vc-sccs.el (vc-sccs-header):
* lisp/vc/vc-svn.el (vc-svn-header): Do not consult vc-header-alist.
* lisp/obsolete/vc-mcvs.el (vc-mcvs-header):
* lisp/progmodes/cperl-mode.el (cperl-mode): Only set vc-header-alist
on XEmacs.

* etc/NEWS: Mention above change.
 2010-10-03 14:05:47 -07:00
Chong Yidong
fea9cabd27 Merge changes from emacs-23 branch. 2010-07-16 11:42:15 -04:00
Chong Yidong
2ec1b5ee34 Merge changes from emacs-23 branch. 2010-07-10 14:52:53 -04:00
Chong Yidong
a2f043d3d7 Allow global VC ops like `C-x v D' in Diff and Log-View buffers. 
* vc/diff-mode.el (diff-vc-backend): New var.

* vc/vc.el (vc-deduce-backend): New fun.  Handle diff buffers.
(vc-root-diff, vc-print-root-log, vc-log-incoming)
(vc-log-outgoing): Use it.
(vc-diff-internal): Set diff-vc-backend.
 2010-06-29 14:17:31 -04:00
Juri Linkov
5af72a47bb * lisp/vc/vc.el (vc-diff-internal): Set `revert-buffer-function' 
buffer-locally to lambda that re-runs the vc diff command.  (Bug#6447)
 2010-06-25 00:38:07 +03:00
Juri Linkov
9766adfbca * lisp/finder.el (finder-known-keywords): Add keyword "vc" 
for version control.

* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
 2010-06-11 22:09:57 +03:00
Juri Linkov
56b2854f30 Move version control related files to the "vc" subdirectory. 
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff-diff.el,
* ediff.el, ediff-help.el, ediff-hook.el, ediff-init.el,
* ediff-merg.el, ediff-mult.el, ediff-ptch.el, ediff-util.el,
* ediff-vers.el, ediff-wind.el, emerge.el, log-edit.el, log-view.el,
* pcvs-defs.el, pcvs.el, pcvs-info.el, pcvs-parse.el, pcvs-util.el,
* smerge-mode.el, vc-annotate.el, vc-arch.el, vc-bzr.el, vc-cvs.el,
* vc-dav.el, vc-dir.el, vc-dispatcher.el, vc.el, vc-git.el,
* vc-hg.el, vc-hooks.el, vc-mtn.el, vc-rcs.el, vc-sccs.el, vc-svn.el:
Move files to the "vc" subdirectory.
 2010-06-11 21:51:00 +03:00
Renamed from lisp/vc.el (Browse further)