Mercurial > hg
changeset 4896:ee04732fe61d
merge with crew-stable
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Tue, 17 Jul 2007 09:28:01 -0300 |
| parents | 44b0031514c1 (current diff) fa6c9381d053 (diff) |
| children | 4574925db5c0 |
| files | hgext/convert/__init__.py mercurial/commands.py |
| diffstat | 4 files changed, 41 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Tue Jul 17 08:22:43 2007 +0200 +++ b/hgext/convert/__init__.py Tue Jul 17 09:28:01 2007 -0300 @@ -295,6 +295,8 @@ srcauthor=whatever string you want ''' + util._encoding = 'UTF-8' + if not dest: dest = hg.defaultdest(src) + "-hg" ui.status("assuming destination %s\n" % dest)
--- a/mercurial/commands.py Tue Jul 17 08:22:43 2007 +0200 +++ b/mercurial/commands.py Tue Jul 17 09:28:01 2007 -0300 @@ -1993,7 +1993,10 @@ """ rev = opts.get('rev') if file_: - ctx = repo.filectx(file_, changeid=rev) + files, match, anypats = cmdutil.matchpats(repo, (file_,), opts) + if anypats or len(files) != 1: + raise util.Abort(_('can only specify an explicit file name')) + ctx = repo.filectx(files[0], changeid=rev) elif rev: ctx = repo.changectx(rev) else:
--- a/tests/test-parents Tue Jul 17 08:22:43 2007 +0200 +++ b/tests/test-parents Tue Jul 17 09:28:01 2007 -0300 @@ -1,8 +1,8 @@ #!/bin/sh # test parents command -hg init a -cd a +hg init repo +cd repo echo % no working directory hg parents @@ -25,3 +25,20 @@ echo % hg parents -r 2 a hg parents -r 2 a + +echo % hg parents -r 2 ../a +hg parents -r 2 ../a + +echo '% cd dir; hg parents -r 2 ../a' +mkdir dir +cd dir +hg parents -r 2 ../a + +echo '% hg parents -r 2 path:a' +hg parents -r 2 path:a + +echo '% hg parents -r 2 glob:a' +cd .. +hg parents -r 2 glob:a + +true
--- a/tests/test-parents.out Tue Jul 17 08:22:43 2007 +0200 +++ b/tests/test-parents.out Tue Jul 17 09:28:01 2007 -0300 @@ -26,3 +26,19 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: ab +% hg parents -r 2 ../a +abort: ../a not under root +% cd dir; hg parents -r 2 ../a +changeset: 0:b6a1406d8886 +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: ab + +% hg parents -r 2 path:a +changeset: 0:b6a1406d8886 +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: ab + +% hg parents -r 2 glob:a +abort: can only specify an explicit file name