Re: [Emacs-diffs] emacs-25 c71e1e8: Use short date for 'hg annotate', and output the author

[Ken Brown]

On 1/10/2016 12:40 PM, Ken Brown wrote:
> On 1/9/2016 8:13 PM, Dmitry Gutov wrote:
> > +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-filename ()
> > +  ;; with filename
> > +  (with-temp-buffer
> > +    (save-excursion (insert "215 2007-06-20 CONTENTS:"))
> > +    (should (equal (vc-hg-annotate-extract-revision-at-line)
> > +                   (cons
> > +                    "215"
> > +                    (expand-file-name "test/automated/CONTENTS"
> > +                                      source-directory))))))
> > +
>
> [...]
>
> > +(ert-deftest vc-hg-annotate-extract-revision-at-line-with-both ()
> > +  (with-temp-buffer
> > +    (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:"))
> > +    (should (equal (vc-hg-annotate-extract-revision-at-line)
> > +                   (cons
> > +                    "218075"
> > +                    (expand-file-name "test/automated/CLOBBER"
> > +                                      source-directory))))))
>
> These two tests fail on an out-of-tree build.

How about the following fix:

diff --git a/test/automated/vc-hg.el b/test/automated/vc-hg.el
index 6828271..76ba785 100644
--- a/test/automated/vc-hg.el
+++ b/test/automated/vc-hg.el
@@ -34,8 +34,8 @@
     (should (equal (vc-hg-annotate-extract-revision-at-line)
                    (cons
                     "215"
-                    (expand-file-name "test/automated/CONTENTS"
-                                      source-directory))))))
+                    (expand-file-name "CONTENTS"
+                                      default-directory))))))

 (ert-deftest vc-hg-annotate-extract-revision-at-line-with-user ()
   (with-temp-buffer
@@ -49,8 +49,8 @@
     (should (equal (vc-hg-annotate-extract-revision-at-line)
                    (cons
                     "218075"
-                    (expand-file-name "test/automated/CLOBBER"
-                                      source-directory))))))
+                    (expand-file-name "CLOBBER"
+                                      default-directory))))))

 (ert-deftest vc-hg-annotate-time ()
   (with-temp-buffer

Ken