[P4] check the differences between the two historical versions of the library file

Click to enter 【 Chip design verification 】 Community , See more

---

  Statement ：

• 🥭 Author URI ：【MangoPapa Of CSDN Home page 】.
• ️ This article was first published in CSDN, Please indicate the source of reprint or quotation https://mangopapa.blog.csdn.net/article/details/125939746.
• ️ This paper is non-profit , The purpose is Personal learning record And Knowledge sharing . Limited by personal ability , There is a possibility of incorrect interpretation of the agreement . If you refer to this article for product design or other matters and cause adverse consequences , I will not bear relevant legal liabilities .
• ️ If the pictures or relevant references used in this article infringe upon your legitimate rights and interests , Please contact me to delete .
• Welcome to point out the mistakes in the article , Welcome colleagues to communicate with me ~
• mailbox ：[email protected]

---

introduction

This column records some commonly used Command combination or Script . Scripts include but are not limited to shell、python、perl.
This article is 《【P4】 Solve the conflict between local file modification and library file 》.
More practical scripts Click to view the general directory .

---

Demand is raised

   Want to compare the difference between local files and files in the Library , It can be used p4 diff file. So how to compare two historical versions in the Library ？ For example, compare files A Two versions of m and n, There are several ways ：

1. use p4 diff2 A#m A#n To compare , But this only shows the difference on the screen , It's not very intuitive .
2. Put two versions of the file check out Go locally and name them separately , And then use tkdiff、meld、bcompare And other tools to compare the two files . This method can show the difference between the two versions in the left and right columns , Comparison method 1 It is more intuitive in the display effect , But the operation is cumbersome . If the current file has been edit 了 , The process is even more cumbersome , You have to first revert, Wait until the comparison is over edit.

   The above two methods have their own advantages and disadvantages , Is there any method that has good display effect and simple operation ？ Write it yourself .

---

Script features

   Today, I want to talk about methods, principles and methods 2 similar , But don't worry about the document being edit The problem of —— To borrow p4 print To transit . Ideas as follows ： use p4 print Print two versions of the file to be compared to the local temporary file , then bcompare comparison , Finally, delete the temporary file .

---

Script

   The script is called p4_diff2.sh, For convenience, please use ~/.bashrc in alias p4_diff2 'sh ~/script/p4_diff2.sh'.

#! /usr/bin/sh
# File Name : p4_diff2.sh
# Usage : sh p4_diff2.sh file v1 v2

file=$1
v1=$2
v2=$3

p4 print $file#$v1 > .$file.$v1
p4 print $file#$v2 > .$file.$v2
bcompare .$file.$v1 .$file.$v2
rm .$file.$v1 .$file.$v2