Mercurial > public > mercurial-scm > hg-stable
diff mercurial/subrepo.py @ 13428:5ef29e0dd418 stable
subrepos: print short git changeset ids
This changes the prompts on git subrepos to show only the first seven
digits of git changeset IDs (as git's command line does):
$ hg update
subrepository sources for s differ (in checked out version)
use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Wed, 16 Feb 2011 11:53:48 -0600 |
| parents | 0748e18be470 |
| children | 5a5bd7614401 |
line wrap: on
line diff
--- a/mercurial/subrepo.py Wed Feb 16 14:13:22 2011 -0600 +++ b/mercurial/subrepo.py Wed Feb 16 11:53:48 2011 -0600 @@ -886,7 +886,7 @@ if self.dirty(): if self._gitstate() != revision: dirty = self._gitstate() == self._state[1] or code != 0 - if _updateprompt(self._ui, self, dirty, self._state[1], revision): + if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]): mergefunc() else: mergefunc()