@@ -15,29 +15,74 @@ use Gitprep::Util;

 has 'app';

 has 'authorized_keys_file';

-sub lock_rep {

-  my ($self, $rep_info) = @_;

-  

-  my $git_dir = $rep_info->{git_dir};

-  my $lock_file = "$git_dir/config";

-  

-  open my $lock_fh, '<', $lock_file

-    or croak "Can't open lock file $lock_file: $!";

-    

-  flock $lock_fh, LOCK_EX

-    or croak "Can't lock $lock_file";

-  

-  return $lock_fh;

+has '_tmp_branch' => '__gitprep_tmp_branch__';

+

+sub prepare_merge {

+  my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

+  

+  # Fetch base repository

+  my $base_user_id = $rep_info1->{user};

+  my @git_fetch_base_cmd = $self->app->git->cmd($work_rep_info, 'fetch', 'origin', $base_branch);

+  Gitprep::Util::run_command(@git_fetch_base_cmd)

+    or Carp::croak "Can't execute git fetch: @git_fetch_base_cmd";

+  

+  # Remeve remote

+  my $target_user_id = $rep_info2->{user};

+  my @git_remote_remove_cmd =  $self->app->git->cmd(

+    $work_rep_info,

+    'remote',

+    'remove',

+    $target_user_id

+  );

+  Gitprep::Util::run_command(@git_remote_remove_cmd);

+  

+  # Set remote add target repository

+  my $target_git_dir = $rep_info2->{git_dir};

+  my @git_remote_add_cmd = $self->app->git->cmd(

+    $work_rep_info,

+    'remote',

+    'add',

+    $target_user_id,

+    $target_git_dir

+  );

+  Gitprep::Util::run_command(@git_remote_add_cmd)

+    or Carp::croak "Can't execute git remote add: @git_remote_add_cmd";

+  

+  # Fetch target repository

+  my @git_fetch_target_cmd = $self->app->git->cmd($work_rep_info, 'fetch', $target_user_id, $target_branch);

+  Gitprep::Util::run_command(@git_fetch_target_cmd)

+    or Carp::croak "Can't execute git fetch: @git_fetch_target_cmd";

+  

+  # Checkout tmp branch and git reset --hard from my remote branch

+  my @git_checkout_tmp_branch = $self->app->git->cmd(

+    $work_rep_info,

+    'checkout',

+    $self->_tmp_branch

+  );

+  Gitprep::Util::run_command(@git_checkout_tmp_branch)

+    or Carp::croak "Can't execute git checkout: @git_checkout_tmp_branch";

+  

+  # git reset --hard

+  my @git_reset_hard_cmd = $self->app->git->cmd(

+    $work_rep_info,

+    'reset',

+    '--hard',

+    "origin/$base_branch"

+  );

+  Gitprep::Util::run_command(@git_reset_hard_cmd)

+    or Carp::croak "Can't execute git reset --hard: @git_reset_hard_cmd";

 }

 sub check_merge_automatical {

-  my ($self, $rep_info, $branch1, $branch2) = @_;

+  my ($self, $work_rep_info, $rep_info1, $base_branch, $rep_info2, $target_branch) = @_;

   # Create patch

+  my $tmp_branch = $self->_tmp_branch;

+  my $target_user_id = $rep_info2->{user};

   my @git_format_patch_cmd = $self->app->git->cmd(

-    $rep_info,

+    $work_rep_info,

     'format-patch',

-    "$branch1..$branch2",

+    "$tmp_branch..$target_user_id/$target_branch",

     "--stdout"

   );

   open my $git_format_patch_fh, '-|', @git_format_patch_cmd

@@ -54,7 +99,7 @@ sub check_merge_automatical {

   # Check if this patch can be applied

   my @git_apply_cmd = $self->app->git->cmd(

-    $rep_info,

+    $work_rep_info,

     'apply',

     $patch_file,

     '--check'

@@ -64,6 +109,21 @@ sub check_merge_automatical {

   return $automatical;

 }

+sub lock_rep {

+  my ($self, $rep_info) = @_;

+  

+  my $git_dir = $rep_info->{git_dir};

+  my $lock_file = "$git_dir/config";

+  

+  open my $lock_fh, '<', $lock_file

+    or croak "Can't open lock file $lock_file: $!";

+    

+  flock $lock_fh, LOCK_EX

+    or croak "Can't lock $lock_file";

+  

+  return $lock_fh;

+}

+

 sub create_work_rep {

   my ($self, $user, $project) = @_;

@@ -84,11 +144,10 @@ sub create_work_rep {

       or croak "Can't git clone: @git_clone_cmd";

     # Create temparary branch

-    my $gitprep_tmp_branch_name = '__gitprep_tmp_branch__';

     my @git_branch_cmd = $self->app->git->cmd(

       $work_rep_info,

       'branch',

-      $gitprep_tmp_branch_name,

+      $self->_tmp_branch

     );

     Gitprep::Util::run_command(@git_branch_cmd)

       or Carp::croak "Can't execute git branch: @git_branch_cmd";

@@ -101,7 +101,8 @@

   }

   # Commits

-  my $commits = $git->forward_commits(app->rep_info($user_id, $project_id), $from_rev, $rev);

+  my $rep_info = app->rep_info($user_id, $project_id);

+  my $commits = $git->forward_commits($rep_info, $from_rev, $rev);

   my $commits_count = @$commits;

   my $commits_date = {};

   my $authors = {};

@@ -114,10 +115,10 @@

   my $authors_count = keys %$authors;

   # Start commit

-  my $start_commit = $git->separated_commit(app->rep_info($user_id, $project_id), $from_rev, $rev);

+  my $start_commit = $git->separated_commit($rep_info, $from_rev, $rev);

   # End commit

-  my $end_commit = $git->get_commit(app->rep_info($user_id, $project_id), $rev);

+  my $end_commit = $git->get_commit($rep_info, $rev);

   if (!$start_commit || !$end_commit) {

     $self->reply->not_found;

@@ -125,7 +126,7 @@

   }

   # Branches

-  my $branches = $git->branches(app->rep_info($user_id, $project_id));

+  my $branches = $git->branches($rep_info);

   @$branches = sort { $a->{commit}{age} <=> $b->{commit}{age} } @$branches;

   # Variables

@@ -147,41 +148,30 @@

     # Create working repository if it don't exist

     $self->app->manager->create_work_rep($user_id, $project_id);

-    # Fetch repository

+    # Lock working repository

     my $work_rep_info = app->work_rep_info($user_id, $project_id);

-    my @git_fetch_cmd = $self->app->git->cmd($work_rep_info, 'fetch');

-    Gitprep::Util::run_command(@git_fetch_cmd)

-      or Carp::croak "Can't execute git fetch: @git_fetch_cmd";

+    my $lock_fh = $self->app->manager->lock_rep($work_rep_info);

-    # Lock repository

-    my $lock = $self->app->manager->lock_rep($work_rep_info);

-    

-    # Checkout tmp branch and git reset --hard from my remote branch

-    my $gitprep_tmp_branch_name = '__gitprep_tmp_branch__';

-    my @git_checkout_tmp_branch = $self->app->git->cmd(

-      $work_rep_info,

-      'checkout',

-      $gitprep_tmp_branch_name,

-    );

-    Gitprep::Util::run_command(@git_checkout_tmp_branch)

-      or Carp::croak "Can't execute git checkout: @git_checkout_tmp_branch";

-    

-    # git reset --hard

-    my @git_reset_hard_cmd = $self->app->git->cmd(

+    # Prepare merge

+    $self->app->manager->prepare_merge(

       $work_rep_info,

-      'reset',

-      '--hard',

-      "origin/$from_rev"

+      $rep_info,

+      $from_rev,

+      $rep_info,

+      $rev

     );

-    Gitprep::Util::run_command(@git_reset_hard_cmd)

-      or Carp::croak "Can't execute git reset --hard: @git_reset_hard_cmd";

     # Check merge automatically

     $merge_automatical = $self->app->manager->check_merge_automatical(

-      app->work_rep_info($user_id, $project_id),

-      $gitprep_tmp_branch_name,

-      "origin/$rev"

+      $work_rep_info,

+      $rep_info,

+      $from_rev,

+      $rep_info,

+      $rev

     );

+    

+    # Unlock explicitly

+    close $lock_fh;

   }

   layout 'common', title => "Comparing $from_rev...$rev \x{30fb} $user_id/$project_id";

@@ -88,6 +88,18 @@

     where => {pull_request => $row_id, number => 1}

   )->one;

+  # Check merge automatically

+  my $merge_automatical;

+  if ($api->can_write_access($session_user_id, $user_id, $project_id) && $pull_request->{open}) {

+    $merge_automatical = $self->app->manager->check_merge_automatical(

+      app->work_rep_info($user_id, $project_id),

+      $rep_info,

+      $branch1,

+      $rep_info,

+      $branch2

+    );

+  }

+

   # Commit body arguments

   my %commit_body_args = (

     id => $end_commit->{id},