A Scalable, User-Friendly Source Control System.
Go to file
Jun Wu ecbfc04760 fastannotate: improve documentation of the command
Summary:
The command docstring was written with a full repo in mind. With a shallow
repo, things become different. This diff updates the documentation so it
also makes sense for a shallow repo.

Test Plan: Vim spellchecker.

Reviewers: #sourcecontrol, stash

Reviewed By: stash

Subscribers: mjpieters

Differential Revision: https://phabricator.intern.facebook.com/D4098257

Signature: t1:4098257:1477920765:8a48b332e786c4c538e939536564262214b3cc04
2016-10-28 19:49:59 +01:00
cdatapack Fixing integer size conversions. 2016-10-13 09:15:15 -07:00
cfastmanifest port upgrades of buffer.h into clib 2016-08-26 17:14:52 -07:00
clib port upgrades of buffer.h into clib 2016-08-26 17:14:52 -07:00
contrib debian: add missing dependencies so that cdatapack builds 2016-10-18 16:29:33 -07:00
ctreemanifest treemanifest: fix bug in NewTreeIterator walk 2016-10-25 14:39:52 -07:00
fastannotate fastannotate: improve documentation of the command 2016-10-28 19:49:59 +01:00
fastmanifest fastmanifest: fallback to old manifest in readshallowfast 2016-10-27 09:23:05 -07:00
hgext3rd smartlog: do not change node char for fake nodes 2016-10-26 18:33:10 +01:00
infinitepush infinitepush: inhibit pulled revs 2016-11-01 03:42:26 -07:00
linelog linelogcli: add new command getalllines 2016-08-15 12:47:14 +01:00
phabricator conduit: stop using httplib 2016-07-04 03:00:37 -07:00
remotefilelog remotefilelog: fix getchangegroup signature 2016-10-31 13:40:33 -07:00
scripts scripts: unify spwaning run-test logic 2016-10-28 13:58:48 +01:00
sqldirstate integration tests for sqldirstate/fbhistedit and "hg amend" test for latter 2016-10-21 06:01:59 -07:00
tests fastannotate: implement downloading logic for clients 2016-10-29 23:44:34 +01:00
treemanifest treemanifest: write trees during local commits 2016-10-21 11:02:26 -07:00
.editorconfig Add editorconfig 2016-04-20 03:05:42 -07:00
.hgignore arc: implement an arcanist unittest engine for mercurial 2016-09-19 22:41:58 +01:00
cfastmanifest.c [cfastmanifest] add PyObject_Del to dealloc method 2016-08-09 13:47:49 -07:00
CMakeLists.txt Move ctreemanifest and cdatapack out of remotefilelog 2016-09-21 13:55:12 -07:00
COPYING Initial commit with extensions and readme 2014-06-02 12:54:54 -07:00
Makefile merge Makefile contents 2016-08-26 06:27:59 -07:00
README.md rewrite intro paragraph to README.md 2016-08-26 08:46:48 -07:00
setup.py treemanifest: fix build breaks on OSX 2016-10-17 11:47:47 -07:00
statprof.py Added additional flags to statprof.py 2016-10-17 18:49:22 -07:00

fb-hgext

This is a collection of Mercurial extensions written at Facebook. Many of them are in heavy use by thousands of users on a daily basis. However, some of them are very specific to Facebook's very large repositories so their value to others will vary. We're still making these open source as examples of the workflows we use and direction we are working.

Note that there will be extensions included here that only work with Facebook's internal infrastructure; they are included to give you an idea of how we integrate mercurial with our workflows.

Below are snippets about some of the extensions contained here.

smartlog

An extension that adds the 'hg smartlog' command. It prints graph log output containing only the commits relevant to yourself. Shows your bookmarks, the @ or master bookmark, and any draft commits without bookmarks that you've made within the past 2 weeks. Any commits in the graph that are skipped are represented by '...'.

We recommend also having an 'hg sl' alias that gives more concise output:

alias.sl=smartlog --template "{shortest(node)}  {author|user}  {bookmarks % '{ifeq(bookmark, current, label(\"yellow\", \" {bookmark}*\"), label(\"green\", \" {bookmark}\"))}'} {ifeq(branch, 'default', '', label(\"bold\", branch))}\n{desc|firstline}\n\n"

githelp

An extension that adds the 'hg githelp' command. It translates Git commands into Mercurial commands. Example:

$ hg githelp -- git rebase origin/master
  hg rebase -d master

$ hg githelp -- reset --hard HEAD^
  hg strip -r .

So it acts as a useful cheat sheet tool for people moving from Git to Mercurial.

backups

An extension that adds the 'hg backups' command. 'hg backups' prints a list of recently deleted commits (by reading your .hg/strip-backups directory) and allows you to recover a commit by doing 'hg backups --recover '. It prints the missing commits in reverse chronological order, and acts as a pseudo-replacement for Git's reflog.

fbamend

An extension that adds the 'hg amend --rebase' command. When working with a stack of commits, it's currently impossible to amend a commit in the middle of the stack. This extension enables that ability, adds a 'hg amend' command that invokes 'hg commit --amend', and adds a --rebase flag to 'hg amend --rebase' that rebase all the children of the commit onto the newly amended version.

If 'hg amend' is run on a commit in the middle of a stack without using --rebase, the amend succeeds and the old version of the commit is left behind with a marker bookmark on it 'bookmarkname(preamend)'. The user can then run 'hg amend --fixup' to post-humously rebase the children onto the new version of the commit.

uncommit

Adds a 'hg uncommit' command, which undoes the effect of a local commit. This allows you to either undo a mistake, or remove files from a commit which weren't intended for it.

By default it uncommits all the files, and completely hides the changeset. However, if filenames are specified then it will create a new changeset excluding those files and leave the files in a dirty state in the working dir. In all cases, files are left unchanged in the working dir, so other local changes are unaffected.

Uncommit does work in the middle of a stack of changes (possibly creating a new head), but cannot be used to undo a merge changeset.

chistedit

An interactive ncurses interface to histedit.

NOTE: This requires python-curses installed and Mercurial's histedit extension enabled.

This extensions allows you to interactively move around changesets or change the action to perform while keeping track of possible conflicts.

upgradegeneraldelta

Upgrades manifests to generaldelta in-place, without needing to reclone.

Contributing

Patches are welcome as pull requests, though they will be collapsed and rebased to maintain a linear history.

We (Facebook) have to ask for a "Contributor License Agreement" from someone who sends in a patch or code that we want to include in the codebase. This is a legal requirement; a similar situation applies to Apache and other ASF projects.

If we ask you to fill out a CLA we'll direct you to our online CLA page where you can complete it easily. We use the same form as the Apache CLA so that friction is minimal.

License

These extensions are made available under the terms of the GNU General Public License version 2, or any later version. See the COPYING file that accompanies this distribution for the full text of the license.