Re: hg problem

[Ernst Reissner]

On 07/28/2016 11:21 PM, John W. Eaton wrote:
> On 07/28/2016 04:52 PM, Ernst Reissner wrote:
>> Hi all,
>>
>> i face that in my invironment:
>>
>> address@hidden:~/Octave/octave> hg update
>> 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>> address@hidden:~/Octave/octave>
>>
>>
>> but
>>
>> address@hidden:~/Octave/octave> hg heads
>> changeset:   22196:d821e306c922
>> tag:         tip
>> parent:      22194:fee0dca31524
>> parent:      22195:829e0aafebdc
>> user:        Ernst Reissner <address@hidden>
>> date:        Thu Jul 28 22:01:19 2016 +0200
>> summary:     merge
>>
>> changeset:   22046:de18e547e99d
>> branch:      stable
>> parent:      22026:837d7e48c9b4
>> user:        Rik <address@hidden>
>> date:        Wed Jul 06 07:55:18 2016 -0700
>> summary:     Link Z_LIB to liboctinterp (bug #48407).
>>
>> and hg export is no empty.
>>
>> I have the impression that I shall add the two heads but i can't.
>
> No, we have two branches.  The one marked stable is for the stable
> release series.  Unless you are fixing a bug, you shouldn't be doing
> anything with that.  Just work on the other one (default).
>
> jwe
>
>
>
Update:

now I have

address@hidden:~/Octave/octave> hg heads
changeset:   22199:14a4a5f62595
tag:         tip
parent:      22196:d821e306c922
parent:      22198:8971508e21c8
user:        Ernst Reissner <address@hidden>
date:        Fri Jul 29 00:55:00 2016 +0200
summary:     merge

changeset:   22046:de18e547e99d
branch:      stable
parent:      22026:837d7e48c9b4
user:        Rik <address@hidden>
date:        Wed Jul 06 07:55:18 2016 -0700
summary:     Link Z_LIB to liboctinterp (bug #48407).

so all ok.

address@hidden:~/Octave/octave> hg pull
pulling from http://www.octave.org/hg/octave
real URL is http://hg.savannah.gnu.org/hgweb/octave
searching for changes
no changes found


address@hidden:~/Octave/octave> hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

address@hidden:~/Octave/octave> hg diff
is empty

and so all ok. BUT:


address@hidden:~/Octave/octave> hg export
# HG changeset patch
# User Ernst Reissner <address@hidden>
# Date 1469746500 -7200
#      Fri Jul 29 00:55:00 2016 +0200
# Node ID 14a4a5f625950eb0854c665b770e7180ea40286d
# Parent  d821e306c9224f7b13eb02423d2ae48383f5961b
# Parent  8971508e21c8c5c0d4f138edc06b09e4d0c241e6
merge

diff -r d821e306c922 -r 14a4a5f62595 libgui/graphics/Container.cc
--- a/libgui/graphics/Container.cc      Thu Jul 28 22:01:19 2016 +0200
+++ b/libgui/graphics/Container.cc      Fri Jul 29 00:55:00 2016 +0200
@@ -89,11 +89,16 @@
 
           if (obj)
             {
-              Matrix bb = obj->properties ().get_boundingbox (false);
+              graphics_object go = obj->object ();
 
-              obj->qWidget<QWidget> ()
-                ->setGeometry (octave::math::round (bb(0)),
octave::math::round (bb(1)),
-                               octave::math::round (bb(2)),
octave::math::round (bb(3)));
+              if (go.valid_object ())
+                {
+                  Matrix bb = go.get_properties ().get_boundingbox (false);
+
+                  obj->qWidget<QWidget> ()
+                    ->setGeometry (octave::math::round (bb(0)),
octave::math::round (bb(1)),
+                                   octave::math::round (bb(2)),
octave::math::round (bb(3)));
+                }
             }
         }
     }
diff -r d821e306c922 -r 14a4a5f62595 libgui/graphics/Panel.cc
--- a/libgui/graphics/Panel.cc  Thu Jul 28 22:01:19 2016 +0200
+++ b/libgui/graphics/Panel.cc  Fri Jul 29 00:55:00 2016 +0200
@@ -191,7 +191,11 @@
                     {
                       gh_manager::auto_lock lock;
 
-                      ContextMenu::executeAt (properties (),
m->globalPos ());
+                      graphics_object go = object ();
+
+                      if (go.valid_object ())
+                        ContextMenu::executeAt (go.get_properties (),
+                                                m->globalPos ());
                     }
                 }
               break;
