Mercurial > hg-stable
changeset 4809:4582c28e2874
Merge with crew
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 05 Jul 2007 12:00:43 -0700 |
| parents | 244a2609c199 (diff) 79210a63f452 (current diff) |
| children | c2d529f288a1 |
| files | |
| diffstat | 5 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/alias.py Thu Jul 05 20:50:24 2007 +0200 +++ b/hgext/alias.py Thu Jul 05 12:00:43 2007 -0700 @@ -42,7 +42,6 @@ return try: - self._loading = True self._cmd = findcmd(self._ui, self._target)[1] if self._cmd == self: raise RecursiveCommand()
--- a/hgext/convert/common.py Thu Jul 05 20:50:24 2007 +0200 +++ b/hgext/convert/common.py Thu Jul 05 12:00:43 2007 -0700 @@ -17,7 +17,7 @@ def __init__(self, ui, path, rev=None): """Initialize conversion source (or raise NoRepo("message") exception if path is not a valid repository)""" - raise NotImplementedError() + pass def getheads(self): """Return a list of this repository's heads"""
--- a/hgext/convert/cvs.py Thu Jul 05 20:50:24 2007 +0200 +++ b/hgext/convert/cvs.py Thu Jul 05 12:00:43 2007 -0700 @@ -7,6 +7,8 @@ class convert_cvs(converter_source): def __init__(self, ui, path, rev=None): + super(convert_cvs, self).__init__(ui, path, rev=rev) + self.path = path self.ui = ui self.rev = rev
--- a/hgext/convert/git.py Thu Jul 05 20:50:24 2007 +0200 +++ b/hgext/convert/git.py Thu Jul 05 12:00:43 2007 -0700 @@ -9,6 +9,8 @@ return os.popen('GIT_DIR=%s %s' % (self.path, s)) def __init__(self, ui, path, rev=None): + super(convert_git, self).__init__(ui, path, rev=rev) + if os.path.isdir(path + "/.git"): path += "/.git" if not os.path.exists(path + "/objects"):
--- a/hgext/convert/subversion.py Thu Jul 05 20:50:24 2007 +0200 +++ b/hgext/convert/subversion.py Thu Jul 05 12:00:43 2007 -0700 @@ -77,6 +77,8 @@ # SVN conversion code stolen from bzr-svn and tailor class convert_svn(converter_source): def __init__(self, ui, url, rev=None): + super(convert_svn, self).__init__(ui, url, rev=rev) + try: SubversionException except NameError: