A Scalable, User-Friendly Source Control System.
Go to file
Evan Krause 733e5117fe Confirm being splitting with unsaved message edits
Summary:
Add confirmation modal before you open the split UI, to ask if the user wants to confirm their unsaved edits to the commit message.

This is only required because split can produce strange successors, which will later cause ISL to reapply edited commit messages to unrelated commits from the original. This can duplicate messages and diffs and other weird stuff.

The confirmation here lets the user chose to immediately discard or immediately save the results.

This diff adds the discard path, but see later diffs in the stack for the "save". It won't actually save just yet, it just loads the edited message into the split UI's data, so that when you DO split, it will apply the changes. This allows us to skip waiting for metaedit and doing complicated syncing.

The confirmation here also shows you which commit(s) have unsaved changes, and which fields are unsaved, like title/test plan etc. I think this will be helpful to confirm things.

I believe there's a bug (which I haven't tracked down) in message syncing that can make a commit appear edited even if it was just due a remote syncing difference. So showing the user what's changed makes it easier to think about (IMO).

Ideally I guess we'd even show the diff if you hover the fields...but I don't do that just yet.

Reviewed By: quark-zju

Differential Revision: D49551314

fbshipit-source-id: 7581726c8c18e7459319a5be9b6f8bf626169da8
2023-09-22 13:21:25 -07:00
.github/workflows Eliminate dependency on unmaintained node12-based action 2023-07-05 08:38:06 -07:00
addons Confirm being splitting with unsaved message edits 2023-09-22 13:21:25 -07:00
build move oss to sai 1.13.0 2023-09-21 11:18:40 -07:00
ci fix compatibility with PEP 440 (#606) 2023-04-18 10:12:23 -07:00
CMake fix some warnings in gcc 2023-07-17 19:10:59 -07:00
common expose env when fb feature is enabled 2023-07-27 08:19:54 -07:00
configerator/structs/scm adding deprecated_default_enum_min_i32: multi-liners [3/n] 2023-09-07 12:53:33 -07:00
eden construct main_client_id 2023-09-22 13:20:31 -07:00
website Bump word-wrap from 1.2.3 to 1.2.5 in /website (#687) 2023-07-27 13:09:22 -07:00
.gitignore mononoke: add README.md and the missing pieces for supporting cargo (#13) 2020-02-13 00:12:36 -08:00
.projectid replace the old getdeps.py script with a build.sh script 2020-03-30 19:27:54 -07:00
build.bat fs: fix license header 2022-01-04 15:00:07 -08:00
build.sh fs: fix license header 2022-01-04 15:00:07 -08:00
clippy.toml Add support for clippy.toml configuration file 2023-03-10 19:22:46 -08:00
CMakeLists.txt fix getdeps build on Windows 2023-07-25 15:24:16 -07:00
CODE_OF_CONDUCT.md Adopt Contributor Covenant 2019-08-29 23:23:31 -07:00
CONTRIBUTING.md fix CONTRIBUTING.md to reference main instead of master (#436) 2023-01-18 19:58:13 -08:00
LICENSE relicense to GPLv2 2019-06-19 17:02:45 -07:00
make-client.py fs: fix license header 2022-01-04 15:00:07 -08:00
README.md Fix spelling mistake (#677) 2023-07-25 12:33:29 -07:00
requirements_ubuntu.txt include oss installation instructions for ubuntu 2020-07-24 11:34:17 -07:00
rustfmt.toml rustfmt.toml: group_imports = StdExternalCrate 2022-08-06 12:33:42 -07:00
SAPLING_VERSION bump SAPLING_VERSION from 0.1 to 0.2 in preparation for the next release 2022-12-21 12:23:53 -08:00

Sapling SCM

Sapling SCM is a cross-platform, highly scalable, Git-compatible source control system.

It aims to provide both user-friendly and powerful interfaces for users, as well as extreme scalability to deal with repositories containing many millions of files and many millions of commits.

Using Sapling

To start using Sapling, see the Getting Started page for how to clone your existing Git repositories. Checkout the Overview for a peek at the various features. Coming from Git? Checkout the Git Cheat Sheet.

Sapling also comes with an Interactive Smartlog (ISL) web UI for seeing and interacting with your repository, as well as a VS Code integrated Interactive Smartlog.

The Sapling Ecosystem

Sapling SCM is comprised of three main components:

  • The Sapling client: The client-side sl command line and web interface for users to interact with Sapling SCM.
  • Mononoke: A highly scalable distributed source control server. (Not yet supported publicly.)
  • EdenFS: A virtual filesystem for efficiently checking out large repositories. (Not yet supported publicly.)

Sapling SCM's scalability goals are to ensure that all source control operations scale with the number of files in use by a developer, and not with the size of the repository itself. This enables fast, performant developer experiences even in massive repositories with millions of files and extremely long commit histories.

Sapling CLI

The Sapling CLI, sl, was originally based on Mercurial, and shares various aspects of the UI and features of Mercurial.

The CLI code can be found in the eden/scm subdirectory.

Mononoke

Mononoke is the server-side component of Sapling SCM.

While it is used in production within Meta, it currently does not build in an open source context and is not yet supported for external usage.

EdenFS

EdenFS is a virtual file system for managing Sapling checkouts.

While it is used in production within Meta, it currently does not build in an open source context and is not yet supported for external usage.

EdenFS speeds up operations in large repositories by only populating working directory files on demand, as they are accessed. This makes operations like checkout much faster, in exchange for a small performance hit when first accessing new files. This is quite beneficial in large repositories where developers often only work with a small subset of the repository at a time.

More detailed EdenFS design documentation can be found at eden/fs/docs/Overview.md.

Building the Sapling CLI

The Sapling CLI currently builds and runs on Linux, Mac, and Windows. It can be built by running make oss in the eden/scm directory and running the resulting sl executable.

Building the Sapling CLI requires Python 3.8, Rust, CMake, and OpenSSL for the main cli, and Node and Yarn for the ISL web UI.

License

See LICENSE.