# HG changeset patch # User Bryan O'Sullivan # Date 1125510886 25200 # Node ID ba4ce38b90a3b419d3aeaf3e40b54afc0ba27e31 # Parent 7e909ceeb36a1e32e8c90d2af976b9634097b0c6# Parent 9d9f4973c76ad99a1e977eecc652559e12f53aef Merge with TAH. diff --git a/contrib/mercurial.el b/contrib/mercurial.el --- a/contrib/mercurial.el +++ b/contrib/mercurial.el @@ -469,12 +469,11 @@ directory names from the file system. W (set-buffer hg-prev-buffer)) (let ((rev (or default "tip"))) (if current-prefix-arg - (let ((revs (split-string (hg-chomp - (hg-run0 "-q" "log" "-r" - (format "-%d" - hg-rev-completion-limit) - "-r" "tip")) - "[\n:]"))) + (let ((revs (split-string + (hg-chomp + (hg-run0 "-q" "log" "-r" + (format "-%d:tip" hg-rev-completion-limit))) + "[\n:]"))) (dolist (line (split-string (hg-chomp (hg-run0 "tags")) "\n")) (setq revs (cons (car (split-string line "\\s-")) revs))) (completing-read (format "Revision%s (%s): " @@ -966,9 +965,10 @@ With a prefix argument, prompt for each (format "Mercurial: Log of rev %s of %s" rev1 a-path) (format "Mercurial: Log from rev %s to %s of %s" r1 r2 a-path))) - (if (> (length path) (length (hg-root path))) - (call-process (hg-binary) nil t nil "log" "-r" r1 "-r" r2 path) - (call-process (hg-binary) nil t nil "log" "-r" r1 "-r" r2)) + (let ((revs (format "%s:%s" r1 r2))) + (if (> (length path) (length (hg-root path))) + (call-process (hg-binary) nil t nil "log" "-r" revs path) + (call-process (hg-binary) nil t nil "log" "-r" revs))) (hg-log-mode)))) (defun hg-log-repo (path &optional rev1 rev2)