diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 565018b..cb5ed05 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -110,6 +110,8 @@ newIsImage: Boolean, oldObjectId: Option[String], newObjectId: Option[String], + oldMode: String, + newMode: String, tooLarge: Boolean ) @@ -515,6 +517,8 @@ newIsImage = newIsImage, oldObjectId = None, newObjectId = Option(treeWalk.getObjectId(0)).map(_.name), + oldMode = treeWalk.getFileMode(0).toString, + newMode = treeWalk.getFileMode(0).toString, tooLarge = false ) } else { @@ -528,6 +532,8 @@ newIsImage = newIsImage, oldObjectId = None, newObjectId = Option(treeWalk.getObjectId(0)).map(_.name), + oldMode = treeWalk.getFileMode(0).toString, + newMode = treeWalk.getFileMode(0).toString, tooLarge = false ) })) @@ -562,6 +568,8 @@ newIsImage = false, oldObjectId = Option(diff.getOldId).map(_.name), newObjectId = Option(diff.getNewId).map(_.name), + oldMode = diff.getOldMode.toString, + newMode = diff.getNewMode.toString, tooLarge = true ) } else { @@ -578,6 +586,8 @@ newIsImage = newIsImage, oldObjectId = Option(diff.getOldId).map(_.name), newObjectId = Option(diff.getNewId).map(_.name), + oldMode = diff.getOldMode.toString, + newMode = diff.getNewMode.toString, tooLarge = false ) } else { @@ -591,6 +601,8 @@ newIsImage = newIsImage, oldObjectId = Option(diff.getOldId).map(_.name), newObjectId = Option(diff.getNewId).map(_.name), + oldMode = diff.getOldMode.toString, + newMode = diff.getNewMode.toString, tooLarge = false ) } diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html index d05049d..40e9cb3 100644 --- a/src/main/twirl/gitbucket/core/helper/diff.scala.html +++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html @@ -54,9 +54,8 @@ View } - - - @diff.oldPath -> @diff.newPath + + @diff.oldPath → @diff.newPath } @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){ @if(newCommitId.isDefined){ @@ -73,7 +72,7 @@ } - @diff.newPath + @diff.newPath } @if(diff.changeType == ChangeType.DELETE){ @if(oldCommitId.isDefined){ @@ -82,16 +81,22 @@ View } - - - @diff.oldPath + + @diff.oldPath + } + @if(diff.oldMode != diff.newMode){ + @diff.oldMode → @diff.newMode } @if(diff.oldObjectId == diff.newObjectId){ -
File renamed without changes
+ @if(diff.oldPath != diff.newPath){ +
File renamed without changes
+ } else { +
File mode changed
+ } } else { @if(diff.newContent != None || diff.oldContent != None){