Merge lp:~jelmer/brz/3.2-merge-3.1 into lp:brz/3.2

[Jelmer Vernooij]

Merge lp:brz/3.1.

Merge lp:brz/3.1.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

There was nothing to merge
https://ci.breezy-vcs.org/job/brz-3.1/job/brz-3.1-land/867/

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/config.py'
--- breezy/config.py	2020-06-23 01:02:30 +0000
+++ breezy/config.py	2021-05-02 18:08:32 +0000
@@ -1250,6 +1250,8 @@
 
     def _get_location_config(self):
         if self._location_config is None:
+            if self.branch.base is None:
+                self.branch.base = 'memory://'
             self._location_config = LocationConfig(self.branch.base)
         return self._location_config
 

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2021-04-03 12:58:34 +0000
+++ breezy/git/branch.py	2021-05-02 18:08:32 +0000
@@ -456,10 +456,10 @@
         except ValueError:
             self.name = None
             if self.ref is not None:
-                params = {"ref": urlutils.escape(self.ref)}
+                params = {"ref": urlutils.escape(self.ref, safe='')}
         else:
             if self.name != "":
-                params = {"branch": urlutils.escape(self.name)}
+                params = {"branch": urlutils.escape(self.name, safe='')}
         for k, v in params.items():
             self._user_transport.set_segment_parameter(k, v)
             self._control_transport.set_segment_parameter(k, v)

=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2021-04-03 12:58:34 +0000
+++ breezy/git/dir.py	2021-05-02 18:08:32 +0000
@@ -161,7 +161,8 @@
             result = ControlDir.open_from_transport(target_transport)
         except brz_errors.NotBranchError:
             result = cloning_format.initialize_on_transport(target_transport)
-        source_branch = self.open_branch()
+        if source_branch is None:
+            source_branch = self.open_branch()
         source_repository = self.find_repository()
         try:
             result_repo = result.find_repository()
@@ -637,7 +638,12 @@
         if not nascent_ok and ref not in self._git.refs:
             raise brz_errors.NotBranchError(
                 self.root_transport.base, controldir=self)
-        ref_chain, unused_sha = self._git.refs.follow(ref)
+        try:
+            ref_chain, unused_sha = self._git.refs.follow(ref)
+        except KeyError as e:
+            raise brz_errors.NotBranchError(
+                self.root_transport.base, controldir=self,
+                detail='intermediate ref %s missing' % e.args[0])
         if ref_chain[-1] == b'HEAD':
             controldir = self
         else:

=== modified file 'breezy/git/transportgit.py'
--- breezy/git/transportgit.py	2020-05-06 02:13:25 +0000
+++ breezy/git/transportgit.py	2021-05-02 18:08:32 +0000
@@ -20,6 +20,7 @@
 
 import os
 import sys
