diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java | 70 |
1 files changed, 21 insertions, 49 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java index 7561927dff..55ea30d24b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java @@ -1,44 +1,11 @@ /* - * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> - * and other copyright owners as documented in the project's IP log. + * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> and others * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ package org.eclipse.jgit.revwalk; @@ -52,13 +19,15 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; -/** Base object type accessed during revision walking. */ +/** + * Base object type accessed during revision walking. + */ public abstract class RevObject extends ObjectIdOwnerMap.Entry { static final int PARSED = 1; int flags; - RevObject(final AnyObjectId name) { + RevObject(AnyObjectId name) { super(name); } @@ -69,7 +38,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { IncorrectObjectTypeException, IOException; /** - * Get Git object type. See {@link Constants}. + * Get Git object type. See {@link org.eclipse.jgit.lib.Constants}. * * @return object type */ @@ -91,7 +60,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * the flag to test. * @return true if the flag has been added to this object; false if not. */ - public final boolean has(final RevFlag flag) { + public final boolean has(RevFlag flag) { return (flags & flag.mask) != 0; } @@ -103,7 +72,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * @return true if any flag in the set has been added to this object; false * if not. */ - public final boolean hasAny(final RevFlagSet set) { + public final boolean hasAny(RevFlagSet set) { return (flags & set.mask) != 0; } @@ -115,7 +84,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * @return true if all flags of the set have been added to this object; * false if some or none have been added. */ - public final boolean hasAll(final RevFlagSet set) { + public final boolean hasAll(RevFlagSet set) { return (flags & set.mask) == set.mask; } @@ -127,7 +96,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * @param flag * the flag to mark on this object, for later testing. */ - public final void add(final RevFlag flag) { + public final void add(RevFlag flag) { flags |= flag.mask; } @@ -137,7 +106,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * @param set * the set of flags to mark on this object, for later testing. */ - public final void add(final RevFlagSet set) { + public final void add(RevFlagSet set) { flags |= set.mask; } @@ -149,7 +118,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * @param flag * the flag to remove from this object. */ - public final void remove(final RevFlag flag) { + public final void remove(RevFlag flag) { flags &= ~flag.mask; } @@ -159,7 +128,7 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { * @param set * the flag to remove from this object. */ - public final void remove(final RevFlagSet set) { + public final void remove(RevFlagSet set) { flags &= ~set.mask; } @@ -175,11 +144,14 @@ public abstract class RevObject extends ObjectIdOwnerMap.Entry { } /** + * Append a debug description of core RevFlags to a buffer. + * * @param s * buffer to append a debug description of core RevFlags onto. */ - protected void appendCoreFlags(final StringBuilder s) { + protected void appendCoreFlags(StringBuilder s) { s.append((flags & RevWalk.TOPO_DELAY) != 0 ? 'o' : '-'); + s.append((flags & RevWalk.TOPO_QUEUED) != 0 ? 'q' : '-'); s.append((flags & RevWalk.TEMP_MARK) != 0 ? 't' : '-'); s.append((flags & RevWalk.REWRITE) != 0 ? 'r' : '-'); s.append((flags & RevWalk.UNINTERESTING) != 0 ? 'u' : '-'); |