##// END OF EJS Templates
manifest: for diff(), only iterate over files, not flags...
manifest: for diff(), only iterate over files, not flags From manifest.diff(), we return a dict from filename to pairs of pairs of file nodeids and flags (values of the form ((n1,n2),(fl1,fl2))). To create this dict, we currently generate one dict for files (with (n1,n2) values) and one for flags (with (fl1,fl2) values) and then join these dicts. Missing files are represented by None and missing flags by '', but due to the dict joining, the inner pairs themselves can also be None. The only caller, merge.manifestmerge(), then unpacks these values while checking for None values. By inlining the calls to dicthelpers and simplifying it to only iterate over files (ignoring flags-only differences), we can simplify life for our caller.

File last commit:

r20227:9c963a43 default
r22965:b697fa74 default
Show More
hgignore.5.txt
34 lines | 716 B | text/plain | TextLexer
Takumi IINO
doc: make man and html from translated documents...
r19426 ==========
hgignore
==========
---------------------------------
syntax for Mercurial ignore files
---------------------------------
:Author: Vadim Gelfer <vadim.gelfer@gmail.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. include:: hgignore.5.gendoc.txt
Author
======
Vadim Gelfer <vadim.gelfer@gmail.com>
Mercurial was written by Matt Mackall <mpm@selenic.com>.
See Also
========
|hg(1)|_, |hgrc(5)|_
Copying
=======
This manual page is copyright 2006 Vadim Gelfer.
Kevin Bullock
doc: bump copyright year
r20227 Mercurial is copyright 2005-2014 Matt Mackall.
Takumi IINO
doc: make man and html from translated documents...
r19426 Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.. include:: common.txt