9962f55805
Summary:
sshing to the hg server could result in stdout containing 'remote: ...' (like if
the user had an extension enabled that wasn't on the server). This interefered
with fbmake being able to parse the git hash and broke fbmake for people with
such configs.
The fix is to redirect it to stderr instead. I tried using ui.push/popbuffer
but it doesn't actually work because the ui that is being used is newly
constructed as part of the peer being created, and therefore doesn't respect the
buffer stack. I also tried ui.quiet=True, but that also failed, as newly created
ui's don't inherit the original quiet value, but instead look at the main
config['quiet'].
Test Plan:
Added a bogus extension to my ~/.hgrc
hh log -r 1095d3a297300405f679826fc78d52c8a6c1da85 -T '{gitnode}\n' 2>/dev/null
hh log -r g988fa44ff4bebf4093b09ef27b5e24702ebda6ab 2>/dev/null
Verified there was no 'remote:' output.
Reviewers: sid0, mpm, pyd
Differential Revision: https://phabricator.fb.com/D1604547
|
||
|---|---|---|
| crecord | ||
| fb_share_bookmarks | ||
| tests | ||
| .hgignore | ||
| backups.py | ||
| COPYING | ||
| fbamend.py | ||
| githelp.py | ||
| gitlookup.py | ||
| gitrevset.py | ||
| Makefile | ||
| phrevset.py | ||
| README.md | ||
| setup.py | ||
| smartlog.py | ||
| tweakdefaults.py | ||
hg-experimental
This is a collection of proof-of-concept Mercurial extensions written at Facebook. While they are all in basic use, they are considered experimental, are unsupported, and may or may not receive updates in the future. We're making them open source as examples of some better workflows we've been experimenting with.
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.
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.