Mercurial > hg
changeset 12031:77bbeafd7519
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 25 Aug 2010 13:40:46 +0200 |
| parents | e1a3d7ed478e (current diff) 927d63be166b (diff) |
| children | ad787252fed6 |
| files | mercurial/context.py |
| diffstat | 5 files changed, 56 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Mon Aug 23 22:22:05 2010 +0200 +++ b/mercurial/context.py Wed Aug 25 13:40:46 2010 +0200 @@ -198,7 +198,7 @@ if match(fn): yield fn for fn in sorted(fset): - if match.bad(fn, 'No such file in rev ' + str(self)) and match(fn): + if match.bad(fn, _('No such file in rev %s') % self) and match(fn): yield fn def sub(self, path):
--- a/tests/test-convert-cvs Mon Aug 23 22:22:05 2010 +0200 +++ b/tests/test-convert-cvs Wed Aug 25 13:40:46 2010 +0200 @@ -132,12 +132,22 @@ sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' cd .. +echo % commit new file revisions with some fuzz +cd src +echo f >> a +cvscall -q commit -mfuzzy . | grep '<--' |\ + sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' +sleep 4 # the two changes will be split if fuzz < 4 +echo g >> b/c +cvscall -q commit -mfuzzy . | grep '<--' |\ + sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' +cd .. + echo % convert again -hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' +hg convert --config convert.cvsps.fuzz=2 src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g' -echo "graphlog = " >> $HGRCPATH hg -R src-hg glog --template '{rev} ({branches}) {desc} files: {files}\n' echo % testing debugcvsps cd src -hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' +hg debugcvsps --fuzz=2 | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
--- a/tests/test-convert-cvs.out Mon Aug 23 22:22:05 2010 +0200 +++ b/tests/test-convert-cvs.out Wed Aug 25 13:40:46 2010 +0200 @@ -150,18 +150,27 @@ 0 Initial revision files: b/c % commit a new revision with funny log message checking in src/a,v +% commit new file revisions with some fuzz +checking in src/a,v +checking in src/b/c,v % convert again connecting to cvsrepo scanning source... collecting CVS rlog -9 log entries -cvslog hook: 9 entries +11 log entries +cvslog hook: 11 entries creating changesets -6 changeset entries -cvschangesets hook: 6 changesets +8 changeset entries +cvschangesets hook: 8 changesets sorting... converting... -0 funny +2 funny +1 fuzzy +0 fuzzy +o 8 (branch) fuzzy files: b/c +| +o 7 (branch) fuzzy files: a +| o 6 (branch) funny | ---------------------------- | log message files: a @@ -179,11 +188,11 @@ % testing debugcvsps collecting CVS rlog -9 log entries -cvslog hook: 9 entries +11 log entries +cvslog hook: 11 entries creating changesets -8 changeset entries -cvschangesets hook: 8 changesets +10 changeset entries +cvschangesets hook: 10 changesets --------------------- PatchSet 1 Date: @@ -286,3 +295,27 @@ Members: a:1.2->1.2.2.1 +--------------------- +PatchSet 9 +Date: +Author: +Branch: branch +Tag: (none) +Log: +fuzzy + +Members: + a:1.2.2.1->1.2.2.2 + +--------------------- +PatchSet 10 +Date: +Author: +Branch: branch +Tag: (none) +Log: +fuzzy + +Members: + b/c:1.1.2.1->1.1.2.2 +
--- a/tests/test-dispatch Mon Aug 23 22:22:05 2010 +0200 +++ b/tests/test-dispatch Wed Aug 25 13:40:46 2010 +0200 @@ -21,10 +21,6 @@ EOF hg cat a -echo '% working directory removed' -sh -c "cd $dir && rm -rf a" -hg --version 2>&1 | sed -e 's,\(abort:.*:\).*$,\1 ...,g' - echo '% no repo' cd $dir hg cat
--- a/tests/test-dispatch.out Mon Aug 23 22:22:05 2010 +0200 +++ b/tests/test-dispatch.out Wed Aug 25 13:40:46 2010 +0200 @@ -33,7 +33,5 @@ % [defaults] a a: No such file in rev 000000000000 -% working directory removed -abort: error getting current working directory: ... % no repo abort: There is no Mercurial repository here (.hg not found)!