Christian Ebert
576714b48a
mail: test patch mime encoding for patchbomb
2008-10-20 17:40:29 +02:00
Dirkjan Ochtman
f5ea74b223
clean up trailing spaces, leading spaces in C
2008-10-20 14:57:04 +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
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
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
Thomas Arendsen Hein
0bafe8661c
convert documentation: --config argument with spaces needs quoting.
2008-10-19 15:24:33 +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
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
Benoit Boissinot
27bcc719e6
add a missing +x to test-inotify-lookup
2008-10-19 01:28:35 +02:00
Benoit Boissinot
56d9a3258b
merge with crew
2008-10-18 23:20:23 +02:00
Benoit Boissinot
3babcafb3e
inotify: fix status not showing "clean" files (issue907)
...
The inotify server uses 'c' for clean, not 'n'.
2008-10-18 23:06:29 +02:00
Benoit Boissinot
624e32832b
run-tests.py: report missing file as an error
2008-10-18 22:44:01 +02:00
Brendan Cully
cc3761c2b3
Merge with crew
2008-10-18 13:22:46 -07:00
Brendan Cully
203e3723e8
Prevent import over an applied patch (closes issue795)
2008-10-18 13:22:29 -07:00
John Mulligan
636223becf
issue 1144: prevent traceback on verify of bundles
2008-10-18 14:43:14 -04:00
Benoit Boissinot
44d89759ff
run-tests.py: use --prefix instead of --home
...
Some SUSE version don't like --home, they fail with:
"error: must supply either home or prefix/exec-prefix -- not both"
this is due to SUSE shipping a distutils.cfg conflicting with --home.
2008-10-18 21:08:44 +02:00
Benoit Boissinot
4e105a6d69
test-permission: put sane permissions at the end of the test
...
If we don't do that, we won't delete all directories at the end of the test
2008-10-18 20:47:47 +02:00
Dirkjan Ochtman
1830efd60d
tests: fix output for test-notify
2008-10-18 18:24:37 +02:00
Stefano Tortarolo
7658d9947c
rebase: disable rollback after rebasing
2008-10-18 17:00:28 +02:00
Dirkjan Ochtman
c5e3760e1d
help: better documentation intro for a few extensions
2008-10-18 16:56:39 +02:00
Patrick Mezard
910e49f24f
test-doctest: remove TERM env variable only if it's there
2008-10-11 16:40:59 +02:00
Patrick Mezard
3eb95e081f
convert: properly encode subversion URLs (issue 1224)
2008-10-10 11:36:02 +02:00
Dirkjan Ochtman
fcf19417f1
clone: honor -r even when pulling named branches
2008-09-24 13:10:09 +02:00
Benoit Boissinot
0d1cd8705f
Escape '%' when writing to hgrc (issue1199)
...
Fixes clone with paths containing '%'.
Patch provided by mjc.
2008-09-20 15:00:58 +02:00
Dennis Schoen
ed4bd4d0e6
tests: add test for notify extension as changegroup hook
2008-09-18 13:55:58 +02:00
Mads Kiilerich
b80093e190
tests: fix reported patch tool name in test-mq
...
Strip any path of the patch executable, which it might return on failure.
2008-09-18 13:45:36 +02:00
Mads Kiilerich
b0d9bb04f5
tests: fix readline escape characters in output for test-doctest.py
2008-09-18 13:48:41 +02:00
Dirkjan Ochtman
87abdc361c
tests: fix test-highlight for compatiblity with newer Pygments
2008-09-17 11:14:06 +02:00
Benoit Boissinot
d6add1b5a8
forbid username with '\n' at the changelog level
...
It was already forbidden for ui.username() but no verification were
made for username passed through the commandline.
2008-09-13 17:46:09 +02:00
Benoit Boissinot
fdb31340ce
run-tests.py: fix the check for the hg installation with -jn (n > 1)
2008-09-10 13:52:33 +02:00
Benoit Boissinot
bb6f34eb86
inotify: add client code for long pathname handling
2008-09-07 15:10:11 +02:00
Benoit Boissinot
6600c99d5a
inotify: workaround ENAMETOOLONG by using symlinks
...
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.
Fix issue1208
2008-09-06 14:11:33 +02:00
Benoit Boissinot
5b0f8d909f
inotify: deactivate inotify status on failure
...
workaround issue1208, add test
fix traceback handling (socket.error is a singleton in this case)
2008-09-06 12:49:20 +02:00
Benoit Boissinot
3e99382003
fix test-bisect error (because of set -e)
2008-09-05 11:02:12 +02:00
Dirkjan Ochtman
f785a1c716
bisect: only complain when nothing can be done
2008-09-03 19:00:43 +02:00
Dirkjan Ochtman
8c471ba704
imported patch test-check
2008-09-03 19:01:35 +02:00
Patrick Mezard
a5a7a649cf
graphlog: fix calls from outside the repository (issue1285)
2008-09-02 09:25:29 +02:00
Dirkjan Ochtman
83b9ec89ae
bisect: status message when no action is specified
2008-08-21 19:02:56 +02:00
Christian Ebert
51ca48048e
Make test-hardlinks-safety portable
...
On some systems cp cannot create/preserve hardlinks.
Use util.copyfiles instead, after making sure it actually does
create hardlinks.
2008-08-20 17:58:12 +02:00
Thomas Arendsen Hein
0e5b328695
Adjust test output for hg help qrecord since 0fd032cb1106
2008-08-20 15:04:45 +02:00
Dov Feldstern
7805ceec07
test symlinks on symlink-capable os but non-capable filesystem (issue1149)
...
The "real" way to test this is to mount a non-symlink-capable filesystem, and
try working on it; however, I don't know how to mount filesystems as a
non-priveleged user from within the testing framework. So instead, os.symlink
is overridden to raise the exception that would be raised on such a filesystem.
2008-07-31 22:41:19 +03:00
Matt Mackall
4d074f2f87
add a fix for issue 1175
...
If we copy a file followed by an update, it's possible for the parent
manifest to no longer contain the source file of the copy, which could cause
commit to fail. If this happens, we search backwares from the first
parent to find the most likely original revision.
2008-08-10 18:01:03 -05:00
Thomas Arendsen Hein
67623d98de
Make test-convert-mtn pass on systems where mtn add -R uses different order
2008-08-09 11:46:20 +02:00
Thomas Arendsen Hein
d912d56f04
Make test-hardlinks-safety repeatable and executable
2008-08-08 18:48:26 +02:00
Bernhard Leiner
12387fffd4
add additional bisect tests
2008-08-02 22:10:54 +02:00
Bernhard Leiner
41c8918f2f
add additional complex bisect tests (with non-linear history)
2008-08-02 22:11:22 +02:00
Patrick Mezard
c717caba48
Fix subversion tests with svn 1.5
2008-07-30 22:26:41 +02:00
Benoit Boissinot
9d636a4b09
make mq and tags hardlink safe
...
The code didn't check for modes like "r+" or "rb+".
Many thanks to agriffis for noticing it.
2008-07-23 16:08:20 +02:00
Patrick Mezard
1277ce4266
test-branches: add a test for long branch name (issue 1230)
2008-07-20 21:00:13 +02:00
Patrick Mezard
42c2e73f4f
mq: fix qrefresh losing copy information (issue 1134)
2008-07-07 09:16:09 +02:00
Brendan Cully
2aef8dbc09
Check that git patches only touch files under root
2008-06-25 14:13:20 -07:00
Thomas Arendsen Hein
6fbdf04649
run-tests.py: Make tests run with python2.3 if HGTEST_* is set.
...
optparse of python2.3 does not transform default values to the specified
type so e.g. "HGTEST_JOBS=4" (introduced in b8e8d6b0ae08) causes tests
to abort, because options.jobs is set to '4' instead of the number 4.
2008-06-16 11:37:26 +02:00
Patrick Mezard
c7f6f81b90
Ignore dummy copies in dirstate and localrepo.filecommit()
2008-06-15 13:01:03 +02:00
Dirkjan Ochtman
fc7fc528ad
show enabled extensions in hg help
2008-10-18 16:50:03 +02:00
Benoit Allard
38a25978ad
graph: replace the blinking no javascript message
2008-10-18 16:09:07 +02:00
Christian Ebert
5cbc9e210a
highlight: convert text to local before passing to pygmentize (issue1341)
...
Example case:
Display file written in iso-8859-1 with current HGENCODING utf-8.
At the moment only an Error page appears because pygmentize
chokes on the replacement chars.
Alternatives:
1) Turn off highlighting and avoid UnicodeDecodeError
for files that are not in HGENCODING.
2) [this patch] use util.tolocal to display these files.
Alternative 2) seems ok, as this only concerns display and
readability.
See also: c5f1a58b8b9a, apparently put aside during refactor of
highlight.
Add test for UnicodeDecodeError with iso-8859-1 file contents.
2008-10-17 12:12:33 +02:00
Christian Ebert
586a27bcb7
notify: mime-encode messages
...
- addresses will be properly encoded
- message bodies will also be encoded as we are not sending
patches that are meant to be applied
- update test output
- adapt test-keyword to ignore the new headers
2008-07-12 19:12:18 +01:00
Mads Kiilerich
552c248fa5
mq: Allow qrefresh --silent to take parameters
...
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.
This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.
FIXME: Why do mq refresh have two matchers if we only need one?
2008-10-17 21:26:39 +02:00
Bernhard Leiner
78aef95fe0
Add parseindex2.py test case
...
Make sure that the new implementation in C return that same values as the
original Python implementation.
2008-10-17 01:05:10 +02:00
Dirkjan Ochtman
fc7a3b7024
tests: add some testing for patch.diffstat()
2008-10-17 17:34:25 +02:00
Benoit Boissinot
d6688cc959
bdiff: normalize the diff (issue1295)
...
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
2008-10-14 20:13:53 +02:00
Patrick Mezard
71877ea8d9
convert: make built-in cvsps the default
...
Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>
2008-10-15 20:14:28 +02:00
Benoit Boissinot
6f9f41a33d
merge with crew
2008-10-15 16:27:36 +02:00
Benoit Boissinot
1d33f1c63b
dirstate.walk: skip unreadable directories (issue1213)
...
Do not abort on permission denied error, just skip the directory.
2008-10-15 14:52:27 +02:00
Benoit Boissinot
45680829ac
dirstate._dirs: fix refcounting broken by ece124266b74
...
reported by Patrick Waugh
2008-10-15 01:14:29 +02:00
Patrick Mezard
8e45917fce
convert: fix builtin cvsps under Windows
...
Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.
2008-10-13 17:31:03 +01:00
Matt Mackall
c44a262dd5
inotify: add a test for lookup bug
2008-10-10 12:08:49 -05:00
Matt Mackall
84505139dc
inotify: skip deactivation message
2008-10-10 11:29:57 -05:00
Patrick Mezard
0d0f719f13
tests: Windows compatibility fixes
...
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
2008-10-12 19:11:59 +02:00
Patrick Mezard
e82fd2d627
Merge with crew-stable
2008-10-12 19:11:56 +02:00
Patrick Mezard
f8f73e46ef
Merge with crew-stable
2008-10-10 13:20:40 +02:00
Patrick Mezard
e8a232c5c8
Show added files as "added" in editor commit message (issue 1330)
2008-10-09 14:16:17 +02:00
Alexander Solovyov
dfa7272d1d
churn and stats commands merged
2008-10-09 00:14:20 +03:00
Matt Mackall
48ebb7a1ba
merge: fix bug going backwards for already reverted files (issue1303)
2008-10-08 16:22:08 -05:00
Alexander Solovyov
0d41308ed2
churn: generalisation, now it is possible to see statistics grouped by custom template
2008-10-03 00:07:38 +03:00
Sune Foldager
9b5eac039b
provide nicer feedback when an unknown node id is passed to a command
...
Previously, an unknown node id would lead to the following error:
abort: 00changelog.i@343445453433: no node!
All other unknown revision would instead display as:
abort: unknown revision '343445453'!
The former error message has been suppressed in favor of the latter.
2008-10-04 10:14:39 +02:00
Dirkjan Ochtman
1fde4bfba1
tests: check for bzr support by importing bzrlib
...
This is better than starting bzr --version, because it works correctly when
running tests with a non-default Python (version).
2008-10-02 16:22:02 +02:00
Benoit Boissinot
6866fd146e
source
doesn't work for some /bin/sh, use .
instead
2008-09-29 12:12:53 +02:00
Patrick Mezard
4813e1621f
get-with-headers: fix stream modes under Windows
2008-09-28 20:40:38 +02:00
Marek Kubica
0f790a60a5
convert: add bzr source
2008-09-26 20:33:47 +02:00
Dirkjan Ochtman
ba6b67f951
merge with crew-stable
2008-09-24 13:50:29 +02:00
Sune Foldager
1465c20864
fetch: use dirstate branch instead of first parents
2008-09-24 13:22:11 +02:00
Benoit Boissinot
66c79ea6b0
merge with -stable
2008-09-22 14:47:21 +02:00
Patrick Mezard
9b11dbf5dd
Update coverage.py
...
There is no technical reason to update it except it contains all the patches
already done in mercurial plus other stuff. It will be easier to update and
maintain in the future.
2008-09-17 22:15:36 +02:00
Dirkjan Ochtman
0aa08a7ed8
merge with crew-stable
2008-09-17 11:34:37 +02:00
Rocco Rutte
f70a5a0f4e
hgweb: Respond with HTTP 403 for disabled archive types instead of 404
...
This makes it easier for clients/users to distinct between supported
but disabled and unsupported archive types.
2008-09-05 17:28:37 +02:00
Benoit Boissinot
9ceefedcef
merge with -stable
2008-09-10 23:20:04 +02:00
Benoit Boissinot
54526438a0
make test-mq-qdelete work reliably (issue1180)
...
if after a and b has been applied, their hash starts with c, then the test
would fail (because there would be a rev c which would be seen as "applied")
so probability of failure would be 2*1/16.
2008-09-10 17:55:49 +02:00
Benoit Boissinot
1dcbb85da7
run-tests.py: fix the check for the hg installation with -jn (n > 1)
2008-09-10 13:52:33 +02:00
Benoit Boissinot
401371bd20
merge backout
2008-09-10 08:49:05 +02:00
Benoit Boissinot
f4db28e2cc
Backed out changeset 1aa58165fc81 (see issue916 for details)
2008-09-10 08:48:23 +02:00
Benoit Boissinot
7ba2d57a89
Do not try to load extensions twice (issue811)
2008-09-09 14:43:12 +02:00
Benoit Boissinot
416e5f2ef9
tag: without a checkout, base the tag changeset on tip instead of nullid
...
issue916
2008-09-08 14:04:10 +02:00
Sune Foldager
71dc05b36f
fetch: added support for named branches
...
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
2008-09-08 12:55:46 +02:00
Sune Foldager
20edf348ee
branch: added more support for named branches
...
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
2008-09-08 12:55:27 +02:00
Martin Geisler
ca8bba4890
do not pretend to lock static-http repositories (issue994)
2008-09-08 11:32:53 +02:00
Benoit Boissinot
ebcbcef11c
merge with -stable
2008-09-06 17:04:01 +02:00
Benoit Boissinot
ba9e79c7be
merge with crew
2008-09-05 11:04:36 +02:00
Benoit Boissinot
0156251424
merge with -stable
2008-09-05 11:03:34 +02:00
Dirkjan Ochtman
051db6ab82
merge with crew-stable
2008-09-03 19:03:57 +02:00
Benoit Boissinot
20fc9c8d79
allow committing a removed directory
...
fix issue1089
2008-09-03 02:27:25 +02:00
Patrick Mezard
94ead662e7
convert: document source and sink identifiers, fix error message
2008-09-02 22:21:19 +02:00
Rocco Rutte
cc79439de6
highlight: only pygmentize for HTML mimetypes
...
For non-html mimetypes it doesn't make much sense. This also fixes the
issue that highlight unconditionally adds a <link/> tag for its CSS to
the template's header (which is pointless in text/plain output).
2008-09-05 10:39:57 +02:00
Patrick Mezard
20286160ce
Merge with crew-stable
2008-09-02 09:47:40 +02:00
Benoit Boissinot
a45e96bda8
fix test output broken by 3268cb531b33
2008-09-02 01:19:12 +02:00
Martin Geisler
897f1ddab8
i18n: avoid naive plural tricks
2008-08-31 16:12:02 +02:00
Adrian Buehlmann
c937a43696
increase code coverage of test-clone
...
* add a non-inlined filelog to the test repo
* add 'clone --pull' test case
2008-08-30 18:47:54 +02:00
Dirkjan Ochtman
0c1845ffb9
hgweb: return content iterator instead of using write() callable
...
This is a new version of b6b16fec2a60 (which was backed out in faf83e1e40f5),
with an extra line removed to fix problems with hg serve. hg's internal web
server contains checking if the app isn't trying to write more bytes than
specified by the Content-Length header. The first try still contained an old
line that wrote the response, so the response was sent twice.
2008-08-30 17:13:23 +02:00
Benoit Boissinot
5562ddda56
fix regression on empty repo cloning introduced by d87e43563bf4
...
The store directory wasn't copied. Unconditionally create the directories
instead.
2008-08-29 16:50:11 +02:00
Martin Geisler
73f6ec8db1
qimport: report filename in case of IOError
...
The old behaviour was to say "abort: unable to read" since the
patchname variable was always None.
2008-08-26 00:04:18 +02:00
Stefano Tortarolo
2892a4755b
Fix wrong redirection in test-rebase-parameters
2008-08-27 12:49:39 +02:00
Patrick Mezard
f0168e36a9
Merge with Gilles Moris
2008-08-24 22:40:34 +02:00
Gilles Moris
5d85996f85
Have verbose and debug flag print the changeset rev and hash when committing.
...
Besides updating the tests output, I had to push back at the end the test for
issue1193 in test-commit, solved by cset 31a0a36d6d95, because it was using the
current date for commit and was randomizing the subsequent hash.
2008-08-22 22:32:53 +02:00
Patrick Mezard
a8ac103268
Backed out changeset 0f390189b058
...
Replace this change with a better one.
2008-08-24 22:13:39 +02:00
Gilles Moris
4c144a2f64
Have verbose flag print the changeset hash when committing
2008-08-22 13:25:35 +02:00
Patrick Mezard
aee5d531f1
test-rebase-mq: '|' is a GNU sed extension, unfold it
2008-08-24 19:24:47 +02:00
Christian Ebert
ef7b051c64
keyword: avoid additional conflicts during merge/resolve
...
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:
$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other
and will again be expanded on commit.
Demonstrate in test case.
2008-08-22 08:26:18 +02:00
Dirkjan Ochtman
c29fabfbde
merge with crew-stable
2008-08-21 19:05:18 +02:00
Christian Ebert
a72d3adc8a
keyword: thorough hgweb testing
...
- test hgweb while keyword extension is _enabled_
- check expansion with hgweb.file
- besides log and diff, also check annotate for not expanding
2008-08-21 10:20:44 +02:00
Dirkjan Ochtman
3e077a5422
strip trailing whitespace, replace tabs by spaces
2008-08-21 11:35:17 +02:00
Dirkjan Ochtman
afa3084f5f
hgweb: fix WSGI iterators handling in CGI adapter (issue1254)
2008-08-21 10:55:24 +02:00
Thomas Arendsen Hein
dd28190592
merge with crew-stable
2008-08-20 19:00:39 +02:00
Thomas Arendsen Hein
f8baf69ea4
merge with crew-stable
2008-08-20 15:05:43 +02:00
Maxim Dounin
1ce305a01e
addremove: correctly handle intermediate symlinks
...
This fixes problems mentioned in issue660 comments (unrelated to original
issue) where directory was renamed, and symlink was added instead.
In such situation addremove wasn't able to correctly detect that old files
no longer here, but tried to add symlink (and failed due collision with
old files).
2008-05-07 14:32:00 +04:00
Patrick Mezard
574f71dd66
test-mq-qrename: test added patch renaming
2008-06-06 18:23:33 +02:00
Dirkjan Ochtman
ff7fe64e1f
mq: don't update the working copy on strip if parents aren't stripped
...
* * *
2008-06-03 12:10:14 +02:00
Patrick Mezard
ea981a320c
test-convert-mtn: test descriptions with quotes
2008-06-02 21:38:52 +02:00
Stefano Tortarolo
826bd6dc17
Active branches fix (issue1104)
2008-05-29 22:21:29 +02:00
Patrick Mezard
ada9662975
test-mq-merge: test mq merge and explicit patch queue
2008-05-24 18:11:34 +02:00
Dirkjan Ochtman
7b9076932b
tests: don't run test-convert-cvs if there's no cvs server
2008-05-23 16:50:17 +02:00
Patrick Mezard
ae8e8e5874
test-mq: update qdiff summary output
2008-05-18 20:54:10 +02:00
Patrick Mezard
77b17b8e99
mq: make qselect fail properly on an empty guard
2008-05-18 17:01:24 +02:00
Dirkjan Ochtman
7863711fa6
mq: don't commit local changes on pushing empty patch (issue1087)
2008-04-16 16:04:07 +02:00
Patrick Mezard
6b3f1e7d00
test-merge-internal-tools-pattern: make executable
2008-04-14 23:21:27 +02:00
Patrick Mezard
f7c7c06863
convert: fix svn file copy detection code
2008-04-14 22:31:34 +02:00
Patrick Mezard
9d916aae03
convert: fix svn branch source detection corner case
...
It was confused by composite-looking revisions made by copy + remove.
2008-04-14 22:31:34 +02:00
Patrick Mezard
7914c93a87
convert: handle past or foreign partial svn copies
...
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
2008-04-14 22:31:34 +02:00
Patrick Mezard
a5bba7499c
convert: improve subversion branch filtering
2008-04-14 22:31:33 +02:00
Patrick Mezard
2b144ed542
test-convert-svn-branches: short identifiers are more legible
2008-04-14 22:31:33 +02:00
Dov Feldstern
2451adfa26
test that internal merge tools are used when set for a merge-pattern in hgrc
...
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
2008-04-04 02:20:58 +03:00
Benoit Boissinot
e297c198c0
fix import with -p0
2008-04-12 22:41:07 -04:00
Patrick Mezard
7d3027f767
convert: check svn branches are directories
2008-04-07 11:59:20 +02:00
Adrian Buehlmann
94cd97b240
tests/test-diff-copy-depth: using sh instead of bash
...
test failed on plain FreeBSD 6.2 due to nonexistent bash
2008-04-07 09:02:26 +02:00
Patrick Mezard
f572ee0b5f
dirstate: do not ignore current directory '.' (issue 1078)
2008-04-05 18:15:04 +02:00
Patrick Mezard
8e0cbccd26
Let --unified default to diff.unified (issue 1076)
2008-04-04 22:15:14 +02:00
Dirkjan Ochtman
95639b6467
hgweb: make hgwebdir work in the absence of PATH_INFO
...
Thanks to Andrea Arcangeli for reporting and an initial patch.
2008-04-03 13:14:43 +02:00
Thomas Arendsen Hein
a8733ad91a
make test-diff-copy-depth executable
2008-04-02 21:45:35 +02:00
Peter Arrenbrecht
898046c9b1
convert: fix test-convert-svn-* problems with mtime not changing
...
The `svn commit` command does not detect changed files unless
their mtime has changed. A quick succession of, for instance,
`svn co ...; echo x >> y; svn ci` can thus lead to the change to y
being ignored.
Edited by pmezard to write in binary mode.
2008-04-01 09:17:11 +02:00
Thomas Arendsen Hein
448785c6b4
merge with hg-stable
2008-04-01 08:33:17 +02:00
Thomas Arendsen Hein
330a183096
Fix test-convert-svn-tags on case sensitive filesystems
2008-03-30 23:58:02 +02:00
Patrick Mezard
2a688097e7
commands: fix shadowed repo module
2008-03-30 20:18:40 +02:00
Brendan Cully
7e5542bf1f
Debashify rebase tests
2008-08-19 18:07:26 -07:00
Matt Mackall
09385b3219
Fix up tests
2008-08-18 16:50:36 -05:00
Stefano Tortarolo
a60c518854
Add rebase extension
2008-08-18 21:16:31 +02:00
Matt Mackall
9b20862a98
store: simplify class hierarchy
2008-08-13 20:18:43 -05:00
Adrian Buehlmann
6041ce9b15
add test-verify
2008-08-13 20:18:41 -05:00
Stefano Tortarolo
61967725af
make commit fail when committing unresolved files
2008-08-13 20:18:40 -05:00
Patrick Mezard
0eba22ee63
convert: implement startrev for hg source
2008-08-13 23:31:10 +02:00
Dirkjan Ochtman
6b51480caa
merge with crew-stable
2008-08-12 17:47:08 +02:00
Matt Mackall
08b29d9875
Merge with stable
...
Simplify the copy search algorithm
2008-08-10 18:38:43 -05:00
Stefano Tortarolo
5388b1792f
Add ancestors and descendants to revlog
...
This patch adds two methods to revlog:
- ancestors: given a list of revisions returns their ancestors
- descendants: given a list of revisions return their descendants
2008-07-19 18:19:50 +02:00
Thomas Arendsen Hein
b88ac9c741
merge with crew-stable
2008-08-08 18:49:55 +02:00
Christian Ebert
5f30d91aa9
keyword: add verify to nokwcommands after refactor in 3fd7bf0cb4ce
...
Add test as well.
Thanks to Guy Brand for spotting this.
2008-08-07 09:53:57 +02:00
Brendan Cully
a6d56747f2
Fix intermittent broken pipe in test-highlight
2008-08-06 15:08:18 -07:00
Patrick Mezard
d5320d378a
Merge with crew-stable
2008-08-02 23:45:10 +02:00
Patrick Mezard
a7fffbf6bb
Merge with crew-stable
2008-07-30 22:33:40 +02:00
Benoit Boissinot
664b2fafe8
merge with -stable
2008-07-23 16:14:45 +02:00
Matt Mackall
8cb2b4a288
dirstate.walk: push sorting up
2008-07-22 13:03:19 -05:00
Patrick Mezard
49cd301d4b
Merge with crew-stable
2008-07-20 21:51:13 +02:00
Patrick Mezard
5d042582b9
Add test for case folding issues
2008-07-11 14:40:44 +02:00
Paul Moore
ab028fc78a
Sort removes first when applying updates (fixes issues 750 and 912)
...
This change ensures that removes happen first in applyupdates(). This avoids
issues where we try to make a case-only rename of a file on a case insensitive
system. Without this patch, the add of the new name happens before the remove
of the old one - which results in the file not existing, as the two names are
effectively the same.
With the patch, the old name gets removed then the new one gets added, which
is always safe.
2008-07-01 17:59:31 +01:00
Patrick Mezard
9cb9c8c81f
Merge with crew-stable
2008-07-07 09:31:32 +02:00
Patrick Mezard
3035d96fcf
hgk: ctx.parents() problem introduced by 781913965579
2008-07-05 14:35:36 +02:00
Patrick Mezard
71bb2f4e7d
Fix tests failures introduced by 95f45587a770
2008-07-05 14:35:34 +02:00
Frank Kingswood
9871c3ea34
convert: add documentation for CVS source
2008-06-24 10:40:41 +01:00
Dirkjan Ochtman
1599d4d765
merge another backout
2008-07-02 12:27:57 +02:00
Dirkjan Ochtman
0bf39aa189
Backed out changeset b6b16fec2a60 (incorrect Content-Length on Windows)
2008-07-02 12:02:33 +02:00
Dirkjan Ochtman
9f2ed6feaf
merge with main
2008-07-02 09:31:13 +02:00
Dirkjan Ochtman
01e366a587
tests: add a test for the hgweb graph
2008-06-29 22:47:57 +02:00
Dirkjan Ochtman
35c3380f04
hgweb: return content iterator instead of using write() callable
2008-06-29 22:36:18 +02:00
Dirkjan Ochtman
e28d0d4d77
hgweb: centralize permission checks for protocol commands
...
Consistently enforces authorization checks set up in hgrc up front, so that
the actual commands don't have to worry about them and implementers of
hgweb alternatives can easily implement their own permission checks.
2008-06-29 11:35:06 +02:00
Dirkjan Ochtman
cf58037f76
tests: add some tests for web.allowpull configurations
2008-06-29 11:02:19 +02:00
Dirkjan Ochtman
ea809de249
hgweb: protocol requests are processed immediately
...
This makes separation of interface/webcommands and protocol easier and will
make http repos slightly faster because there's less overhead.
2008-06-28 15:28:43 +02:00
Matt Mackall
2791e35714
acl: refactoring
...
- undo class structure
- make buildmatch return None for no function
- use contexts properly
- simplify check loop
2008-06-27 21:45:16 -05:00
Matt Mackall
d22a1c9537
remove: work directly off status
...
This allows us to use a single directory walk and to trivially ignore
unknown files. The resulting code is also easier to follow.
2008-06-27 14:53:30 -05:00
Brendan Cully
f5b1d49e0d
Check that git patches only touch files under root
2008-06-25 14:13:20 -07:00
Matt Mackall
8e1dce7068
purge: cleanup
...
- remove casefolding check, no longer needed
- fold error function into remove
- simplify eol logic
- remove force logic and parameters
2008-06-26 18:44:54 -05:00
Matt Mackall
bc715be859
add __len__ and __iter__ methods to repo and revlog
2008-06-26 14:35:50 -05:00
Matt Mackall
fbb5127472
use repo[changeid] to get a changectx
2008-06-26 14:35:46 -05:00
Matt Mackall
5867ff1667
use repo.changectx(None) to get a workingctx
2008-06-26 13:46:29 -05:00
Matt Mackall
0a211cf39a
context: consistently return p1 context for None
2008-06-25 17:33:51 -05:00
Matt Mackall
9ab99468a9
lookup: optimize '.'
...
Remove error messages as behavior is documented in hg help revs
2008-06-25 17:33:34 -05:00
Dirkjan Ochtman
a2fa8fc7e2
fix dumb test failure introduced in 31fe61a80219
2008-06-25 10:37:07 +02:00
Dirkjan Ochtman
bf8b01e844
merge: only in-branch merges can be implicit
2008-06-23 15:02:52 +02:00
Patrick Mezard
31cc575735
test-commit: test unset date is not read as epoch origin
2008-06-23 10:36:00 +02:00
Patrick Mezard
93bb017ccb
convert: hg sink commits without working dir
2008-06-19 00:14:24 +02:00
Patrick Mezard
67c45a2700
context: let workingctx.date(), .user() and description() be overriden
2008-06-18 22:52:26 +02:00
Dirkjan Ochtman
bb2114f00f
tests: make new convert-cvs tests executable
2008-06-18 12:38:45 +02:00
Dirkjan Ochtman
a74c0e9f94
tests: fix test breakage from graph template changes
2008-06-18 11:08:21 +02:00
Frank Kingswood
6c0cfe8797
convert: cvs.py - Allow user to use built-in CVS changeset code.
...
tests: add two testcases for CVS conversion with builtin CVS
including a testcase for issue 1148.
2008-06-15 16:05:46 +01:00
Thomas Arendsen Hein
393614fcfa
merge with crew-stable
2008-06-16 11:51:19 +02:00
Patrick Mezard
1fa87a95fd
Merge with crew-stable
2008-06-15 13:05:39 +02:00
Christian Ebert
dba21309cf
keyword: mimic cmdutil.bail_if_changed even more
...
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
2008-06-12 02:27:06 +02:00
Matt Mackall
9861703d4b
tag: record tag we're superseding, if any (issue 1102)
2008-06-13 17:29:10 -05:00
Jason Orendorff
1b4f863a3f
mq: qdiff: support all diffopts
2008-06-12 07:38:15 -05:00
Christian Ebert
a2f0369b37
keyword: disable expansion for annotate
...
Keyword expansion should not be annotated.
Annotate revision when unexpanded keyword was inserted.
Add test.
2008-06-12 11:01:36 +02:00
Matt Mackall
dccdda4480
Merge with crew
2008-06-10 12:11:06 -05:00
Dirkjan Ochtman
cd5e863912
hgweb: show cset node and description when hovering over annotate prefix
2008-06-07 17:52:00 +02:00
Patrick Mezard
a19a271534
Merge with crew-stable
2008-06-07 11:43:16 +02:00
Matt Mackall
ded6ff0bc4
copies: teach copies about dirstate.copies
...
When we're using copies() to find changes between the working directory and
its first parent for diff/status/etc., use dirstate.copies() directly.
This avoids doing a full statwalk for simple diffs (issue1090) and
removes a special case from the status command.
2008-06-03 15:41:09 -05:00
Johannes Stezenbach
fd4475d65a
help: move "revision syntax" help topics into online help
...
Move the "Specifying Single Revisions" and "Specifying Multiple
Revisions" help topics from the manual page into the helptable
so they are available both online and in the manual page.
2008-06-03 21:20:52 +02:00
Johannes Stezenbach
cb9002a114
help: list special help topics with -v
2008-06-03 20:56:54 +02:00
Patrick Mezard
e8f9e548cb
Merge with crew-stable
2008-06-06 18:31:57 +02:00
Dirkjan Ochtman
466179d35f
mq: introduce the qfinish command
2008-06-03 09:34:14 +02:00
Dirkjan Ochtman
2cac185fe4
merge from crew-stable
2008-06-03 12:27:48 +02:00
Patrick Mezard
495db7d2e2
Merge with crew-stable
2008-06-02 21:42:16 +02:00
Dirkjan Ochtman
d5bb71e5c9
merge from crew-stable
2008-05-29 22:23:33 +02:00
Christian Ebert
1011bbaea8
Make test-bundle-type work on MacOS 10.4.11
...
head on MacOS Tiger doesn't have a -c option.
2008-05-29 16:29:28 +02:00
Patrick Mezard
352a46be1d
localrepo: fix partial merge test (issue 1111)
2008-05-28 22:45:07 +02:00
Patrick Mezard
1c417db0b5
Merge with crew-stable
2008-05-24 18:23:13 +02:00
Patrick Mezard
49ab85e83f
Merge with crew-stable
2008-05-18 23:49:33 +02:00
Matt Mackall
fb88571d19
match: remove files arg from repo.status and friends
2008-05-12 11:37:08 -05:00
Matt Mackall
7a52386b9e
walk: return a single value
2008-05-12 11:37:08 -05:00
Matt Mackall
525eaf2be0
walk: remove more old badmatch logic
2008-05-12 11:37:08 -05:00
Matt Mackall
fb724552a5
walk: pass match object to cmdutil.walk
...
- introduce cmdutil.match
- change args to cmdutil.walk
- create match objects for walk calls
2008-05-12 11:37:07 -05:00
Benoit Allard
05751ba685
add compression type type parameter to bundle command
2008-04-24 17:16:02 +02:00
Dirkjan Ochtman
8b56cfd1ea
tests: fix test-highlight output, changed in 7ebbe90114ae
2008-04-24 11:43:54 +02:00
Dirkjan Ochtman
f70807073f
merge from crew-stable
2008-04-16 16:07:15 +02:00
Patrick Mezard
08be82588e
Merge with crew-stable, fix test output
2008-04-14 23:28:50 +02:00
Patrick Mezard
acfe08ba86
Merge with crew-stable
2008-04-14 23:04:34 +02:00
Matt Mackall
619e79c725
Merge with -stable
2008-04-13 11:31:45 -05:00
Benoit Boissinot
60caa13781
merge with -stable
2008-04-12 23:05:51 -04:00
Bryan O'Sullivan
1234e5c53b
test-imerge: disable due to massive brokenness
2008-04-11 22:17:20 -07:00
Matt Mackall
edf5a0f5d0
resolve: new command
...
- add basic resolve command functionality
- point failed update and merge at resolve
2008-04-11 12:52:56 -05:00
Adrian Buehlmann
00f3faf7cc
fixed missing sorting in test-dumprevlog
...
The test failed at random because the order of files was non-deterministic,
which produced diffs in test output.
2008-04-11 09:27:28 +02:00
Patrick Mezard
0ec4a6ad34
test-dumprevlog: fix extra path separator under MacOSX
...
The "find .hg/store/ -name '*.i'" command returned paths with extra separators
like '.hg/store//00changelog.i'.
2008-04-11 11:21:55 +02:00
Matt Mackall
8d82cba09a
merge: introduce mergestate
2008-04-10 15:02:24 -05:00
Dirkjan Ochtman
8e0e741a7c
python-2.6: md5 import in test-archive helper
2008-04-08 15:41:21 +02:00
Patrick Mezard
4f5e5e015a
Merge with crew-stable
2008-04-07 13:16:11 +02:00
Dirkjan Ochtman
e31d0e46c9
Merge from crew-stable.
2008-04-07 09:26:40 +02:00
Isaac Jurado
ec51524d45
highlight: Generate pygments style sheet dynamically
...
This patch allows a per-repository (for example, within a hgwebdir) selection
of pygments_style web option. No static .css files required.
Test edited by pmezard (compatibility fixes)
2008-04-05 21:29:02 +02:00
Patrick Mezard
6cb37d1b54
Merge with macencode branch
2008-04-05 19:33:34 +02:00
Patrick Mezard
5f02ff8613
test-mactext: simplify test, coverage is ensured by win32text tests
2008-04-05 19:03:45 +02:00
Patrick Mezard
ad00fc6726
Merge with crew-stable
2008-04-05 18:19:49 +02:00
Thomas Arendsen Hein
82ad00cdba
Make tests/test-dumprevlog executable
2008-04-05 00:11:36 +02:00
Thomas Arendsen Hein
7528210be5
merge with main
2008-04-05 00:04:50 +02:00
Dirkjan Ochtman
ea3191d104
mq: add --force option to strip
2008-04-04 17:44:31 +02:00
Dirkjan Ochtman
34d6bea8db
python 2.6 compatibility: compatibility wrappers for hash functions
2008-04-04 22:36:40 +02:00
Patrick Mezard
2a9d095734
Merge with crew-stable
2008-04-04 22:18:38 +02:00
Adrian Buehlmann
5c85e0dcee
add tests for contrib/dumprevlog and undumprevlog
2008-04-03 17:17:39 +02:00
OHASHI Hideya
3cdbbe36e4
win32text: Add macencode/macdecode
2008-04-03 20:41:31 +09:00
Dirkjan Ochtman
9700c3ce4c
tests: easier error diagnostics for test-serve
2008-04-03 12:46:37 +02:00
Dirkjan Ochtman
67493fd86d
Merge from crew-stable.
2008-04-03 13:21:42 +02:00
Thomas Arendsen Hein
cd73c3d67a
merge with crew-stable
2008-04-02 21:46:30 +02:00
Bryan O'Sullivan
f8a82de0aa
test-churn: force COLUMNS to be set
2008-04-02 08:56:38 -07:00
Christian Ebert
2da59c83a3
Consistently 1 space after full stops in command doc strings
...
Update test output accordingly.
2008-04-02 14:03:16 +02:00
Patrick Mezard
c9239a49e0
Merge with crew-stable
2008-04-01 10:19:49 +02:00
Matt Mackall
74e8b50e35
Merge with stable
2008-03-31 21:49:26 -05:00
Benoit Boissinot
8042e0ac71
hg serve: add clearer message when starting the server with --verbose
...
Explicitly tell the address is the one the process is bound to.
Fix the printing of IPv6 addresses.
2008-03-31 18:44:12 +02:00
Matt Mackall
c9895536f8
copies: skip directory rename checks when not merging
...
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
2008-03-29 12:39:47 -05:00
Matt Mackall
1b20d834b6
copies: sort old names by depth
2008-03-29 12:39:47 -05:00
Matt Mackall
8a7d38f2e2
backout: reverse changeset belongs on current branch
...
Backing out a changeset that is before a named branch branchpoint was
making the reverse changeset the tip of the old branch, which is wrong
and very confusing. So instead, we put it on the current named branch.
2008-03-29 12:39:47 -05:00
Patrick Mezard
d556aa96d4
test-convert-svn-source: remove redundant tests
2008-03-29 17:16:39 +01:00
Patrick Mezard
664a12a36c
convert: allow tags detection to be disabled
...
Tags calculation becomes more reliable but slower, measurable on frequent
synchronizations.
2008-03-29 17:16:18 +01:00
Patrick Mezard
686a0f8465
convert: follow svn tags history (issue953)
2008-03-29 17:15:45 +01:00
Patrick Mezard
05b7b4915e
Add a test for svn tags conversion
2008-03-29 17:15:43 +01:00
Patrick Mezard
da284c98c8
test-convert-mtn: test directory deletion
2008-03-29 17:14:47 +01:00
Bryan O'Sullivan
c8e33b9c63
Tests for issue 1049
2008-03-24 15:50:58 -07:00
Bryan O'Sullivan
776bc63f5b
commit: when committing the results of a merge, it's all or nothing
...
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
2008-03-24 15:36:56 -07:00
Thomas Arendsen Hein
ae74a1c929
Skip older monotone versions for tests.
...
test-convert-mtn is known to work with 0.37 and 0.38, but fails with
0.31 (Debian etch). hghave now skips all versions up to 0.31.
2008-03-24 22:49:33 +01:00
Thomas Arendsen Hein
818fb02fb9
run-tests.py: Only one fail message when output changed and error code.
...
This fixes passing back fail messages mistaken for skip messages when
running with parallel jobs because run_children() only expects one message per
fail.
2008-03-24 22:09:01 +01:00
Thomas Arendsen Hein
5690af9ff7
Fix missing space in one of the new update messages.
2008-03-24 20:28:13 +01:00
Matt Mackall
5c0b28f679
Merge with crew
2008-03-24 11:12:57 -05:00
Patrick Mezard
91f7424c6f
test-convert-mtn: test directory move
2008-03-24 17:02:31 +01:00
Patrick Mezard
d098a6938d
convert: record deleted files in monotone source
2008-03-24 17:02:08 +01:00
Matt Mackall
fb8b59de16
update: better logic and messages for updates
...
- complain about attempts to merge with ancestor
- when updating, differentiate between
- crossing named branches with no local changes (jump)
- crossing named branches with local changes (complain)
- nonlinear update on the same named branch, no changes (complain some more)
- nonlinear update on the same named branch, changes (different complaining)
2008-03-24 10:01:05 -05:00
Patrick Mezard
fe0eb5235b
Add a test for monotone conversion
2008-03-23 23:18:20 +01:00
Dirkjan Ochtman
056bb10b17
hgweb: better error messages
2008-03-23 23:08:18 +01:00
Thomas Arendsen Hein
702b9172d1
run-tests.py: Allow environment variables to set jobs/timeout/port.
2008-03-23 21:48:38 +01:00
Patrick Mezard
d458f6f4af
test-imerge: test resolve subcommand
2008-03-23 20:37:04 +01:00
Patrick Mezard
e54f2a771f
imerge: replace "merge" with "internal:merge" when non-interactive
2008-03-23 20:37:02 +01:00
Patrick Mezard
56154985f7
test-mq-symlinks: skip if symlinks are not supported
2008-03-23 16:07:27 +01:00
Florent Guillaume
a17c5f228a
test-notify: make it pass on Mac OS X 10.5
2008-03-23 01:23:03 +01:00
Florent Guillaume
d5f64814b4
test-remove: make tests really pass
...
Ah, the joys of cross-platform shell scripting...
2008-03-23 01:13:56 +01:00
Florent Guillaume
8a0668790f
test-remove: fix for non-gnu find
2008-03-23 01:04:51 +01:00
Florent Guillaume
37434df8b2
test-remove: make it pass on Mac OS X 10.5
2008-03-22 21:13:22 +01:00
Dirkjan Ochtman
a3c9e25c1e
tests: add highlight extension tests
2008-03-22 20:16:30 +01:00
Dirkjan Ochtman
5f60a364ae
tests: add tests for hgweb to test-keyword
2008-03-22 18:33:10 +01:00
Matt Mackall
9454e6e5aa
update: no -C needed to switch branches without outstanding changes
2008-03-22 13:30:08 -05:00
Patrick Mezard
60bc8be0a8
coverage: deal with symlinked input paths (MacOSX issue)
...
/tmp is symlinked in MacOSX therefore test scripts as well as python modules
are installed in a symlinked location. coverage.py uses abspath() to normalize
its inputs which fails if these are referencing real paths. Use realpath()
instead.
2008-03-22 19:01:09 +01:00
Patrick Mezard
449fc02367
Make churn an official extension
2008-03-22 18:01:46 +01:00