@@ -209,7 +213,10 @@
                 {
                   gh_manager::auto_lock lock;
 
-                  properties ().update_boundingbox ();
+                  graphics_object go = object ();
+
+                  if (go.valid_object ())
+                    go.get_properties ().update_boundingbox ();
                 }
               break;
 
diff -r d821e306c922 -r 14a4a5f62595 libinterp/corefcn/graphics.in.h
--- a/libinterp/corefcn/graphics.in.h   Thu Jul 28 22:01:19 2016 +0200
+++ b/libinterp/corefcn/graphics.in.h   Fri Jul 29 00:55:00 2016 +0200
@@ -2796,13 +2796,15 @@
   virtual base_properties& get_properties (void)
   {
     static base_properties properties;
-    error ("base_graphics_object::get_properties: invalid graphics
object");
+    warning ("base_graphics_object::get_properties: invalid graphics
object");
+    return properties;
   }
 
   virtual const base_properties& get_properties (void) const
   {
     static base_properties properties;
-    error ("base_graphics_object::get_properties: invalid graphics
object");
+    warning ("base_graphics_object::get_properties: invalid graphics
object");
+    return properties;
   }
 
   virtual void update_axis_limits (const std::string& axis_type);
diff -r d821e306c922 -r 14a4a5f62595 test/publish/publish.tst
--- a/test/publish/publish.tst  Thu Jul 28 22:01:19 2016 +0200
+++ b/test/publish/publish.tst  Fri Jul 29 00:55:00 2016 +0200
@@ -1,23 +1,35 @@
 ## publish
 
-%!testif HAVE_X_WINDOWS
-%! cases = dir ("test_script*.m");
-%! cases = strsplit (strrep ([cases.name], ".m", ".m\n"));
-%! for i = 1:length(cases)-1
-%!   publish (cases{i});
-%! endfor
-%! confirm_recursive_rmdir (false, "local");
-%! rmdir ("html", "s");
+%!test
+%! visibility = get (0, "defaultfigurevisible");
+%! unwind_protect
+%!   set (0, "defaultfigurevisible", "off");
+%!   cases = dir ("test_script*.m");
+%!   cases = strsplit (strrep ([cases.name], ".m", ".m\n"));
+%!   for i = 1:length(cases)-1
+%!     publish (cases{i});
+%!   endfor
+%!   confirm_recursive_rmdir (false, "local");
+%!   rmdir ("html", "s");
+%! unwind_protect_cleanup
+%!   set (0, "defaultfigurevisible", visibility);
+%! end_unwind_protect
 
 ## grabcode
 
-%!testif HAVE_X_WINDOWS
-%! publish ("test_script.m");
-%! str1 = fileread ("test_script.m");
-%! str2 = grabcode ("html/test_script.html");
-%! confirm_recursive_rmdir (false, "local");
-%! rmdir ("html", "s");
-%! # Canonicalize strings
-%! str1 = strjoin (deblank (strsplit (str1, "\n")), "\n");
-%! str2 = strjoin (deblank (strsplit (str2, "\n")), "\n");
-%! assert (hash ("md5", str1), hash ("md5", str2));
\ No newline at end of file
+%!test
+%! visibility = get (0, "defaultfigurevisible");
+%! unwind_protect
+%!   set (0, "defaultfigurevisible", "off");
+%!   publish ("test_script.m");
+%!   str1 = fileread ("test_script.m");
+%!   str2 = grabcode ("html/test_script.html");
+%!   confirm_recursive_rmdir (false, "local");
+%!   rmdir ("html", "s");
+%!   # Canonicalize strings
+%!   str1 = strjoin (deblank (strsplit (str1, "\n")), "\n");
+%!   str2 = strjoin (deblank (strsplit (str2, "\n")), "\n");
+%!   assert (hash ("md5", str1), hash ("md5", str2));
+%! unwind_protect_cleanup
+%!   set (0, "defaultfigurevisible", visibility);
+%! end_unwind_protect
address@hidden:~/Octave/octave>


This is not what I expected.

I cannot deliver patches unless this output is empty, right?


Help very much appreciated.


Ernst