conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
@ContextConfiguration(classes = JavaMessageListenerContainerAwsTest.MessageListenerContainerAwsTestConfiguration.class)
class JavaMessageListenerContainerAwsTest extends MessageListenerContainerAwsTest {
=======
@ContextConfiguration(
classes = JavaMessageListenerContainerAwsTest.MessageListenerContainerAws... |
<<<<<<<
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
=======
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
>>>>>>>
import org.junit.jupiter.api.Test;
import org.junit.jupiter... |
<<<<<<<
=======
import javax.ws.rs.ApplicationPath;
>>>>>>>
import javax.ws.rs.ApplicationPath;
<<<<<<<
final IPWhitelistFilter iPWhitelistFilter = new IPWhitelistFilter();
final RawTransactionResource rawTransactionResource = new RawTransactionResource(transactionManager);
=======
final... |
<<<<<<<
@Override
public String workdir() { return "qdata"; };
@Override
public String socket() { return "/tmp/tst1.ipc"; };
=======
@Override
public List<String> generatekeys() {
return emptyList();
}
>>>>>>>
@Override
public List<String> generatekeys() {
return... |
<<<<<<<
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.ObjectMetadata;
import org.elasticspring.support.TestStackEnvironment;
import org.junit.After;
=======
import org.elasticspring.core.region.S3Region;
>>>>>>>
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.servi... |
<<<<<<<
classes = BootNotificationMessagingTemplateIntegrationTest.NotificationMessagingTemplateIntegrationTestConfiguration.class)
class BootNotificationMessagingTemplateIntegrationTest
=======
classes = BootNotificationMessagingTemplateIntegrationTest.NotificationMessagingTemplateIntegrationTestConfiguration.cl... |
<<<<<<<
registerBeanDefinitionParser("cache-manager", new CacheBeanDefinitionParser());
=======
registerBeanDefinitionParser("context-region", new ContextRegionBeanDefinitionParser());
>>>>>>>
registerBeanDefinitionParser("cache-manager", new CacheBeanDefinitionParser());
registerBeanDefinitionParser("contex... |
<<<<<<<
@SpringBootTest(classes = BootQueueMessagingTemplateIntegrationTest.QueueMessagingTemplateIntegrationTestConfiguration.class)
class BootQueueMessagingTemplateIntegrationTest
=======
@SpringBootTest(
classes = BootQueueMessagingTemplateIntegrationTest.QueueMessagingTemplateIntegrationTestConfiguration.class)... |
<<<<<<<
private int mAllDayEventHeight = 100;
=======
private int mAllDayEventHeight= 100;
private int mScrollDuration = 250;
>>>>>>>
private int mAllDayEventHeight = 100;
private int mScrollDuration = 250;
<<<<<<<
mAllDayEventHeight = a.getDimensionPixelSize(R.styleable.WeekView_all... |
<<<<<<<
double scrollToHour = mScrollToHour;
=======
mEffectiveMinHourHeight= Math.max(mMinHourHeight, (int) ((getHeight() - mHeaderTextHeight - mHeaderRowPadding * 2 - mHeaderMarginBottom) / 24));
>>>>>>>
mEffectiveMinHourHeight= Math.max(mMinHourHeight, (int) ((getHeight() - mHe... |
<<<<<<<
import android.R.integer;
=======
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
>>>>>>>
import android.R.integer;
import android.animation.Animator;
import android.animation.AnimatorListenerA... |
<<<<<<<
@StreamMessageConverter
public AbstractMessageConverter busJsonConverter() {
return new BusJacksonMessageConverter();
=======
public BusJacksonMessageConverter busJsonConverter(@Autowired(required = false) ObjectMapper objectMapper) {
return new BusJacksonMessageConverter(objectMapper);
>>>>>>>
@Stre... |
<<<<<<<
@Configuration
@ConditionalOnClass({ Endpoint.class, RefreshScope.class })
protected static class BusRefreshConfiguration {
@Configuration
@ConditionalOnBean(ContextRefresher.class)
protected static class BusRefreshEndpointConfiguration {
@Bean
@ConditionalOnEnabledEndpoint
public RefreshBus... |
<<<<<<<
key = k;
project = p;
lock = new Object();
=======
>>>>>>>
key = k;
project = p; |
<<<<<<<
// null paths since we won't actually be reading them
final ConfigKeyPair keypair = new FilesystemKeyPair(null, null);
final KeyConfiguration keyConfig =
new KeyConfiguration(null, emptyList(), singletonList(keypair), null, null, null);
=======
// null paths sin... |
<<<<<<<
=======
import java.io.IOException;
import java.util.List;
>>>>>>>
import java.io.IOException;
import java.util.List; |
<<<<<<<
if(!messageIsForChange()) {
commitMessageNotForChange();
=======
if (!messageIsForChange()) {
insertMessage(db);
if (changeMessage != null) {
ChangeUtil.bumpRowVersionNotLastUpdatedOn(
changeMessage.getKey().getParentKey(), db);
}
>>>>>>>
if(!messageI... |
<<<<<<<
validateParentUpdate(ctl, input.parent, checkIfAdmin);
=======
String parentName = MoreObjects.firstNonNull(
Strings.emptyToNull(input.parent), allProjects.get());
validateParentUpdate(ctl, parentName, true);
IdentifiedUser user = (IdentifiedUser) ctl.getCurrentUser();
>>>>>>>
Str... |
<<<<<<<
=======
if (topic.canEdit()) {
keysAction.add(new KeyCommand(0, 't', Util.C.keyEditTopic()) {
@Override
public void onKeyPress(KeyPressEvent event) {
// In Firefox this event is mistakenly called when F5 is pressed so
// differentiate F5 from 't' by ch... |
<<<<<<<
import com.google.gerrit.testutil.FakeEmailSender;
=======
import com.google.gerrit.server.util.SystemLog;
>>>>>>>
import com.google.gerrit.server.util.SystemLog;
import com.google.gerrit.testutil.FakeEmailSender; |
<<<<<<<
import java.nio.file.Files;
import java.nio.file.Path;
=======
import java.util.Collection;
>>>>>>>
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collection; |
<<<<<<<
createCommit(
testRepo,
=======
testPushWithMultipleChangeIds();
}
@Test
public void pushWithMultipleChangeIdsWithCreateNewChangeForAllNotInTarget()
throws Exception {
enableCreateNewChangeForAllNotInTarget();
testPushWithMultipleChangeIds();
}
private void testPushWi... |
<<<<<<<
public byte[] createNewRecipientBox(EncodedPayloadWithRecipients payload, PublicKey publicKey) {
if (payload.getRecipientKeys().isEmpty() || payload.getEncodedPayload().getRecipientBoxes().isEmpty()) {
throw new RuntimeException("No key or recipient-box to use");
}
fina... |
<<<<<<<
import static java.util.Collections.*;
import static org.assertj.core.api.Assertions.*;
import org.mockito.ArgumentCaptor;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collections;
import java.util.Optional;
import static java.util.Collections.*;
=======
import static java.util.Coll... |
<<<<<<<
private static final Pattern NEW_PATCHSET = Pattern
.compile("^refs/changes/(?:[0-9][0-9])?(/[1-9][0-9]*){1,2}(?:/new)?$");
private static final String GIT_HOOKS_COMMIT_MSG =
"`git rev-parse --git-dir`/hooks/commit-msg";
=======
>>>>>>>
private static final String GIT_HOOKS_COMMIT_MSG =
... |
<<<<<<<
saveProjectConfig(project, cfg);
=======
Util.allow(cfg, Permission.forLabel(P.getName()), 0, 1, anonymousUsers,
"refs/heads/*");
saveProjectConfig(cfg);
>>>>>>>
Util.allow(cfg, Permission.forLabel(P.getName()), 0, 1, anonymousUsers,
"refs/heads/*");
saveProjectConfig(proj... |
<<<<<<<
=======
import org.apache.commons.dbcp.BasicDataSource;
import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
<<<<<<<
import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import javax.sql.DataSource;
>>>>>>>
... |
<<<<<<<
con.prepareStatement(
"INSERT INTO ACCOUNT_PATCH_REVIEWS "
+ "(ACCOUNT_ID, CHANGE_ID, PATCH_SET_ID, FILE_NAME) VALUES "
+ "(?, ?, ?, ?)")) {
=======
con.prepareStatement("INSERT INTO account_patch_reviews "
+ "(acc... |
<<<<<<<
=======
import static com.google.gerrit.acceptance.GitUtil.cloneProject;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
>>>>>>>
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
<<<<<... |
<<<<<<<
Map<String, Ref> allRefs = repo.getRefDatabase().getRefs(ALL);
for (Entry<String, Ref> entry : allRefs.entrySet()) {
=======
for (Entry<String, Ref> entry : repo.getAllRefs().entrySet()) {
String refName = entry.getKey();
if (!refName.startsWith("refs/heads") && !re... |
<<<<<<<
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
=======
import com.google.common.collect.HashMultimap;
>>>>>>>
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.BiMap;
import com.google.... |
<<<<<<<
descBlock.display(r.getChange(), null, false, r.getPatchSetInfo(), r.getAccounts(),
r.getSubmitTypeRecord(), commentLinkProcessor);
=======
descBlock.display(changeDetail, null, false, r.getPatchSetInfo(), r.getAccounts(),
r.getSubmitTypeRecord());
>>>>>>>
descBlock.display(changeD... |
<<<<<<<
List<SubmitStrategyOp> ops = new ArrayList<>(sorted.size());
boolean first = true;
=======
for (CodeReviewCommit c : sorted) {
if (c.getParentCount() > 1) {
// Since there is a merge commit, sort and prune again using
// MERGE_IF_NECESSARY semantics to avoid creating duplic... |
<<<<<<<
import com.google.gerrit.common.data.GroupDetail;
=======
import com.google.gerrit.common.Nullable;
>>>>>>>
<<<<<<<
import com.google.gerrit.server.account.VersionedAccountDestinations;
import com.google.gerrit.server.account.VersionedAccountQueries;
import com.google.gerrit.server.account.GroupCache;
impor... |
<<<<<<<
type.setLinkName(cfg.getString("gitweb", null, "linkname"));
=======
if (type == null) {
url = null;
gitweb_cgi = null;
gitweb_css = null;
gitweb_js = null;
git_logo_png = null;
return;
}
>>>>>>>
if (type == null) {
url = null;
gitweb_cgi = nul... |
<<<<<<<
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountJson;
=======
>>>>>>>
import com.google.gerrit.server.account.AccountJson; |
<<<<<<<
=======
import com.google.gerrit.server.util.MagicBranch;
import com.google.gwtorm.server.AtomicUpdate;
>>>>>>>
import com.google.gerrit.server.util.MagicBranch;
<<<<<<<
final String msg =
"Patch Set " + newPatchSet.getPatchSetId()
+ ": Commit message was updated";
chang... |
<<<<<<<
"WARN: InitStep from plugin %s does not implement %s (Exception: %s)",
jar.getFileName(), InitStep.class.getName(), e.getMessage());
=======
"WARN: InitStep from plugin %s does not implement %s (Exception: %s)\n",
jar.getName(), InitStep.class.getName(), e.getMe... |
<<<<<<<
=======
import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.common.Die;
import com.google.gerrit.common.DisabledChangeHooks;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.extensio... |
<<<<<<<
import com.google.common.base.Strings;
=======
import com.google.gerrit.common.ChangeHooks;
>>>>>>>
import com.google.common.base.Strings;
import com.google.gerrit.common.ChangeHooks; |
<<<<<<<
@Source("listAdd.png")
public ImageResource listAdd();
=======
@Source("important.png")
public ImageResource important();
>>>>>>>
@Source("listAdd.png")
public ImageResource listAdd();
@Source("important.png")
public ImageResource important(); |
<<<<<<<
PrivacyHelper privacyHelper,
=======
BatchPayloadPublisher batchPayloadPublisher,
>>>>>>>
PrivacyHelper privacyHelper,
BatchPayloadPublisher batchPayloadPublisher,
<<<<<<<
=======
payloadPublisher,
batchPayloadPublisher,
>>>>... |
<<<<<<<
throws IntegrationException {
=======
throws MergeException {
// Test for merge instead of cherry pick to avoid false negatives
// on commit chains.
>>>>>>>
throws IntegrationException {
// Test for merge instead of cherry pick to avoid false negatives
// on commit chains. |
<<<<<<<
stdout.print(String.format("%8s %-12s %-12s %-4s %s\n", //
id(task.getTaskId()), start, startTime, "", format(task)));
=======
stdout.print(String.format(
"%8s %-12s %-8s %s\n",
id(taskInfo.getTaskId()), start, "",
taskInfo.getTaskString(taskName... |
<<<<<<<
private final CreateChange createChange;
=======
private final ChangeIndexer changeIndexer;
>>>>>>>
private final CreateChange createChange;
private final ChangeIndexer changeIndexer;
<<<<<<<
DynamicMap<RestView<ChangeResource>> views,
CreateChange createChange) {
=======
Dynamic... |
<<<<<<<
import com.google.gerrit.server.config.AllProjectsNameProvider;
=======
import com.google.gerrit.server.git.GitRepositoryManager;
>>>>>>>
import com.google.gerrit.server.config.AllProjectsNameProvider;
<<<<<<<
ChangeProjectAccess(ProjectAccessFactory.Factory projectAccessFactory,
ProjectControl.Fact... |
<<<<<<<
import com.google.gerrit.server.mime.MimeUtil2Module;
import com.google.gerrit.server.patch.IntraLineWorkerPool;
=======
import com.google.gerrit.server.patch.DiffExecutorModule;
>>>>>>>
import com.google.gerrit.server.mime.MimeUtil2Module;
import com.google.gerrit.server.patch.DiffExecutorModule;
<<<<<<<
... |
<<<<<<<
=======
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.PersonIdent;
>>>>>>>
<<<<<<<
return Guice.createInjector(
Stage.DEVELOPMENT,
new AbstractModule() {
@Override
protected void configure() {
... |
<<<<<<<
=======
import java.util.Date;
import java.util.HashMap;
>>>>>>>
import java.util.HashMap; |
<<<<<<<
=======
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Ints;
>>>>>>>
import com.google.common.primitives.Ints;
<<<<<<<
=======
import java.io.IOException;
import java.util.Collections;
>>>>>>>
import java.io.IOException;
<<<<<<<
ChangeUtil changeUtil,
Cre... |
<<<<<<<
private void setCreatedOnToNull(AccountGroup.Id groupId) throws Exception {
AccountGroup group = db.accountGroups().get(groupId);
group.setCreatedOn(null);
db.accountGroups().update(ImmutableList.of(group));
groupCache.evict(group);
}
=======
private void assertBadRequest(Groups.ListRe... |
<<<<<<<
import com.quorum.tessera.partyinfo.*;
import com.quorum.tessera.recover.resend.BatchResendManager;
=======
import com.quorum.tessera.enclave.EncodedPayload;
import com.quorum.tessera.enclave.PayloadEncoder;
import com.quorum.tessera.partyinfo.ResendRequest;
import com.quorum.tessera.partyinfo.ResendResponse;... |
<<<<<<<
import com.google.common.collect.Iterables;
=======
import com.google.common.collect.Lists;
>>>>>>>
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
<<<<<<<
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
=====... |
<<<<<<<
@Test
public void testStore() {
EncodedPayloadWithRecipients payload = mock(EncodedPayloadWithRecipients.class);
when(txService.encryptPayload(any(), any(), any())).thenReturn(payload);
enclave.store(new byte[0], new byte[0][0], new byte[0]);
verify(txService).... |
<<<<<<<
baseConfig.setInt("receive", null, "changeUpdateThreads", 4);
if (classDesc.equals(methodDesc)) {
=======
if (classDesc.equals(methodDesc) && !classDesc.sandboxed() &&
!methodDesc.sandboxed()) {
>>>>>>>
baseConfig.setInt("receive", null, "changeUpdateThreads", 4);
if (classDesc.eq... |
<<<<<<<
import com.google.common.base.CharMatcher;
import com.google.common.base.Joiner;
=======
import com.google.common.base.Objects;
>>>>>>>
import com.google.common.base.CharMatcher;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
<<<<<<<
import com.google.gerrit.server.config.AllPr... |
<<<<<<<
import com.quorum.tessera.api.constraint.PrivacyValid;
import com.quorum.tessera.config.constraints.ValidBase64;
=======
>>>>>>>
import com.quorum.tessera.api.constraint.PrivacyValid;
import com.quorum.tessera.config.constraints.ValidBase64;
<<<<<<<
public Response send(
@ApiParam(name = "se... |
<<<<<<<
import static com.google.gerrit.server.mail.MailUtil.getRecipientsFromReviewers;
=======
>>>>>>>
import static com.google.gerrit.server.mail.MailUtil.getRecipientsFromReviewers;
<<<<<<<
reject(inputCommand, "commit already exists");
=======
reject(inputCommand, "commit already exists (as c... |
<<<<<<<
=======
import static org.eclipse.jgit.lib.Constants.R_HEADS;
import com.google.gerrit.extensions.restapi.AuthException;
>>>>>>>
import static org.eclipse.jgit.lib.Constants.R_HEADS; |
<<<<<<<
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.NotifyHandling;
=======
import com.google.gerrit.common.data.Permission;
import com.google.g... |
<<<<<<<
RefControl refControl) throws InvalidChangeOperationException,
IOException, OrmException, NoSuchChangeException {
final ChangeControl changeControl =
refControl.getProjectControl().controlFor(change);
=======
RefControl refControl, IdentifiedUser uploader)
throws InvalidCha... |
<<<<<<<
@UiHandler("addme")
void onAddMe(@SuppressWarnings("unused") ClickEvent e) {
=======
@UiHandler("addMe")
void onAddMe(ClickEvent e) {
>>>>>>>
@UiHandler("addMe")
void onAddMe(@SuppressWarnings("unused") ClickEvent e) { |
<<<<<<<
import com.google.inject.Singleton;
=======
import com.google.inject.Provider;
>>>>>>>
import com.google.inject.Provider;
import com.google.inject.Singleton; |
<<<<<<<
=======
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.UncheckedExecutionException;
>>>>>>>
import com.google.common.util.concurrent.UncheckedExecutionException;
<<<<<<<
return cache.get(key, new Loader(key, dest, repo));
... |
<<<<<<<
eventFactory.addPatchSets(db, rw, c, d.patchSets(),
=======
eventFactory.addPatchSets(db.get(), rw, c, d.visiblePatchSets(),
>>>>>>>
eventFactory.addPatchSets(db, rw, c, d.visiblePatchSets(),
<<<<<<<
eventFactory.addPatchSets(db, rw, c, d.patchSets(),
=======
eventFactory... |
<<<<<<<
String workdir();
String socket();
=======
Set<String> whitelist();
>>>>>>>
Set<String> whitelist();
String workdir();
String socket(); |
<<<<<<<
if (!isAdmin) {
GroupControl c = groupControlFactory.controlFor(group);
if (!c.isVisible()) {
continue;
}
}
=======
>>>>>>> |
<<<<<<<
import com.google.common.collect.Iterables;
=======
import static com.google.common.base.Preconditions.checkNotNull;
>>>>>>>
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.Iterables; |
<<<<<<<
=======
if (input.email != null && !email.equals(input.email)) {
throw new BadRequestException("email address must match URL");
}
if (!EmailValidator.getInstance().isValid(email)) {
throw new BadRequestException("invalid email address");
}
>>>>>>>
if (!EmailValidator.getInst... |
<<<<<<<
public ReviewResult review(ReviewInput in) {
=======
public void review(ReviewInput in) throws RestApiException {
>>>>>>>
public ReviewResult review(ReviewInput in) throws RestApiException {
<<<<<<<
public CommitInfo commit(boolean addLinks) {
throw new NotImplementedException();
}... |
<<<<<<<
@Override
public String workdir() { return "qdata"; };
@Override
public String socket() { return "/tmp/tst1.ipc"; };
=======
@Override
public Set<String> whitelist() {
return emptySet();
}
>>>>>>>
@Override
public Set<String> whitelist() {
return emptyS... |
<<<<<<<
=======
import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.common.data.PermissionRule;
import com.google.gerrit.extensions.api.changes.CherryPickInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.SubmitInput;
import co... |
<<<<<<<
@UiField ToggleButton skipDeleted;
@UiField ToggleButton skipUnchanged;
@UiField ToggleButton skipUncommented;
=======
@UiField ToggleButton lineWrapping;
>>>>>>>
@UiField ToggleButton lineWrapping;
@UiField ToggleButton skipDeleted;
@UiField ToggleButton skipUnchanged;
@UiField ToggleButton ... |
<<<<<<<
import com.google.gerrit.extensions.api.groups.GroupInput;
import com.google.gerrit.extensions.api.projects.BranchApi;
import com.google.gerrit.extensions.api.projects.BranchInput;
=======
import com.google.gerrit.extensions.api.projects.BranchApi;
import com.google.gerrit.extensions.api.projects.BranchInput;... |
<<<<<<<
c = ChangeNotes.readOneReviewDbChange(db, id);
=======
c = ReviewDbUtil.unwrapDb(db).changes().get(id);
if (c == null) {
logDebug("Failed to get change {} from unwrapped db", id);
throw new NoSuchChangeException(id);
}
>>>>>>>
c = ChangeNotes.readOn... |
<<<<<<<
// This is a hack to detect an operator that requires authentication.
Pattern p =
Pattern.compile("^Error in operator (.*:self|is:watched|is:owner|is:reviewer|has:.*)$");
Matcher m = p.matcher(e.getMessage());
if (m.matches()) {
String op = m.group(1);
throw new... |
<<<<<<<
matches.add(id);
=======
if (visibilityControl.isVisibleTo(id)) {
matches.put(id, accountLoader.get(id));
}
>>>>>>>
if (visibilityControl.isVisibleTo(id)) {
matches.add(id);
} |
<<<<<<<
protected void merge(PushOneCommit.Result r) throws Exception {
revision(r).review(ReviewInput.approve());
revision(r).submit();
}
=======
protected PushOneCommit.Result amendChangeAsDraft(String changeId)
throws Exception {
return amendChange(changeId, "refs/drafts/master");
}
>>... |
<<<<<<<
=======
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.Sandboxed;
>>>>>>>
<<<<<<<
=======
import com.google.gerrit.extensions.api.projects.BranchInfo;
import com.google.gerrit.extensions.api.projects.BranchInput;
>>>>>>>
import com.google.gerrit.extensions.api.proje... |
<<<<<<<
batchRefUpdate = repoView.getRepository().getRefDatabase().newBatchUpdate();
batchRefUpdate.setPushCertificate(pushCert);
batchRefUpdate.setRefLogMessage(refLogMessage, true);
batchRefUpdate.setAllowNonFastForwards(true);
repoView.getCommands().addTo(batchRefUpdate);
=======
batchRefUp... |
<<<<<<<
CodeReviewRevWalk revWalk = CodeReviewCommit.newRevWalk(oi.newReader())) {
Ref destRef = git.getRefDatabase().exactRef(targetRef);
=======
ObjectReader reader = oi.newReader();
CodeReviewRevWalk revWalk = CodeReviewCommit.newRevWalk(reader)) {
Ref destRef = git.getRefDataba... |
<<<<<<<
private final IdentifiedUser.GenericFactory identifiedUserFactory;
private final AgreementJson agreementJson;
=======
>>>>>>>
private final AgreementJson agreementJson;
<<<<<<<
IdentifiedUser.GenericFactory identifiedUserFactory,
AgreementJson agreementJson,
=======
>>>>>>>
Agreem... |
<<<<<<<
=======
import com.google.gerrit.reviewdb.RefRight;
import com.google.gerrit.reviewdb.SystemConfig;
>>>>>>>
<<<<<<<
import java.util.Collection;
=======
import java.util.Collections;
>>>>>>>
import java.util.Collection;
import java.util.Collections;
<<<<<<<
private final Set<AccountGroup.UUID> uploadG... |
<<<<<<<
pushFactory.create(db, ident, testRepo, PushOneCommit.SUBJECT, FILE_NAME,
new String(CONTENT_OLD));
return push.to("refs/for/master").getChangeId();
=======
pushFactory.create(db, ident, PushOneCommit.SUBJECT, FILE_NAME,
new String(CONTENT_OLD, StandardCharsets.UTF_... |
<<<<<<<
import com.sun.management.OperatingSystemMXBean;
import com.sun.management.UnixOperatingSystemMXBean;
=======
>>>>>>>
<<<<<<<
if (sys instanceof UnixOperatingSystemMXBean) {
final UnixOperatingSystemMXBean unix = (UnixOperatingSystemMXBean) sys;
if (unix.getOpenFileDescriptorCount() != -1) {... |
<<<<<<<
command("git-upload-pack").to(Commands.key(git, "upload-pack"));
command(git, "upload-pack").to(Upload.class);
command("git-upload-archive").to(Commands.key(git, "upload-archive"));
command(git, "upload-archive").to(UploadArchive.class);
=======
if (sshEnabled()) {
command("git-uploa... |
<<<<<<<
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.gerrit.common.FileUtil;
=======
import com.google.common.base.Preconditions;
>>>>>>>
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.base.Preconditions;
import com.google.gerrit.common.FileUtil; |
<<<<<<<
"keys.keyData.publicKeyPath",
"keys.keyData.azureKeyVaultId",
"keys.azureKeyVaultConfig.url",
=======
// "keys.keyData.publicKeyPath",
>>>>>>>
// "keys.keyData.publicKeyPath",
"keys.keyData.azureKeyVaultId",
... |
<<<<<<<
=======
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.gerrit.common.TimeUtil;
>>>>>>>
<<<<<<<
=======
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
>>>>>>>
import org.ec... |
<<<<<<<
private final PatchSetInfoFactory psInfoFactory;
=======
private final PersonIdent myIdent;
>>>>>>>
private final PatchSetInfoFactory psInfoFactory;
private final PersonIdent myIdent;
<<<<<<<
final PatchSetInfoFactory psif,
PatchListCache patchListCache, SchemaFactory<ReviewDb> schema) {... |
<<<<<<<
private final Provider<InternalAccountQuery> accountQueryProvider;
private final ExternalIds externalIds;
=======
private final AuditService auditService;
>>>>>>>
private final ExternalIds externalIds;
<<<<<<<
Provider<InternalAccountQuery> accountQueryProvider,
ExternalIds externalIds,
... |
<<<<<<<
return cmd + " " + path + userName;
=======
return cmd + " " + path;
} else {
return req.getMethod() + " " + uri;
>>>>>>>
return cmd + " " + path; |
<<<<<<<
import think.rpgitems.support.WGSupport;
=======
import think.rpgitems.utils.Pair;
>>>>>>>
import think.rpgitems.support.WGSupport;
import think.rpgitems.utils.Pair; |
<<<<<<<
import static org.assertj.core.api.Assertions.catchThrowable;
=======
import org.junit.After;
import org.junit.Before;
>>>>>>>
import org.junit.After;
import org.junit.Before;
import static org.assertj.core.api.Assertions.catchThrowable;
<<<<<<<
CliResult result = LegacyCliAdapter.writeToOutputFil... |
<<<<<<<
private TitleProvider mTitleProvider;
private int mCurrentPage = -1;
=======
private PagerAdapter mPagerAdapter;
private int mCurrentPage;
>>>>>>>
private PagerAdapter mPagerAdapter;
private int mCurrentPage = -1; |
<<<<<<<
String LAYOUT_DRAWER = "/layout/drawer";
String LAYOUT_VIEW_SYSTEM = "/layout/view_system";
String LAYOUT_VIEW_ANIMATE = "/layout/view_animate";
=======
String LAYOUT_SUPPORT_28 = "/layout/support_28";
String LAYOUT_BOTTOM_APP_BAR = "/layout/bottom_app_bar";
>>>>>>>
String LAYOUT_DRAW... |
<<<<<<<
import com.github.tessera.config.KeyDataConfig;
=======
import com.github.tessera.config.PrivateKeyData;
>>>>>>>
import com.github.tessera.config.KeyDataConfig;
<<<<<<<
import java.util.stream.IntStream;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax... |
<<<<<<<
import com.quorum.tessera.encryption.Nonce;
import com.quorum.tessera.partyinfo.ResendManager;
import com.quorum.tessera.data.EncryptedTransactionDAO;
import com.quorum.tessera.data.EncryptedRawTransactionDAO;
import com.quorum.tessera.partyinfo.ResendResponse;
import com.quorum.tessera.partyinfo.ResendRequestT... |
<<<<<<<
import com.couchbase.touchdb.TDMisc;
import com.couchbase.touchdb.TDRevision;
import com.couchbase.touchdb.TDRevisionList;
import com.couchbase.touchdb.TDStatus;
import com.couchbase.touchdb.replicator.changetracker.TDChangeTracker;
import com.couchbase.touchdb.replicator.changetracker.TDChangeTracker.TDChangeT... |
<<<<<<<
@Override
public PublicKey[] getNodeKeys() {
return nodeKeys;
}
@Override
public PublicKey[] getAlwaysSendTo() {
return alwaysSendTo;
}
=======
@Override
public PublicKey[] alwaysSendTo() {
File[] alwaysSendTo = config.alwaysSendTo();
return Arrays.stream(alwaysSendTo).map(f... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.