Dirkjan Ochtman
12d9da5e35
help: show help topics by default in 'hg help', with longest available id
2008-10-21 11:05:45 +02:00
Christian Ebert
e8342a5b19
mail: correct typo in variable name
2008-10-21 10:29:57 +02:00
Thomas Arendsen Hein
614711f636
merge with crew
2008-10-20 18:29:44 +02:00
Christian Ebert
576714b48a
mail: test patch mime encoding for patchbomb
2008-10-20 17:40:29 +02:00
Christian Ebert
d34f3992ca
patchbomb: mime-encode clean utf-8 patches (issue814)
...
Fixes issue814, but only for utf.
2008-10-20 17:40:29 +02:00
Christian Ebert
febc2f8f3c
mail: mime-encode patches that are utf-8
...
utf-8 can be safely detected without making assumptions on the
encoding/locale used by the recipient.
Content-Transfer-Encoding for utf-8 patches is base64 (default of
python's email module).
2008-10-20 17:40:29 +02:00
Thomas Arendsen Hein
8999e196bc
Some additional space/tab cleanups
2008-10-20 15:19:05 +02:00
Dirkjan Ochtman
1c96ed002e
merge with crew-stable, again
2008-10-20 14:58:49 +02:00
Dirkjan Ochtman
f73840b37b
merge with crew-stable
2008-10-20 14:57:56 +02:00
Dirkjan Ochtman
f5ea74b223
clean up trailing spaces, leading spaces in C
2008-10-20 14:57:04 +02:00
Thomas Arendsen Hein
380f8d8da9
spaces->tabs in one line of a C extension for consistency
2008-10-20 14:53:53 +02:00
Dirkjan Ochtman
664ef048a7
merge with crew-stable
2008-10-20 14:52:58 +02:00
Dirkjan Ochtman
e085823cf1
clean up trailing spaces
2008-10-20 14:51:55 +02:00
Dirkjan Ochtman
cc867a892e
hgweb: working diff for removed files
2008-10-20 14:13:37 +02:00
Dirkjan Ochtman
3bcd8d8cc6
hgweb: remove links to non-existent file versions
2008-10-20 12:41:09 +02:00
Dirkjan Ochtman
b7ae732f0c
coal/paper: widen author column in log table
2008-10-20 10:20:35 +02:00
Dirkjan Ochtman
e7f8861527
hgweb: be sure to drain request data even in early error conditions
...
Thanks to Mads Kiilerich with noticing this. The hg client can only read data
after all the sent data has been read, so we have to read all the request data
even if we're not going to do anything with it (in error conditions). This
is not easy to fix in the client, because we're using Python's httplib, which
is strictly stateful. Abstracted the draining into a separate method.
2008-10-20 10:15:26 +02:00
Thomas Arendsen Hein
28f8d4bb8e
merge with crew-stable
2008-10-19 22:07:43 +02:00
Thomas Arendsen Hein
94f908042c
Fix Debian bug #494889 (fetching from static-http://... broken)
...
Changeset 055df4ac4b13 which fixed issue965 (hg clone static-http
does not work for empty repos) broke cloning of repos with old layout
(without store) via static-http.
This fix makes cloning from old-style repositories possible again,
but will not allow cloning of empty old-style repositories as this
can not be detected reliably.
2008-10-19 19:49:56 +02:00
Mads Kiilerich
905ce16584
mq: Fix --qrefresh --short to work with --exclude and --include
...
pmezard expects
hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before c302ef4372b2. That change seemed sensible, but it
wasn't...
mpm says
(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
(17:22:54) pmezard_: kiilerix1: and --include too
(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch
This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.
2008-10-19 16:31:24 +02:00
Benoit Boissinot
bc6e674802
merge with crew
2008-10-19 20:29:41 +02:00
Benoit Boissinot
fdd2a14dd6
parsers.c: do not try to untrack after a failure
2008-10-19 20:17:06 +02:00
Benoit Boissinot
64b6a68b1b
parsers.c: fix integer overflows
...
thanks to zzuf for helping finding those
2008-10-19 20:16:37 +02:00
Thomas Arendsen Hein
1493b09823
Merge with crew
2008-10-19 19:10:26 +02:00
Thomas Arendsen Hein
d6b1ca4cb9
Use dummy diffstat in tests and remove older diffstat workaround.
...
This makes test-notify pass on systems without diffstat installed
or where the diffstat version yields a different output.
2008-10-19 19:03:23 +02:00
Thomas Arendsen Hein
c740f7ded2
Fix test-bundle-type output by changing head|cut to cut|head.
...
With some versions of cut the output otherwise has no end of line.
2008-10-19 17:40:35 +02:00
Benoit Boissinot
0a350d3213
parsers.c: there is no reference to data_obj, so it shouldn't be decref'ed
2008-10-19 16:11:23 +02:00
Thomas Arendsen Hein
0bafe8661c
convert documentation: --config argument with spaces needs quoting.
2008-10-19 15:24:33 +02:00
Thomas Arendsen Hein
e5350e7597
Copy index before parsing to enforce alignment with inline data present.
...
Fixes issue1348 (Bus error in parsers.c) on Solaris/sparc.
2008-10-19 15:08:30 +02:00
Benoit Boissinot
33a3a545ff
merge with crew
2008-10-19 13:00:36 +02:00
Thomas Arendsen Hein
68521aa75e
Fix test-notify output for older diffstat versions.
2008-10-19 12:34:34 +02:00
Benoit Boissinot
980f1548c1
hgweb: nodeids should be aligned in raw changesets
...
If they aren't it breaks hg import --exact
Thanks to Jesper Noehr for noticing it.
2008-10-19 12:23:58 +02:00
Thomas Arendsen Hein
593bff360d
Add util.popen3 fallback, simplify import of Popen3
2008-10-19 12:19:55 +02:00
Thomas Arendsen Hein
b7ce96daba
Fix util.popen2 for Python 2.3
...
1. trigger ImportError early, so fallbacks are activated
2. util.popen2 replaces previous usage of os.popen2, not popen2.popen2
2008-10-19 12:13:25 +02:00
Brendan Cully
428ac5338a
mq: heavy rearrangement of qnew to make it recover reliably from errors.
...
Closes issue1269.
2008-10-18 21:52:22 -07:00
Brendan Cully
c935fe6e01
mq: abort qnew -f if any file in an explicit list cannot be read
2008-10-18 20:45:53 -07:00
Brendan Cully
eeb6237595
mq: make qimport -f work properly. Closes issue1255.
...
From Bernhard Leiner.
2008-10-18 17:29:45 -07:00
Brendan Cully
a52b846f5d
Merge with crew
2008-10-18 16:53:44 -07:00
Brendan Cully
08cb02aa5a
mq: let qimport read patches from URLs
2008-10-18 16:40:01 -07:00
Brendan Cully
cc98fdf26c
mq: do not invoke editor until just before patch creation. Closes issue1346.
2008-10-18 16:33:10 -07:00
Benoit Boissinot
2a624d5e3d
merge with crew
2008-10-19 01:29:57 +02:00
Benoit Boissinot
27bcc719e6
add a missing +x to test-inotify-lookup
2008-10-19 01:28:35 +02:00
Benoit Boissinot
1abf8f679b
index parser: fix refcounting in case of errors, refactor
...
due to incorrect refcounting, on a bad revlog it was failing with:
*** glibc detected *** /usr/bin/python: corrupted double-linked list: 0x0816d318 ***
and a backtrace.
2008-10-19 01:26:46 +02:00
Patrick Mezard
907514d367
patch: pass linereader to binaryhunk.extract() instead of wrapped fp
...
It unifies input patch file access methods
2008-10-18 23:45:46 +02:00
Patrick Mezard
7e769ebcae
patch: pass linereader to scangitpatch(), extract from iterhunks()
...
It's good because it unifies the patch file access methods.
2008-10-18 23:45:46 +02:00
Patrick Mezard
92038e51fa
patch: change functions definition order for readability
2008-10-18 23:45:45 +02:00
Patrick Mezard
3eb6564f0f
patch: map changed files to patchmeta directly
2008-10-18 23:45:45 +02:00
Patrick Mezard
caa00c7b41
patch: patchmeta gives (islink, isexec) tuple instead of int mode
2008-10-18 23:45:45 +02:00
Patrick Mezard
5924883bb6
patch: extract and rename gitpatch into patchmeta, document
2008-10-18 23:45:45 +02:00
Patrick Mezard
d76f01041c
patch: remove applydiff() useless updatedir and rejmerge arguments
2008-10-18 23:45:45 +02:00
