Mercurial > hg
diff mercurial/context.py @ 21663:8d9449eaaeff
context: fix wrong indentation from renaming method
author | Sean Farley <sean.michael.farley@gmail.com> |
---|---|
date | Thu, 29 May 2014 16:09:16 -0500 |
parents | 0a8e7f81e8ae |
children | 151a992c3874 |
line wrap: on
line diff
--- a/mercurial/context.py Tue May 27 16:33:06 2014 -0700 +++ b/mercurial/context.py Thu May 29 16:09:16 2014 -0500 @@ -107,7 +107,7 @@ return s def _buildstatus(self, other, s, match, listignored, listclean, - listunknown): + listunknown): """build a status with respect to another context""" mf1 = other._manifestmatches(match, s) mf2 = self._manifestmatches(match, s) @@ -303,7 +303,7 @@ listunknown) r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown) r = ctx2._buildstatus(ctx1, r, match, listignored, listclean, - listunknown) + listunknown) r = ctx2._poststatus(ctx1, r, match, listignored, listclean, listunknown) @@ -1402,7 +1402,7 @@ return [modified, added, removed, deleted, unknown, ignored, clean] def _buildstatus(self, other, s, match, listignored, listclean, - listunknown): + listunknown): """build a status with respect to another context This includes logic for maintaining the fast path of status when