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

91 Commits

Author SHA1 Message Date
Stefan Monnier
2793b89ee4 (vc-bzr-state-heuristic): Fallback on vc-bzr-state in case
of any kind of error (e.g. when "sha1sum" is not found).
2009-05-17 03:38:41 +00:00
Chong Yidong
4ffdb3072c * vc-bzr.el (vc-bzr-log-view-mode): Fix last fix. 2009-04-07 04:06:39 +00:00
Chong Yidong
71de5c37a1 * vc-bzr.el (vc-bzr-log-view-mode): Tweak log-view-message-re (Bug#2872). 2009-04-07 01:49:40 +00:00
Dan Nicolaescu
be14a4253c (vc-bzr-working-revision): Add support for lightweight
checkouts.  (Bug#2157)
(vc-bzr-after-dir-status): Ignore a warning for bzr status.
(vc-bzr-dir-extra-headers): Add headers for lightweight checkouts.
2009-03-23 16:25:30 +00:00
Dan Nicolaescu
6510501067 (vc-bzr-working-revision): Recognize a newer branch
format.  Use when instead of if.
2009-02-04 07:32:51 +00:00
Glenn Morris
eb2ffb185a Comments (minor fixes of some header conventions). 2009-01-10 21:50:40 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
f9528daad0 (vc-bzr-diff-switches): Doc fix. Add t as option.
(vc-bzr-log-switches): Doc fix.
2008-12-03 07:36:23 +00:00
Chong Yidong
da4d406679 (vc-bzr-dir-extra-headers): New function.
(vc-bzr-dir-printer): Rename from vc-bzr-status-printer.
2008-11-04 17:36:43 +00:00
Dan Nicolaescu
11b4001c8f (vc-bzr-after-dir-status): Parse the output for non
existent files.
(vc-bzr-dir-status-files): New function.
2008-10-05 00:08:49 +00:00
Glenn Morris
60aff9248a (vc-bzr-diff): Use vc-switches rather than the obsolete vc-diff-switches. 2008-10-02 17:32:40 +00:00
Dan Nicolaescu
89d9800051 * vc-bzr.el (vc-bzr-show-log-entry):
* vc-git.el (vc-git-show-log-entry): Deal with a nil argument,
C-x v l for a directory uses that.
2008-09-18 17:01:41 +00:00
Dan Nicolaescu
a0c38937bb (vc-bzr-extra-fileinfo): New defstruct.
(vc-bzr-status-printer): New function.
(vc-bzr-after-dir-status): Deal with renamed files.
2008-09-07 17:24:57 +00:00
Dan Nicolaescu
d3c24c25b3 (vc-bzr-find-revision): Rename from
vc-bzr-find-version, forgotten in the 2007-10-10 renaming.
2008-08-10 19:48:57 +00:00
Dan Nicolaescu
701d018c5c (vc-bzr-after-dir-status): Deal with execute bit changes. 2008-07-07 16:34:14 +00:00
Dan Nicolaescu
f8bd9ac6ef * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
* vc-rcs.el (vc-annotate-convert-time):
* vc-mtn.el (vc-annotate-convert-time):
* vc-git.el (vc-annotate-convert-time):
* vc-cvs.el (vc-annotate-convert-time):
* vc-bzr.el (vc-annotate-convert-time): Declare as functions.
2008-06-24 02:41:04 +00:00
Stefan Monnier
96be150368 (vc-bzr-annotate-extract-revision-at-line):
Allow more than one space before the |.
2008-06-20 18:12:01 +00:00
Juanma Barranquero
def61be234 (log-view-per-file-logs): Pacify byte compiler. 2008-06-16 08:55:56 +00:00
Dan Nicolaescu
6653c6b769 * log-view.el (log-view-diff-changeset): New function.
(log-view-mode-map, log-view-mode-menu): Bind it.
(log-view-per-file-logs, log-view-vc-fileset)
(log-view-vc-backend): New variables.
(log-view-find-revision, log-view-modify-change-comment)
(log-view-annotate-version): Throw an error if the log is for more
than one file and we can't find the current file.  Get the current
file from log-view-vc-fileset if necessary.
(log-view-diff): Get the current file from log-view-vc-fileset if
necessary.

* vc.el (vc-print-log): Set log-view-vc-fileset and log-view-vc-backend.

* vc-hg.el (vc-hg-log-view-mode): Call the log method only once.
(vc-hg-log-view-mode): Declare for compiler.
(vc-hg-log-view-mode): Set log-view-per-file-logs and
log-view-file-re.
(vc-hg-diff): If no file is passed, use default-directory for cwd.

* vc-bzr.el (vc-bzr-log-view-mode): Set log-view-per-file-logs.

* vc-svn.el (vc-svn-log-view-mode): New derived mode.
2008-06-15 14:58:24 +00:00
Stefan Monnier
8100b5a869 (vc-bzr-revision-completion-table): Choose the right `:'. 2008-05-23 03:01:10 +00:00
Stefan Monnier
f838180339 * minibuffer.el (completion-boundaries): Change calling convention, so
`string' has the same semantics as in try-completion and all-completions.
(completion-table-with-context, completion--embedded-envvar-table)
(completion--file-name-table, completion-pcm--find-all-completions):
Adjust code accordingly.
* vc-bzr.el (vc-bzr-annotate-time): Reduce memory allocation.
(vc-bzr-revision-completion-table): Handle `boundaries' argument.
2008-05-23 01:58:15 +00:00
Dan Nicolaescu
3c9ee7c915 (vc-bzr-after-dir-status): Remove unused binding. 2008-05-18 07:13:08 +00:00
Stefan Monnier
07c4b87ce2 (vc-bzr-sha1, vc-bzr-command-discarding-stderr)
(vc-bzr-revision-completion-table): Use process-file.
(vc-bzr-working-revision): Pass relative file names.
2008-05-11 21:59:45 +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
Eric S. Raymond
4903369afe Remove VC-Dired and backend dir-state methods. 2008-05-07 21:27:41 +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
0a29940833 Name change in preparation for ripping out vc-dired. 2008-05-02 06:56:59 +00:00
Eric S. Raymond
5a9de6d018 Remove some XXX comments no longer needed. 2008-05-01 19:28:56 +00:00
Eric S. Raymond
3702367bce Change 'needs-patch to 'needs-update. 2008-05-01 19:13:16 +00:00
Stefan Monnier
e0607aaa2c Make `checkout-model' apply to filesets.
* vc-hooks.el (vc-checkout-model): Rewrite.
(vc-before-save, vc-after-save): Adjust callers accordingly.
* vc.el (vc-editable-p, vc-next-action, vc-checkout, vc-update)
(vc-transfer-file): Adjust callers accordingly.
* vc-rcs.el (vc-rcs-checkout-model): Adjust arg.
(vc-rcs-state, vc-rcs-state-heuristic, vc-rcs-receive-file)
(vc-rcs-checkout, vc-rcs-fetch-master-state): Use vc-rcs-checkout-model
instead of vc-checkout-model.
* vc-mcvs.el (vc-mcvs-revert):
Use vc-mcvs-checkout-model i.s.o vc-checkout-model.
* vc-cvs.el (vc-cvs-checkout-model): Adjust arg.
(vc-cvs-revert): Use vc-cvs-checkout-model i.s.o vc-checkout-model.
* vc-svn.el (vc-svn-checkout-model):
* vc-hg.el (vc-hg-checkout-model):
* vc-git.el (vc-git-checkout-model):
* vc-bzr.el (vc-bzr-checkout-model): Adjust arg.
2008-04-29 15:32:56 +00:00
Stefan Monnier
ec50e665d2 (vc-bzr-complete-with-prefix): Remove.
(vc-bzr-revision-completion-table): Use completion-table-with-context instead.
2008-04-21 20:49:06 +00:00
Stefan Monnier
c1b513745f Change `dir-status' to not take (and pass) status-buffer.
(vc-status-create-fileinfo): Make `extra' optional.
(vc-status-busy): New fun.
(vc-status-menu-map): Use it.
(vc-status-crt-marked): Remove.
(vc-status-update): Rename from vc-status-add-entries.
Add argument so as to prevent addition of entries.  Rewrite.
(vc-update-vc-status-buffer): Remove.
(vc-status-refresh): Don't remove old entries, set them to
up-to-date instead.  Also do it after the update is complete.
(vc-status-marked-files): η-reduce.
2008-04-11 15:17:59 +00:00
Dan Nicolaescu
21f7bc38bd (vc-bzr-after-dir-status): Detect the conflict state. 2008-04-10 15:03:27 +00:00
Miles Bader
5bc6ddff00 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1107
2008-04-05 23:01:26 +00:00
Dan Nicolaescu
6efbb10c5b (vc-bzr-state): Use when instead of if. 2008-04-04 22:29:02 +00:00
Stefan Monnier
882e82db4d (vc-bzr-previous-revision, vc-bzr-next-revision): New funs. 2008-04-03 13:34:34 +00:00
Stefan Monnier
5a3b79c471 (vc-bzr-checkout): Simplify. 2008-04-03 02:21:33 +00:00
Dan Nicolaescu
1b3f2d4ec6 * vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.
(vc-status-mark-buffer-changed): Handle the extra field.

* vc-bzr.el (vc-bzr-after-dir-status):
* vc-cvs.el (vc-cvs-after-dir-status):
* vc-hg.el (vc-hg-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status): Return a list not a cons.
2008-03-31 15:36:56 +00:00
Dan Nicolaescu
115c006177 * vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
(vc-status-refresh): Create a temporary buffer and call the
`dir-status' backend function from that buffer.

* vc-bzr.el (vc-bzr-dir-status): Don't create a buffer.
(vc-bzr-after-dir-status): Don't kill the buffer.

* vc-cvs.el (vc-cvs-dir-status): Don't create a buffer.
(vc-cvs-after-dir-status): Don't kill the buffer.

* vc-git.el (vc-git-dir-status): Don't create a buffer.
(vc-git-after-dir-status-stage2): Don't kill the buffer.

* vc-hg.el (vc-hg-dir-status): Don't create a buffer.
(vc-hg-after-dir-status): Don't kill the buffer.

* vc-svn.el (vc-svn-dir-status): Don't create a buffer.
(vc-svn-after-dir-status): Don't kill the buffer.
2008-03-29 05:34:52 +00:00
Stefan Monnier
769087cead (vc-bzr-state-heuristic): Fix last change for when there are conflicts. 2008-03-29 01:09:45 +00:00
Stefan Monnier
82eb83ffdb (vc-bzr-sha1): New fun.
(vc-bzr-state-heuristic): New fun, extracted from vc-bzr-registered.
(vc-bzr-registered): Use it.
2008-03-28 19:51:21 +00:00
Stefan Monnier
5a07b0f024 (vc-bzr-print-log, vc-bzr-diff): Do it asynchronously. 2008-03-24 19:52:29 +00:00
Dan Nicolaescu
49546869f3 * vc-hg.el (vc-hg-after-dir-status):
* vc-bzr.el (vc-bzr-after-dir-status): Detect missing files.
2008-03-24 08:47:06 +00:00
Dan Nicolaescu
54bf37044b (vc-bzr-state): Return 'removed for removed files and
'unregistered for unregistered files.
2008-03-23 20:50:52 +00:00
Dan Nicolaescu
6a3f9bb72d * vc-hg.el (vc-hg-state):
* vc-git.el (vc-git-state):
* vc-cvs.el (vc-cvs-parse-status):
* vc-bzr.el (vc-bzr-state): Return 'added when the file is in that
state.
2008-03-21 05:53:48 +00:00
Dan Nicolaescu
9c4c634e3e (vc-bzr-print-log): Ensure it works when passed a
single file argument.
(vc-bzr-show-log-entry): Fix typo.
2008-03-20 07:48:08 +00:00
Dan Nicolaescu
fd2d29b2bd (vc-bzr-print-log): Insert a file marker. Run the log
command for each file in the list.
(vc-bzr-log-view-mode): Recognize the file marker.
(vc-bzr-show-log-entry): Make regexp match more cases.
2008-03-19 03:49:09 +00:00
Stefan Monnier
1690cfbfac (vc-bzr-log-view-mode, vc-bzr-annotate-command)
(vc-bzr-annotate-time, vc-bzr-annotate-extract-revision-at-line):
Revision numbers can include ".".
2008-03-18 20:52:17 +00:00
Dan Nicolaescu
a676223563 Revert unintended change. 2008-03-17 21:58:19 +00:00