Commit Graph

2127 Commits

Author SHA1 Message Date
Dirkjan Ochtman
29fd92e139 tests: fix for test-identify returning 255 2009-02-13 13:52:34 +01:00
Gilles Moris
60d2f6f240 extdiff: add --change option to display single changeset diff
This is the counterpart for extdiff of 44ccab2b73f0.
2009-02-07 19:41:05 +01:00
Dirkjan Ochtman
73563fa8ff identify: have consistent output for local repositories
Also, add some extensive testing for it (hardly any in the suite so far).
2009-02-13 11:32:33 +01:00
Martin Geisler
8d98ac17bc reset mergestate after commit 2008-12-25 10:42:01 +01:00
Mads Kiilerich
d775f5aa2a Make util.find_exe alway returns existing file, fixing issue1459
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT

This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
2009-01-25 21:20:13 +01:00
Mads Kiilerich
ec83cadc8e test-merge-tools
Some tests of merge-tools configuration and selection, mostly excercising
filemerge.py
2009-01-25 21:20:11 +01:00
Jim Correia
652c76f46a Account for symlinks when setting up HGTMP.
On Mac OS X, several top-level directories are actually symlinks into
/private. When setting up HGTMP, expand the symlinks so that later
comparisons to or substituations with the actual path work as expected.
2009-01-25 14:12:41 -05:00
Benoit Allard
c429e1d8f6 coal/paper: switch to XHTML 1.1 2009-02-05 18:15:33 +01:00
Martin Geisler
8fdb89c045 run-tests: add --pure flag for using pure Python modules 2009-01-31 22:50:18 +01:00
Benoit Boissinot
51f22b2a1b merge with crew 2009-01-27 18:17:59 +01:00
Steve Borho
4860997ffa record: do not lose permission changes on commit 2009-01-27 09:58:48 -06:00
Dirkjan Ochtman
e5623f9c50 graphlog: some testing for incoming and outgoing graphs 2009-01-26 16:34:38 +01:00
Matt Mackall
e0882a579f fix up tests for paths and urls help 2009-01-25 12:07:41 -06:00
Patrick Mezard
1977ae7dbb Merge with crew-stable 2009-01-25 18:58:12 +01:00
Patrick Mezard
56a4e737a8 Fix a corner case when committing a rename after a merge (issue1476) 2009-01-25 18:55:29 +01:00
Dirkjan Ochtman
4e4940dc82 templater: fix age filter to state the obvious on future timestamps 2009-01-22 16:07:44 +01:00
Dirkjan Ochtman
2976fb29b0 tests: fix issue in test-audit-path with HGTMP on OS X 2009-01-22 15:22:37 +01:00
Dirkjan Ochtman
ed55287ff1 tests: eliminate use of sed -i (which fails on NetBSD) 2009-01-22 14:33:49 +01:00
Dirkjan Ochtman
44cb61f1a6 tests: fix up tests to cope with 8d681e04a351 2009-01-22 14:32:39 +01:00
Dirkjan Ochtman
c4b462d161 merge with crew-stable 2009-01-19 12:58:01 +01:00
Stepan Koltsov
1fa2450a68 coal/paper: add missing spaces in changeset child formatting 2009-01-19 12:36:06 +01:00
Christian Ebert
5afb33fd34 notify: fix neglect of custom headers set via template
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
2009-01-15 01:38:52 +01:00
Patrick Mezard
a70c4ebc9d merge: fix execute bit update issue introduced by db8aabe14ff1 2009-01-13 22:41:06 +01:00
Patrick Mezard
7ab8b3fde9 diffstat: don't fail on merges
First version by Alexander Solovyov <piranha@piranha.org.ua>
2009-01-13 20:28:06 +02:00
Christian Ebert
4f717b637b notify: fix neglect of custom headers set via template
0366830cd960 introduced a bug that discarded all custom headers.
Add custom header to test template.
2009-01-15 01:38:52 +01:00
John Mulligan
5d89493a96 branch closing: add test for branch closing (and reopening) 2009-01-14 21:47:38 -05:00
John Mulligan
9e580fc6f7 store all heads of a branch in the branch cache
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.

