equal
deleted
inserted
replaced
46 if 'debugc' in arg: |
46 if 'debugc' in arg: |
47 break |
47 break |
48 else: |
48 else: |
49 data = repo.opener.tryread('obsolete-relations') |
49 data = repo.opener.tryread('obsolete-relations') |
50 if not data: |
50 if not data: |
51 data = repo.sopener.tryread('obsoletemarkers') |
51 data = repo.svfs.tryread('obsoletemarkers') |
52 if data: |
52 if data: |
53 raise util.Abort('old format of obsolete marker detected!\n' |
53 raise util.Abort('old format of obsolete marker detected!\n' |
54 'run `hg debugconvertobsolete` once.') |
54 'run `hg debugconvertobsolete` once.') |
55 |
55 |
56 def _obsdeserialise(flike): |
56 def _obsdeserialise(flike): |
108 f.close() |
108 f.close() |
109 unlink.append(repo.join('obsolete-relations')) |
109 unlink.append(repo.join('obsolete-relations')) |
110 except IOError: |
110 except IOError: |
111 pass |
111 pass |
112 ### second (json) format |
112 ### second (json) format |
113 data = repo.sopener.tryread('obsoletemarkers') |
113 data = repo.svfs.tryread('obsoletemarkers') |
114 if data: |
114 if data: |
115 some = True |
115 some = True |
116 for oldmark in json.loads(data): |
116 for oldmark in json.loads(data): |
117 del oldmark['id'] # dropped for now |
117 del oldmark['id'] # dropped for now |
118 del oldmark['reason'] # unused until then |
118 del oldmark['reason'] # unused until then |