Mercurial > hg
changeset 5247:20770c5d41e0
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2007 19:13:24 +0200 |
| parents | 7d3dcdd92a1a (current diff) 9d7052f17d77 (diff) |
| children | 5517aa5aafb0 |
| files | hgext/convert/git.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/git.py Sun Aug 26 16:49:26 2007 +0200 +++ b/hgext/convert/git.py Sun Aug 26 19:13:24 2007 +0200 @@ -1,6 +1,7 @@ # git support for the convert extension import os +from mercurial import util from common import NoRepo, commit, converter_source @@ -41,7 +42,8 @@ def catfile(self, rev, type): if rev == "0" * 40: raise IOError() - fh = self.gitcmd("git-cat-file %s %s 2>/dev/null" % (type, rev)) + fh = self.gitcmd("git-cat-file %s %s 2>%s" % (type, rev, + util.nulldev)) return fh.read() def getfile(self, name, rev): @@ -101,7 +103,8 @@ def gettags(self): tags = {} - fh = self.gitcmd('git-ls-remote --tags "%s" 2>/dev/null' % self.path) + fh = self.gitcmd('git-ls-remote --tags "%s" 2>%s' % (self.path, + util.nulldev)) prefix = 'refs/tags/' for line in fh: line = line.strip()