Mercurial > hgsubversion

comparison tests/test_util.py @ 1338:356460fb01fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Wed, 08 Jul 2015 16:11:00 -0400
parents 0f1f88e71138
children c6b01fd34694
comparison
equal deleted inserted replaced
1335:c7d067c174b8 1338:356460fb01fa
511 os.environ[var] = val 511 os.environ[var] = val
512 try: 512 try:
513 i18n._ugettext = self.oldugettext # Mercurial >= 3.2 513 i18n._ugettext = self.oldugettext # Mercurial >= 3.2
514 except AttributeError: 514 except AttributeError:
515 i18n.t = self.oldt 515 i18n.t = self.oldt
516 os.chdir(self.oldwd)
516 rmtree(self.tmpdir) 517 rmtree(self.tmpdir)
517 os.chdir(self.oldwd)
518 setattr(ui.ui, self.patch[0].func_name, self.patch[0]) 518 setattr(ui.ui, self.patch[0].func_name, self.patch[0])
519 519
520 _verify_our_modules() 520 _verify_our_modules()
521 521
522 def ui(self, layout='auto'): 522 def ui(self, layout='auto'):