--- a/contrib/check-code.py Fri Jul 01 13:59:09 2011 -0500
+++ b/contrib/check-code.py Tue Jul 05 14:30:53 2011 -0500
@@ -68,6 +68,7 @@
(r'touch -d', "don't use 'touch -d', use 'touch -t' instead"),
(r'ls\s+[^|-]+\s+-', "options to 'ls' must come before filenames"),
(r'[^>]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"),
+ (r'stop\(\)', "don't use 'stop' as a shell function name"),
],
# warnings
[]
--- a/mercurial/fileset.py Fri Jul 01 13:59:09 2011 -0500
+++ b/mercurial/fileset.py Tue Jul 05 14:30:53 2011 -0500
@@ -195,7 +195,7 @@
def binary(mctx, x):
"""``binary()``
- File that appears to be binary (contails NUL bytes).
+ File that appears to be binary (contains NUL bytes).
"""
# i18n: "binary" is a keyword
getargs(x, 0, 0, _("binary takes no arguments"))
--- a/mercurial/help/filesets.txt Fri Jul 01 13:59:09 2011 -0500
+++ b/mercurial/help/filesets.txt Tue Jul 05 14:30:53 2011 -0500
@@ -58,7 +58,7 @@
hg revert "set:copied() and binary() and size('>1M')"
-- Remove files listed in files.lst that contain the letter a or b::
+- Remove files listed in foo.lst that contain the letter a or b::
hg remove "set: 'listfile:foo.lst' and (**a* or **b*)"
--- a/mercurial/patch.py Fri Jul 01 13:59:09 2011 -0500
+++ b/mercurial/patch.py Tue Jul 05 14:30:53 2011 -0500
@@ -593,7 +593,7 @@
self.exists = backend.exists(self.fname)
self.missing = False
if data:
- self.lines = data.splitlines(True)
+ self.lines = mdiff.splitnewlines(data)
if self.mode is None:
self.mode = mode
if self.lines:
--- a/mercurial/setdiscovery.py Fri Jul 01 13:59:09 2011 -0500
+++ b/mercurial/setdiscovery.py Tue Jul 05 14:30:53 2011 -0500
@@ -124,7 +124,7 @@
srvheads = dag.internalizeall(srvheadhashes, filterunknown=True)
if len(srvheads) == len(srvheadhashes):
- ui.note("all remote heads known locally\n")
+ ui.debug("all remote heads known locally\n")
return (srvheadhashes, False, srvheadhashes,)
if sample and util.all(yesno):
--- a/tests/test-patch.t Fri Jul 01 13:59:09 2011 -0500
+++ b/tests/test-patch.t Tue Jul 05 14:30:53 2011 -0500
@@ -46,9 +46,9 @@
$ rm $HGRCPATH
$ hg init c
$ cd c
- $ echo 0 > a
+ $ printf "a\rc" > a
$ hg ci -A -m 0 a -d '0 0'
- $ echo 1 >> a
+ $ printf "a\rb\rc" > a
$ cat << eof > log
> first line which can't start with '# '
> # second line is a comment but that shouldn't be a problem.
@@ -73,7 +73,7 @@
$ hg import ../c/p
applying ../c/p
$ hg log -v -r 1
- changeset: 1:e8cc66fbbaa6
+ changeset: 1:cd0bde79c428
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-push-warn.t Fri Jul 01 13:59:09 2011 -0500
+++ b/tests/test-push-warn.t Tue Jul 05 14:30:53 2011 -0500
@@ -127,7 +127,6 @@
$ hg push -v -r 3 -r 4 ../c
pushing to ../c
searching for changes
- all remote heads known locally
new remote heads on branch 'default'
new remote head a5dda829a167
new remote head ee8fbc7a0295
@@ -138,7 +137,6 @@
$ hg push -v -f -r 3 -r 4 ../c
pushing to ../c
searching for changes
- all remote heads known locally
2 changesets found
adding changesets
adding manifests
--- a/tests/test-treediscovery-legacy.t Fri Jul 01 13:59:09 2011 -0500
+++ b/tests/test-treediscovery-legacy.t Tue Jul 05 14:30:53 2011 -0500
@@ -17,7 +17,7 @@
$ remote=http://localhost:$HGPORT/
$ export remote
- $ start() {
+ $ tstart() {
> echo '[web]' > $1/.hg/hgrc
> echo 'push_ssl = false' >> $1/.hg/hgrc
> echo 'allow_push = *' >> $1/.hg/hgrc
@@ -25,7 +25,7 @@
> hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log
> cat hg.pid >> $DAEMON_PIDS
> }
- $ stop() {
+ $ tstop() {
> "$TESTDIR/killdaemons.py"
> cp $HGRCPATH-withcap $HGRCPATH
> }
@@ -34,7 +34,7 @@
$ hg init empty1
$ hg init empty2
- $ start empty2
+ $ tstart empty2
$ hg incoming -R empty1 $remote
comparing with http://localhost:$HGPORT/
no changes found
@@ -49,7 +49,7 @@
$ hg push -R empty1 $remote
pushing to http://localhost:$HGPORT/
no changes found
- $ stop
+ $ tstop
Base repo:
@@ -82,7 +82,7 @@
o 0 d57206cc072a: r0
$ cd ..
- $ start main
+ $ tstart main
Full clone:
@@ -199,7 +199,7 @@
Remote is empty:
- $ stop ; start empty2
+ $ tstop ; tstart empty2
$ cd main
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -241,7 +241,7 @@
Local is superset:
- $ stop
+ $ tstop
$ hg clone main subset2 --rev name2
adding changesets
adding manifests
@@ -249,7 +249,7 @@
added 6 changesets with 12 changes to 2 files
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ start subset2
+ $ tstart subset2
$ cd main
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -291,7 +291,7 @@
Partial pull:
- $ stop ; start main
+ $ tstop ; tstart main
$ hg clone $remote partial --rev name2
abort: partial pull cannot be done because other repository doesn't support changegroupsubset.
[255]
@@ -306,5 +306,5 @@
[255]
$ cd ..
- $ stop
+ $ tstop
--- a/tests/test-treediscovery.t Fri Jul 01 13:59:09 2011 -0500
+++ b/tests/test-treediscovery.t Tue Jul 05 14:30:53 2011 -0500
@@ -13,14 +13,14 @@
$ remote=http://localhost:$HGPORT/
$ export remote
- $ start() {
+ $ tstart() {
> echo '[web]' > $1/.hg/hgrc
> echo 'push_ssl = false' >> $1/.hg/hgrc
> echo 'allow_push = *' >> $1/.hg/hgrc
> hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -E errors.log
> cat hg.pid >> $DAEMON_PIDS
> }
- $ stop() {
+ $ tstop() {
> "$TESTDIR/killdaemons.py"
> }
@@ -28,7 +28,7 @@
$ hg init empty1
$ hg init empty2
- $ start empty2
+ $ tstart empty2
$ hg incoming -R empty1 $remote
comparing with http://localhost:$HGPORT/
no changes found
@@ -43,7 +43,7 @@
$ hg push -R empty1 $remote
pushing to http://localhost:$HGPORT/
no changes found
- $ stop
+ $ tstop
Base repo:
@@ -76,7 +76,7 @@
o 0 d57206cc072a: r0
$ cd ..
- $ start main
+ $ tstart main
Full clone:
@@ -187,7 +187,7 @@
Remote is empty:
- $ stop ; start empty2
+ $ tstop ; tstart empty2
$ cd main
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -229,7 +229,7 @@
Local is superset:
- $ stop
+ $ tstop
$ hg clone main subset2 --rev name2
adding changesets
adding manifests
@@ -237,7 +237,7 @@
added 6 changesets with 12 changes to 2 files
updating to branch name2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ start subset2
+ $ tstart subset2
$ cd main
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -279,7 +279,7 @@
Partial pull:
- $ stop ; start main
+ $ tstop ; tstart main
$ hg clone $remote partial --rev name2
adding changesets
adding manifests
@@ -321,12 +321,12 @@
Both have new stuff in new named branches:
- $ stop
+ $ tstop
$ hg clone main repo1a --rev name1 -q
$ hg clone repo1a repo1b -q
$ hg clone main repo2a --rev name2 -q
$ hg clone repo2a repo2b -q
- $ start repo1a
+ $ tstart repo1a
$ cd repo2a
$ hg incoming $remote
@@ -369,7 +369,7 @@
[1]
$ cd ..
- $ stop ; start repo1b
+ $ tstop ; tstart repo1b
$ cd repo2b
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -413,13 +413,13 @@
Both have new stuff in existing named branches:
- $ stop
+ $ tstop
$ rm -r repo1a repo1b repo2a repo2b
$ hg clone main repo1a --rev 3 --rev 8 -q
$ hg clone repo1a repo1b -q
$ hg clone main repo2a --rev 4 --rev 7 -q
$ hg clone repo2a repo2b -q
- $ start repo1a
+ $ tstart repo1a
$ cd repo2a
$ hg incoming $remote
@@ -457,7 +457,7 @@
[1]
$ cd ..
- $ stop ; start repo1b
+ $ tstop ; tstart repo1b
$ cd repo2b
$ hg incoming $remote
comparing with http://localhost:$HGPORT/
@@ -494,5 +494,5 @@
[1]
$ cd ..
- $ stop
+ $ tstop