+import posixpath
 
 from dulwich.errors import (
     NoIndexPresent,
@@ -39,11 +40,16 @@
 from dulwich.pack import (
     MemoryPackIndex,
     PackData,
+    PackIndexer,
     Pack,
+    PackStreamCopier,
     iter_sha1,
     load_pack_index_file,
     write_pack_objects,
     write_pack_index_v2,
+    write_pack_header,
+    compute_file_sha,
+    write_pack_object,
     )
 from dulwich.repo import (
     BaseRepo,
@@ -96,12 +102,7 @@
         return "%s(%r)" % (self.__class__.__name__, self.transport)
 
     def _ensure_dir_exists(self, path):
-        for n in range(path.count("/")):
-            dirname = "/".join(path.split("/")[:n + 1])
-            try:
-                self.transport.mkdir(dirname)
-            except FileExists:
-                pass
+        self.transport.clone(posixpath.dirname(path)).create_prefix()
 
     def subkeys(self, base):
         """Refs present in this container under a base.
@@ -267,6 +268,7 @@
         :param new_ref: The new sha the refname will refer to.
         :return: True if the set was successful, False otherwise.
         """
+        self._check_refname(name)
         try:
             realnames, _ = self.follow(name)
             realname = realnames[-1]
@@ -640,7 +642,12 @@
                 try:
                     size = self.pack_transport.stat(pack_name).st_size
                 except TransportNotPossible:
-                    f = self.pack_transport.get(pack_name)
+                    try:
+                        f = self.pack_transport.get(pack_name)
+                    except NoSuchFile:
+                        warning('Unable to read pack file %s',
+                                self.pack_transport.abspath(pack_name))
+                        continue
                     # TODO(jelmer): Don't read entire file into memory?
                     f = BytesIO(f.read())
                     pd = PackData(pack_name, f)
@@ -817,3 +824,99 @@
         except FileExists:
             pass
         return cls(transport)
+
+    def _get_pack_basepath(self, entries):
+        suffix = iter_sha1(entry[0] for entry in entries)
+        # TODO: Handle self.pack_dir being bytes
+        suffix = suffix.decode('ascii')
+        return self.pack_transport.local_abspath("pack-" + suffix)
+
+    def _complete_thin_pack(self, f, path, copier, indexer):
+        """Move a specific file containing a pack into the pack directory.
+
+        Note: The file should be on the same file system as the
+            packs directory.
+
+        Args:
+          f: Open file object for the pack.
+          path: Path to the pack file.
+          copier: A PackStreamCopier to use for writing pack data.
+          indexer: A PackIndexer for indexing the pack.
+        """
+        entries = list(indexer)
+
+        # Update the header with the new number of objects.
+        f.seek(0)
+        write_pack_header(f, len(entries) + len(indexer.ext_refs()))
+
+        # Must flush before reading (http://bugs.python.org/issue3207)
+        f.flush()
+
+        # Rescan the rest of the pack, computing the SHA with the new header.
+        new_sha = compute_file_sha(f, end_ofs=-20)
+
+        # Must reposition before writing (http://bugs.python.org/issue3207)
+        f.seek(0, os.SEEK_CUR)
+
+        # Complete the pack.
+        for ext_sha in indexer.ext_refs():
+            type_num, data = self.get_raw(ext_sha)
+            offset = f.tell()
+            crc32 = write_pack_object(
+                f, type_num, data, sha=new_sha,
+                compression_level=self.pack_compression_level)
+            entries.append((ext_sha, offset, crc32))
+        pack_sha = new_sha.digest()
+        f.write(pack_sha)
+        f.close()
+
+        # Move the pack in.
+        entries.sort()
+        pack_base_name = self._get_pack_basepath(entries)
+        target_pack = pack_base_name + '.pack'
+        if sys.platform == 'win32':
+            # Windows might have the target pack file lingering. Attempt
+            # removal, silently passing if the target does not exist.
+            try:
+                os.remove(target_pack)
+            except FileNotFoundError:
+                pass
+        os.rename(path, target_pack)
+
+        # Write the index.
+        index_file = GitFile(pack_base_name + '.idx', 'wb')
+        try:
+            write_pack_index_v2(index_file, entries, pack_sha)
+            index_file.close()
+        finally:
+            index_file.abort()
+
+        # Add the pack to the store and return it.
+        final_pack = Pack(pack_base_name)
+        final_pack.check_length_and_checksum()
+        self._add_cached_pack(pack_base_name, final_pack)
+        return final_pack
+
+    def add_thin_pack(self, read_all, read_some):
+        """Add a new thin pack to this object store.
+
+        Thin packs are packs that contain deltas with parents that exist
+        outside the pack. They should never be placed in the object store
+        directly, and always indexed and completed as they are copied.
+
+        Args:
+          read_all: Read function that blocks until the number of
+            requested bytes are read.
+          read_some: Read function that returns at least one byte, but may
+            not return the number of bytes requested.
+        Returns: A Pack object pointing at the now-completed thin pack in the
+            objects/pack directory.
+        """
+        import tempfile
+        fd, path = tempfile.mkstemp(dir=self.pack_transport.local_abspath('.'), prefix='tmp_pack_')
+        with os.fdopen(fd, 'w+b') as f:
+            indexer = PackIndexer(f, resolve_ext_ref=self.get_raw)
+            copier = PackStreamCopier(read_all, read_some, f,
+                                      delta_iter=indexer)
+            copier.verify()
+            return self._complete_thin_pack(f, path, copier, indexer)

=== modified file 'breezy/memorybranch.py'
--- breezy/memorybranch.py	2020-07-28 01:15:49 +0000
+++ breezy/memorybranch.py	2021-05-02 18:08:32 +0000
@@ -20,7 +20,7 @@
 from __future__ import absolute_import
 
 from . import config as _mod_config, errors, osutils
-from .branch import Branch
+from .branch import Branch, BranchWriteLockResult
 from .lock import LogicalLockResult, _RelockDebugMixin
 from .revision import NULL_REVISION
 from .tag import DisabledTags, MemoryTags
@@ -42,6 +42,9 @@
         self._partial_revision_id_to_revno_cache = {}
         self.base = 'memory://' + osutils.rand_chars(10)
 
+    def __repr__(self):
+        return "<MemoryBranch()>"
+
     def get_config(self):
         return _mod_config.Config()
 
@@ -49,6 +52,9 @@
         self.repository.lock_read()
         return LogicalLockResult(self.unlock)
 
+    def is_locked(self):
+        return self.repository.is_locked()
+
     def lock_write(self, token=None):
         self.repository.lock_write()
         return BranchWriteLockResult(self.unlock, None)
@@ -62,7 +68,6 @@
     def _gen_revision_history(self):
         """Generate the revision history from last revision
         """
-        last_revno, last_revision = self.last_revision_info()
         with self.lock_read():
             self._extend_partial_history()
             return list(reversed(self._partial_revision_history_cache))
@@ -87,3 +92,14 @@
                         distance_from_last:
                     self._extend_partial_history(distance_from_last)
                 return self._partial_revision_history_cache[distance_from_last]
+
+    def get_config_stack(self):
+        """Get a breezy.config.BranchStack for this Branch.
+
+        This can then be used to get and set configuration options for the
+        branch.
+
+        :return: A breezy.config.BranchStack.
+        """
+        gstore = _mod_config.GlobalStore()
+        return _mod_config.Stack([_mod_config.NameMatcher(gstore, 'DEFAULT').get_sections])

=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2021-04-03 12:58:34 +0000
+++ breezy/plugins/github/hoster.py	2021-05-02 18:08:32 +0000
@@ -333,6 +333,8 @@
             'POST', path, body=json.dumps(data).encode('utf-8'))
         if response.status == 403:
             raise PermissionDenied(path, response.text)
+        if response.status == 422:
+            raise ValidationFailed(json.loads(response.text))
         if response.status != 201:
             raise UnexpectedHttpStatus(path, response.status)
         return json.loads(response.text)
@@ -659,5 +661,7 @@
                 maintainer_can_modify=allow_collaboration,
                 )
         except ValidationFailed:
+            # TODO(jelmer): Check the actual error message rather than assuming
+            # a merge proposal exists?
             raise MergeProposalExists(self.source_branch.user_url)
         return GitHubMergeProposal(self.gh, pull_request)

=== modified file 'setup.py'
--- setup.py	2021-02-19 02:53:40 +0000
+++ setup.py	2021-05-02 18:08:32 +0000
@@ -72,8 +72,8 @@
         ],
     'extras_require': {
         'cext': ['cython>=0.29'],
-        'fastimport': ['fastimport'],
-        'git': [],
+        'fastimport': ['fastimport<0.9.8;python_version<"3.0"', 'fastimport;python_version>="3.5"'],
+        'git': ['dulwich'],
         'launchpad': ['launchpadlib>=1.6.3'],
         'workspace': ['pyinotify'],
         'doc': ['setuptools<45;python_version<"3.0"', 'sphinx==1.8.5;python_version<"3.0"', 'sphinx_epytext'],