--- a/mercurial/subrepo.py Mon Mar 07 15:37:11 2011 +0800
+++ b/mercurial/subrepo.py Mon Mar 07 15:46:46 2011 -0600
@@ -703,6 +703,9 @@
return retdata, p.returncode
+ def _gitmissing(self):
+ return not os.path.exists(os.path.join(self._abspath, '.git'))
+
def _gitstate(self):
return self._gitcommand(['rev-parse', 'HEAD'])
@@ -759,7 +762,7 @@
return _abssource(self)
def _fetch(self, source, revision):
- if not os.path.exists(os.path.join(self._abspath, '.git')):
+ if self._gitmissing():
source = self._abssource(source)
self._ui.status(_('cloning subrepo %s from %s\n') %
(self._relpath, source))
@@ -774,6 +777,8 @@
(revision, self._relpath))
def dirty(self, ignoreupdate=False):
+ if self._gitmissing():
+ return True
if not ignoreupdate and self._state[1] != self._gitstate():
# different version checked out
return True
@@ -862,6 +867,8 @@
rawcheckout()
def commit(self, text, user, date):
+ if self._gitmissing():
+ raise util.Abort(_("subrepo %s is missing") % self._relpath)
cmd = ['commit', '-a', '-m', text]
env = os.environ.copy()
if user:
@@ -898,6 +905,8 @@
mergefunc()
def push(self, force):
+ if self._gitmissing():
+ raise util.Abort(_("subrepo %s is missing") % self._relpath)
# if a branch in origin contains the revision, nothing to do
branch2rev, rev2branch = self._gitbranchmap()
if self._state[1] in rev2branch:
@@ -931,6 +940,8 @@
return False
def remove(self):
+ if self._gitmissing():
+ return
if self.dirty():
self._ui.warn(_('not removing repo %s because '
'it has changes.\n') % self._relpath)
@@ -974,6 +985,9 @@
def status(self, rev2, **opts):
+ if self._gitmissing():
+ # if the repo is missing, return no results
+ return [], [], [], [], [], [], []
rev1 = self._state[1]
modified, added, removed = [], [], []
if rev2: