Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 13179:b512a7074349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: support ignoreupdate in gitsubrepo's dirty()
author Eric Eisner <ede@mit.edu>
date Mon, 20 Dec 2010 13:59:33 -0500
parents c4d857f5405d
children a79e0688a5ee
comparison
equal deleted inserted replaced
13178:c4d857f5405d 13179:b512a7074349
725 self._gitcommand(['fetch', source]) 725 self._gitcommand(['fetch', source])
726 if not self._githavelocally(revision): 726 if not self._githavelocally(revision):
727 raise util.Abort(_("revision %s does not exist in subrepo %s\n") % 727 raise util.Abort(_("revision %s does not exist in subrepo %s\n") %
728 (revision, self._path)) 728 (revision, self._path))
729 729
730 def dirty(self): 730 def dirty(self, ignoreupdate=False):
731 if self._state[1] != self._gitstate(): # version checked out changed? 731 # version checked out changed?
732 if not ignoreupdate and self._state[1] != self._gitstate():
732 return True 733 return True
733 # check for staged changes or modified files; ignore untracked files 734 # check for staged changes or modified files; ignore untracked files
734 out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) 735 out, code = self._gitdir(['diff-index', '--quiet', 'HEAD'])
735 return code == 1 736 return code == 1
736 737