Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:17:25 +0200] rev 14566
patch: generalize the use of patchmeta in applydiff()
- Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta
instances in applydiff() makes things simpler.
- Rename selectfile() into makepatchmeta(). It is responsible for creating
patchmeta for regular patches.
- Pass patchmeta objects to patchfile() directly
patchmeta instances were associated with git patches, for regular patches we
had to pass additional variables to tell the patch intent to patchfile().
Instead, we generate patchmeta for regular patches and pass them. This will
also help with patch filtering by matcher objects.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:13 +0200] rev 14565
patch: stop updating changed files set in applydiff()
This information is more correctly returned by backends.
The extra updated file removed from test-mq-merge.t output came from changes
from git patches being counted before being really applied in some cases.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:11 +0200] rev 14564
patch: turn patch() touched files dict into a set
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:19:39 +0800] rev 14563
paper, coal: define the diffstat templates
The templates output the filename, the total number of changes to the file
and a bar graph of the adds and removes. The filename is a link into the diff
output.
The diffstat is not yet displayed, but it can be manually added to the
changeset page template.
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:15:49 +0800] rev 14562
web: provide the file number to the diffstat templates
This allows the diffstat templates to link into the diff output. For example,
the URLs of the first three files within the diff are #l1.1, #l2.1, #l3.1.
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:14:22 +0800] rev 14561
web: include all files in the diffstat
The webutil.diffstat function now returns a diffstat template for each file
in the diff. It previously returned a template for each file returned by
ctx.files() which did not work well for merge changesets.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 20:38:02 +0200] rev 14560
hgignore: ignore MANIFEST.in (generated since
2ce7dfe17bc5)
LUO Zheng <xmuluo@gmail.com> [Wed, 08 Jun 2011 21:25:18 +0800] rev 14559
bookmarks: recognize the current bookmark when the local encoding isn't UTF-8
The current bookmark is stored in bookmark.current, supposingly in UTF-8.
But the call to encoding.fromlocal() is missing, therefore Hg is not able
to recognize the current bookmark in the case that bookmark uses
characters of which the bit stream is different between local encoding
and UTF-8.
For example, the Chinese version of Windows cmd uses gbk(cp936), not UTF-8.
Therefore I won't be able to make a Chinese bookmark current.
By wrapping mark in a encoding.fromlocal() call, the problem is solved.
Stephen Thorne <stephen@thorne.id.au> [Thu, 09 Jun 2011 10:15:24 +1000] rev 14558
distutils: Create MANIFEST.in instead of MANIFEST in Makefile
When running 'python setup.py sdist' many files were omitted from the resulting
tarball that are required for a complete build, including the .h file for the
inotify extension due to a python2.7+ distutils bug. This would cause 'make dist'
to fail to build a correct dist on python2.7
By building a MANIFEST.in that is the same as the old MANIFEST with 'include'
at the start of each line will cause a correct MANIFEST to be built and used
by distutils.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 09 Jun 2011 18:39:14 +0200] rev 14557
revert: is reverting file states, not just file contents
e.g. x bit is reverted as well
Also makes this paragraph more consistent with the preceding one,
which already uses the term "state" (not "content").