Show More
@@ -14,7 +14,6 b' from .node import (' | |||||
14 | bin, |
|
14 | bin, | |
15 | hex, |
|
15 | hex, | |
16 | nullid, |
|
16 | nullid, | |
17 | wdirid, |
|
|||
18 | ) |
|
17 | ) | |
19 |
|
18 | |||
20 | from . import ( |
|
19 | from . import ( | |
@@ -536,9 +535,6 b' class changelog(revlog.revlog):' | |||||
536 | # overlay over the standard revlog._addrevision to track the new |
|
535 | # overlay over the standard revlog._addrevision to track the new | |
537 | # revision on the transaction. |
|
536 | # revision on the transaction. | |
538 | rev = len(self) |
|
537 | rev = len(self) | |
539 | if node == wdirid: # nullid is checked in super method |
|
|||
540 | raise error.RevlogError(_("%s: attempt to add wdir revision") % |
|
|||
541 | (self.indexfile)) |
|
|||
542 | node = super(changelog, self)._addrevision(node, rawtext, transaction, |
|
538 | node = super(changelog, self)._addrevision(node, rawtext, transaction, | |
543 | *args, **kwargs) |
|
539 | *args, **kwargs) | |
544 | revs = transaction.changes.get('revs') |
|
540 | revs = transaction.changes.get('revs') |
@@ -1697,6 +1697,10 b' class revlog(object):' | |||||
1697 | if node == nullid: |
|
1697 | if node == nullid: | |
1698 | raise RevlogError(_("%s: attempt to add null revision") % |
|
1698 | raise RevlogError(_("%s: attempt to add null revision") % | |
1699 | (self.indexfile)) |
|
1699 | (self.indexfile)) | |
|
1700 | if node == wdirid: | |||
|
1701 | raise RevlogError(_("%s: attempt to add wdir revision") % | |||
|
1702 | (self.indexfile)) | |||
|
1703 | ||||
1700 | btext = [rawtext] |
|
1704 | btext = [rawtext] | |
1701 | def buildtext(): |
|
1705 | def buildtext(): | |
1702 | if btext[0] is not None: |
|
1706 | if btext[0] is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now