equal
deleted
inserted
replaced
557 "treemanifest enabled")) |
557 "treemanifest enabled")) |
558 dirlog = repo.manifestlog._revlog.dirlog(dir) |
558 dirlog = repo.manifestlog._revlog.dirlog(dir) |
559 if len(dirlog): |
559 if len(dirlog): |
560 r = dirlog |
560 r = dirlog |
561 elif mf: |
561 elif mf: |
562 r = repo.manifest |
562 r = repo.manifestlog._revlog |
563 elif file_: |
563 elif file_: |
564 filelog = repo.file(file_) |
564 filelog = repo.file(file_) |
565 if len(filelog): |
565 if len(filelog): |
566 r = filelog |
566 r = filelog |
567 if not r: |
567 if not r: |
1322 |
1322 |
1323 if self.ui.debugflag and rev is not None: |
1323 if self.ui.debugflag and rev is not None: |
1324 mnode = ctx.manifestnode() |
1324 mnode = ctx.manifestnode() |
1325 # i18n: column positioning for "hg log" |
1325 # i18n: column positioning for "hg log" |
1326 self.ui.write(_("manifest: %d:%s\n") % |
1326 self.ui.write(_("manifest: %d:%s\n") % |
1327 (self.repo.manifest.rev(mnode), hex(mnode)), |
1327 (self.repo.manifestlog._revlog.rev(mnode), |
|
1328 hex(mnode)), |
1328 label='ui.debug log.manifest') |
1329 label='ui.debug log.manifest') |
1329 # i18n: column positioning for "hg log" |
1330 # i18n: column positioning for "hg log" |
1330 self.ui.write(_("user: %s\n") % ctx.user(), |
1331 self.ui.write(_("user: %s\n") % ctx.user(), |
1331 label='log.user') |
1332 label='log.user') |
1332 # i18n: column positioning for "hg log" |
1333 # i18n: column positioning for "hg log" |