##// END OF EJS Templates
diffstat: fix parsing of filenames with spaces...
diffstat: fix parsing of filenames with spaces The patch changes the output of "hg diff --stat" when one file whose filename has spaces has changed, making it get the full filename instead of just the substring between the last space and the end of the filename. It also changes the diffstat generated by "hg email -d" when one of the commit messages starts with "diff". Because of the regex used to parse the filename, the diffstat generated by "hg email -d" will still be not correct if a commit message starts with "diff -r ". Before the patch Mercurial has the following behavior: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) After the patch: $ echo "foobar">"file with spaces" $ hg add "file with spaces" $ hg diff --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ hg diff --git --stat file with spaces | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Before the patch: $ hg add mercurial/patch.py tests/tests-diffstat.t $ hg commit -m "diffstat: fix parsing of filenames" $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] filenames | 0 mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...] After the patch: $ hg email -d --test tip This patch series consists of 1 patches. diffstat: fix parsing of filenames [...] mercurial/patch.py | 6 ++++-- tests/test-diffstat.t | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) [...]

File last commit:

r12170:581066a3 stable
r13395:104c9ed9 default
Show More
revlog-formatv0.py
60 lines | 1.8 KiB | text/x-python | PythonLexer
#!/usr/bin/env python
# Copyright 2010 Intevation GmbH
# Author(s):
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""Create a Mercurial repository in revlog format 0
changeset: 0:a1ef0b125355
tag: tip
user: user
date: Thu Jan 01 00:00:00 1970 +0000
files: empty
description:
empty file
"""
import os, sys
files = [
('formatv0/.hg/00changelog.i',
'000000000000004400000000000000000000000000000000000000'
'000000000000000000000000000000000000000000000000000000'
'0000a1ef0b125355d27765928be600cfe85784284ab3'),
('formatv0/.hg/00changelog.d',
'756163613935613961356635353036303562366138343738336237'
'61623536363738616436356635380a757365720a3020300a656d70'
'74790a0a656d7074792066696c65'),
('formatv0/.hg/00manifest.i',
'000000000000003000000000000000000000000000000000000000'
'000000000000000000000000000000000000000000000000000000'
'0000aca95a9a5f550605b6a84783b7ab56678ad65f58'),
('formatv0/.hg/00manifest.d',
'75656d707479006238306465356431333837353835343163356630'
'35323635616431343461623966613836643164620a'),
('formatv0/.hg/data/empty.i',
'000000000000000000000000000000000000000000000000000000'
'000000000000000000000000000000000000000000000000000000'
'0000b80de5d138758541c5f05265ad144ab9fa86d1db'),
('formatv0/.hg/data/empty.d',
''),
]
def makedirs(name):
"""recursive directory creation"""
parent = os.path.dirname(name)
if parent:
makedirs(parent)
os.mkdir(name)
makedirs(os.path.join(*'formatv0/.hg/data'.split('/')))
for name, data in files:
f = open(name, 'wb')
f.write(data.decode('hex'))
f.close()
sys.exit(0)