Merge lp:~jelmer/brz-git/break-lock into lp:brz-git

[Jelmer Vernooij]

Implement Branch.break_lock.

Implement Branch.break_lock.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

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

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-git-dev/152/

=== modified file 'branch.py'
--- branch.py	2018-04-02 14:42:37 +0000
+++ branch.py	2018-04-02 15:45:26 +0000
@@ -604,6 +604,9 @@
     def _unlock_ref(self):
         self._ref_lock.unlock()
 
+    def break_lock(self):
+        self.repository._git.refs.unlock_ref(self.ref)
+
     def fetch(self, from_branch, last_revision=None, limit=None):
         return branch.InterBranch.get(from_branch, self).fetch(
             stop_revision=last_revision, limit=limit)

=== modified file 'transportgit.py'
--- transportgit.py	2018-04-02 15:24:40 +0000
+++ transportgit.py	2018-04-02 15:45:26 +0000
@@ -72,6 +72,7 @@
 from ...errors import (
     AlreadyControlDirError,
     FileExists,
+    LockBroken,
     LockError,
     LockContention,
     NotLocalUrl,
@@ -337,16 +338,27 @@
         except KeyError:
             return default
 
+    def unlock_ref(self, name):
+        if name == b"HEAD":
+            transport = self.worktree_transport
+        else:
+            transport = self.transport
+        lockname = name + ".lock"
+        try:
+            self.transport.delete(lockname)
+        except NoSuchFile:
+            pass
+
     def lock_ref(self, name):
         if name == b"HEAD":
             transport = self.worktree_transport
         else:
             transport = self.transport
         self._ensure_dir_exists(name)
+        lockname = name + ".lock"
         try:
             local_path = self.transport.local_abspath(name)
         except NotLocalUrl:
-            lockname = name + ".lock"
             # This is racy, but what can we do?
             if self.transport.has(lockname):
                 raise LockContention(name)
@@ -358,7 +370,14 @@
             except FileLocked as e:
                 raise LockContention(name, e)
             else:
-                return LogicalLockResult(gf.abort)
+                def unlock():
+                    try:
+                        self.transport.delete(lockname)
+                    except NoSuchFile:
+                        raise LockBroken(lockname)
+                    # GitFile.abort doesn't care if the lock has already disappeared
+                    gf.abort()
+                return LogicalLockResult(unlock)
 
 
 class TransportRepo(BaseRepo):