mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
eb1a2b671c
Summary: Make sure we use pointers to const GitIgnoreStack objects when possible. Also change the code to store the root GitIgnoreStack object for a diff() operation in the DiffContext object, instead of having EdenMount::diff() allocate it separately on the heap. This will make it easier to consolidate a bit more logic in the DiffContext class in the future. In particular, I suspect we will want a version of diff() that only works on one portion of the tree. Putting more of the functionality in DiffContext will make it slightly easier to share code between the full-mount diff and the subtree diff functions. This also happens to save a memory allocation for now. Reviewed By: wez Differential Revision: D4968833 fbshipit-source-id: 1dc33b3d44cdf00e93b22d810c3a736d27c13638
109 lines
3.1 KiB
C++
109 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2004-present, Facebook, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under the BSD-style license found in the
|
|
* LICENSE file in the root directory of this source tree. An additional grant
|
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
*
|
|
*/
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include "eden/fs/inodes/InodePtrFwd.h"
|
|
#include "eden/fs/utils/PathFuncs.h"
|
|
|
|
namespace folly {
|
|
template <typename T>
|
|
class Future;
|
|
class Unit;
|
|
}
|
|
|
|
namespace facebook {
|
|
namespace eden {
|
|
|
|
class DiffContext;
|
|
class GitIgnoreStack;
|
|
class Hash;
|
|
class ObjectStore;
|
|
class TreeEntry;
|
|
class TreeInode;
|
|
class InodeDiffCallback;
|
|
|
|
/**
|
|
* A helper class for use in TreeInode::diff()
|
|
*
|
|
* While diff() holds the contents_ lock it computes a set of child entries
|
|
* that need to be examined later once it releases the contents_ lock.
|
|
* DeferredDiffEntry is used to store the data about which children need to be
|
|
* examined. The DeferredDiffEntry subclasses contain the logic for how to
|
|
* then perform the diff on the child entry.
|
|
*/
|
|
class DeferredDiffEntry {
|
|
public:
|
|
explicit DeferredDiffEntry(const DiffContext* context, RelativePath&& path)
|
|
: context_{context}, path_{std::move(path)} {}
|
|
virtual ~DeferredDiffEntry() {}
|
|
|
|
const RelativePath& getPath() const {
|
|
return path_;
|
|
}
|
|
|
|
virtual folly::Future<folly::Unit> run() = 0;
|
|
|
|
static std::unique_ptr<DeferredDiffEntry> createUntrackedEntry(
|
|
const DiffContext* context,
|
|
RelativePath path,
|
|
InodePtr inode,
|
|
const GitIgnoreStack* ignore,
|
|
bool isIgnored);
|
|
|
|
/*
|
|
* This is named differently from the createUntrackedEntry() function above
|
|
* just to avoid ambiguous overload calls--folly::Future<X> can unfortunately
|
|
* be implicitly constructed from X. We could help the compiler avoid the
|
|
* ambiguity by making the Future<InodePtr> version of createUntrackedEntry()
|
|
* be a template method. However, just using a separate name is easier for
|
|
* now.
|
|
*/
|
|
static std::unique_ptr<DeferredDiffEntry> createUntrackedEntryFromInodeFuture(
|
|
const DiffContext* context,
|
|
RelativePath path,
|
|
folly::Future<InodePtr>&& inodeFuture,
|
|
const GitIgnoreStack* ignore,
|
|
bool isIgnored);
|
|
|
|
static std::unique_ptr<DeferredDiffEntry> createRemovedEntry(
|
|
const DiffContext* context,
|
|
RelativePath path,
|
|
const TreeEntry& scmEntry);
|
|
|
|
static std::unique_ptr<DeferredDiffEntry> createModifiedEntry(
|
|
const DiffContext* context,
|
|
RelativePath path,
|
|
const TreeEntry& scmEntry,
|
|
InodePtr inode,
|
|
const GitIgnoreStack* ignore,
|
|
bool isIgnored);
|
|
|
|
static std::unique_ptr<DeferredDiffEntry> createModifiedEntryFromInodeFuture(
|
|
const DiffContext* context,
|
|
RelativePath path,
|
|
const TreeEntry& scmEntry,
|
|
folly::Future<InodePtr>&& inodeFuture,
|
|
const GitIgnoreStack* ignore,
|
|
bool isIgnored);
|
|
|
|
static std::unique_ptr<DeferredDiffEntry> createModifiedEntry(
|
|
const DiffContext* context,
|
|
RelativePath path,
|
|
const TreeEntry& scmEntry,
|
|
Hash currentBlobHash);
|
|
|
|
protected:
|
|
const DiffContext* const context_;
|
|
RelativePath const path_;
|
|
};
|
|
}
|
|
}
|