Commit Graph

5527 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
d4fc1890f0 mqrepo: don't abort if the status file has an unknown node 2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
65d93076b9 sshrepo: be more careful while reading data
This should avoid some tracebacks when the server sends some garbage.
2008-02-03 21:03:46 -02:00
Alexis S. L. Carvalho
05d18f9b8d fix markup of templates/{,old/}header.tmpl 2008-02-03 21:03:46 -02:00
Matt Mackall
77a0b60046 win32: remove excessive flushing
Our Windows file code was flushing buffers from the operating system
to disk, rather than from the application to the operating system.
2008-01-30 17:30:34 -06:00
Patrick Mezard
fd2ee26173 convert: hg.clonebranches must pull missing parents (issue941) 2008-01-26 19:55:04 +01:00
Thomas Arendsen Hein
76157ccf47 CVS convert: Find correct parent for new branch (issue704)
Previously the parent was determined by the last changeset where the branched
file was changed even if the branch is based on an earlier revision.
Fix written by mpm.
2008-01-22 00:16:50 +01:00
Thomas Arendsen Hein
01046fa09f Test for converting a CVS branch 2008-01-22 00:08:43 +01:00
Patrick Mezard
494df8c5f5 convert: mercurial sink must be local 2008-01-21 22:24:28 +01:00
Thomas Arendsen Hein
133747d109 Fix double import of 're'. 2008-01-21 22:00:44 +01:00
Thomas Arendsen Hein
64125b8004 convert: Do not abort with TypeError if svn commit message is None (issue934) 2008-01-21 21:44:16 +01:00
Patrick Mezard
2e6086567e convert: enforce svn_source.getchanges() files unicity 2008-01-21 10:04:35 +01:00
Patrick Mezard
205c9daa57 localrepo: ensure files unicity in commit() (issue 714) 2008-01-21 10:02:32 +01:00
Matt Mackall
b35a91a7c0 util: simplify unique 2007-12-27 23:55:40 -06:00
Patrick Mezard
33d8300598 convert: fix invalid svn.ra.check_path() call (issue 771)
The svn transport must be reparented to repository root before using
check_path() with full entrypaths.
2008-01-19 14:39:30 +01:00
Patrick Mezard
37bb6e0440 util_win32: make os_link more robust (issue 761)
On mapped drives, os_link() manages to create links but nlink() does not report them.
2008-01-18 23:56:51 +01:00
Patrick Mezard
2d2126f043 patch: handle empty vs no file in git patches (issue906) 2008-01-12 19:35:11 +01:00
Patrick Mezard
b3a11777ac patch: remove CRLF when parsing file names 2008-01-12 20:43:09 +01:00
Brendan Cully
53f181168a Document --base null in bundle help 2008-01-11 18:31:13 -08:00
John Coomes
e9eb2749fb hg tag: run tag hook just once 2007-12-18 12:45:30 -08:00
Patrick Mezard
47378bdecc Make run-tests.py --interactive work on Windows 2008-01-05 17:55:16 +01:00
Patrick Mezard
8fdc85530f convert: filemap must call base converter before()/after() actions 2008-01-04 23:23:47 +01:00
Patrick Mezard
0f68a55738 patchbomb: make --bundle respect --desc 2007-12-27 22:40:07 -06:00
Patrick Mezard
219b578ed9 patchbomb: read bundle file in binary mode 2007-12-28 16:41:40 +01:00
Thomas Arendsen Hein
e6f1571179 Tests for 2d14cb7e2a9e and a60a6bd11ed6 (interactive prompts during merge) 2007-12-27 13:39:03 +01:00
Thomas Arendsen Hein
0a782ae200 Make ui.prompt repeat on "unrecognized response" again (issue897)
(this was accidentally changed in 18945c2eb022)
2007-12-27 10:32:33 +01:00
Thomas Arendsen Hein
94bdbd585c Fix misleading error and prompts during update/merge (issue556) 2007-12-26 22:47:16 +01:00
Patrick Mezard
a802f4255a patch: be more tolerant to diffstat failures (issue 865)
Sometimes, revisions cannot be represented by a regular diff, only a git diff
would capture binary files or permission changes. diffstat cannot handle git
patches and will output "0 files changed" when fed with an empty diff. We
cannot consider the latter to be an error, unless we rewrite diffstat to handle
these correctly.
2007-12-25 22:21:51 +01:00
Thomas Arendsen Hein
462c1975db Fix chmod of writable but unowned files (issue530)
This could happen e.g. in group writable local repositories where a file
should become executable on update.

