Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 23679:dd1e73c4be13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: add forgotten annotation for reverting git subrepos Support for reverting git subrepos was added earlier, but the annotation to handle any subrepo errors was forgotten.
author Mathias De Mar? <mathias.demare@gmail.com>
date Sun, 28 Dec 2014 23:59:57 +0100
parents 194d2f185008
children 7cc77030c557
comparison
equal deleted inserted replaced
23678:194d2f185008 23679:dd1e73c4be13
1653 for f in match.files(): 1653 for f in match.files():
1654 ui.write(self._gitcommand(cmd + [f])) 1654 ui.write(self._gitcommand(cmd + [f]))
1655 elif match(gitprefix): #Subrepo is matched 1655 elif match(gitprefix): #Subrepo is matched
1656 ui.write(self._gitcommand(cmd)) 1656 ui.write(self._gitcommand(cmd))
1657 1657
1658 @annotatesubrepoerror
1658 def revert(self, substate, *pats, **opts): 1659 def revert(self, substate, *pats, **opts):
1659 self.ui.status(_('reverting subrepo %s\n') % substate[0]) 1660 self.ui.status(_('reverting subrepo %s\n') % substate[0])
1660 if not opts.get('no_backup'): 1661 if not opts.get('no_backup'):
1661 status = self.status(None) 1662 status = self.status(None)
1662 names = status.modified 1663 names = status.modified