mirror of
https://github.com/LCTT/TranslateProject.git
synced 2025-01-04 22:00:34 +08:00
VicYu
GitHub
commit
f7f368c0d3
@ -1,155 +0,0 @@
|
||||
GitFuture is translating
|
||||
|
||||
A beginner's guide to comparing files using visual diff/merge tool Meld on Linux
|
||||
============================================================
|
||||
|
||||
### On this page
|
||||
|
||||
1. [About Meld][1]
|
||||
2. [Meld Installation][2]
|
||||
3. [Meld Usage][3]
|
||||
4. [Conclusion][4]
|
||||
|
||||
Now that we've [covered][5] [some][6] command line-based diff/merge tools in Linux, it'd be logical to explain some visual diff/merge tools available for the OS as well. Reason being, not everybody is used-to the command line, and/or command-line based comparison tools could be more difficult to learn and understand for some.
|
||||
|
||||
So, we'll kick off this new series with a GUI-based tool dubbed **Meld**.
|
||||
|
||||
But before we jump onto the installation and explanation part, it'd be worth sharing that all the instructions and examples presented in this tutorial have been tested on Ubuntu 14.04 and the Meld version we've used is 3.14.2.
|
||||
|
||||
### About Meld
|
||||
|
||||
[Meld][7] is basically a visual comparison and merging tool that's primarily aimed at developers (however, rest assured that we'll be explaining the tool keeping in mind end-users). The tool supports both two- and three-way comparisons, and not only lets you compare files, but directories and version controlled projects as well.
|
||||
|
||||
"Meld helps you review code changes and understand patches," the official website says. "It might even help you to figure out what is going on in that merge you keep avoiding." The tool is licensed under GPL v2.
|
||||
|
||||
### Meld Installation
|
||||
|
||||
If you are using Ubuntu or any-other Debian-based Linux distro, you can download and install Meld using the following command:
|
||||
|
||||
sudo apt-get install meld
|
||||
|
||||
Alternatively, you can also use your system's package manager to download the tool. For example, on Ubuntu, you can use the Ubuntu Software Center, or [Ubuntu Software][8], which has replaced the former starting version 16.04 of the OS.
|
||||
|
||||
However, it may be possible that the version of Meld in Ubuntu's official repositories is old. So, in that case if you want to use a more recent version, you can download the package from [here][9]. If you choose this method, then all you have to do is to extract the downloaded package, and then run the 'meld' binary present under the 'bin' folder:
|
||||
|
||||
~/Downloads/meld-3.14.2/bin$ **./meld**
|
||||
|
||||
FYI, following are the packages that Meld requires:
|
||||
|
||||
* Python 2.7 (Python 3.3 in development)
|
||||
* GTK+ 3.14
|
||||
* GLib 2.36
|
||||
* PyGObject 3.14
|
||||
* GtkSourceView 3.14
|
||||
* pycairo
|
||||
|
||||
### Meld Usage
|
||||
|
||||
When the tool is launched, you'll see a screen similar to the following:
|
||||
|
||||
[
|
||||
|
||||
][10]
|
||||
|
||||
So you have three options: File comparison, Directory comparison, and Version control view.
|
||||
|
||||
Click the 'File comparison' option, and you'll be asked to select the files to compare:
|
||||
|
||||
[
|
||||
|
||||
][11]
|
||||
|
||||
As clear from the screenshot above, Meld also lets you perform 3-way comparisons, but - in this first part of this article series - we'll stick to two-way comparisons that are more common.
|
||||
|
||||
Moving on, select the files that you want to compare and then click the 'Compare' button. You'll see that the tool opens both files side by side and also highlights the differing lines (as well as differences).
|
||||
|
||||
[
|
||||
|
||||
][12]
|
||||
|
||||
So the difference is in the second line of both files, and the actual difference is the extra '3' in the second line of file2\. Those black arrows that you see are there to perform the merge/change operation. The right arrow, in this case, will change the second line in 'file2' with the corresponding line from 'file1'. The left arrow will do vice-versa.
|
||||
|
||||
After making changes, you can do a Ctrl+s to save them.
|
||||
|
||||
So that was a simple example to let you know how Meld works on a basic level. Let's take a look at a slightly more complicated comparison:
|
||||
|
||||
[
|
||||
|
||||
][13]
|
||||
|
||||
Before discussing the changes, it's worth mentioning here that there are areas in Meld GUI that give you visual overview of the changes between the files. Specifically, what we're trying to bring into your notice here are vertical bars at the left and right-hand sides of the window. For example, see the following screenshot:
|
||||
|
||||
[
|
||||
|
||||
][14]
|
||||
|
||||
If you observe closely, the bar in the screenshot above contains some coloured blocks. These blocks are designed to give you an overview of all of the differences between the two files. "Each coloured block represents a section that is inserted, deleted, changed or in conflict between your files, depending on the block's colour used," the official documentation explains.
|
||||
|
||||
Now, let's come back to the example we were discussing. The following screenshots show how easy is to understand file changes (as well as merge them) when using Meld:
|
||||
|
||||
[
|
||||
|
||||
][15]
|
||||
|
||||
[
|
||||
|
||||
][16]
|
||||
|
||||
[
|
||||
|
||||
][17]
|
||||
|
||||
Moving on, so far, we jumped from one change to another by scrolling the files. However, there may be times when the files being compared are very large, making it difficult to scroll every time you want to jump to a change. For this, you can use the orange-colored arrows in the toolbar which itself sits above the editing area:
|
||||
|
||||
[
|
||||
|
||||
][18]
|
||||
|
||||
Here's how you do some of the common things while using Meld: You can use the standard Ctrl+f key-combination to find something in the editor area, press F11 key to make the tool go in full screen mode, and Ctrl+r to refresh (usually used when the any or both of files being compared have changed).
|
||||
|
||||
Following are some of the key features that the official Meld website advertises:
|
||||
|
||||
* Two- and three-way comparison of files and directories
|
||||
* File comparisons update as you type
|
||||
* Auto-merge mode and actions on change blocks help make merges easier
|
||||
* Visualisations make it easier to compare your files
|
||||
* Supports Git, Bazaar, Mercurial, Subversion, etc.
|
||||
|
||||
Note that the list above is not exhaustive. The website contains a dedicated [Features page][19] that contains an exhaustive list of features that Meld offers. All the features listed there are divided in sections based on whether the tool is being used for file comparison, directory comparison, version control, or in the merge mode.
|
||||
|
||||
Like any other software tool, there are certain things that Meld can't do. The official website lists at-least one of them: "When Meld shows differences between files, it shows both files as they would appear in a normal text editor. It does not insert additional lines so that the left and right sides of a particular change are the same size. There is no option to do this.".
|
||||
|
||||
### Conclusion
|
||||
|
||||
We've just scratched the surface here, as Meld is capable of doing a lot more. But it's ok for now, given that it's the first part of the tutorial series. Just to give you an idea about Meld's capabilities, you can configure the tool to ignore certain type of changes, ask it to move, copy or delete individual differences between files, as well as launch it from the command line. We'll discuss all these key functionalities in upcoming parts of this tutorial series.
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/
|
||||
|
||||
作者：[Ansh][a]
|
||||
译者：[译者ID](https://github.com/译者ID)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/
|
||||
[1]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#about-meld
|
||||
[2]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#meld-installation
|
||||
[3]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#meld-usage
|
||||
[4]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#conclusion
|
||||
[5]:https://www.howtoforge.com/tutorial/linux-diff-command-file-comparison/
|
||||
[6]:https://www.howtoforge.com/tutorial/how-to-compare-three-files-in-linux-using-diff3-tool/
|
||||
[7]:http://meldmerge.org/
|
||||
[8]:https://www.howtoforge.com/tutorial/ubuntu-16-04-lts-overview/
|
||||
[9]:https://git.gnome.org/browse/meld/refs/tags
|
||||
[10]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-launch-screen-1.png
|
||||
[11]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-file-comparison-2.png
|
||||
[12]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-diff-in-action-3.png
|
||||
[13]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-multiple-changes-4.png
|
||||
[14]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-multiple-colors-5.png
|
||||
[15]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-makes-it-easy-6.png
|
||||
[16]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-makes-it-easy-7.png
|
||||
[17]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-makes-it-easy-8.png
|
||||
[18]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-go-next-prev-9.png
|
||||
[19]:http://meldmerge.org/features.html
|
||||
@ -0,0 +1,155 @@
|
||||
Linux 系统可视化的比较与合并工具 Meld 的新手使用教程
|
||||
============================================================
|
||||
|
||||
### 本页内容
|
||||
|
||||
1. [关于 Meld][1]
|
||||
2. [安装 Meld][2]
|
||||
3. [使用 Meld][3]
|
||||
4. [总结][4]
|
||||
|
||||
我们已经[讲过][5] Linux 中[一些][6]基于命令行的比较和合并工具，再来讲解该系统的一些可视化的比较与合并工具也很合理。首要的原因是，不是每个人都习惯使用命令行，而且对于某些人来说，基于命令行的比较工具可能很难学习和理解。
|
||||
|
||||
因此，我们将会推出关于可视化工具 **Meld** 的系列文章。
|
||||
|
||||
在跳到安装和介绍部分前，分享这篇教程所有指令和用例是很有用的，而且它们已经在 Ubuntu 14.04 中测试过了，我们使用的 Meld 版本是 3.14.2。
|
||||
|
||||
### 关于 Meld
|
||||
|
||||
[Meld][7] 主要是一个可视化的比较和合并的工具，目标人群是开发者（当然，我们将要讲到的其它部分也会考虑到终端用户）。这个工具同时支持双向和三向的比较，不仅仅是比较文件，还可以比较目录，以及版本控制的项目。
|
||||
|
||||
“Meld 帮你回顾代码改动，理解补丁，”官网如是说。“它甚至可以告知你如果你不进行合并将会发生什么事情。”该工具使用 GPL v2 协议进行授权。
|
||||
|
||||
### 安装 Meld
|
||||
|
||||
如果你用的是 Ubuntu 或者其它基于 Debian 的 Linux 分支，你可以用以下命令下载安装 Meld：
|
||||
|
||||
```sh
|
||||
sudo apt-get install meld
|
||||
```
|
||||
|
||||
或者你也可以用系统自带的包管理软件下载这个工具。比如在 Ubuntu 上，你可以用 Ubuntu 软件中心（Ubuntu Software Center），或者用 [Ubuntu Software][8]，Ubuntu Software 从 Ubuntu 16.04 版本开始取代了软件中心。
|
||||
|
||||
当然，Ubuntu 官方仓库里的 Meld 版本很有可能比较陈旧。因此如果你想要用更新的版本，你可以在[这里][9]下载软件包。如果你要用这个方法，你要做的就是解压下载好的软件包，然后运行 “bin” 目录下的 “meld” 程序。
|
||||
|
||||
~/Downloads/meld-3.14.2/bin$ **./meld**
|
||||
|
||||
以下是 Meld 依赖的软件，仅供参考：
|
||||
|
||||
* Python 2.7 (Python 3.3 开发版)
|
||||
* GTK+ 3.14
|
||||
* GLib 2.36
|
||||
* PyGObject 3.14
|
||||
* GtkSourceView 3.14
|
||||
* pycairo
|
||||
|
||||
### 使用 Meld
|
||||
|
||||
装好了软件，就可以看到类似这样的画面：
|
||||
|
||||
[
|
||||
|
||||
][10]
|
||||
|
||||
有三个选项：比较文件（File comparison），比较目录（Directory comparison）以及版本控制视图（Version control view）。
|
||||
|
||||
点击“比较文件”选项，就可以选择需要比较的文件：
|
||||
|
||||
[
|
||||
|
||||
][11]
|
||||
|
||||
就像上面的截图那样明白，Meld 也可以进行三向比较，但是在这一系列文章的第一部分，我们只会讲更常用的双向比较。
|
||||
|
||||
接着，选择你想要比较的文件，点击“比较”（Compare）按钮。软件会在两边分别打开两个文件，高亮不同的行（以及不同的部分）。
|
||||
|
||||
[
|
||||
|
||||
][12]
|
||||
|
||||
两个文件的不同之处在第二行，差别在于 “file2” 文件的第二行多了一个 “3”。你看到的黑色箭头是用来进行合并或修改的操作的。该例中，向右的箭头将会把 “file2” 文件的第二行改成文件 “file1” 中对应行的内容。左向箭头做的事情相反。
|
||||
|
||||
做完修改后，按下 Ctrl+s 来保存。
|
||||
|
||||
这个简单的例子，让你知道 Meld 的基本用法。让我们看一看稍微复杂一点的比较：
|
||||
|
||||
[
|
||||
|
||||
][13]
|
||||
|
||||
在讨论这些变化前，这里提一下， Meld GUI 中有几个区域，可以给出文件之间的差异，让概况变得直观。这里特别需要注意窗口的左右两边垂直的栏。比如下面这个截图：
|
||||
|
||||
[
|
||||
|
||||
][14]
|
||||
|
||||
仔细观察，图中的这个栏包含几个不同颜色的区块。这些区块是用来让你对文件之间的差异有个大概的了解。“每一个上色的区块表示一个部分，这个部分可能是插入、删除、修改或者有差别的，取决于区块所用的颜色。”官方文档是这样说的。
|
||||
|
||||
现在，让我们回到我们之前讨论的例子中。接下来的截图展示了用 Meld 理解文件的改动是很简单的（以及合并这些改动）：
|
||||
|
||||
[
|
||||
|
||||
][15]
|
||||
|
||||
[
|
||||
|
||||
][16]
|
||||
|
||||
[
|
||||
|
||||
][17]
|
||||
|
||||
接着，我们滑动文件，从一个改动跳到另一个。但是，当要比较的文件很大时，这会耗一点时间，当你想要滑动文件跳到一个改动的位置时，也会变得很困难。如果是这种情况的话，你可以用工具栏的橙色箭头，就在编辑区域的上方：
|
||||
|
||||
[
|
||||
|
||||
][18]
|
||||
|
||||
这些是你使用 Meld 时做的一般性的事情：可以用标准的 “Ctrl+f” 组合键在编辑区域内进行查找，按 “F11” 键让软件进入全屏模式，再按 “Ctrl+f” 来刷新（通常在所有要比较的文件改变的时候使用）。
|
||||
|
||||
以下是 Meld 官方网站宣传的重要特性：
|
||||
|
||||
* 文件和目录的双向及三向比较
|
||||
* 输入即更新文件的比较
|
||||
* 自动合并模式，改动区块的动作让合并更加简单
|
||||
* 可视化让比较文件更简单
|
||||
* 支持 Git，Bazaar，Mercurial，Subversion 等等
|
||||
|
||||
注意还不仅仅只有以上所列的。网站上有个专门的[特性页面][19]，里面提到了 Meld 提供的所有特性。这个页面列出的所有特性分为几个部分，以该软件是用来做文件比较，目录比较，版本控制还是处于合并模式下为基础进行划分。
|
||||
|
||||
和其它软件相似，有些事情 Meld 做不到。官方网站上列出了其中的一部分：“当 Meld 展示文件之间的差异时，它同时显示两个文件，看起来就像在普通的文本编辑器中。它不会添加额外的行，让左右两边文件的特殊改动是同样的行数。没有做这个事情的选项。”
|
||||
|
||||
### 总结
|
||||
|
||||
我们刚刚了解到的不过是皮毛，因为 Meld 还能做很多事情。考虑到这是教程系列的第一部分，这也挺不错的。这仅仅是让你了解 Meld 的作用，你可以配置它，忽略一些特定类型的改动，让它移动，复制或者删除文件之间的个别差异，也可以从命令行启动它。在即将退出的系列教程中，我们将会讲述所有这些重要功能。
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/
|
||||
|
||||
作者：[Ansh][a]
|
||||
译者：[GitFuture](https://github.com/GitFuture)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/
|
||||
[1]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#about-meld
|
||||
[2]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#meld-installation
|
||||
[3]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#meld-usage
|
||||
[4]:https://www.howtoforge.com/tutorial/beginners-guide-to-visual-merge-tool-meld-on-linux/#conclusion
|
||||
[5]:https://www.howtoforge.com/tutorial/linux-diff-command-file-comparison/
|
||||
[6]:https://www.howtoforge.com/tutorial/how-to-compare-three-files-in-linux-using-diff3-tool/
|
||||
[7]:http://meldmerge.org/
|
||||
[8]:https://www.howtoforge.com/tutorial/ubuntu-16-04-lts-overview/
|
||||
[9]:https://git.gnome.org/browse/meld/refs/tags
|
||||
[10]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-launch-screen-1.png
|
||||
[11]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-file-comparison-2.png
|
||||
[12]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-diff-in-action-3.png
|
||||
[13]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-multiple-changes-4.png
|
||||
[14]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-multiple-colors-5.png
|
||||
[15]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-makes-it-easy-6.png
|
||||
[16]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-makes-it-easy-7.png
|
||||
[17]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-makes-it-easy-8.png
|
||||
[18]:https://www.howtoforge.com/images/how-to-use-visual-diff-and-merge-tools-in-linux-meld-and-kdiff/big/meld-go-next-prev-9.png
|
||||
[19]:http://meldmerge.org/features.html
|
||||
Loading…
Reference in New Issue
Block a user