# HG changeset patch
# User Keshav Kini <kini@member.ams.org>
# Date 1308023697 25200
# Node ID d4247ebe65d0f31e1127fe3e3a7cb8cd254461a6
# Parent 08af52703328259d27b217c298f1ac492b45a8d6
trac #11121: Set up good defaults for sage's mercurial
diff --git a/SPKG.txt b/SPKG.txt
|
a
|
b
|
|
| 26 | 26 | * Currently none (except one should make sure the patch still applies) |
| 27 | 27 | |
| 28 | 28 | == Changelog == |
| | 29 | |
| | 30 | === mercurial-1.6.4.p1 (Keshav Kini, 2011-04-06) === |
| | 31 | * Add some useful default configuration settings |
| | 32 | |
| 29 | 33 | === mercurial-1.7.3 (Ryan Grout, January 11, 2010) === |
| 30 | 34 | * Updated to Mercurial 1.7.3 |
| 31 | 35 | * Updated posix.py (patched against 1.7.3) |
diff --git a/spkg-install b/spkg-install
|
a
|
b
|
|
| 36 | 36 | exit 1 |
| 37 | 37 | fi |
| 38 | 38 | |
| | 39 | mkdir -p "$SAGE_LOCAL/etc/mercurial" |
| | 40 | cat > "$SAGE_LOCAL/etc/mercurial/hgrc" <<HEREDOC |
| | 41 | [trusted] |
| | 42 | users = $USER |
| | 43 | |
| | 44 | [diff] |
| | 45 | git = true |
| | 46 | |
| | 47 | [extensions] |
| | 48 | color = |
| | 49 | mq = |
| | 50 | pager = |
| | 51 | rebase = |
| | 52 | relink = |
| | 53 | |
| | 54 | [pager] |
| | 55 | pager = less -R |
| | 56 | attend = annotate, cat, diff, log, glog, qdiff |
| | 57 | HEREDOC |
| | 58 | if [ $? -ne 0 ]; then |
| | 59 | echo "Error installing custom hgrc" |
| | 60 | fi |
| | 61 | |
| 39 | 62 | if [ "$UNAME" = "Darwin" ]; then |
| 40 | 63 | echo 'Copying custom hgmerge script over to $SAGE_LOCAL/bin/' |
| 41 | 64 | cd "$CUR" |