Commit Graph

2003 Commits

Author SHA1 Message Date
Dirkjan Ochtman
265b2d6c5c merge with crew-stable 2008-12-19 18:49:02 +01:00
Dirkjan Ochtman
600f058f30 hgweb: mq repos should be in non-recursive collections, too 2008-12-19 18:24:49 +01:00
Dirkjan Ochtman
46c7d48798 merge with crew-stable (again) 2008-12-19 08:42:41 +01:00
Dirkjan Ochtman
21211bc14d tests: fix test-mq-qclone-http (broken by 8cf97ec9314a) 2008-12-19 08:41:46 +01:00
Dirkjan Ochtman
8215a72dd6 merge with crew-stable 2008-12-19 08:20:19 +01:00
Benoit Allard
6edf6273f0 hgweb: recurse down collections only if ** in [paths]
collections: direct child repos only
paths *: direct child repos only (like collections)
paths **: recursive discovery

When ** is used, the mq repository (if any) is also shown.
2008-12-18 22:32:48 +01:00
Brendan Cully
81d39df2bc Merge with crew-stable 2008-12-14 23:05:18 -08:00
Brendan Cully
6e6159b63f patch: handle git patches that remove symlinks (issue1438) 2008-12-14 23:04:29 -08:00
Adrian Buehlmann
b2991e8893 store: encode trailing period and space on directory names (issue1417)
Windows won't create directories with names ending in period or space, so
we encode the last period/space character in directory names of non-hashed
paths in the store using reversible ~xx encoding (' ' -> '~20', '.' -> '~2e').

With this change it is possible to remove a directory ending in period or space
that was inadvertantly checked in on a linux system while still being able
to clone such a repository with its full history to Windows (see also issue793).
2008-12-13 18:32:29 +01:00
Adrian Buehlmann
9a0526b2cd store: don't create dirs ending in period or space for hashed paths (issue1417)
Windows won't create directories with names ending in period or space, so
we replace the last period/space character in truncated directory names of
hashed paths with some other character (underbar).
2008-12-13 17:39:56 +01:00
Patrick Mezard
1620a3ec34 Merge with crew-stable 2008-12-14 18:13:41 +01:00
Benoit Boissinot
f57ea72890 merge with -stable 2008-12-13 13:28:20 +01:00
Patrick Mezard
50f814764a Merge with crew-stable 2008-12-11 23:36:43 +01:00
Patrick Mezard
b8790bb493 test-mq-missing: add test for directory creation on git copy 2008-12-11 22:59:35 +01:00
Patrick Mezard
0f741b13f8 test-convert-cvs-builtincvsps: test debugcvsps command 2008-12-10 17:47:56 +01:00
Patrick Mezard
42823196e7 Merge with crew-stable 2008-12-10 00:29:10 +01:00
Patrick Mezard
1ab0600f40 util: disable walkrepo() recursive behaviour
Revert b1aea76f700 and c6d3b233571e for performances reasons. Traversing
checkout working directories may be too expensive.
2008-12-10 00:16:12 +01:00
Benoit Allard
a26522bf8d tests: test-walkrepo shouldn't throw SystemExit
Write to stdout instead of throwing Exceptions
2008-12-08 20:42:53 +01:00
David Soria Parra
aa564788a6 Merge bookmarks 2008-12-07 08:47:02 +01:00
Patrick Mezard
951d92c2e0 Merge with crew-stable 2008-12-06 20:17:45 +01:00
Patrick Mezard
a03d1cd8a8 convert: backout 54f9cfa0c3a5
This change is brain damaged, there is no reason the copyfrom revision of the
project items may have any relevance when deciding the revision parent. It is
meaningful only when fetching files content.

Incorrect converted graph was spotted in pyglet svn repository at:

------------------------------------------------------------------------
r274 | r1chardj0n3s | 2006-12-21 02:02:14 +0100 (Jeu, 21 Dec 2006) | 2 lines
Changed paths:
   A /branches/richard-glx-version (from /trunk:269)
   M /branches/richard-glx-version/pyglet/window/xlib/__init__.py
   R /branches/richard-glx-version/tests/test.py (from /trunk/tests/test.py:270)
   R /branches/richard-glx-version/tools/info.py (from /trunk/tools/info.py:272)
   R /branches/richard-glx-version/website/get_involved.php (from /trunk/website/get_involved.php:273)

Branching to horribly mangle GLX
2008-12-06 20:10:31 +01:00
Patrick Mezard
7c5f958561 Rewrite svn tests using svndump
They are:
- faster to run (12s vs 30s in test-convert-svn-branches case)
- easier to craft
- easier to debug
- more portable
2008-12-06 20:07:44 +01:00
Benoit Boissinot
dd2edb030b use repr() instead of backticks 2008-12-06 15:37:15 +01:00
David Soria Parra
18c8648fbf bookmarks: Fix tests
As we merge tags now with bookmarks we have add those tags
to the tests.
2008-12-06 16:15:59 +01:00
Jim Hague
4c1c67e78b Fix test-acl failure on AIX due to read only LOGNAME.
On AIX /etc/profile sets LOGNAME read only. This causes test-acl to
fail when it comes to set LOGNAME in do_push().

