# # # patch "AdvancedFind.pm" # from [a90306fcf2481e01544f00af6790718417b6f703] # to [9e7ed7872bbe9dd29d712fb54727bae6af7be4c2] # # patch "History.pm" # from [fc8d780c02209c8643440fee625c7673e7947cc4] # to [06156650d4157a98ad7b2d627b2f9da2d58c83ac] # # patch "mtn-browse" # from [bfe15c84b9b74a9c6f0b482987d43fe25d5fba8b] # to [186fceb438602cbd85c940611e2083ffbd795358] # ============================================================ --- AdvancedFind.pm a90306fcf2481e01544f00af6790718417b6f703 +++ AdvancedFind.pm 9e7ed7872bbe9dd29d712fb54727bae6af7be4c2 @@ -316,7 +316,7 @@ sub populate_button_clicked_cb($$) } elsif ($selector eq __("Head Revision")) { - $to_insert = "h:"; + $to_insert = "h:" . (($arg eq "") ? __("") : $arg); } elsif ($selector eq __("Identifier")) { @@ -385,7 +385,7 @@ sub term_combobox_changed_cb($$) $advanced_find->{argument_entry}->set_sensitive(FALSE); $advanced_find->{date_dateedit}->set_sensitive(TRUE); } - elsif ($selector eq __("Head Revision") || $selector eq __("Separator")) + elsif ($selector eq __("Separator")) { $advanced_find->{argument_entry}->set_sensitive(FALSE); $advanced_find->{date_dateedit}->set_sensitive(FALSE); ============================================================ --- History.pm fc8d780c02209c8643440fee625c7673e7947cc4 +++ History.pm 06156650d4157a98ad7b2d627b2f9da2d58c83ac @@ -947,6 +947,10 @@ sub compare_revisions($$$;$) if ($instance->{diff_output}->[$i] =~ m/^==/o) { + # Check for aborts. + + last if ($instance->{stop}); + # Extract the file name, if this doesn't work then it is # probably a comment stating that the file is binary. @@ -1186,8 +1190,8 @@ sub external_diffs_button_clicked_cb($$) # Generate temporary disk file names. - if (! defined($old_file = generate_tmp_path("OLDER_" . $file_name)) - || ! defined($new_file = generate_tmp_path("NEWER_" . $file_name))) + if (! defined($old_file = generate_tmp_path(__("OLDER_") . $file_name)) + || ! defined($new_file = generate_tmp_path(__("NEWER_") . $file_name))) { my $dialog = Gtk2::MessageDialog->new ($instance->{window}, @@ -1262,7 +1266,7 @@ sub save_differences_button_clicked_cb($ my $data; $data = join("\n", @{$instance->{diff_output}}) . "\n"; - save_as_file($instance->{window}, "unified_diff.out", \$data); + save_as_file($instance->{window}, __("unified_diff.patch"), \$data); } # ============================================================ --- mtn-browse bfe15c84b9b74a9c6f0b482987d43fe25d5fba8b +++ mtn-browse 186fceb438602cbd85c940611e2083ffbd795358 @@ -395,7 +395,7 @@ sub about_activate_cb($$) if (! defined($large_logo)); Gnome2::About->new ("mtn-browse", - "0.44b", + "0.45", __("Copyright \xa9 2007-2009 Anthony Cooper"), __("A graphical front-end browser for Monotone VCS databases"), ["Anthony Cooper "], @@ -432,10 +432,26 @@ sub new_toolbutton_clicked_cb($$) # Simply get a new/unused browser window and display it. - get_revision_ids($browser, address@hidden); - get_browser_window($browser->{mtn}, - $browser->{branch_combo_details}->{value}, - $revision_ids[0]); + if (! defined($browser->{mtn})) + { + get_browser_window(); + } + elsif (! $browser->{branch_combo_details}->{complete}) + { + get_browser_window($browser->{mtn}); + } + elsif (! $browser->{revision_combo_details}->{complete}) + { + get_browser_window($browser->{mtn}, + $browser->{branch_combo_details}->{value}); + } + else + { + get_revision_ids($browser, address@hidden); + get_browser_window($browser->{mtn}, + $browser->{branch_combo_details}->{value}, + $revision_ids[0]); + } } #