Show More
@@ -635,10 +635,7 b' def override_archive(orig, repo, dest, n' | |||
|
635 | 635 | if subrepos: |
|
636 | 636 | for subpath in ctx.substate: |
|
637 | 637 | sub = ctx.sub(subpath) |
|
638 | try: | |
|
639 | sub.archive(repo.ui, archiver, prefix) | |
|
640 | except TypeError: | |
|
641 | sub.archive(archiver, prefix) | |
|
638 | sub.archive(repo.ui, archiver, prefix) | |
|
642 | 639 | |
|
643 | 640 | archiver.done() |
|
644 | 641 |
@@ -88,12 +88,8 b' def reposetup(ui, repo):' | |||
|
88 | 88 | clean=False, unknown=False, listsubrepos=False): |
|
89 | 89 | listignored, listclean, listunknown = ignored, clean, unknown |
|
90 | 90 | if not self.lfstatus: |
|
91 | try: | |
|
92 | return super(lfiles_repo, self).status(node1, node2, match, | |
|
93 | listignored, listclean, listunknown, listsubrepos) | |
|
94 | except TypeError: | |
|
95 | return super(lfiles_repo, self).status(node1, node2, match, | |
|
96 | listignored, listclean, listunknown) | |
|
91 | return super(lfiles_repo, self).status(node1, node2, match, | |
|
92 | listignored, listclean, listunknown, listsubrepos) | |
|
97 | 93 | else: |
|
98 | 94 | # some calls in this function rely on the old version of status |
|
99 | 95 | self.lfstatus = False |
@@ -140,12 +136,8 b' def reposetup(ui, repo):' | |||
|
140 | 136 | |
|
141 | 137 | # Get ignored files here even if we weren't asked for them; we |
|
142 | 138 | # must use the result here for filtering later |
|
143 | try: | |
|
144 | result = super(lfiles_repo, self).status(node1, node2, m, | |
|
145 | True, clean, unknown, listsubrepos) | |
|
146 | except TypeError: | |
|
147 | result = super(lfiles_repo, self).status(node1, node2, m, | |
|
148 | True, clean, unknown) | |
|
139 | result = super(lfiles_repo, self).status(node1, node2, m, | |
|
140 | True, clean, unknown, listsubrepos) | |
|
149 | 141 | if working: |
|
150 | 142 | # hold the wlock while we read largefiles and |
|
151 | 143 | # update the lfdirstate |
General Comments 0
You need to be logged in to leave comments.
Login now