Commit Graph

12477 Commits

Author SHA1 Message Date
Matt Mackall
8ae5ecd1af tests: unify test-convert-tla 2010-09-26 17:18:53 -05:00
Matt Mackall
b2af7a3e51 tests: unify test-convert-mtn 2010-09-26 17:18:28 -05:00
Matt Mackall
4a721be0fe tests: unify test-convert-splicemap 2010-09-26 17:17:19 -05:00
Matt Mackall
75c074ba2e tests: unify test-convert-git 2010-09-26 17:16:46 -05:00
Matt Mackall
50d09c4529 tests: unify test-convert-filemap 2010-09-26 17:14:35 -05:00
Matt Mackall
e4c062e907 tests: unify test-convert-datesort 2010-09-26 16:54:28 -05:00
Matt Mackall
c88a328e4f tests: unify test-convert-hg-svn 2010-09-26 16:53:06 -05:00
Matt Mackall
2066e73671 tests: unify test-convert-hg-source 2010-09-26 16:48:57 -05:00
Matt Mackall
0691b72c3c tests: unify test-convert-hg-sink 2010-09-26 16:47:59 -05:00
Matt Mackall
6edfd1dac8 tests: unify test-convert-darcs 2010-09-26 16:45:51 -05:00
Matt Mackall
d1eea2f57b tests: unify test-convert-cvsnt-mergepoints 2010-09-26 16:43:48 -05:00
Matt Mackall
f8167456f4 tests: unify test-convert-cvs-synthetic 2010-09-26 16:39:52 -05:00
Matt Mackall
164446c4ff tests: unify test-convert-cvs-detectmerge 2010-09-26 15:42:48 -05:00
Matt Mackall
a2ca33dda2 tests: unify test-convert-cvs-branch 2010-09-26 15:33:09 -05:00
Matt Mackall
c1e84a96d4 tests: unify test-convert-cvs 2010-09-26 14:50:58 -05:00
Matt Mackall
04110ded40 tests: unify test-convert-clonebranches 2010-09-26 14:39:34 -05:00
Matt Mackall
0e01c3e732 tests: unify test-convert-bzr-treeroot 2010-09-26 14:37:47 -05:00
Matt Mackall
0d19ecca74 tests: unify test-convert-bzr-merges 2010-09-26 14:37:30 -05:00
Matt Mackall
9bc614322b tests: unify test-convert-bzr-ghosts 2010-09-26 14:36:49 -05:00
Matt Mackall
13dbf6f0f8 tests: unify test-convert-bzr-directories 2010-09-26 14:36:32 -05:00
Matt Mackall
2d08a28bd1 tests: unify test-convert-bzr-114 2010-09-26 14:35:43 -05:00
Matt Mackall
a3dced962f tests: unify test-convert-bzr 2010-09-26 14:35:24 -05:00
Matt Mackall
1094885dbb tests: unify test-convert-authormap 2010-09-26 14:33:08 -05:00
Matt Mackall
5516e0259e tests: unify test-convert 2010-09-26 14:32:13 -05:00
Steve Losh
9c8327389c contrib/vim: add a syntax file for unified tests
This syntax file adds:

* Highlighting of comments, output, and commands (with sh highlighting
  in commands).
* Folding for output and blocks of commands+output.
* Setting tab/indent settings to 2 spaces, because that's what's defined by the
  unified test file format.
2010-09-26 20:43:43 -04:00
Martin Geisler
1bb28d1ed3 merge with stable 2010-09-27 10:20:19 +02:00
Erik Zielke
0c1276bb2d mq: removed -m from qpush help (Issue2401)
The -m option became deprecated in changeset 1e63d4dee4f6,
but the option still appeared in the help line for the qpush
command
2010-09-27 09:19:48 +02:00
Brodie Rao
ac14679b96 subrepos: add missing self argument to abstractsubrepo.checknested 2010-09-26 16:11:04 -05:00
Brodie Rao
b469322e9a test-pull: convert regexes to globs 2010-09-26 16:01:13 -05:00
Brodie Rao
709f38fa67 test-ssh: test absolute path that exists 2010-09-26 14:35:52 -05:00
Mads Kiilerich
d6040e08e1 test-gendoc: mute gendoc stderr
Solaris had problems with zh_CN and warned "couldn't set locale correctly" on
stderr. We don't care.
2010-09-24 02:57:15 +02:00
Mads Kiilerich
8e2068d8b4 test-mq-symlinks: fix symlink handling on solaris
It seems like ln -s gets confused if an existing symlink is dangling:
$ rm -f a b; ln -s a b; ln -sf b b
ln: cannot create b: File exists

