Update githelp to advise when sl clean --dirs is necessary
#575
Conversation
Summary: * `clean` with paths implies `--dirs` * `clean` with `-d` implies `--dirs` * `clean` with `-x` implies `--ignored` Test Plan: CI run.
Summary: See tests in previous commit. Test Plan: CI run.
|
I haven't actually run the tests yet, because I was too lazy to figure out how. Kind of hoping you'll just mash the ‘run workflows’ button on this PR. :) |
|
It's really easy to run tests (but undocumented >.>) python run-tests.py test-fb-ext-githelp.t |
~/src/sapling/eden/scm/tests$ python3 run-tests.py test-fb-ext-githelp.t
usage: run-tests.py [options] [tests]
run-tests.py: error: --local specified, but sl or hg not found in '~/src/sapling/eden/scm' or not executableI couldn't build, and didn't want to solve the 2^53 errors that the build process spit off. If you can mash the ‘run workflows’ button that would be awesome. |
|
Ah, solved the last of my build problems with #577. |
|
OK, I got the tests running but I don't really know what I'm supposed to do here. The tests presume Mercurial, and the runs replace everything with $ hg githelp -- git checkout --force
- hg revert --all
+ sl revert --all
githelp for grep with pattern and path
$ hg githelp -- grep shrubbery flib/intern/
- hg grep shrubbery flib/intern/
+ sl grep shrubbery flib/intern/
githelp for reset, checking ~ in git becomes ~1 in mercurial
$ hg githelp -- reset HEAD~
- Mercurial has no strict equivalent to `git reset`.
- If you want to remove a commit, use `hg hide -r HASH`.
- If you want to move a bookmark, use `hg book -r HASH NAME`.
- If you want to undo a commit, use `hg uncommit.
- If you want to undo an amend, use `hg unamend.
+ Sapling has no strict equivalent to `git reset`.
+ If you want to remove a commit, use `sl hide -r HASH`.
+ If you want to move a bookmark, use `sl book -r HASH NAME`.
+ If you want to undo a commit, use `sl uncommit.
+ If you want to undo an amend, use `sl unamend. |
|
Thanks for your PR, taking a look |
| @@ -384,8 +384,10 @@ def clean(ui, repo, *args, **kwargs) -> None: | |||
| args, opts = parseoptions(ui, cmdoptions, args) | |||
|
|
|||
| cmd = Command("clean") | |||
| if opts.get("d") or len(args) > 0: | |||
| cmd["--dirs"] = None | |||
There was a problem hiding this comment.
For Sapling, --dirs only delete empty directories, so I think need to set both --dirs and --files option.
|
@zzl0 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
Thanks! It's been a bit over a year since I've submitted a diff to Phabricator. |
Whenever there's a path or the
-dflag,git cleanimplies that cleaning should be done recursively, into directories, removing empty ones as it goes.The equivalent in Sapling is
sl clean --dirs.Closes #564.