Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/patch.py @ 17299:e51d4aedace9 stable
check-code: indent 4 spaces in py files
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 31 Jul 2012 03:30:42 +0200 |
| parents | cafd8a8fb713 |
| children | d587925680d9 |
comparison
equal
deleted
inserted
replaced
| 17298:59c14bf5a48c | 17299:e51d4aedace9 |
|---|---|
| 632 if self.create: | 632 if self.create: |
| 633 self.missing = False | 633 self.missing = False |
| 634 if self.mode is None: | 634 if self.mode is None: |
| 635 self.mode = (False, False) | 635 self.mode = (False, False) |
| 636 if self.missing: | 636 if self.missing: |
| 637 self.ui.warn(_("unable to find '%s' for patching\n") % self.fname) | 637 self.ui.warn(_("unable to find '%s' for patching\n") % self.fname) |
| 638 | 638 |
| 639 self.hash = {} | 639 self.hash = {} |
| 640 self.dirty = 0 | 640 self.dirty = 0 |
| 641 self.offset = 0 | 641 self.offset = 0 |
| 642 self.skew = 0 | 642 self.skew = 0 |
| 1628 | 1628 |
| 1629 copy = {} | 1629 copy = {} |
| 1630 if opts.git or opts.upgrade: | 1630 if opts.git or opts.upgrade: |
| 1631 copy = copies.pathcopies(ctx1, ctx2) | 1631 copy = copies.pathcopies(ctx1, ctx2) |
| 1632 | 1632 |
| 1633 difffn = (lambda opts, losedata: | 1633 def difffn(opts, losedata): |
| 1634 trydiff(repo, revs, ctx1, ctx2, modified, added, removed, | 1634 return trydiff(repo, revs, ctx1, ctx2, modified, added, removed, |
| 1635 copy, getfilectx, opts, losedata, prefix)) | 1635 copy, getfilectx, opts, losedata, prefix) |
| 1636 if opts.upgrade and not opts.git: | 1636 if opts.upgrade and not opts.git: |
| 1637 try: | 1637 try: |
| 1638 def losedata(fn): | 1638 def losedata(fn): |
| 1639 if not losedatafn or not losedatafn(fn=fn): | 1639 if not losedatafn or not losedatafn(fn=fn): |
| 1640 raise GitDiffRequired | 1640 raise GitDiffRequired |