HEAD is resolved within stream where possible (#133)

python/perforce.py

@@ -148,6 +148,11 @@ def info(self):
 
     def head(self):
         """Get current head revision"""
+        if self.stream is not None:
+            stream_head = self.perforce.run_changes([
+                '-m', '1', '-s', 'submitted', '%s/...' % self.stream])
+            if stream_head:
+                return stream_head[0]['change']
         return self.perforce.run_counter("maxCommitChange")[0]['value']
 
     def description(self, changelist):
@@ -253,4 +258,4 @@ def sizeof_fmt(num, suffix='B'):
         if abs(num) < 1024.0:
             return "%3.1f%s%s" % (num, unit, suffix)
         num /= 1024.0
-    return "%.1f%s%s" % (num, 'Pi', suffix)
+    return "%.1f%s%s" % (num, 'Pi', suffix)

python/test_perforce.py

@@ -93,7 +93,6 @@ def test_fixture(capsys):
     # Returns [metadata, contents]
     content = repo.perforce.run_print("//depot/file.txt")[1]
     assert content == "Hello World\n"
-    assert repo.head() == "2", "Unexpected head revision"
 
     shelved_change = repo.perforce.run_describe('-sS', '3')
     assert len(shelved_change) > 0, "Shelved changelist was missing"
@@ -102,6 +101,18 @@ def test_fixture(capsys):
     # Make changes to the p4 server then check in the new server.zip
     # store_server(repo, 'new_server.zip')
 
+def test_head():
+    """Test resolve of HEAD changelist"""
+    setup_server(from_zip='server.zip')
+    repo = P4Repo(stream='//stream-depot/main')
+    assert repo.head() == "2", "Unexpected HEAD revision for stream"
+
+    repo = P4Repo()
+    assert repo.head() == "6", "Unexpected global HEAD revision"
+
+    repo = P4Repo(stream='//stream-depot/idontexist')
+    assert repo.head() == "6", "Non-existent stream should fallback to global HEAD revision"
+
 def test_checkout():
     """Test normal flow of checking out files"""
     with setup_server_and_client() as client_root: