##// END OF EJS Templates
subrepo: fix exception on revert when "all" option is omitted...
Yuya Nishihara -
r18943:27e8dfc2 default
parent child Browse files
Show More
@@ -764,7 +764,7 b' class hgsubrepo(abstractsubrepo):'
764 opts['rev'] = substate[1]
764 opts['rev'] = substate[1]
765
765
766 pats = []
766 pats = []
767 if not opts['all']:
767 if not opts.get('all'):
768 pats = ['set:modified()']
768 pats = ['set:modified()']
769 self.filerevert(ui, *pats, **opts)
769 self.filerevert(ui, *pats, **opts)
770
770
@@ -774,7 +774,7 b' class hgsubrepo(abstractsubrepo):'
774 def filerevert(self, ui, *pats, **opts):
774 def filerevert(self, ui, *pats, **opts):
775 ctx = self._repo[opts['rev']]
775 ctx = self._repo[opts['rev']]
776 parents = self._repo.dirstate.parents()
776 parents = self._repo.dirstate.parents()
777 if opts['all']:
777 if opts.get('all'):
778 pats = ['set:modified()']
778 pats = ['set:modified()']
779 else:
779 else:
780 pats = []
780 pats = []
@@ -461,6 +461,20 b' update'
461 $ hg ci -m13
461 $ hg ci -m13
462 committing subrepository t
462 committing subrepository t
463
463
464 backout calls revert internally with minimal opts, which should not raise
465 KeyError
466
467 $ hg backout ".^"
468 reverting .hgsubstate
469 reverting subrepo s
470 reverting s/a
471 reverting subrepo ss
472 reverting subrepo t
473 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
474
475 $ hg up -C # discard changes
476 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
477
464 pull
478 pull
465
479
466 $ cd ../tc
480 $ cd ../tc
General Comments 0
You need to be logged in to leave comments. Login now