Show More
@@ -1647,18 +1647,6 b' class workingcommitctx(workingctx):' | |||||
1647 | super(workingctx, self).__init__(repo, text, user, date, extra, |
|
1647 | super(workingctx, self).__init__(repo, text, user, date, extra, | |
1648 | changes) |
|
1648 | changes) | |
1649 |
|
1649 | |||
1650 | def _buildstatus(self, other, s, match, |
|
|||
1651 | listignored, listclean, listunknown): |
|
|||
1652 | """Prevent ``workingctx._buildstatus`` from changing ``self._status`` |
|
|||
1653 | """ |
|
|||
1654 | s = self._dirstatestatus(match, listignored, listclean, listunknown) |
|
|||
1655 | if other != self._repo['.']: |
|
|||
1656 | # workingctx._buildstatus doesn't change self._status in this case |
|
|||
1657 | superself = super(workingcommitctx, self) |
|
|||
1658 | s = superself._buildstatus(other, s, match, |
|
|||
1659 | listignored, listclean, listunknown) |
|
|||
1660 | return s |
|
|||
1661 |
|
||||
1662 | def _dirstatestatus(self, match=None, ignored=False, clean=False, |
|
1650 | def _dirstatestatus(self, match=None, ignored=False, clean=False, | |
1663 | unknown=False): |
|
1651 | unknown=False): | |
1664 | """Return matched files only in ``self._status`` |
|
1652 | """Return matched files only in ``self._status`` |
General Comments 0
You need to be logged in to leave comments.
Login now