Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/mercurial/patch.py Sat Jul 28 13:33:06 2012 +0200 +++ b/mercurial/patch.py Tue Jul 31 03:30:42 2012 +0200 @@ -634,7 +634,7 @@ if self.mode is None: self.mode = (False, False) if self.missing: - self.ui.warn(_("unable to find '%s' for patching\n") % self.fname) + self.ui.warn(_("unable to find '%s' for patching\n") % self.fname) self.hash = {} self.dirty = 0 @@ -1630,9 +1630,9 @@ if opts.git or opts.upgrade: copy = copies.pathcopies(ctx1, ctx2) - difffn = (lambda opts, losedata: - trydiff(repo, revs, ctx1, ctx2, modified, added, removed, - copy, getfilectx, opts, losedata, prefix)) + def difffn(opts, losedata): + return trydiff(repo, revs, ctx1, ctx2, modified, added, removed, + copy, getfilectx, opts, losedata, prefix) if opts.upgrade and not opts.git: try: def losedata(fn):