Show More
@@ -16,6 +16,9 b' import zipfile' | |||||
16 | import zlib |
|
16 | import zlib | |
17 |
|
17 | |||
18 | from .i18n import _ |
|
18 | from .i18n import _ | |
|
19 | from .node import ( | |||
|
20 | nullrev, | |||
|
21 | ) | |||
19 |
|
22 | |||
20 | from . import ( |
|
23 | from . import ( | |
21 | error, |
|
24 | error, | |
@@ -76,7 +79,7 b' def _rootctx(repo):' | |||||
76 | # repo[0] may be hidden |
|
79 | # repo[0] may be hidden | |
77 | for rev in repo: |
|
80 | for rev in repo: | |
78 | return repo[rev] |
|
81 | return repo[rev] | |
79 |
return repo[ |
|
82 | return repo[nullrev] | |
80 |
|
83 | |||
81 | # {tags} on ctx includes local tags and 'tip', with no current way to limit |
|
84 | # {tags} on ctx includes local tags and 'tip', with no current way to limit | |
82 | # that to global tags. Therefore, use {latesttag} as a substitute when |
|
85 | # that to global tags. Therefore, use {latesttag} as a substitute when |
@@ -21,6 +21,7 b' from .node import (' | |||||
21 | bin, |
|
21 | bin, | |
22 | hex, |
|
22 | hex, | |
23 | nullid, |
|
23 | nullid, | |
|
24 | nullrev, | |||
24 | short, |
|
25 | short, | |
25 | wdirid, |
|
26 | wdirid, | |
26 | wdirrev, |
|
27 | wdirrev, | |
@@ -730,7 +731,7 b' def meaningfulparents(repo, ctx):' | |||||
730 | if len(parents) > 1: |
|
731 | if len(parents) > 1: | |
731 | return parents |
|
732 | return parents | |
732 | if repo.ui.debugflag: |
|
733 | if repo.ui.debugflag: | |
733 |
return [parents[0], repo[ |
|
734 | return [parents[0], repo[nullrev]] | |
734 | if parents[0].rev() >= intrev(ctx) - 1: |
|
735 | if parents[0].rev() >= intrev(ctx) - 1: | |
735 | return [] |
|
736 | return [] | |
736 | return parents |
|
737 | return parents |
General Comments 0
You need to be logged in to leave comments.
Login now