Mercurial > hg

changeset 35210:15d38e8fcb1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <augie@google.com>
date Mon, 04 Dec 2017 11:28:29 -0500
parents 9153871d50e0 (current diff) 759234670d19 (diff)
children 1df2f0e1dfd2
files hgext/convert/bzr.py
diffstat 1 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/bzr.py	Wed Nov 29 20:39:59 2017 -0500
+++ b/hgext/convert/bzr.py	Mon Dec 04 11:28:29 2017 -0500
@@ -205,6 +205,13 @@
         changes = []
         renames = {}
         seen = set()
+
+        # Fall back to the deprecated attribute for legacy installations.
+        try:
+            inventory = origin.root_inventory
+        except AttributeError:
+            inventory = origin.inventory
+
         # Process the entries by reverse lexicographic name order to
         # handle nested renames correctly, most specific first.
         curchanges = sorted(current.iter_changes(origin),
@@ -229,10 +236,9 @@
                     renaming = paths[0] != paths[1]
                     # neither an add nor an delete - a move
                     # rename all directory contents manually
-                    subdir = origin.root_inventory.path2id(paths[0])
+                    subdir = inventory.path2id(paths[0])
                     # get all child-entries of the directory
-                    for name, entry in origin.root_inventory.iter_entries(
-                            subdir):
+                    for name, entry in inventory.iter_entries(subdir):
                         # hg does not track directory renames
                         if entry.kind == 'directory':
                             continue