Rev 21: Update to hg 0.9.3 support only, breaking < 0.9.3 from Tim Hatch. in http://bazaar.launchpad.net/~bzr/bzr-hg/trunk

Robert Collins robertc at robertcollins.net
Wed Jul 11 09:06:30 BST 2007


At http://bazaar.launchpad.net/~bzr/bzr-hg/trunk

------------------------------------------------------------
revno: 21
revision-id: robertc at robertcollins.net-20070711080621-jhtqit9lsw74va37
parent: jelmer at samba.org-20070120190039-9lqukuvyl3oezgkc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2007-07-11 18:06:21 +1000
message:
  Update to hg 0.9.3 support only, breaking < 0.9.3 from Tim Hatch.
modified:
  __init__.py                    __init__.py-20060531211707-2fy7rwqqcmfgf8ve-1
=== modified file '__init__.py'
--- a/__init__.py	2007-01-20 19:00:39 +0000
+++ b/__init__.py	2007-07-11 08:06:21 +0000
@@ -150,7 +150,6 @@
         hgid = hgrevid_from_bzr(revision_id)
         log = self._hgrepo.changelog.read(hgid)
         manifest = self._hgrepo.manifest.read(log[0])
-        manifest_flags = self._hgrepo.manifest.readflags(log[0])
         all_relevant_revisions = self.get_revision_graph(revision_id)
         ancestry_cache = {}
         result = Inventory()
@@ -269,7 +268,7 @@
             # TODO: perhaps we should use readmeta here to figure out renames ?
             text = revlog.read(file_revision)
             entry.text_sha1 = sha_strings(text)
-            if manifest_flags[file]:
+            if manifest.execf(file):
                 entry.executable = True
             entry.revision = modified_revision
         for dir, dir_revision_id in directories.items():
@@ -349,6 +348,7 @@
     """An adapter to mercurial repositories for bzr Branch objects."""
 
     def __init__(self, hgrepo, hgdir, lockfiles):
+        bzrlib.branch.Branch.__init__(self)
         self._hgrepo = hgrepo
         self.bzrdir = hgdir
         self.control_files = lockfiles




More information about the bazaar-commits mailing list