# # # patch "lib/perl/AdvancedFind.pm" # from [1a706d28e9628ecb70166b58b1a1c83df0758533] # to [856fdd55fe5c47125d357c605a455b477ce02ce2] # # patch "lib/perl/Annotate.pm" # from [9805aae5c5ac9cd9e650e99d3f928687cd6067b4] # to [f80a20fab4e1b51c47331dc69f52153a640b1be9] # # patch "lib/perl/Common.pm" # from [8e650608a7fa05dbb21d3d4d1cc290df238244f8] # to [e907af6ee7754a6d899a0c226ef67e5cac7167d0] # # patch "lib/perl/FindFiles.pm" # from [10a2d9032978d20fdb9496ef876da845fa9ea8fb] # to [adc0848bcb3a9f34e12cc65e377fdbf44b58de36] # # patch "lib/perl/FindText.pm" # from [65000c0c8004be927d06248a4cae65e47fbca015] # to [15db71ad8a95650872646ef06553497cdc027908] # # patch "lib/perl/History.pm" # from [a29e79c181fc8de7480d32eb3dd530a5fdad9c5d] # to [1eabcf9989ba60ef2ae9401af5cf6cdb88c0ee22] # # patch "lib/perl/Preferences.pm" # from [92111fa9127ba4345a281e4e1d62f6a89955a3c1] # to [bc9a565ac54237e185670c70618d24e2507a91d5] # # patch "mtn-browse" # from [881f0a6488e4f5b6fa0962fe0d438245e29a0b05] # to [9e81bf545d4bf3279fa9981d051ca173845379a9] # ============================================================ --- lib/perl/AdvancedFind.pm 1a706d28e9628ecb70166b58b1a1c83df0758533 +++ lib/perl/AdvancedFind.pm 856fdd55fe5c47125d357c605a455b477ce02ce2 @@ -958,7 +958,7 @@ sub update_advanced_find_state($$) else { - my($err, + my($exception, $query); $query = $advanced_find->{search_term_comboboxentry}->child()-> @@ -989,13 +989,13 @@ sub update_advanced_find_state($$) $advanced_find->{mtn}->select(address@hidden, $query); $matches = scalar(@revision_ids); }; - $err = $@; + $exception = $@; CachingAutomateStdio->register_error_handler(MTN_SEVERITY_ALL, \&mtn_error_handler); # If the query was valid then store it in the history. - if ($err eq "") + if (! $exception) { if (scalar(@revision_ids) == 0) { ============================================================ --- lib/perl/Annotate.pm 9805aae5c5ac9cd9e650e99d3f928687cd6067b4 +++ lib/perl/Annotate.pm f80a20fab4e1b51c47331dc69f52153a640b1be9 @@ -808,7 +808,7 @@ sub mtn_annotate($$$$) my($buffer, @cmd, $cwd, - $err); + $exception); # Run mtn annotate in the root directory so as to avoid any workspace # conflicts. @@ -826,9 +826,9 @@ sub mtn_annotate($$$$) die("chdir failed: " . $!) unless (chdir(File::Spec->rootdir())); return unless (run_command(\$buffer, @cmd)); }; - $err = $@; + $exception = $@; chdir($cwd); - if ($err ne "") + if ($exception) { my $dialog = Gtk2::MessageDialog->new_with_markup (undef, @@ -838,7 +838,7 @@ sub mtn_annotate($$$$) __x("Problem running mtn annotate, got:\n" . "{error_message}\n" . "This should not be happening!", - error_message => Glib::Markup::escape_text($err))); + error_message => Glib::Markup::escape_text($exception))); WindowManager->instance()->allow_input(sub { $dialog->run(); }); $dialog->destroy(); return; ============================================================ --- lib/perl/Common.pm 8e650608a7fa05dbb21d3d4d1cc290df238244f8 +++ lib/perl/Common.pm e907af6ee7754a6d899a0c226ef67e5cac7167d0 @@ -481,7 +481,7 @@ sub open_database($$$) if ($chooser_dialog->run() eq "ok") { - my($err, + my($exception, $fh, $fname, $mtn_obj); @@ -517,10 +517,10 @@ sub open_database($$$) { $mtn_obj = CachingAutomateStdio->new($fname); }; - $err = $@; + $exception = $@; CachingAutomateStdio->register_error_handler (MTN_SEVERITY_ALL, \&mtn_error_handler); - if ($err ne "") + if ($exception) { my $dialog = Gtk2::MessageDialog->new ($parent, @@ -815,7 +815,7 @@ sub treeview_column_searcher($$$$) $re = qr/\Q$key\E/; } }; - return TRUE if ($@ ne ""); + return TRUE if ($@); # Actually do the match. @@ -1341,7 +1341,7 @@ sub handle_comboxentry_history($$;$) { save_preferences($user_preferences); }; - if ($@ ne "") + if ($@) { chomp($@); my $dialog = Gtk2::MessageDialog->new ============================================================ --- lib/perl/FindFiles.pm 10a2d9032978d20fdb9496ef876da845fa9ea8fb +++ lib/perl/FindFiles.pm adc0848bcb3a9f34e12cc65e377fdbf44b58de36 @@ -1072,7 +1072,7 @@ sub validate_query($$) { qr/$re_text/; }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new ($instance->{window}, @@ -1095,7 +1095,7 @@ sub validate_query($$) { qr/$re_text/; }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new ($instance->{window}, ============================================================ --- lib/perl/FindText.pm 65000c0c8004be927d06248a4cae65e47fbca015 +++ lib/perl/FindText.pm 15db71ad8a95650872646ef06553497cdc027908 @@ -389,7 +389,7 @@ sub find_text_button_clicked_cb($$) $expr = qr/$search_term/i; } }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new ($instance->{window}, ============================================================ --- lib/perl/History.pm a29e79c181fc8de7480d32eb3dd530a5fdad9c5d +++ lib/perl/History.pm 1eabcf9989ba60ef2ae9401af5cf6cdb88c0ee22 @@ -2051,7 +2051,7 @@ sub mtn_diff($$$$;$) my($buffer, @cmd, $cwd, - $err); + $exception); # Run mtn diff in the root directory so as to avoid any workspace # conflicts. @@ -2071,9 +2071,9 @@ sub mtn_diff($$$$;$) die("chdir failed: " . $!) unless (chdir(File::Spec->rootdir())); return unless (run_command(\$buffer, @cmd)); }; - $err = $@; + $exception = $@; chdir($cwd); - if ($err ne "") + if ($exception) { my $dialog = Gtk2::MessageDialog->new_with_markup (undef, @@ -2083,7 +2083,7 @@ sub mtn_diff($$$$;$) __x("Problem running mtn diff, got:\n" . "{error_message}\n" . "This should not be happening!", - error_message => Glib::Markup::escape_text($err))); + error_message => Glib::Markup::escape_text($exception))); WindowManager->instance()->allow_input(sub { $dialog->run(); }); $dialog->destroy(); return; ============================================================ --- lib/perl/Preferences.pm 92111fa9127ba4345a281e4e1d62f6a89955a3c1 +++ lib/perl/Preferences.pm bc9a565ac54237e185670c70618d24e2507a91d5 @@ -200,7 +200,7 @@ sub preferences($) { $preferences = load_preferences(); }; - if ($@ ne "") + if ($@) { chomp($@); my $dialog = Gtk2::MessageDialog->new @@ -259,7 +259,7 @@ sub preferences($) { save_preferences($preferences); }; - if ($@ ne "") + if ($@) { chomp($@); my $dialog = Gtk2::MessageDialog->new @@ -319,7 +319,7 @@ sub load_preferences() eval(join("", $prefs_file->getlines())); die(__x("Invalid user preferences file: {error_message}\n", error_message => $@)) - if ($@ ne ""); + if ($@); $prefs_file->close(); die(__x("Preferences file, `{file_name}',\n", file_name => $file_name) . __("is corrupt, please remove it.\n")) @@ -861,7 +861,7 @@ sub add_file_name_pattern_button_clicked { qr/$re_text/; }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new ($instance->{window}, ============================================================ --- mtn-browse 881f0a6488e4f5b6fa0962fe0d438245e29a0b05 +++ mtn-browse 9e81bf545d4bf3279fa9981d051ca173845379a9 @@ -225,7 +225,7 @@ sub view_button_clicked_cb($$); $mime_match_table = build_mime_match_table($user_preferences->{mime_table}); }; - if ($@ ne "") + if ($@) { chomp($@); my $dialog = Gtk2::MessageDialog->new @@ -250,7 +250,7 @@ sub view_button_clicked_cb($$); TMPDIR => 1, CLEANUP => 1); }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new (undef, @@ -310,7 +310,7 @@ sub view_button_clicked_cb($$); $mtn = CachingAutomateStdio-> new($user_preferences->{default_mtn_db}); }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new (undef, @@ -502,7 +502,7 @@ sub home_page_activate_cb($$) { display_html("http://www.coosoft.plus.com/software.html"); }; - if ($@ ne "") + if ($@) { my $dialog = Gtk2::MessageDialog->new_with_markup ($browser->{window}, @@ -2715,8 +2715,8 @@ sub display_file($$) { $loader->close(); }; - $exception = $@ if ($@ ne ""); - if ($exception eq "") + $exception = $@ if ($@); + if (! $exception) { $browser->{file_view_svbuffer}->insert_pixbuf ($browser->{file_view_svbuffer}->get_start_iter(), @@ -2912,7 +2912,7 @@ sub setup_mtn_object($$) { save_preferences($user_preferences); }; - if ($@ ne "") + if ($@) { chomp($@); my $dialog = Gtk2::MessageDialog->new