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