Patchwork [2,of,9,v3] repair: build dirlogs using manifest, rather than repo shortcut method

login
register
mail settings
Submitter Augie Fackler
Date Aug. 5, 2016, 9:45 p.m.
Message ID <f93baa31b02114f4a615.1470433503@arthedain.pit.corp.google.com>
Download mbox | patch
Permalink /patch/16136/
State Accepted
Headers show

Comments

Augie Fackler - Aug. 5, 2016, 9:45 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1470416461 14400
#      Fri Aug 05 13:01:01 2016 -0400
# Node ID f93baa31b02114f4a61513b9ee03333a390155bf
# Parent  213fc73c4433d4cc0152dada40dd98a50c2f0229
repair: build dirlogs using manifest, rather than repo shortcut method

As before, this was rarely used, so let's get rid of the convenience method.

Patch

diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -173,7 +173,7 @@  def strip(ui, repo, nodelist, backup=Tru
                     if (unencoded.startswith('meta/') and
                         unencoded.endswith('00manifest.i')):
                         dir = unencoded[5:-12]
-                        repo.dirlog(dir).strip(striprev, tr)
+                        repo.manifest.dirlog(dir).strip(striprev, tr)
             for fn in files:
                 repo.file(fn).strip(striprev, tr)
             tr.endgroup()