The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.

The localrepo.branchheads function is reworked to use the data from the cache.
2009-01-14 21:47:38 -05:00
Bernhard Leiner
bf4052120f mq: make qnew patch format consistent with qrefresh (issue1457) 2009-01-12 09:12:35 +01:00
Matt Mackall
356502607f refactor version code
- simplify version detection code
- move detection code into setup.py
- move version reading function into util.py
- drop version.py code

This makes hg more closely follow its own recommendation of how to deal with
versioning your builds: use hg id in your build script.
2009-01-10 18:02:38 -06:00
Patrick Mezard
6aa7cd6f84 Merge with crew-stable 2009-01-13 23:17:19 +01:00
Stepan Koltsov
321c35acaa diff: add --change option to display single changeset diff (issue1420) 2009-01-13 10:44:16 +01:00
Benoit Boissinot
75e98806a7 web: use the correct filectx in filelog 2009-01-09 17:34:06 +01:00
Benoit Boissinot
9eaa24618d correctly update dirstate after update+mode change (issue1456) 2009-01-07 02:11:17 +01:00
Jason Orendorff
500c43b1e4 mq: don't warn about ambiguous patch name when using patch index (issue1439) 2009-01-06 10:30:22 +01:00
Patrick Mezard
cfa7c44e4c convert/gnuarch: fix switched copy source and destination
Reported by Edouard Gomez <ed.gomez@free.fr>
2009-01-05 14:34:20 +01:00
Patrick Mezard
c8f0bb9bb7 mq: drop copy records when refreshing regular patches (issue1441)
Copy information was saved in a common loop, then refined in a git-only block.
The problem was the latter did filter out renames occuring in the current
patch and irrelevant to commit. In the non-git case, copy records still existed
in the dirstate, referencing removed files, making the commit to fail. Git and
non-git copy handling paths are now separated for simplicity.

Reported by Gary Bernhardt
2009-01-04 21:32:40 +01:00
Dirkjan Ochtman
074cf082f4 hgweb: fix problems with empty repositories 2009-01-04 19:10:42 +01:00
Patrick Mezard
7930704b3e localrepo: fix bad manifest delta generation (issue1433)
The issue came from the 63f9ab8034d1 fix for issue586 working only for
manifest.add() fast path, where the incorrect removed file set was
ignored. This path was no longer taken after 5958346d119e refactoring.
2009-01-03 20:16:10 +01:00
Mark Edgington
fcbe766152 hgweb: send HTTP unauthorized error when denying pull 2009-01-03 20:50:06 +01:00
Martin Geisler
dc4fd3bf46 mq: lowercase output
This extension produces quite a lot of informational messages during
its normal operation and it is hard to say which strings can be
changed and which cannot.
2009-01-03 17:15:21 +01:00
Stefan Ring
171ebe0873 Improved hgweb test.
The hgweb fix in dc83349025f7 aimed at restoring the "back" link in hgweb's
filelog that has been lost in 81d0ede3de31. However, the previous version of
this test ran the filelog command on a file with only a single filelog entry.
In this case, the previous hgweb version did not exhibit the bug. The error
condition is now correctly tested with a filelog of 2 entries.
2009-01-12 13:20:09 +01:00
Dirkjan Ochtman
e53eace7ea tests: use killdaemons.py in test-highlight 2009-01-12 09:57:52 +01:00
Dirkjan Ochtman
aabce1d60c mq: allow qpop if popped revisions are not working dir parents 2009-01-12 09:07:02 +01:00
Dirkjan Ochtman
b62067242a merge with crew-stable 2009-01-12 09:13:45 +01:00
Benoit Boissinot
6b71924a1b merge with -stable 2009-01-09 18:12:53 +01:00
Benoit Boissinot
b3e502e61c merge with -stable 2009-01-07 02:13:32 +01:00
Dirkjan Ochtman
7898fef4da merge with crew-stable 2009-01-06 10:33:57 +01:00
Dirkjan Ochtman
03e3ada916 tests: shrink wait interval for test-convert-bzr-merges 2009-01-05 18:45:20 +01:00
Patrick Mezard
cdcf39e446 Merge with crew-stable 2009-01-05 14:37:46 +01:00
Marek Kubica
3a78577a8b tests: try to prevent different ordering in test-convert-bzr-merges 2009-01-05 12:31:00 +01:00
Benoit Boissinot
722aaa1329 merge with crew 2009-01-04 21:49:37 +01:00
Patrick Mezard
93125a20b3 Merge with crew-stable 2009-01-04 21:44:06 +01:00
Frank Kingswood
c52ddbe980 test: added testcase for cvsps log message lookahead 2009-01-04 10:06:44 +00:00
Dirkjan Ochtman
ad878f12a5 merge with crew-stable 2009-01-04 19:13:02 +01:00
Benoit Boissinot
f1393e61f3 merge with crew 2009-01-04 13:52:28 +01:00
Peter Arrenbrecht
cbd55becad test-audit-path: add one more test (issue 1450) 2009-01-04 08:06:05 +01:00
Patrick Mezard
66fcf68fa2 Merge with crew-stable 2009-01-03 21:54:58 +01:00
Dirkjan Ochtman
823b43d5b5 tests: use killdaemons.py in test-pull-http 2009-01-03 20:20:40 +01:00
Dirkjan Ochtman
25cd3135ab merge with crew-stable 2009-01-03 21:24:31 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output
This does not effect the log or status commands and should be okay
according to the compatibility rules.
2009-01-03 17:15:21 +01:00
Martin Geisler
23608038bf lowercase help output
Changes docstrings to begin with a lowercase word. Only docstrings
used in help output is changed.

