np4: Handle missing head info for depot file (#261)

* np4: Handle missing head info for depot file * np4: Bump version number
BastianBlokland · Jul 8, 2022 · 12a76fe · 12a76fe
1 parent ba4598e
commit 12a76fe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/utilities/np4/app.ns b/utilities/np4/app.ns
@@ -17,4 +17,4 @@ cli(cliCmd("status",    statusCmd,    "Print the status of the current workspace
     cliCmd("streams",   streamsCmd,   "Print a graph of all the streams on the server"),
     cliAppInfo(
       "Novus P4", "Convenience wrapper around the p4 perforce client.",
-      Version(0, 13, 0)))
+      Version(0, 14, 0)))
diff --git a/utilities/np4/perforce/data/file.ns b/utilities/np4/perforce/data/file.ns
@@ -6,7 +6,7 @@ import "path.ns"
 
 // -- Types.
 
-enum P4FileOp = Add, Edit, Delete, Branch, MoveAdd, MoveDelete, Integrate, Import, Purge, Archive
+enum P4FileOp = Add, Edit, Delete, Branch, MoveAdd, MoveDelete, Integrate, Import, Purge, Archive, Unknown
 
 struct P4FileRev = long i
 
@@ -21,10 +21,10 @@ struct P4FileInfo =
 struct P4DepotFileInfo =
   P4DepotPath           depotFile,
   Option{P4ClientPath}  clientFile,
-  P4FileOp              headAction,
+  Option{P4FileOp}      headAction,
   Option{string}        headType,
-  P4FileRev             headRev,
-  P4Change              headChange
+  Option{P4FileRev}     headRev,
+  Option{P4Change}      headChange
 
 struct P4FileLocation =
   P4DepotPath   depotFile,
@@ -39,7 +39,14 @@ fun string(P4FileRev r)
   else               -> r.i.string()
 
 fun P4FileInfo(P4DepotFileInfo f)
-  P4FileInfo(f.depotFile, f.clientFile, f.headAction, f.headType, f.headRev, f.headChange)
+  P4FileInfo(
+    f.depotFile,
+    f.clientFile,
+    f.headAction ?? P4FileOp.Unknown,
+    f.headType,
+    f.headRev ?? P4FileRev(0),
+    f.headChange ?? P4Change(0)
+  )
 
 // -- Utilities.