# HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1321790097 -3600
# Node ID 9d15e76fafc9a94ed2efd9310a275dd032b0984c
# Parent da0327650f46df7d9c3209ffa690b7003f809987
Always use HGPLAIN, except when running "sage -hg" directly
diff --git a/sage-bdist b/sage-bdist
a
|
b
|
|
41 | 41 | cd "$SAGE_ROOT" |
42 | 42 | |
43 | 43 | echo "Copying root repository..." |
44 | | "$SAGE_ROOT"/sage --hg clone --pull . "$TMP" |
| 44 | hg clone --pull . "$TMP" |
45 | 45 | |
46 | 46 | if [ $? -ne 0 ]; then |
47 | 47 | echo "Error copying Sage root repository." |
diff --git a/sage-combinat b/sage-combinat
a
|
b
|
|
262 | 262 | ############################################################################## |
263 | 263 | |
264 | 264 | sage = options.sage |
265 | | hg = sage+""" -hg --config 'extensions.hgext.mq=' --config 'ui.username="sage-combinat script"'""" |
| 265 | hg = """hg --config 'extensions.hgext.mq=' --config 'ui.username="sage-combinat script"'""" |
266 | 266 | sage_root = get_sage_root() |
267 | 267 | sage_version = get_sage_version() |
268 | 268 | |
diff --git a/sage-env b/sage-env
a
|
b
|
|
168 | 168 | # See Trac Ticket #11830 |
169 | 169 | HGENCODING="utf8" && export HGENCODING |
170 | 170 | |
| 171 | # Make Mercurial not use any user defaults (like enabling the pager extension) |
| 172 | # This is needed in order to use mercurial in scripts. When running hg |
| 173 | # directly through "sage -hg", we will disable HGPLAIN in sage-sage. |
| 174 | # See Trac Ticket #12058 |
| 175 | HGPLAIN="yes" && export HGPLAIN |
| 176 | |
171 | 177 | SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH |
172 | 178 | SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE |
173 | 179 | |
diff --git a/sage-make_devel_packages b/sage-make_devel_packages
a
|
b
|
|
145 | 145 | cd "$ROOT_REPO" |
146 | 146 | |
147 | 147 | echo "Copying root repository..." |
148 | | "$SAGE_ROOT"/sage --hg clone --pull "$SAGE_ROOT" . |
| 148 | hg clone --pull "$SAGE_ROOT" . |
149 | 149 | |
150 | 150 | if [ $? -ne 0 ]; then |
151 | 151 | echo "Error copying Sage root repository." |
diff --git a/sage-pkg b/sage-pkg
a
|
b
|
|
91 | 91 | else: |
92 | 92 | spkg_txt = "File is missing" |
93 | 93 | |
94 | | p = Popen("cd %s; sage --hg diff" % dir, shell=True, stdout=PIPE, stderr=PIPE) |
| 94 | p = Popen("cd '%s' && hg diff" % dir, shell=True, stdout=PIPE, stderr=PIPE) |
95 | 95 | std_out, std_err = p.communicate() |
96 | 96 | if len(std_err) != 0: |
97 | 97 | hgrepo_txt = "Error reading repository" |
diff --git a/sage-pull b/sage-pull
a
|
b
|
|
1 | 1 | #!/bin/sh |
2 | | sage -hg pull http://www.sagemath.org/hg/scripts-main |
| 2 | hg pull http://www.sagemath.org/hg/scripts-main |
diff --git a/sage-sage b/sage-sage
a
|
b
|
|
542 | 542 | if [ "$1" = '-hg' -o "$1" = '--hg' ]; then |
543 | 543 | cd "$CUR" |
544 | 544 | shift |
| 545 | # Disable HGPLAIN, so we use all user defaults |
| 546 | # (both in $SAGE_LOCAL/etc/mercurial and $HOME/.hgrc) |
| 547 | unset HGPLAIN |
545 | 548 | "$SAGE_LOCAL/bin/hg" "$@" |
546 | 549 | exit $? |
547 | 550 | fi |
diff --git a/sage-sdist b/sage-sdist
a
|
b
|
|
84 | 84 | hg commit -m "$SAGE_VERSION" |
85 | 85 | |
86 | 86 | echo "Copying root repository..." |
87 | | "$SAGE_ROOT"/sage --hg clone --pull . "$TMP" |
| 87 | hg clone --pull . "$TMP" |
88 | 88 | |
89 | 89 | if [ $? -ne 0 ]; then |
90 | 90 | echo "Error copying Sage root repository." |
diff --git a/sage-test-new b/sage-test-new
a
|
b
|
|
7 | 7 | |
8 | 8 | os.chdir('%s/devel/sage'%os.environ['SAGE_ROOT']) |
9 | 9 | |
10 | | v = os.popen('sage -hg status').read() |
| 10 | v = os.popen('hg status').read() |
11 | 11 | print v |
12 | 12 | F = [] |
13 | 13 | for X in v.split('\n'): |
diff --git a/sage-update b/sage-update
a
|
b
|
|
347 | 347 | # check sage root repo. if present, check status; if there are |
348 | 348 | # any unchecked in changes, abort. |
349 | 349 | os.chdir(SAGE_ROOT) |
350 | | err = subprocess.call('./sage -hg verify', shell=True, |
| 350 | err = subprocess.call('hg verify', shell=True, |
351 | 351 | stdout=subprocess.PIPE, |
352 | 352 | stderr=subprocess.PIPE) |
353 | 353 | root_repo_intact = (err == 0) |
354 | 354 | if root_repo_intact: |
355 | | P = subprocess.Popen('./sage -hg status', shell=True, |
| 355 | P = subprocess.Popen('hg status', shell=True, |
356 | 356 | stdout=subprocess.PIPE) |
357 | 357 | output = P.communicate()[0] |
358 | 358 | if len(output) > 0: # uncommitted changes |
… |
… |
|
410 | 410 | for file in ['spkg/install', |
411 | 411 | 'spkg/standard/deps', |
412 | 412 | 'spkg/standard/newest_version']: |
413 | | subprocess.call('./sage -hg commit %s -m ' % file + |
| 413 | subprocess.call('hg commit %s -m ' % file + |
414 | 414 | '"committing %s while running sage-update" ' % file + |
415 | 415 | '-u "Sage (during sage -upgrade)"', |
416 | 416 | shell=True) |