--- a/contrib/check-code.py Wed Aug 22 11:18:35 2012 -0400
+++ b/contrib/check-code.py Fri Aug 24 14:53:07 2012 -0500
@@ -91,7 +91,7 @@
uprefix = r"^ \$ "
utestpats = [
[
- (r'^(\S| $ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"),
+ (r'^(\S.*|| [$>] .*)[ \t]\n', "trailing whitespace on non-output"),
(uprefix + r'.*\|\s*sed[^|>\n]*\n',
"use regex test output patterns instead of sed"),
(uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"),
--- a/i18n/ru.po Wed Aug 22 11:18:35 2012 -0400
+++ b/i18n/ru.po Fri Aug 24 14:53:07 2012 -0500
@@ -173,7 +173,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2012-08-09 13:23+0400\n"
+"POT-Creation-Date: 2012-08-13 16:01+0400\n"
"PO-Revision-Date: 2011-05-12 23:48+0400\n"
"Last-Translator: Alexander Sauta <demosito@gmail.com>\n"
"Language-Team: Russian\n"
@@ -14542,11 +14542,11 @@
" bookmarks`)."
msgid ""
-" Update sets the working directory's parent revison to the specified\n"
+" Update sets the working directory's parent revision to the specified\n"
" changeset (see :hg:`help parents`)."
msgstr ""
-" Update устанавливает ревизию родителя рабочего каталога в заданный\n"
-" набор изменений (см. :hg:`help update`)."
+" Update делает заданный набор изменений родительской ревизией рабочего\n"
+" каталога (см. :hg:`help parents`)."
msgid ""
" If the changeset is not a descendant or ancestor of the working\n"
--- a/mercurial/commands.py Wed Aug 22 11:18:35 2012 -0400
+++ b/mercurial/commands.py Fri Aug 24 14:53:07 2012 -0500
@@ -4177,7 +4177,7 @@
res.append(fn[plen:-slen])
finally:
lock.release()
- for f in sorted(res):
+ for f in res:
ui.write("%s\n" % f)
return
--- a/mercurial/context.py Wed Aug 22 11:18:35 2012 -0400
+++ b/mercurial/context.py Fri Aug 24 14:53:07 2012 -0500
@@ -885,8 +885,7 @@
p = self._repo.dirstate.parents()
if p[1] == nullid:
p = p[:-1]
- self._parents = [changectx(self._repo, x) for x in p]
- return self._parents
+ return [changectx(self._repo, x) for x in p]
def status(self, ignored=False, clean=False, unknown=False):
"""Explicit status query
--- a/mercurial/parsers.c Wed Aug 22 11:18:35 2012 -0400
+++ b/mercurial/parsers.c Fri Aug 24 14:53:07 2012 -0500
@@ -9,6 +9,7 @@
#include <Python.h>
#include <ctype.h>
+#include <stddef.h>
#include <string.h>
#include "util.h"
@@ -72,7 +73,7 @@
for (start = cur = str, zero = NULL; cur < str + len; cur++) {
PyObject *file = NULL, *node = NULL;
PyObject *flags = NULL;
- int nlen;
+ ptrdiff_t nlen;
if (!*cur) {
zero = cur;
@@ -94,7 +95,7 @@
nlen = cur - zero - 1;
- node = unhexlify(zero + 1, nlen > 40 ? 40 : nlen);
+ node = unhexlify(zero + 1, nlen > 40 ? 40 : (int)nlen);
if (!node)
goto bail;
--- a/mercurial/templatekw.py Wed Aug 22 11:18:35 2012 -0400
+++ b/mercurial/templatekw.py Fri Aug 24 14:53:07 2012 -0500
@@ -275,6 +275,28 @@
"""
return ctx.hex()
+def showp1rev(repo, ctx, templ, **args):
+ """:p1rev: Integer. The repository-local revision number of the changeset's
+ first parent, or -1 if the changeset has no parents."""
+ return ctx.p1().rev()
+
+def showp2rev(repo, ctx, templ, **args):
+ """:p2rev: Integer. The repository-local revision number of the changeset's
+ second parent, or -1 if the changeset has no second parent."""
+ return ctx.p2().rev()
+
+def showp1node(repo, ctx, templ, **args):
+ """:p1node: String. The identification hash of the changeset's first parent,
+ as a 40 digit hexadecimal string. If the changeset has no parents, all
+ digits are 0."""
+ return ctx.p1().hex()
+
+def showp2node(repo, ctx, templ, **args):
+ """:p2node: String. The identification hash of the changeset's second
+ parent, as a 40 digit hexadecimal string. If the changeset has no second
+ parent, all digits are 0."""
+ return ctx.p2().hex()
+
def showphase(repo, ctx, templ, **args):
""":phase: String. The changeset phase name."""
return ctx.phasestr()
@@ -320,6 +342,10 @@
'latesttagdistance': showlatesttagdistance,
'manifest': showmanifest,
'node': shownode,
+ 'p1rev': showp1rev,
+ 'p1node': showp1node,
+ 'p2rev': showp2rev,
+ 'p2node': showp2node,
'phase': showphase,
'phaseidx': showphaseidx,
'rev': showrev,
--- a/mercurial/templater.py Wed Aug 22 11:18:35 2012 -0400
+++ b/mercurial/templater.py Fri Aug 24 14:53:07 2012 -0500
@@ -146,7 +146,15 @@
def runfilter(context, mapping, data):
func, data, filt = data
- return filt(func(context, mapping, data))
+ try:
+ return filt(func(context, mapping, data))
+ except (ValueError, AttributeError, TypeError):
+ if isinstance(data, tuple):
+ dt = data[1]
+ else:
+ dt = data
+ raise util.Abort(_("template filter '%s' is not compatible with "
+ "keyword '%s'") % (filt.func_name, dt))
def buildmap(exp, context):
func, data = compileexp(exp[1], context)
--- a/tests/test-annotate.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-annotate.t Fri Aug 24 14:53:07 2012 -0500
@@ -279,10 +279,10 @@
> EOF
$ hg ci -Am "adda"
adding a
- $ cat > a <<EOF
+ $ sed 's/EOL$//g' > a <<EOF
> a a
>
- >
+ > EOL
> b b
> EOF
$ hg ci -m "changea"
--- a/tests/test-basic.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-basic.t Fri Aug 24 14:53:07 2012 -0500
@@ -33,7 +33,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg identify -n
0
-
+
Poke around at hashes:
--- a/tests/test-bookmarks-pushpull.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-bookmarks-pushpull.t Fri Aug 24 14:53:07 2012 -0500
@@ -210,7 +210,7 @@
$ cat ../hg.pid >> $DAEMON_PIDS
$ cd ../a
- $ hg debugpushkey http://localhost:$HGPORT/ namespaces
+ $ hg debugpushkey http://localhost:$HGPORT/ namespaces
bookmarks
phases
namespaces
@@ -260,7 +260,7 @@
Z 2:0d2164f0ce0d
foo -1:000000000000
foobar 1:9b140be10808
-
+
$ cd ..
Pushing a bookmark should only push the changes required by that
--- a/tests/test-clone.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-clone.t Fri Aug 24 14:53:07 2012 -0500
@@ -533,7 +533,7 @@
destination directory not empty
- $ mkdir a
+ $ mkdir a
$ echo stuff > a/a
$ hg clone q a
abort: destination 'a' is not empty
--- a/tests/test-command-template.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-command-template.t Fri Aug 24 14:53:07 2012 -0500
@@ -592,7 +592,8 @@
$ for key in author branch branches date desc file_adds file_dels file_mods \
> file_copies file_copies_switch files \
- > manifest node parents rev tags diffstat extras; do
+ > manifest node parents rev tags diffstat extras \
+ > p1rev p2rev p1node p2node; do
> for mode in '' --verbose --debug; do
> hg log $mode --template "$key$mode: {$key}\n"
> done
@@ -1095,7 +1096,114 @@
extras--debug: branch=default
extras--debug: branch=default
extras--debug: branch=default
-
+ p1rev: 7
+ p1rev: -1
+ p1rev: 5
+ p1rev: 3
+ p1rev: 3
+ p1rev: 2
+ p1rev: 1
+ p1rev: 0
+ p1rev: -1
+ p1rev--verbose: 7
+ p1rev--verbose: -1
+ p1rev--verbose: 5
+ p1rev--verbose: 3
+ p1rev--verbose: 3
+ p1rev--verbose: 2
+ p1rev--verbose: 1
+ p1rev--verbose: 0
+ p1rev--verbose: -1
+ p1rev--debug: 7
+ p1rev--debug: -1
+ p1rev--debug: 5
+ p1rev--debug: 3
+ p1rev--debug: 3
+ p1rev--debug: 2
+ p1rev--debug: 1
+ p1rev--debug: 0
+ p1rev--debug: -1
+ p2rev: -1
+ p2rev: -1
+ p2rev: 4
+ p2rev: -1
+ p2rev: -1
+ p2rev: -1
+ p2rev: -1
+ p2rev: -1
+ p2rev: -1
+ p2rev--verbose: -1
+ p2rev--verbose: -1
+ p2rev--verbose: 4
+ p2rev--verbose: -1
+ p2rev--verbose: -1
+ p2rev--verbose: -1
+ p2rev--verbose: -1
+ p2rev--verbose: -1
+ p2rev--verbose: -1
+ p2rev--debug: -1
+ p2rev--debug: -1
+ p2rev--debug: 4
+ p2rev--debug: -1
+ p2rev--debug: -1
+ p2rev--debug: -1
+ p2rev--debug: -1
+ p2rev--debug: -1
+ p2rev--debug: -1
+ p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
+ p1node: 0000000000000000000000000000000000000000
+ p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
+ p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
+ p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
+ p1node: 97054abb4ab824450e9164180baf491ae0078465
+ p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
+ p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
+ p1node: 0000000000000000000000000000000000000000
+ p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
+ p1node--verbose: 0000000000000000000000000000000000000000
+ p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
+ p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
+ p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
+ p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
+ p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
+ p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
+ p1node--verbose: 0000000000000000000000000000000000000000
+ p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
+ p1node--debug: 0000000000000000000000000000000000000000
+ p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
+ p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
+ p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
+ p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
+ p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
+ p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
+ p1node--debug: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
+ p2node: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--verbose: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
+ p2node--debug: 0000000000000000000000000000000000000000
Filters work:
@@ -1245,7 +1353,7 @@
$ hg add a
$ hg commit -m future -d "`cat a`"
- $ hg log -l1 --template '{date|age}\n'
+ $ hg log -l1 --template '{date|age}\n'
7 years from now
Error on syntax:
@@ -1255,6 +1363,30 @@
abort: t:3: unmatched quotes
[255]
+Behind the scenes, this will throw TypeError
+
+ $ hg log -l 3 --template '{date|obfuscate}\n'
+ abort: template filter 'obfuscate' is not compatible with keyword 'date'
+ [255]
+
+Behind the scenes, this will throw a ValueError
+
+ $ hg log -l 3 --template 'line: {desc|shortdate}\n'
+ abort: template filter 'shortdate' is not compatible with keyword 'desc'
+ [255]
+
+Behind the scenes, this will throw AttributeError
+
+ $ hg log -l 3 --template 'line: {date|escape}\n'
+ abort: template filter 'escape' is not compatible with keyword 'date'
+ [255]
+
+Behind the scenes, this will throw ValueError
+
+ $ hg tip --template '{author|email|date}\n'
+ abort: template filter 'datefilter' is not compatible with keyword 'author'
+ [255]
+
$ cd ..
--- a/tests/test-convert-cvsnt-mergepoints.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-cvsnt-mergepoints.t Fri Aug 24 14:53:07 2012 -0500
@@ -43,7 +43,7 @@
$ cvscall -Q add foo
$ cd foo
$ echo foo > foo.txt
- $ cvscall -Q add foo.txt
+ $ cvscall -Q add foo.txt
$ cvsci -m "add foo.txt" foo.txt
$ cd ../..
$ rm -rf cvsworktmp
--- a/tests/test-convert-mtn-rename-directory.out Wed Aug 22 11:18:35 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-% tedious monotone keys configuration
-% create monotone repository
-mtn: adding dir1 to workspace manifest
-mtn: adding dir1/subdir1 to workspace manifest
-mtn: adding dir1/subdir1/file1 to workspace manifest
-mtn: beginning commit on branch 'com.selenic.test'
-mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8
-% rename directory
-mtn: skipping dir1, already accounted for in workspace
-mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest
-mtn: beginning commit on branch 'com.selenic.test'
-mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b
-% convert
-assuming destination repo.mtn-hg
-initializing destination repo.mtn-hg repository
-scanning source...
-sorting...
-converting...
-1 initialize
-0 rename
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% manifest
-dir1/subdir2/file1
--- a/tests/test-convert-svn-branches.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-branches.t Fri Aug 24 14:53:07 2012 -0500
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> EOF
@@ -14,7 +14,7 @@
$ cat > branchmap <<EOF
> old3 newbranch
- >
+ >
>
> EOF
$ hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg
--- a/tests/test-convert-svn-encoding.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-encoding.t Fri Aug 24 14:53:07 2012 -0500
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> EOF
--- a/tests/test-convert-svn-move.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-move.t Fri Aug 24 14:53:07 2012 -0500
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> EOF
@@ -155,7 +155,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > progress =
+ > progress =
> [progress]
> assume-tty = 1
> delay = 0
--- a/tests/test-convert-svn-sink.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-sink.t Fri Aug 24 14:53:07 2012 -0500
@@ -16,7 +16,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> EOF
--- a/tests/test-convert-svn-source.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-source.t Fri Aug 24 14:53:07 2012 -0500
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> [convert]
> svn.trunk = mytrunk
--- a/tests/test-convert-svn-startrev.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-startrev.t Fri Aug 24 14:53:07 2012 -0500
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> EOF
$ convert()
--- a/tests/test-convert-svn-tags.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert-svn-tags.t Fri Aug 24 14:53:07 2012 -0500
@@ -3,7 +3,7 @@
$ cat >> $HGRCPATH <<EOF
> [extensions]
- > convert =
+ > convert =
> graphlog =
> EOF
--- a/tests/test-convert.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-convert.t Fri Aug 24 14:53:07 2012 -0500
@@ -399,7 +399,7 @@
test revset converted() lookup
- $ hg --config convert.hg.saverev=True convert a c
+ $ hg --config convert.hg.saverev=True convert a c
initializing destination c repository
scanning source...
sorting...
--- a/tests/test-diffstat.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-diffstat.t Fri Aug 24 14:53:07 2012 -0500
@@ -68,5 +68,5 @@
$ hg diff --stat --git
file with spaces | Bin
1 files changed, 0 insertions(+), 0 deletions(-)
-
+
$ cd ..
--- a/tests/test-encoding.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-encoding.t Fri Aug 24 14:53:07 2012 -0500
@@ -252,5 +252,5 @@
$ HGENCODING=latin-1 hg up `cat latin-1-tag`
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-
+
$ cd ..
--- a/tests/test-export.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-export.t Fri Aug 24 14:53:07 2012 -0500
@@ -124,7 +124,7 @@
Checking if only alphanumeric characters are used in the file name (%m option):
$ echo "line" >> foo
- $ hg commit -m " !\"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~"
+ $ hg commit -m " !\"#$%&(,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~"
$ hg export -v -o %m.patch tip
exporting patch:
____________0123456789_______ABCDEFGHIJKLMNOPQRSTUVWXYZ______abcdefghijklmnopqrstuvwxyz____.patch
--- a/tests/test-glog.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-glog.t Fri Aug 24 14:53:07 2012 -0500
@@ -83,7 +83,7 @@
$ cat > printrevset.py <<EOF
> from mercurial import extensions, revset, commands, cmdutil
- >
+ >
> def uisetup(ui):
> def printrevset(orig, ui, repo, *pats, **opts):
> if opts.get('print_revset'):
--- a/tests/test-import-git.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-import-git.t Fri Aug 24 14:53:07 2012 -0500
@@ -322,12 +322,12 @@
Filenames with spaces:
- $ hg import -d "1000000 0" -m spaces - <<EOF
+ $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces -
> diff --git a/foo bar b/foo bar
> new file mode 100644
> index 0000000..257cc56
> --- /dev/null
- > +++ b/foo bar
+ > +++ b/foo bar EOL
> @@ -0,0 +1 @@
> +foo
> EOF
@@ -384,7 +384,7 @@
b
\x00 (no-eol) (esc)
- $ hg st --copies --change .
+ $ hg st --copies --change .
A binary2
text2
R text2
--- a/tests/test-inotify-issue1371.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-inotify-issue1371.t Fri Aug 24 14:53:07 2012 -0500
@@ -1,6 +1,6 @@
$ "$TESTDIR/hghave" inotify || exit 80
- $ hg init
+ $ hg init
$ touch a b c d e f
$ echo "[extensions]" >> $HGRCPATH
$ echo "inotify=" >> $HGRCPATH
@@ -41,4 +41,4 @@
Are we able to kill the service? if not, the service died on some error
- $ kill `cat hg.pid`
+ $ kill `cat hg.pid`
--- a/tests/test-keyword.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-keyword.t Fri Aug 24 14:53:07 2012 -0500
@@ -998,7 +998,7 @@
$ echo '$Id$' > m
$ hg add m
- $ hg commit -m 4kw
+ $ hg commit -m 4kw
$ echo foo >> m
$ hg commit -m 5foo
--- a/tests/test-largefiles.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-largefiles.t Fri Aug 24 14:53:07 2012 -0500
@@ -80,7 +80,7 @@
$ rm sub/unknown
Remove both largefiles and normal files.
-
+
$ hg remove normal1 large1
$ hg status large1
R large1
@@ -212,7 +212,7 @@
$ hg archive -r 3 ../archive3
$ hg archive -r 4 ../archive4
$ cd ../archive0
- $ cat normal1
+ $ cat normal1
normal1
$ cat large1
large1
@@ -632,7 +632,7 @@
Old revisions of a clone have correct largefiles content (this also
tests update).
- $ hg update -r 1
+ $ hg update -r 1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
@@ -785,7 +785,7 @@
Rollback on largefiles.
- $ echo large4-modified-again > sub/large4
+ $ echo large4-modified-again > sub/large4
$ hg commit -m "Modify large4 again"
Invoking status precommit hook
M sub/large4
@@ -815,7 +815,7 @@
"update --clean" leaves correct largefiles in working copy.
- $ hg update --clean
+ $ hg update --clean
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
getting changed largefiles
1 largefiles updated, 0 removed
@@ -1019,7 +1019,7 @@
getting changed largefiles
3 largefiles updated, 0 removed
$ cd g
- $ hg transplant -s ../d 598410d3eb9a
+ $ hg transplant -s ../d 598410d3eb9a
searching for changes
searching for changes
adding changesets
--- a/tests/test-mq-header-date.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-mq-header-date.t Fri Aug 24 14:53:07 2012 -0500
@@ -128,7 +128,7 @@
> catlogd 6
>
> drop 6
- >
+ >
>
> echo ==== qnew -u
> hg qnew -u jane 6.patch
--- a/tests/test-mq-qimport.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-mq-qimport.t Fri Aug 24 14:53:07 2012 -0500
@@ -169,7 +169,7 @@
$ cat > appendfoo.diff <<EOF
> append foo
- >
+ >
> diff -r 07f494440405 -r 261500830e46 baz
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/baz Thu Jan 01 00:00:00 1970 +0000
@@ -179,7 +179,7 @@
$ cat > appendbar.diff <<EOF
> append bar
- >
+ >
> diff -r 07f494440405 -r 261500830e46 baz
> --- a/baz Thu Jan 01 00:00:00 1970 +0000
> +++ b/baz Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-mv-cp-st-diff.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-mv-cp-st-diff.t Fri Aug 24 14:53:07 2012 -0500
@@ -187,7 +187,7 @@
+y1
- $ tb "add a a1" "add a a2" "hg cp a b" "copy in working dir"
+ $ tb "add a a1" "add a a2" "hg cp a b" "copy in working dir"
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
--- a/tests/test-pull-branch.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-pull-branch.t Fri Aug 24 14:53:07 2012 -0500
@@ -142,7 +142,7 @@
$ hg branch branchC
marked working directory as branch branchC
(branches are permanent and global, did you want a bookmark?)
- $ echo b1 > bar
+ $ echo b1 > bar
$ hg ci -Am "commit on branchC on tt"
adding bar
@@ -151,7 +151,7 @@
$ cd ../t
$ hg up -C default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ echo a1 > bar
+ $ echo a1 > bar
$ hg ci -Am "commit on default on t"
adding bar
--- a/tests/test-rebase-bookmarks.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-rebase-bookmarks.t Fri Aug 24 14:53:07 2012 -0500
@@ -23,7 +23,7 @@
adding b
$ hg book 'X'
$ hg book 'Y'
-
+
$ echo c > c
$ hg ci -Am C
adding c
@@ -38,7 +38,7 @@
$ hg book W
- $ hg tglog
+ $ hg tglog
@ 3: 'D' bookmarks: W
|
| o 2: 'C' bookmarks: Y Z
@@ -47,7 +47,7 @@
|/
o 0: 'A' bookmarks:
-
+
Move only rebased bookmarks
$ cd ..
@@ -59,7 +59,7 @@
$ hg rebase -s Y -d 3
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
- $ hg tglog
+ $ hg tglog
@ 3: 'C' bookmarks: Y Z
|
o 2: 'D' bookmarks: W
@@ -79,7 +79,7 @@
$ hg rebase -s 1 -d 3
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
- $ hg tglog
+ $ hg tglog
@ 3: 'C' bookmarks: Y Z
|
o 2: 'B' bookmarks: X
--- a/tests/test-rebase-cache.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-rebase-cache.t Fri Aug 24 14:53:07 2012 -0500
@@ -73,7 +73,7 @@
$ hg clone -q -u . a a1
$ cd a1
- $ hg tglog
+ $ hg tglog
@ 8: 'F' branch3
|
o 7: 'branch3' branch3
@@ -120,7 +120,7 @@
2: 'B' branch1
0: 'A'
- $ hg tglog
+ $ hg tglog
@ 8: 'E' branch3
|
o 7: 'D' branch3
@@ -244,7 +244,7 @@
2: 'B' branch1
0: 'A'
- $ hg tglog
+ $ hg tglog
@ 7: 'F' branch2
|
o 6: 'E' branch2
--- a/tests/test-rebase-conflicts.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-rebase-conflicts.t Fri Aug 24 14:53:07 2012 -0500
@@ -69,7 +69,7 @@
Try to continue without solving the conflict:
- $ hg rebase --continue
+ $ hg rebase --continue
abort: unresolved merge conflicts (see hg help resolve)
[255]
--- a/tests/test-rebase-mq-skip.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-rebase-mq-skip.t Fri Aug 24 14:53:07 2012 -0500
@@ -39,7 +39,7 @@
$ hg add p1
$ hg qref -m P1
- $ hg export qtip > p1.patch
+ $ hg export qtip > p1.patch
$ hg up -q -C 1
--- a/tests/test-run-tests.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-run-tests.t Fri Aug 24 14:53:07 2012 -0500
@@ -95,5 +95,5 @@
Exit code:
- $ (exit 1)
+ $ (exit 1)
[1]
--- a/tests/test-status.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-status.t Fri Aug 24 14:53:07 2012 -0500
@@ -330,4 +330,9 @@
$ hg status -A --rev 1 1
R 1/2/3/4/5/b.txt
+#if windows
+ $ hg --config ui.slash=false status -A --rev 1 1
+ R 1\2\3\4\5\b.txt
+#endif
+
$ cd ..
--- a/tests/test-subrepo-deep-nested-change.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-subrepo-deep-nested-change.t Fri Aug 24 14:53:07 2012 -0500
@@ -100,7 +100,7 @@
revision 53dd3430bcaf5ab4a7c48262bcad6d441f510487
Check that deep archiving works
-
+
$ cd cloned
$ echo 'test' > sub1/sub2/test.txt
$ hg --config extensions.largefiles=! add sub1/sub2/test.txt
--- a/tests/test-subrepo-git.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-subrepo-git.t Fri Aug 24 14:53:07 2012 -0500
@@ -446,7 +446,7 @@
$ git rev-parse HEAD
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
$ cd ..
- $ hg update --clean tip > /dev/null 2>&1
+ $ hg update --clean tip > /dev/null 2>&1
Sticky subrepository, revision updates
$ hg id -n
--- a/tests/test-subrepo-missing.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-subrepo-missing.t Fri Aug 24 14:53:07 2012 -0500
@@ -60,7 +60,7 @@
warning: subrepo spec file .hgsub not found
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm .hgsubstate
- $ hg up 0
+ $ hg up 0
remote changed .hgsubstate which local deleted
use (c)hanged version or leave (d)eleted? c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-subrepo.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-subrepo.t Fri Aug 24 14:53:07 2012 -0500
@@ -730,7 +730,7 @@
925c17564ef8 tip
$ hg -R s id
12a213df6fa9 tip
- $ hg -R t id
+ $ hg -R t id
52c0adc0515a tip
$ hg update 11
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -738,7 +738,7 @@
365661e5936a
$ hg -R s id
fc627a69481f
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35
Sticky subrepositorys, file changes
@@ -750,7 +750,7 @@
365661e5936a+
$ hg -R s id
fc627a69481f+
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35+
$ hg update tip
subrepository sources for s differ
@@ -764,7 +764,7 @@
925c17564ef8+ tip
$ hg -R s id
fc627a69481f+
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35+
$ hg update --clean tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -774,7 +774,7 @@
925c17564ef8 tip
$ hg -R s id
12a213df6fa9 tip
- $ hg -R t id
+ $ hg -R t id
52c0adc0515a tip
$ cd s
$ hg update -r -2
@@ -792,7 +792,7 @@
e45c8b14af55+
$ hg -R s id
02dcf1d70411
- $ hg -R t id
+ $ hg -R t id
7af322bc1198
Sticky subrepository, file changes and revision updates
@@ -804,7 +804,7 @@
e45c8b14af55+
$ hg -R s id
02dcf1d70411+
- $ hg -R t id
+ $ hg -R t id
7af322bc1198+
$ hg update tip
subrepository sources for s differ
@@ -818,7 +818,7 @@
925c17564ef8+ tip
$ hg -R s id
02dcf1d70411+
- $ hg -R t id
+ $ hg -R t id
7af322bc1198+
Sticky repository, update --clean
@@ -828,7 +828,7 @@
925c17564ef8 tip
$ hg -R s id
12a213df6fa9 tip
- $ hg -R t id
+ $ hg -R t id
52c0adc0515a tip
Test subrepo already at intended revision:
@@ -843,7 +843,7 @@
11+
$ hg -R s id
fc627a69481f
- $ hg -R t id
+ $ hg -R t id
e95bcfa18a35
Test that removing .hgsubstate doesn't break anything:
--- a/tests/test-tags.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-tags.t Fri Aug 24 14:53:07 2012 -0500
@@ -137,7 +137,7 @@
$ echo >> .hgtags
$ echo "foo bar" >> .hgtags
$ echo "a5a5 invalid" >> .hg/localtags
- $ cat .hgtags
+ $ cat .hgtags
acb14030fe0a21b60322c440ad2d20cf7685a376 first
spam
--- a/tests/test-template-engine.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-template-engine.t Fri Aug 24 14:53:07 2012 -0500
@@ -36,4 +36,12 @@
$ hg log --style=./mymap
0 97e5f848f0936960273bbf75be6388cd0350a32b test
+ $ cat > changeset.txt << EOF
+ > {{p1rev}} {{p1node}} {{p2rev}} {{p2node}}
+ > EOF
+ $ hg ci -Ama
+ $ hg log --style=./mymap
+ 0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000
+ -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000
+
$ cd ..
--- a/tests/test-treediscovery-legacy.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-treediscovery-legacy.t Fri Aug 24 14:53:07 2012 -0500
@@ -330,7 +330,7 @@
$ hg ci -Am A
adding A
$ cd ..
- $ hg clone rlocal rremote
+ $ hg clone rlocal rremote
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd rlocal
@@ -341,7 +341,7 @@
$ tstart rremote
$ cd rlocal
- $ hg incoming $remote
+ $ hg incoming $remote
comparing with http://localhost:$HGPORT/
searching for changes
no changes found
--- a/tests/test-update-branches.t Wed Aug 22 11:18:35 2012 -0400
+++ b/tests/test-update-branches.t Fri Aug 24 14:53:07 2012 -0500
@@ -61,7 +61,7 @@
> hg up $opt $targetrev
> hg parent --template 'parent={rev}\n'
> hg stat -S
- > }
+ > }
$ norevtest () {
> msg=$1
@@ -74,7 +74,7 @@
> hg up $opt
> hg parent --template 'parent={rev}\n'
> hg stat -S
- > }
+ > }
Test cases are documented in a table in the update function of merge.py.
Cases are run as shown in that table, row by row.