Mercurial > hg
changeset 11510:96040c70c9e1
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 04 Jul 2010 14:14:40 +0200 |
| parents | 48e549d7c6ae (current diff) 2eaaad99f2f0 (diff) |
| children | 4a73a0980194 |
| files | |
| diffstat | 4 files changed, 84 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Jul 03 02:15:25 2010 +0200 +++ b/mercurial/commands.py Sun Jul 04 14:14:40 2010 +0200 @@ -42,6 +42,8 @@ adding foo.c $ hg status A foo.c + + Returns 0 if all files are successfully added. """ bad = [] @@ -2519,7 +2521,7 @@ revmatchfn = None if opts.get('patch') or opts.get('stat'): - revmatchfn = cmdutil.match(repo, fns) + revmatchfn = cmdutil.match(repo, fns, default='path') displayer.show(ctx, copies=copies, matchfn=revmatchfn) @@ -2732,6 +2734,8 @@ :hg:`bundle`) operations. See :hg:`help urls` for more information. + + Returns 0 on success. """ if search: for name, path in ui.configitems("paths"):
--- a/tests/test-help.out Sat Jul 03 02:15:25 2010 +0200 +++ b/tests/test-help.out Sun Jul 04 14:14:40 2010 +0200 @@ -252,6 +252,8 @@ If no names are given, add all files to the repository. + Returns 0 if all files are successfully added. + use "hg -v help add" to show verbose help options: @@ -287,6 +289,8 @@ $ hg status A foo.c + Returns 0 if all files are successfully added. + options: -I --include PATTERN [+] include names matching the given patterns @@ -332,6 +336,8 @@ If no names are given, add all files to the repository. + Returns 0 if all files are successfully added. + use "hg -v help add" to show verbose help options: @@ -355,6 +361,8 @@ If no names are given, add all files to the repository. + Returns 0 if all files are successfully added. + use "hg -v help add" to show verbose help options:
--- a/tests/test-log Sat Jul 03 02:15:25 2010 +0200 +++ b/tests/test-log Sun Jul 04 14:14:40 2010 +0200 @@ -181,4 +181,13 @@ echo '% log -b 2' hg log -b 2 +echo '% log -p --cwd dir (in subdir)' +mkdir dir +hg log -p --cwd dir + +echo '% log -p -R repo' +cd dir +hg log -p -R .. ../a + + exit 0
--- a/tests/test-log.out Sat Jul 03 02:15:25 2010 +0200 +++ b/tests/test-log.out Sun Jul 04 14:14:40 2010 +0200 @@ -464,3 +464,65 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default +% log -p --cwd dir (in subdir) +changeset: 3:f5d8de11c2e2 +branch: test +tag: tip +parent: 1:d32277701ccb +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: commit on test + +diff -r d32277701ccb -r f5d8de11c2e2 c +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/c Thu Jan 01 00:00:00 1970 +0000 +@@ -0,0 +1,1 @@ ++c + +changeset: 2:c3a4f03cc9a7 +parent: 0:24427303d56f +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: commit on default + +diff -r 24427303d56f -r c3a4f03cc9a7 c +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/c Thu Jan 01 00:00:00 1970 +0000 +@@ -0,0 +1,1 @@ ++c + +changeset: 1:d32277701ccb +branch: test +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: commit on test + +diff -r 24427303d56f -r d32277701ccb b +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/b Thu Jan 01 00:00:00 1970 +0000 +@@ -0,0 +1,1 @@ ++b + +changeset: 0:24427303d56f +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: commit on default + +diff -r 000000000000 -r 24427303d56f a +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/a Thu Jan 01 00:00:00 1970 +0000 +@@ -0,0 +1,1 @@ ++a + +% log -p -R repo +changeset: 0:24427303d56f +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: commit on default + +diff -r 000000000000 -r 24427303d56f a +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/a Thu Jan 01 00:00:00 1970 +0000 +@@ -0,0 +1,1 @@ ++a +