Mercurial > hg
comparison mercurial/dirstate.py @ 39452:481db51c83e9
merge with stable
Includes an extra bump of the version number for parsers because the
merge produces a new, distinct version of the code.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 05 Sep 2018 09:36:31 -0700 |
| parents | 27946fca8a05 adacefb0b7ea |
| children | 24e493ec2229 |
comparison
equal
deleted
inserted
replaced
| 39451:5bfab9400daf | 39452:481db51c83e9 |
|---|---|
| 1403 # File doesn't exist, so the current state is empty | 1403 # File doesn't exist, so the current state is empty |
| 1404 st = '' | 1404 st = '' |
| 1405 | 1405 |
| 1406 l = len(st) | 1406 l = len(st) |
| 1407 if l == 40: | 1407 if l == 40: |
| 1408 self._parents = st[:20], st[20:40] | 1408 self._parents = (st[:20], st[20:40]) |
| 1409 elif l == 0: | 1409 elif l == 0: |
| 1410 self._parents = [nullid, nullid] | 1410 self._parents = (nullid, nullid) |
| 1411 else: | 1411 else: |
| 1412 raise error.Abort(_('working directory state appears ' | 1412 raise error.Abort(_('working directory state appears ' |
| 1413 'damaged!')) | 1413 'damaged!')) |
| 1414 | 1414 |
| 1415 return self._parents | 1415 return self._parents |