1569         p1, p2 = parents

  1569         p1, p2 = parents

  1570         self._parents = [changectx(self._repo, p) for p in (p1, p2)]

  1570         self._parents = [changectx(self._repo, p) for p in (p1, p2)]

  1571         files = sorted(set(files))

  1571         files = sorted(set(files))

  1572         self._status = [files, [], [], [], []]

  1572         self._status = [files, [], [], [], []]

  1573         self._filectxfn = filectxfn

  1573         self._filectxfn = filectxfn

  1574 

  1575 

  1575         self._extra = extra and extra.copy() or {}

  1576         self._extra = extra and extra.copy() or {}

  1576         if self._extra.get('branch', '') == '':

  1577         if self._extra.get('branch', '') == '':

  1577             self._extra['branch'] = 'default'

  1578             self._extra['branch'] = 'default'

  1578 

  1579