Merge lp:~jelmer/brz-git/pushresult into lp:brz-git

[Jelmer Vernooij]

Fix push result reporting.

Fix push result reporting.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

[lp:~jelmer/brz-git/pushresult]

1912. By Jelmer Vernooij on 2018-03-31

Add extra tests.

1913. By Jelmer Vernooij on 2018-03-31

Fall back to local branch for revno.

=== modified file 'remote.py'
--- remote.py	2018-03-31 19:47:40 +0000
+++ remote.py	2018-03-31 20:29:37 +0000
@@ -59,6 +59,7 @@
     GitBranchFormat,
     GitBranchPushResult,
     GitTags,
+    _quick_lookup_revno,
     )
 from .dir import (
     GitControlDirFormat,
@@ -113,6 +114,24 @@
 from dulwich.pack import load_pack_index
 
 
+class GitPushResult(PushResult):
+
+    def _lookup_revno(self, revid):
+        try:
+            return _quick_lookup_revno(self.source_branch, self.target_branch,
+                revid)
+        except GitSmartRemoteNotSupported:
+            return None
+
+    @property
+    def old_revno(self):
+        return self._lookup_revno(self.old_revid)
+
+    @property
+    def new_revno(self):
+        return self._lookup_revno(self.new_revid)
+
+
 # Don't run any tests on GitSmartTransport as it is not intended to be
 # a full implementation of Transport
 def get_test_permutations():
@@ -441,7 +460,7 @@
             # revision
             revision_id = source.last_revision()
 
-        push_result = PushResult()
+        push_result = GitPushResult()
         push_result.workingtree_updated = None
         push_result.master_branch = None
         push_result.source_branch = source
@@ -478,7 +497,6 @@
             old_remote = ZERO_SHA
         push_result.old_revid = repo.lookup_foreign_revision_id(old_remote)
         self._refs = remote_refs_dict_to_container(new_refs)
-        push_result.old_revno = None
         push_result.target_branch = self.open_branch(name)
         if old_remote != ZERO_SHA:
             push_result.branch_push_result = GitBranchPushResult()

=== modified file 'tests/test_remote.py'
--- tests/test_remote.py	2018-03-31 18:15:39 +0000
+++ tests/test_remote.py	2018-03-31 20:29:37 +0000
@@ -18,6 +18,8 @@
 
 from __future__ import absolute_import
 
+from StringIO import StringIO
+
 import os
 import time
 
@@ -211,9 +213,17 @@
         revid = wt.commit('blah')
 
         if self._from_format == 'git':
-            remote.push_branch(wt.branch, name='newbranch')
-        else:
-            remote.push_branch(wt.branch, lossy=True, name='newbranch')
+            result = remote.push_branch(wt.branch, name='newbranch')
+        else:
+            result = remote.push_branch(wt.branch, lossy=True, name='newbranch')
+
+        self.assertEqual(0, result.old_revno)
+        if self._from_format == 'git':
+            self.assertEqual(1, result.new_revno)
+        else:
+            self.assertIs(None, result.new_revno)
+
+        result.report(StringIO())
 
         self.assertEqual(
                 {'refs/heads/newbranch': self.remote_real.refs['refs/heads/newbranch'],
@@ -237,9 +247,14 @@
         wt.branch.get_config_stack().set('branch.fetch_tags', True)
 
         if self._from_format == 'git':
-            wt.branch.push(remote.create_branch('newbranch'))
+            result = wt.branch.push(remote.create_branch('newbranch'))
         else:
-            wt.branch.push(remote.create_branch('newbranch'), lossy=True)
+            result = wt.branch.push(remote.create_branch('newbranch'), lossy=True)
+
+        self.assertEqual(0, result.old_revno)
+        self.assertEqual(2, result.new_revno)
+
+        result.report(StringIO())
 
         self.assertEqual(
                 {'refs/heads/master': self.remote_real.head(),