Work around this by using env to set LOGNAME and run the command.
2008-12-04 13:42:47 +00:00
Augie Fackler
1edb8ec992 rebase: add support to keep branch names
Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
2008-11-18 21:46:01 -06:00
Frank Kingswood
a411f7bf3c tests: allow cvs import to reorder its filename list
Also fix script to generate non-zero length test file b.
2008-12-01 13:42:04 +00:00
Benoit Boissinot
2d2f786bc1 re-add +x bit for test-convert-darcs (was missing from 82f475165077) 2008-12-03 01:28:33 +01:00
Benoit Boissinot
e5063ce27a push: use the fast changegroup() path on push
The race doesn't happen on push (because the discovery is done
in the same hg process), so use the fast path instead.
2008-12-02 19:36:43 +01:00
Brodie Rao
f47cc3cffa color: replace effect-specific reset control codes with general purpose one 2008-12-01 10:45:22 -05:00
Augie Fackler
f781793820 color: Add tests for colorized diff and status output. 2008-12-02 10:13:52 -06:00
Patrick Mezard
9b8cb99ec1 hgweb: extend [paths] syntax to match repositories recursively (issue852)
This feature somehow duplicates [collections] but it is simpler to use and has
less issues under Windows where using absolute path as configuration file key
is not supported.

Suggested by Dirkjan Ochtman <dirkjan@ochtman.nl>
2008-12-01 14:20:20 +01:00
Thomas Arendsen Hein
94a7bf7e03 Fix non-empty $CDPATH causing failed tests.
If CDPATH contains '.', every cd command prints the target path,
which causes additional output in tests and makes them fail.
2008-12-01 12:11:28 +01:00
Dirkjan Ochtman
92de1e35e4 gitweb: fix graph again after previous faulty commit (e5b968ed257a) 2008-11-30 18:38:42 +01:00
Dirkjan Ochtman
55a235cc5e gitweb: fix graph display in IE 2008-11-28 09:50:30 +01:00
Brendan Cully
1b764744f0 Fix test breakage introduced in e96c889402b8 2008-11-27 11:14:43 -08:00
Brendan Cully
010e2cdb2d Add hgcia to hgext 2008-11-27 11:04:29 -08:00
Dirkjan Ochtman
221c2c31df tests: fix test results for e96c889402b8 2008-11-27 18:46:45 +01:00
Dirkjan Ochtman
9bf5b2380e diff: fix obscure off-by-one error in diff -p 2008-11-27 17:00:54 +01:00
Benoit Boissinot
7c64bcb65d merge with mpm 2008-11-27 01:35:12 +01:00
Mads Kiilerich
6e4fb4100f tests: Skip tests if they will fail because of outer repo
For different reasons these tests will fail if run in a tmpdir which is in a hg
repo.

The following three tests assumes no .hg in path dirs - I don't know how to
work around that:

* test-dispatch explicitly tests for no repo and expects "abort: There is no
Mercurial repository here (.hg not found)!"

* test-extension expects parentui to be None when not cd'ed to a repo dir

* test-globalopts tests that implicit -R works correctly - that could perhaps be
done from another repo instead of assuming no repo

The following two might be worth investigating further:

* test-convert-svn-sink fails for unknown reasons, starting with "abort:
unresolved merge conflicts (see hg resolve)"

* test-glog gets strange failures when testing "from outer space"
2008-11-27 00:57:31 +01:00
Mads Kiilerich
46204606ec tests: use killdaemons in hgweb tests
hgweb tests often failed on my system because the serve port wasn't free when a
new hgweb was started; the killed hg wasn't completely dead yet.

Now we use killdaemons which waits for the process to die.
2008-11-27 00:57:30 +01:00
Benoit Boissinot
22d9484189 Catch both IOError and OSError, fix regression introduced by 0018648194a9 2008-11-26 18:23:35 +01:00
Benoit Boissinot
ea0e021c3d protocol: use changegroupsubset() if possible (issue1389)
Due to the fix to the pull race, to avoid sending unnecessary
changesets, use changegroupsubset if possible.
This will increase the load on the server.
2008-11-25 23:26:33 +01:00
Matt Mackall
c163f654f6 Merge with crew 2008-11-25 16:24:22 -06:00
Benoit Allard
f0e30bc7e3 email: add References field in the header
This hopefully helps clients get the threading right.
2008-11-25 23:13:14 +01:00
Dirkjan Ochtman
6aedc8f323 coal/paper: link to shortlog instead of log from error pages 2008-11-25 22:52:25 +01:00
Dirkjan Ochtman
50396f781f coal/paper: show branch name in changeset view 2008-11-25 22:53:01 +01:00
Benoit Allard
f1183e9953 coal/paper: display branch names in log 2008-11-25 22:51:10 +01:00
Brendan Cully
99c25ba716 Improved error message for log --follow
Mads Kiilerich notes that the existing message was unclear
when a nonexistent file was supplied.
2008-11-24 17:16:39 -08:00