Line data    Source code

       1             : /*
       2             :  * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com> and other copyright
       3             :  * owners as documented in the project's IP log.
       4             :  *
       5             :  * This program and the accompanying materials are made available under the
       6             :  * terms of the Eclipse Distribution License v1.0 which accompanies this
       7             :  * distribution, is reproduced below, and is available at
       8             :  * http://www.eclipse.org/org/documents/edl-v10.php
       9             :  *
      10             :  * All rights reserved.
      11             :  *
      12             :  * Redistribution and use in source and binary forms, with or without
      13             :  * modification, are permitted provided that the following conditions are met:
      14             :  *
      15             :  * - Redistributions of source code must retain the above copyright notice, this
      16             :  * list of conditions and the following disclaimer.
      17             :  *
      18             :  * - Redistributions in binary form must reproduce the above copyright notice,
      19             :  * this list of conditions and the following disclaimer in the documentation
      20             :  * and/or other materials provided with the distribution.
      21             :  *
      22             :  * - Neither the name of the Eclipse Foundation, Inc. nor the names of its
      23             :  * contributors may be used to endorse or promote products derived from this
      24             :  * software without specific prior written permission.
      25             :  *
      26             :  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
      27             :  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
      28             :  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
      29             :  * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
      30             :  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
      31             :  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
      32             :  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
      33             :  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
      34             :  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
      35             :  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
      36             :  * POSSIBILITY OF SUCH DAMAGE.
      37             :  */
      38             : 
      39             : package com.google.gerrit.server.git;
      40             : 
      41             : import java.io.ByteArrayInputStream;
      42             : import java.io.IOException;
      43             : import org.eclipse.jgit.lib.Constants;
      44             : import org.eclipse.jgit.lib.ObjectId;
      45             : import org.eclipse.jgit.lib.ObjectInserter;
      46             : import org.eclipse.jgit.lib.ObjectLoader;
      47             : import org.eclipse.jgit.lib.ObjectReader;
      48             : import org.eclipse.jgit.lib.ObjectStream;
      49             : import org.eclipse.jgit.notes.Note;
      50             : import org.eclipse.jgit.notes.NoteMerger;
      51             : import org.eclipse.jgit.util.io.UnionInputStream;
      52             : 
      53           0 : class ReviewNoteMerger implements NoteMerger {
      54             :   @Override
      55             :   public Note merge(Note base, Note ours, Note theirs, ObjectReader reader, ObjectInserter inserter)
      56             :       throws IOException {
      57           0 :     if (ours == null) {
      58           0 :       return theirs;
      59             :     }
      60           0 :     if (theirs == null) {
      61           0 :       return ours;
      62             :     }
      63           0 :     if (ours.getData().equals(theirs.getData())) {
      64           0 :       return ours;
      65             :     }
      66             : 
      67           0 :     ObjectLoader lo = reader.open(ours.getData());
      68           0 :     byte[] sep = new byte[] {'\n'};
      69           0 :     ObjectLoader lt = reader.open(theirs.getData());
      70           0 :     try (ObjectStream os = lo.openStream();
      71           0 :         ByteArrayInputStream b = new ByteArrayInputStream(sep);
      72           0 :         ObjectStream ts = lt.openStream();
      73           0 :         UnionInputStream union = new UnionInputStream(os, b, ts)) {
      74           0 :       ObjectId noteData =
      75           0 :           inserter.insert(Constants.OBJ_BLOB, lo.getSize() + sep.length + lt.getSize(), union);
      76           0 :       return new Note(ours, noteData);
      77             :     }
      78             :   }
      79             : }