equal
deleted
inserted
replaced
177 if p2 not in nodes: |
177 if p2 not in nodes: |
178 err(_("file %s:%s unknown parent 2 %s") % |
178 err(_("file %s:%s unknown parent 2 %s") % |
179 (f, short(n), short(p1))) |
179 (f, short(n), short(p1))) |
180 nodes[n] = 1 |
180 nodes[n] = 1 |
181 |
181 |
|
182 # check renames |
|
183 try: |
|
184 rp = fl.renamed(n) |
|
185 if rp: |
|
186 fl2 = repo.file(rp[0]) |
|
187 rev = fl2.rev(rp[1]) |
|
188 except KeyboardInterrupt: |
|
189 repo.ui.warn(_("interrupted")) |
|
190 raise |
|
191 except Exception, inst: |
|
192 err(_("checking rename on file %s %s: %s") % (f, short(n), inst)) |
|
193 |
182 # cross-check |
194 # cross-check |
183 for node in filenodes[f]: |
195 for node in filenodes[f]: |
184 err(_("node %s in manifests not in %s") % (hex(node), f)) |
196 err(_("node %s in manifests not in %s") % (hex(node), f)) |
185 |
197 |
186 repo.ui.status(_("%d files, %d changesets, %d total revisions\n") % |
198 repo.ui.status(_("%d files, %d changesets, %d total revisions\n") % |