(Patch by Benoit Boissinot attached to issue530)
2007-12-25 14:05:26 +01:00
Thomas Arendsen Hein
98901c4f4d Fix test-convert-darcs output on Debian etch (issue779)
The CR characters of darcs get confused the output.
Additionally this darcs version printed:
darcs: <stdin>: hGetLine: end of file
2007-12-21 12:07:02 +01:00
Christian Ebert
69c7eeabfc patchbomb: make "hg email -b" w/o destination work as advertised 2007-12-16 22:55:23 +01:00
Lee Cantey
4f90d32027 Default to 10.5 version using the default python 2.5 2007-12-10 14:54:41 -08:00
Patrick Mezard
9760500b06 convert: move commands definition to ease demandload job (issue 860) 2007-12-09 15:25:36 +01:00
David J. Mellor
b1df375d09 convert: fix SVN date parser dropping the final whole second digit 2007-12-06 13:10:25 -08:00
Jim Hague
00def4b7ec Fix bdiff test failures on AIX.
The test fails when, in the call to calloc(), the number of elements (bn)
is 0. In that case, calloc() on AIX will return NULL, while the code expects
a valid heap pointer. Both results are permissible under C99, Unix98 etc.

Work around by ensuring that at least 1 element is requested.
2007-10-23 10:39:24 +00:00
Patrick Mezard
a55f5fd7fe utils_win32: calling SHGetPathFromIDList under NT is useless and broken
The call was done under NT when running as a service (CGI script for instance) and always crash, even in interactive processes.
2007-12-04 23:10:13 +01:00
Patrick Mezard
9421498212 hgwebdir: normalize virtual paths before stripping the separator
It is not even clear that virtual paths should be normalized as normal paths at all, we could expect slash to be the natural separator.
2007-12-02 19:39:27 +01:00
Patrick Mezard
4bd17cf5de mq: missing target files do not make qpush to fail immediately (issue 835)
Reported and explained by Peter Arrenbrecht <peter.arrenbrecht@gmail.com>.
Following file additions were skipped but empty files were still created. This situation could lead to qrefresh losing patch information.
2007-12-02 13:53:29 +01:00
Patrick Mezard
7d72f53113 hgweb.server: flush log files after every access 2007-11-27 23:55:03 +01:00
Patrick Mezard
f280a41d83 test-import: test fuzziness, ambiguous patch locations 2007-11-25 12:17:30 +01:00
Jim Hague
5ef18ea71f patch: fix sort() comparator argument
'hg import' fails under Python 2.3. The name of the compare function parameter in the call to list.sort() is 'cmpfunc' in Python 2.3 and
'cmp' in Python 2.4+. Passing the compare function as a named parameter is therefore problematic.
2007-11-25 11:49:34 +01:00
Patrick Mezard
8ae803be30 mq: avoid qnew committing everything on invalid paths (issue 803)
If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.
2007-11-20 14:31:58 +01:00
Alexis S. L. Carvalho
0086f97dc7 mq: really remove undo after a qpush (and after a strip)
For qpush, removeundo has to be called after the transaction has finished.

strip may use unbundle, which also leaves an undo file.

Fixes issue780.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
f8788ac266 httprepo: give self._url and the netloc to the password manager
This should hide some differences between different python versions.
2007-11-09 20:21:35 -02:00
Manuel Holtgrewe
4a33cb8d98 Do not display passwords with pull/push/incoming/outgoing
Passwords specified in the repository URL are now displayed as '***'
when accessing the remote repository.
2007-11-05 20:29:32 +01:00
Alexis S. L. Carvalho
9877d9e85e run-tests.py: add a default --date "0 0" argument to commit et al
Part of test-tags was modified just to be sure this works.

The change in test-archive-symlinks is necessary to avoid a "helpful"
warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
cde5fb5024 tests/*: avoid losing the original settings from $HGRCPATH 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
8775f8f81c convert: make sure mercurial_source has a local hg repo 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
fe9d865e0d convert: display all errors if we couldn't open the source repo
This should give the user a better hint of what's going wrong.

Improve some error messages.  In particular, mention "CVS checkout" instead
of "CVS repo".

Fixes issue822 and issue826.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
959d3f5cd4 test-convert-darcs: skip if we can't find the elementtree module
This patch is a bit dirty to avoid having to repeat the dance required
to import elementtree.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
bb984a6137 test-permissions: add a chmod +w to allow the directory to be removed 2007-11-09 20:21:35 -02:00