Package org.eclipse.jgit.revwalk

Examples of org.eclipse.jgit.revwalk.RevCommit.abbreviate()

294
295
296
297
298
299
300
301
302
303
304
        String oursName = String.format("HEAD   (%s %s)",
            ours.abbreviate(6).name(),
            oursMsg.substring(0, Math.min(oursMsg.length(), 60)));
        String theirsName = String.format("BRANCH (%s %s)",
            theirs.abbreviate(6).name(),
            theirsMsg.substring(0, Math.min(theirsMsg.length(), 60)));

        MergeFormatter fmt = new MergeFormatter();
        Map<String, MergeResult<? extends Sequence>> r = m.getMergeResults();
        Map<String, ObjectId> resolved = new HashMap<String, ObjectId>();
View Full Code Here
323
324
325
326
327
328
329
330
331
332
333
        // Commit index changes
        CommitBuilder builder = createBuilder();
        builder.setParentId(headCommit);
        builder.setTreeId(cache.writeTree(inserter));
        builder.setMessage(MessageFormat.format(indexMessage, branch,
            headCommit.abbreviate(7).name(),
            headCommit.getShortMessage()));
        ObjectId indexCommit = inserter.insert(builder);

        // Commit untracked changes
        ObjectId untrackedCommit = null;
View Full Code Here
340
341
342
343
344
345
346
347
348
349
350
          untrackedBuilder.finish();

          builder.setParentIds(new ObjectId[0]);
          builder.setTreeId(untrackedDirCache.writeTree(inserter));
          builder.setMessage(MessageFormat.format(MSG_UNTRACKED,
              branch, headCommit.abbreviate(7).name(),
              headCommit.getShortMessage()));
          untrackedCommit = inserter.insert(builder);
        }

        // Commit working tree changes
View Full Code Here
360
361
362
363
364
365
366
367
368
369
370
        builder.addParentId(indexCommit);
        if (untrackedCommit != null)
          builder.addParentId(untrackedCommit);
        builder.setMessage(MessageFormat.format(
            workingDirectoryMessage, branch,
            headCommit.abbreviate(7).name(),
            headCommit.getShortMessage()));
        builder.setTreeId(cache.writeTree(inserter));
        commitId = inserter.insert(builder);
        inserter.flush();
View Full Code Here
265
266
267
268
269
270
271
272
273
274
275
    }

    @Test
    public void testGetAbbreviatedCommitId() throws Exception {
        RevCommit rawCommit = this.createCommit();
        AbbreviatedObjectId abbrevId = rawCommit.abbreviate(7);
        JGitCommit commit = new JGitCommit(rawCommit);

        when(this.repo.getObjectDatabase().newReader().abbreviate(rawCommit)).thenReturn(abbrevId);

        assertThat(this.repository.getAbbreviatedCommitId(commit), is(equalTo(rawCommit.getName().substring(0, 7))));
View Full Code Here
281
282
283
284
285
286
287
288
289
290
291
        // Commit index changes
        CommitBuilder builder = createBuilder(headCommit);
        builder.setTreeId(cache.writeTree(inserter));
        builder.setMessage(MessageFormat.format(indexMessage, branch,
            headCommit.abbreviate(7).name(),
            headCommit.getShortMessage()));
        ObjectId indexCommit = inserter.insert(builder);

        // Commit working tree changes
        if (!wtEdits.isEmpty() || !wtDeletes.isEmpty()) {
View Full Code Here
297
298
299
300
301
302
303
304
305
306
307
          editor.finish();
        }
        builder.addParentId(indexCommit);
        builder.setMessage(MessageFormat.format(
            workingDirectoryMessage, branch,
            headCommit.abbreviate(7).name(),
            headCommit.getShortMessage()));
        builder.setTreeId(cache.writeTree(inserter));
        commitId = inserter.insert(builder);
        inserter.flush();
View Full Code Here
55
56
57
58
59
60
61
62
63
64
65
          op.execute(monitor);
        } catch (CoreException e) {
          return new Status(IStatus.ERROR, Activator.getPluginId(),
              MessageFormat.format(
                  UIText.StashApplyCommand_applyFailed,
                  commit.abbreviate(7).name(),
                  e.getLocalizedMessage()), e);
        }
        return Status.OK_STATUS;
      }
View Full Code Here
252
253
254
255
256
257
258
259
260
261
262
          .getLineOfLastMouseButtonActivity();

    RevCommit commit = this.revision.getCommit();

    String linkText = MessageFormat.format(
        UIText.BlameInformationControl_Commit, commit.abbreviate(7)
            .name());
    commitLabel.setText(linkText);

    PersonIdent author = commit.getAuthorIdent();
    if (author != null) {
View Full Code Here
262
263
264
265
266
267
268
269
270
271
272
      toolkit.createLabel(parents, getParentCommitLabel(i))
          .setForeground(
              toolkit.getColors().getColor(IFormColors.TB_TOGGLE));
      final Hyperlink link = toolkit
          .createHyperlink(parents,
              parentCommit.abbreviate(PARENT_LENGTH).name(),
              SWT.NONE);
      link.addHyperlinkListener(new HyperlinkAdapter() {
        public void linkActivated(HyperlinkEvent e) {
          try {
            CommitEditor.open(new RepositoryCommit(getCommit()
View Full Code Here
TOP
Copyright © 2018 www.massapi.com. All rights reserved.
All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.