Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 21938:c8411fb5dfef stable
memctx: substate needs to be {} instead of None
Setting substate to None was an oversight in 7cfd94ec5d30 and this patch
corrects it by setting substate to an empty dictionary which matches what
subrepo code expects.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Wed, 16 Jul 2014 13:07:39 -0500 |
| parents | 5809d62e7106 |
| children | 412ac613fd89 |
comparison
equal
deleted
inserted
replaced
| 21937:54ff2789d75e | 21938:c8411fb5dfef |
|---|---|
| 1575 p1, p2 = parents | 1575 p1, p2 = parents |
| 1576 self._parents = [changectx(self._repo, p) for p in (p1, p2)] | 1576 self._parents = [changectx(self._repo, p) for p in (p1, p2)] |
| 1577 files = sorted(set(files)) | 1577 files = sorted(set(files)) |
| 1578 self._status = [files, [], [], [], []] | 1578 self._status = [files, [], [], [], []] |
| 1579 self._filectxfn = filectxfn | 1579 self._filectxfn = filectxfn |
| 1580 self.substate = None | 1580 self.substate = {} |
| 1581 | 1581 |
| 1582 self._extra = extra and extra.copy() or {} | 1582 self._extra = extra and extra.copy() or {} |
| 1583 if self._extra.get('branch', '') == '': | 1583 if self._extra.get('branch', '') == '': |
| 1584 self._extra['branch'] = 'default' | 1584 self._extra['branch'] = 'default' |
| 1585 | 1585 |