monotone

monotone Commit Details

Date:2009-01-02 20:08:41 (10 years 5 months ago)
Author:Tony Cooper
Branch:net.venge.monotone.contrib.mtn-browse
Commit:a8e67779fb514feedf99178a344a39959a5776e6
Parents: 7e688a5053d69413c1a68eeb299dfa23e5950119
Message:- Corrected a bug to do with doing external comparisons of renamed files in

subdirectories.
- Now that the latest version of Monotone::AutomateStdio handles starting the
mtn subprocess in the right directory, I have removed all that hacky stuff to
do with changing directory on startup.
- Added an ignore file.
Changes:
A.mtn-ignore (full)
Mlib/perl/History.pm (2 diffs)
Mmtn-browse (1 diff)

File differences

.mtn-ignore
1
2
3
4
5
6
7
8
9
10
11
12
13
^.emacs.desktop$
^MTN$
^MTN-0.40$
^lib/perl/Monotone$
^lib/ui/annotate.png$
^lib/ui/diffs.png$
^lib/ui/external-diffs.png$
^lib/ui/line.png$
^lib/ui/monotone-viz.png$
^lib/ui/mtn-browse-large.png$
^lib/ui/mtn-browse.png$
^test-0_40.mtn$
^test.mtn$
lib/perl/History.pm
13081308
13091309
13101310
1311
1312
1311
1312
13131313
13141314
13151315
......
18451845
18461846
18471847
1848
1849
1850
1848
1849
1850
1851
1852
18511853
18521854
18531855
# Get the details associated with the currently selected file.
$iter = $instance->{file_comparison_combobox}->get_active_iter();
$file_name = basename($instance->{file_comparison_combobox}->get_model()->
get($iter, CLS_FILE_NAME_COLUMN));
$file_name = $instance->{file_comparison_combobox}->get_model()->
get($iter, CLS_FILE_NAME_COLUMN);
$file_id_1 = $instance->{file_comparison_combobox}->get_model()->
get($iter, CLS_FILE_ID_1_COLUMN);
$file_id_2 = $instance->{file_comparison_combobox}->get_model()->
# Generate temporary disk file names.
if (! defined($old_file = generate_tmp_path(__("OLDER_") . $old_file_name))
|| ! defined($new_file = generate_tmp_path(__("NEWER_")
. $new_file_name)))
if (! defined($old_file = generate_tmp_path(__("OLDER_")
. basename($old_file_name)))
|| ! defined($new_file =
generate_tmp_path(__("NEWER_")
. basename($new_file_name))))
{
my $dialog = Gtk2::MessageDialog->new
($instance->{window},
mtn-browse
238238
239239
240240
241
241
242242
243
244
245
243
246244
247
245
246
248247
249
250
251
252
253
254
255
256
257
258
248
249
259250
260
261
262
263
264
265
266
267
268
269
270
251
252
253
271254
272255
273
274
275
276
277
278
279
280
281
282256
283257
284258
# workspace's database. If this doesn't work or the default database is to
# be used anyway then attempt to open that database instead.
eval
if ($user_preferences->{workspace}->{takes_precedence})
{
$mtn = Monotone::AutomateStdio->new();
$mtn = undef;
while (! -d "_MTN")
eval
{
if (! chdir(".."))
$mtn = Monotone::AutomateStdio->new();
if ($user_preferences->{workspace}->{auto_select})
{
my $dialog = Gtk2::MessageDialog->new
(undef,
["modal"],
"error",
"close",
__("Started in a workspace but I cannot\n"
. "find _MTN, I am going to exit."));
$dialog->run();
$dialog->destroy();
exit(1);
$mtn->get_option(\$branch, "branch");
$mtn->get_base_revision_id(\$revision_id);
}
}
$mtn = Monotone::AutomateStdio->new();
if ($user_preferences->{workspace}->{auto_select})
{
$mtn->get_option(\$branch, "branch");
$mtn->get_base_revision_id(\$revision_id);
}
};
if (! ($user_preferences->{workspace}->{takes_precedence}
&& defined($mtn))
&& $user_preferences->{default_mtn_db} ne "")
};
}
if (! defined($mtn) && $user_preferences->{default_mtn_db} ne "")
{
# Before opening the default database, make sure we are not in any
# workspace.
if (defined($mtn))
{
chdir("..");
$mtn = $branch = $revision_id = undef;
}
# Attempt to open the default database.
eval

Archive Download the corresponding diff file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status