tests/conflict-doppleganger.pl

   1 #!/usr/bin/env perl
   2
   3 # Tests for the doppleganger conflict bug.
   4
   5 # For Zooko, with love
   6 # Also, for issue81.
   7
   8 use lib 'lib/perl';
   9
  10 use Test::More 'no_plan';
  11 use Test::Darcs;
  12 use Shell::Command;
  13 use File::Slurp;
  14 use strict;
  15 use warnings;
  16
  17 system 'rm -rf temp';
  18 my $wd = `pwd`;
  19 chomp $wd;
  20 mkdir 'temp';
  21 chdir 'temp';
  22
  23 sub mycleanup {
  24   chdir $wd;
  25   system 'rm -rf temp/*';
  26   chdir 'temp';
  27 }
  28
  29 ok (dopplegangers_conflict('old-fashioned-inventory'),
  30     "default repo format views doppleganger as a conflict");
  31 mycleanup;
  32 ok (dopplegangers_conflict('hashed'),
  33     "hashed  repo format views doppleganger as a conflict");
  34 mycleanup;
  35 ok ((not dopplegangers_conflict('darcs-2')),
  36     "with darcs-2 format, doppleganger's don't conflict! ");
  37 mycleanup;
  38 ok (resolution_dopplegangers_conflict('old-fashioned-inventory'),
  39     "default repo format views resolution doppleganger as a conflict");
  40 mycleanup;
  41 ok (resolution_dopplegangers_conflict('hashed'),
  42     "hashed  repo format views resolution doppleganger as a conflict");
  43 mycleanup;
  44 ok (not (resolution_dopplegangers_conflict('darcs-2')),
  45     "with darcs-2 format, resolution doppleganger's don't conflict! ");
  46
  47
  48 sub dopplegangers_conflict {
  49     my $arg_to_init = shift;
  50     system 'rm -rf tmp_dopple tmp_ganger';
  51
  52     mkpath 'tmp_dopple';
  53     chdir  'tmp_dopple';
  54     darcs 'init --'.$arg_to_init;
  55
  56     # Map args to formats
  57     my %fmts = (
  58         'old-fashioned-inventory' => 'darcs-1.0',
  59         'darcs-2'                 => 'darcs-2',
  60         'hashed'                  => 'hashed',
  61     );
  62
  63     like((darcs 'show repo'), qr/$fmts{$arg_to_init}/,
  64          "reality check: $fmts{$arg_to_init} is repo format of tmp_doppel");
  65
  66     touch 'a.txt';
  67     darcs "add a.txt";
  68     my $out = darcs "record -A base -am 'adding a.txt'";
  69     like($out, qr/finished/msxi, "$arg_to_init: recorded patch for adding file.");
  70
  71     chdir '../';
  72
  73     $out = darcs 'get tmp_dopple tmp_ganger';
  74     like($out, qr/inished getting/, 'get tmp_dopple tmp_ganger worked');
  75     #diag $out;
  76
  77     #like((darcs 'show repo --repodir=tmp_ganger'), qr/$fmts{$arg_to_init}/,
  78     #     "reality check: $fmts{$arg_to_init} is repo format for tmp_ganger");
  79
  80     for my $repo (qw(dopple ganger)) {
  81         ok((chdir  "tmp_$repo"), "chdir'ed tmp_$repo");
  82         `echo "text which appears in both places at once" > a.txt`;
  83         my $out = darcs "record -A $repo -am 'recording an identical change'";
  84         like($out, qr/finished/msxi, "$arg_to_init: recorded patch in $repo");
  85 #        diag "in loop: $out";
  86         chdir '../';
  87     };
  88
  89     # Now that the conflict has been set up, try pull one patch from the other.
  90     chdir 'tmp_ganger';
  91
  92     my $pull_out = darcs 'pull -a ../tmp_dopple';
  93     my $has_a_conflict_p = ($pull_out =~ m/conflict/msxi);
  94 #    diag "result: $pull_out";
  95
  96     ####
  97
  98 #    diag "about to to return: $has_a_conflict_p";
  99
 100     return $has_a_conflict_p;
 101 }
 102
 103 sub resolution_dopplegangers_conflict {
 104     my $arg_to_init = shift;
 105
 106     system 'rm -rf temp0 temp1 temp2';
 107
 108     # Map args to formats
 109     my %fmts = (
 110         'old-fashioned-inventory' => 'darcs-1.0',
 111         'darcs-2'                 => 'darcs-2',
 112         'hashed'                  => 'hashed',
 113     );
 114
 115     mkpath 'temp0';
 116     chdir  'temp0';
 117     darcs 'init --'.$arg_to_init;
 118     like((darcs 'show repo'), qr/$fmts{$arg_to_init}/,
 119          "reality check: $fmts{$arg_to_init} is repo format of temp0");
 120     #diag (darcs 'show repo');
 121     chdir  '..';
 122
 123     # Create a conflict
 124     darcs 'get ../temp0 temp1';
 125     chdir 'temp1';
 126     #diag (darcs 'show repo');
 127     like((darcs 'show repo'), qr/$fmts{$arg_to_init}/,
 128          "reality check: $fmts{$arg_to_init} is repo format of temp1");
 129     `echo "temp1" > a.txt`;
 130     darcs "add a.txt";
 131     darcs "record  -A base -am 'adding a.txt'";
 132     chdir '..';
 133     darcs 'get ../temp0 temp2';
 134     chdir 'temp2';
 135     #diag (darcs 'show repo');
 136     `echo "temp2" > a.txt`;
 137     darcs "add a.txt";
 138     darcs "record  -A base -am 'adding a.txt'";
 139     chdir '..';
 140
 141     # Resolve the conflict the same way on both sides
 142     for my $repo (qw(dopple ganger)) {
 143         darcs "get temp1 tmp_$repo";
 144         ok((chdir  "tmp_$repo"), "chdir'ed tmp_$repo");
 145         darcs "pull -a ../temp2";
 146         `echo "text which appears in both places at once" > a.txt`;
 147         my $out = darcs "record -A $repo -am 'recording an identical change'";
 148         like($out, qr/finished/msxi, "$arg_to_init: recorded patch in $repo");
 149         #diag "in loop: $out";
 150         chdir '../';
 151     };
 152
 153     # Now that the conflict has been set up, try pull one patch from the other.
 154     chdir 'tmp_ganger';
 155
 156     my $pull_out = darcs 'pull -a ../tmp_dopple';
 157     #diag (darcs 'changes -v');
 158     my $has_a_conflict_p = ($pull_out =~ m/conflict/msxi);
 159     #diag "result: $pull_out";
 160     chdir '..';
 161
 162
 163     ####
 164
 165     #diag "about to to return: $has_a_conflict_p";
 166
 167     return $has_a_conflict_p;
 168 }
 169
 170