Scripts are not expected to grep the output of 'hg help' so this
change should pose no problem with regard to the compatibility rules.
2009-01-03 17:15:15 +01:00
Matt Mackall
a25d874c56 Merge with -stable 2008-12-31 18:00:35 -06:00
Peter Arrenbrecht
e4941ea8f1 test-audit-path: add more tests (issue 1450) 2008-12-30 22:10:41 +01:00
Bernhard Leiner
586b4a2c7c Circumvent removal of valid bisect candidates due to previously skipped ones
As reported in issue 1445:
A valid candidate revision for a bisect test is not considered for testing
due to its skipped ancestor. If this revision is the only untested one left
an assertion error occurs.
2008-12-27 19:05:26 +01:00
Benoit Boissinot
e2908a6b20 merge bookmarks 2008-12-31 15:04:18 +01:00
David Soria Parra
b3a470f0b4 bookmarks: tests for track.current option 2008-12-31 14:29:51 +01:00
Gilles Moris
9b7deb4420 test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py
Note that other sed replacement commands are also filtering get-with-headers.py,
but they seem to be more test specific, hence not handled here.
2008-12-25 17:49:08 +01:00
Alexander Solovyov
c1774bb6c3 python implementation of diffstat
Implemented as two functions: diffstat, which yields lines of text,
formatted as a usual diffstat output, and diffstatdata, which is called
inside diffstat to do real performing and yield file names with
appropriate data (numbers of added and removed lines).
2008-12-25 10:48:24 +02:00
Benoit Boissinot
c79382f326 merge with -stable 2008-12-28 20:21:20 +01:00
Dirkjan Ochtman
934178e495 merge with stable 2008-12-20 13:09:05 +01:00
Matt Mackall
bb9114d8ba resolve: clarify and simplify help 2008-12-19 20:58:33 -06:00
Matt Mackall
003766b33a tests: fix no-diffs option 2008-12-19 16:48:32 -06:00
Matt Mackall
96311238c8 archive: fix bogus error message with no working directory 2008-12-19 16:48:31 -06:00
Matt Mackall
966fa4be08 resolve: require -a switch to resolve all files
Like revert -a, this should make this command slightly safer
2008-12-19 16:47:36 -06:00
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
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
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
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