We now rely on rm instead of on ln -sf.
2010-09-24 02:52:12 +02:00
Mads Kiilerich
5f130ba1ac test-archive: fix touch datestamps
Backport ac3a256cdaf4 and cd415c06acaf to stable.
2010-09-24 02:49:09 +02:00
Patrick Mezard
42663f256e convert/darcs: improve unsupported format detection (issue2172) 2010-09-24 00:04:07 +02:00
Patrick Mezard
bc1ff8ebda bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016)
_bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and
tags caches initializations also recurse in lookup() and end up trying to
access _bookmarks again. Massive confusion ensues.

I considered fixing all branches and tags cache loading to avoid recursing in
lookup() but it would add complexity to otherwise working code provided lookups
are performed on nodes or revnums.
2010-09-24 00:03:58 +02:00
Alexandre Fayolle
55241e7f70 Fix memory leak when using hg commands over http repositories
When using hg commands over an http repository in a long running process, a
httphandler instance is leaked for each command, because of a loop
handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which
is not handled by Python's gc. Discussion on #mercurial concluded that removing
the __del__ method solved the problem.
2010-09-23 11:41:27 +02:00
Brodie Rao
20c102ca36 grep: only catch re.error when compiling regular expressions 2010-09-22 19:15:27 -05:00
Anthony Foiani
5a82d7f2a7 doc: clarify smtp.password usage 2010-09-23 00:27:04 -06:00
Mads Kiilerich
48773bdeed log: include unmodified-in-merge files in log diff/stat (issue2383)
f02da4369319 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.

This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
2010-09-23 01:23:16 +02:00
Mads Kiilerich
b0f0118486 tests: fix unzip -l variability fix
01-01-1980 slipped through the grep.
2010-09-23 01:51:17 +02:00
Matt Mackall
0e166af1f9 tests: fix unzip -l variability 2010-09-22 17:13:49 -05:00
Patrick Mezard
23ced90ea0 mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since cb494d252290, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.
2010-09-22 23:51:10 +02:00
Patrick Mezard
aebd1a7052 context: fix filectx.undelete() (issue2388) 2010-09-21 23:14:58 +02:00
Matt Mackall
25cfe14ed3 tests: fix hgweb template change 2010-09-20 17:01:12 -05:00
Ryan Phillips
505aacc190 hgweb: be consistent with the background highlighting on closed branches (Issue2386)
The coal and paper web themes will highlight closed branches as a visual cue to
the user. This patch makes the other two themes constistent.

For users with difficulty differentiating colors, it would be better to split
out closed branches to a new table or optionally hide them.
2010-09-19 21:20:38 -05:00
Dan Villiom Podlaski Christiansen
4a1790f181 mq: fix the deprecation comment for qsave & qrestore.
Changeset 1e63d4dee4f6 deprecated qsave and qrestore. In the
deprecating comment, users were referred to 'rebase --mq' which -- at
the time the message was written -- didn't exist. Currently, on the
default branch, rebase *does* take a '--mq' option, but it probably
doesn't do what Dirkjan expected it to do when he wrote the message.

In the original, deprecating commit, little context was provided as to
why this change was made. Based on my recollection, concensus at the
Paris Sprint in February 2010 was that one of the problems with MQ was
that it exposed far too many commands. Notable among these were qsave
& qrestore: very few core developers understood what they did and even
fewer (none, IIRC) actually used them. However, they couldn't be
removed; not only do the usual backwards compatibility reasons apply,
but the hg book refers to them.
2010-09-20 13:31:02 +02:00
Patrick Mezard
979ccf4590 Use lexists() instead of exists() where appropriate 2010-09-20 21:46:56 +02:00
Patrick Mezard
0988572cc6 convert/svn: fix broken symlink renames in svn sink 2010-09-20 21:46:39 +02:00
Patrick Mezard
e043450e1d rename: do not overwrite existing broken symlinks 2010-09-20 21:46:39 +02:00
Patrick Mezard
21f3e10fb9 patch: do not overwrite broken untracked symlinks 2010-09-20 21:42:11 +02:00