Show More
@@ -50,6 +50,10 b' WARN_UNKNOWN_COPY_SOURCE = _(' | |||||
50 | b"warning: copy source of '%s' not in parents of %s" |
|
50 | b"warning: copy source of '%s' not in parents of %s" | |
51 | ) |
|
51 | ) | |
52 |
|
52 | |||
|
53 | WARN_NULLID_COPY_SOURCE = _( | |||
|
54 | b"warning: %s@%s: copy source revision is nullid %s:%s\n" | |||
|
55 | ) | |||
|
56 | ||||
53 |
|
57 | |||
54 | class verifier(object): |
|
58 | class verifier(object): | |
55 | def __init__(self, repo, level=None): |
|
59 | def __init__(self, repo, level=None): | |
@@ -557,13 +561,9 b' class verifier(object):' | |||||
557 | m = _(b"empty or missing copy source revlog %s:%s") |
|
561 | m = _(b"empty or missing copy source revlog %s:%s") | |
558 | self._err(lr, m % (rp[0], short(rp[1])), f) |
|
562 | self._err(lr, m % (rp[0], short(rp[1])), f) | |
559 | elif rp[1] == self.repo.nullid: |
|
563 | elif rp[1] == self.repo.nullid: | |
560 |
|
|
564 | msg = WARN_NULLID_COPY_SOURCE | |
561 |
|
|
565 | msg %= (f, lr, rp[0], short(rp[1])) | |
562 | b"warning: %s@%s: copy source" |
|
566 | ui.note(msg) | |
563 | b" revision is nullid %s:%s\n" |
|
|||
564 | ) |
|
|||
565 | % (f, lr, rp[0], short(rp[1])) |
|
|||
566 | ) |
|
|||
567 | else: |
|
567 | else: | |
568 | fl2.rev(rp[1]) |
|
568 | fl2.rev(rp[1]) | |
569 | except Exception as inst: |
|
569 | except Exception as inst: |
General Comments 0
You need to be logged in to leave comments.
Login now