ryuslash/vc-p4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor bug fixes from Dan Nicolaescu <dann@ics.uci.edu>.

Browse source 
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 5986]
This commit is contained in:
Jonathan Kamens 2007-07-18 12:14:09 -08:00
parent 435d183a4c
commit 550739981d
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p4-lowlevel.el
View file

@ -394,7 +394,7 @@ value with `-m'; if S-VAL is non-nil, pass that value with `-s'."
(l-list (if l-flag (list "-l"))) (l-list (if l-flag (list "-l")))
(m-list (if m-val (list "-m" (if (numberp m-val) (m-list (if m-val (list "-m" (if (numberp m-val)
(number-to-string m-val) (number-to-string m-val)
mval)))) m-val))))
(s-list (if s-val (list "-s" s-val)))) (s-list (if s-val (list "-s" s-val))))
(p4-lowlevel-command-or-error (append (p4-lowlevel-command-or-error (append
(list "changes") (list "changes")

14
vc-p4.el
View file

@ -57,6 +57,10 @@
(eval-when-compile (eval-when-compile
(require 'vc-hooks) (require 'vc-hooks)
(require 'vc) (require 'vc)
(require 'ediff))
;; FIXME: setq ediff-quit-hook maybe should be add-hook...
(eval-and-compile
(require 'p4-lowlevel)) (require 'p4-lowlevel))
(if (not (memq 'P4 vc-handled-backends)) (if (not (memq 'P4 vc-handled-backends))
@ -72,7 +76,7 @@
(defun vc-default-show-log-entry (backend ver) (defun vc-default-show-log-entry (backend ver)
(if (fboundp 'log-view-goto-rev) (if (fboundp 'log-view-goto-rev)
(log-view-goto-rev rev))) (log-view-goto-rev ver)))
(defun vc-print-log () (defun vc-print-log ()
"List the change log of the current buffer in a window." "List the change log of the current buffer in a window."
@ -259,7 +263,7 @@ The conflicts must be marked with rcsmerge conflict markers."
(save-excursion (save-excursion
(set-buffer your-buffer) (set-buffer your-buffer)
(erase-buffer) (erase-buffer)
(insert-buffer result-buffer) (insert-buffer-substring result-buffer)
(if (not (vc-call-backend backend 'resolve-select-yours)) (if (not (vc-call-backend backend 'resolve-select-yours))
(progn (progn
(kill-buffer your-buffer) (kill-buffer your-buffer)
@ -269,12 +273,12 @@ The conflicts must be marked with rcsmerge conflict markers."
(set-buffer other-buffer) (set-buffer other-buffer)
(erase-buffer) (erase-buffer)
(insert-buffer result-buffer) (insert-buffer-substring result-buffer)
(vc-call-backend backend 'resolve-select-theirs) (vc-call-backend backend 'resolve-select-theirs)
(set-buffer ancestor-buffer) (set-buffer ancestor-buffer)
(erase-buffer) (erase-buffer)
(insert-buffer result-buffer) (insert-buffer-substring result-buffer)
(goto-char (point-min)) (goto-char (point-min))
(if (not (vc-call-backend backend 'resolve-select-original)) (if (not (vc-call-backend backend 'resolve-select-original))
(progn (progn
@ -310,7 +314,7 @@ The conflicts must be marked with rcsmerge conflict markers."
(ediff-cleanup-mess) (ediff-cleanup-mess)
(set-buffer result) (set-buffer result)
(erase-buffer) (erase-buffer)
(insert-buffer buffer-C) (insert-buffer-substring buffer-C)
(kill-buffer buffer-A) (kill-buffer buffer-A)
(kill-buffer buffer-B) (kill-buffer buffer-B)
(kill-buffer buffer-C) (kill-buffer buffer-C)