equal
deleted
inserted
replaced
2282 super(memctx, self).__init__(repo, text, user, date, extra) |
2282 super(memctx, self).__init__(repo, text, user, date, extra) |
2283 self._rev = None |
2283 self._rev = None |
2284 self._node = None |
2284 self._node = None |
2285 parents = [(p or nullid) for p in parents] |
2285 parents = [(p or nullid) for p in parents] |
2286 p1, p2 = parents |
2286 p1, p2 = parents |
2287 self._parents = [changectx(self._repo, p) for p in (p1, p2)] |
2287 self._parents = [self._repo[p] for p in (p1, p2)] |
2288 files = sorted(set(files)) |
2288 files = sorted(set(files)) |
2289 self._files = files |
2289 self._files = files |
2290 if branch is not None: |
2290 if branch is not None: |
2291 self._extra['branch'] = encoding.fromlocal(branch) |
2291 self._extra['branch'] = encoding.fromlocal(branch) |
2292 self.substate = {} |
2292 self.substate = {} |