Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 16687:e34106fa0dc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: "raise SomeException()" -> "raise SomeException"
author Brodie Rao <brodie@sf.io>
date Sat, 12 May 2012 16:00:58 +0200
parents 67964cda8701
children c2d9ef43ff6c
comparison
equal deleted inserted replaced
16686:67964cda8701 16687:e34106fa0dc3
532 532
533 def getfile(self, fname): 533 def getfile(self, fname):
534 if fname in self.data: 534 if fname in self.data:
535 return self.data[fname] 535 return self.data[fname]
536 if not self.opener or fname not in self.files: 536 if not self.opener or fname not in self.files:
537 raise IOError() 537 raise IOError
538 fn, mode, copied = self.files[fname] 538 fn, mode, copied = self.files[fname]
539 return self.opener.read(fn), mode, copied 539 return self.opener.read(fn), mode, copied
540 540
541 def close(self): 541 def close(self):
542 if self.opener: 542 if self.opener:
558 558
559 def getfile(self, fname): 559 def getfile(self, fname):
560 try: 560 try:
561 fctx = self.ctx[fname] 561 fctx = self.ctx[fname]
562 except error.LookupError: 562 except error.LookupError:
563 raise IOError() 563 raise IOError
564 flags = fctx.flags() 564 flags = fctx.flags()
565 return fctx.data(), ('l' in flags, 'x' in flags) 565 return fctx.data(), ('l' in flags, 'x' in flags)
566 566
567 def setfile(self, fname, data, mode, copysource): 567 def setfile(self, fname, data, mode, copysource):
568 if copysource: 568 if copysource:
1626 copy, getfilectx, opts, losedata, prefix)) 1626 copy, getfilectx, opts, losedata, prefix))
1627 if opts.upgrade and not opts.git: 1627 if opts.upgrade and not opts.git:
1628 try: 1628 try:
1629 def losedata(fn): 1629 def losedata(fn):
1630 if not losedatafn or not losedatafn(fn=fn): 1630 if not losedatafn or not losedatafn(fn=fn):
1631 raise GitDiffRequired() 1631 raise GitDiffRequired
1632 # Buffer the whole output until we are sure it can be generated 1632 # Buffer the whole output until we are sure it can be generated
1633 return list(difffn(opts.copy(git=False), losedata)) 1633 return list(difffn(opts.copy(git=False), losedata))
1634 except GitDiffRequired: 1634 except GitDiffRequired:
1635 return difffn(opts.copy(git=True), None) 1635 return difffn(opts.copy(git=True), None)
1636 else: 1636 else: