Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 13427:2432b3227303 | 13428:5ef29e0dd418 |
|---|---|
| 884 self._gitcommand(['merge', '--no-commit', revision]) | 884 self._gitcommand(['merge', '--no-commit', revision]) |
| 885 | 885 |
| 886 if self.dirty(): | 886 if self.dirty(): |
| 887 if self._gitstate() != revision: | 887 if self._gitstate() != revision: |
| 888 dirty = self._gitstate() == self._state[1] or code != 0 | 888 dirty = self._gitstate() == self._state[1] or code != 0 |
| 889 if _updateprompt(self._ui, self, dirty, self._state[1], revision): | 889 if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]): |
| 890 mergefunc() | 890 mergefunc() |
| 891 else: | 891 else: |
| 892 mergefunc() | 892 mergefunc() |
| 893 | 893 |
| 894 def push(self, force): | 894 def push(self, force): |