Mercurial > hg
comparison mercurial/subrepo.py @ 14312:ba883fa211f3
subrepo: use a safer revision check for hg repos
This avoids a traceback if the expected revision has been stripped.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 12 May 2011 18:35:04 -0500 |
parents | ccb7240acf32 |
children | d5b525697ddb |
comparison
equal
deleted
inserted
replaced
14311:9bbac962f4dd | 14312:ba883fa211f3 |
---|---|
406 def dirty(self, ignoreupdate=False): | 406 def dirty(self, ignoreupdate=False): |
407 r = self._state[1] | 407 r = self._state[1] |
408 if r == '' and not ignoreupdate: # no state recorded | 408 if r == '' and not ignoreupdate: # no state recorded |
409 return True | 409 return True |
410 w = self._repo[None] | 410 w = self._repo[None] |
411 if w.p1() != self._repo[r] and not ignoreupdate: | 411 if r != w.p1().node() and not ignoreupdate: |
412 # different version checked out | 412 # different version checked out |
413 return True | 413 return True |
414 return w.dirty() # working directory changed | 414 return w.dirty() # working directory changed |
415 | 415 |
416 def checknested(self, path): | 416 def checknested(self, path): |