Commit Graph

2440 Commits

Author SHA1 Message Date
Martin Geisler
dafda53dbe merge with crew-stable 2009-07-07 14:20:58 +02:00
David Champion
08998d553f Bourne shells do not maintain $PWD; update tests accordingly 2009-07-07 01:25:44 +02:00
Brodie Rao
c8364c2177 tests: remove more instances of export FOO=bar bashism 2009-07-05 18:52:55 -04:00
Brodie Rao
930e73d10f tests: remove more instances of export FOO=bar bashism 2009-07-05 18:52:55 -04:00
David Champion
e2549fcce0 test-gpg: suppress secure memory warning
Some platforms (Solaris for one) does not support secure memory and
would give a warning.
2009-07-05 13:59:25 -05:00
David Champion
260ae3b5d7 test: fix for compatibilty with true Bourne /bin/sh
'export foo=bar' is an extension, replaced with 'foo=bar; export foo'
2009-07-05 13:58:37 -05:00
Alejandro Santos
77d606ac51 compat: use open() instead of file() everywhere 2009-07-05 11:01:30 +02:00
Alejandro Santos
c0dcbaabfe tests: add -3 switch to run-tests.py 2009-07-05 10:59:54 +02:00
Matt Mackall
fc2733b540 commit: lose some pointless 'nothing changed' messages
Move message from localrepo to commands. This drops confusing messages
in subrepo, import, and rebase.
2009-07-01 01:16:19 -05:00
Matt Mackall
a87df088a6 branches: add --closed flag for consistency with heads 2009-07-01 00:31:59 -05:00
Matt Mackall
0210a48141 addremove: build lists of already added and removed files too (issue1696) 2009-06-30 23:25:53 -05:00
Henri Wiechers
712ac310c2 test python hook configured with python:[file]:[hook] syntax
Adds a test for python hooks configured with python:[file]:[hook] syntax
in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85)
to 96% (82/85).
2009-06-26 14:42:05 +02:00
Brendan Cully
119683eac8 Merge with crew 2009-06-29 09:00:37 -07:00
Brendan Cully
742dbdb1e3 Update test output for 084c96645721 2009-06-29 09:00:26 -07:00
Brendan Cully
e55703261f Branch heads should not include "heads" that are ancestors of other heads.
For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a)
I expect "hg heads a" to show only 3.
Discovered by running hg heads HEAD on the mutt repo, where older clients
committed default on top of HEAD.
2009-06-29 00:54:23 -07:00
Christian Ebert
1ac1590504 keyword: improve help for kwfiles
- just use "files" instead of "filenames" (analogous to "hg status -h")
- reference the extension help wrt pattern configuration

Kudos to timeless for helpful suggestions.
2009-06-28 16:23:23 +02:00
Christian Ebert
4a2d871161 keyword: improve help for kwfiles 2009-06-27 13:05:25 +02:00
Greg Ward
e4e711f7e0 color: don't blow up if configured with unknown color (just warn). 2009-06-25 09:23:33 -04:00
Greg Ward
e0eb715075 run-tests: use os.path.realpath() to find hg's setup.py.
Needed for running out-of-tree test suites without --with-hg/--local.
2009-06-23 22:20:54 -04:00
Mads Kiilerich
4f97bc02c9 ui.prompt: Show prompt and selection in non-interactive mode
ui.prompt was completely silent in non-interactive mode, unless in verbose
mode. It is fine that it chooses the default automatically, but it is confusing
that the message and prompt shown interactively can't be found in scripted
tests.

The prompt and selection is now .write'ed instead of .note'ed.
2009-06-21 03:13:38 +02:00
Martin Geisler
1454ed1684 commands: wrap short descriptions in 'hg help'
The code for wrapping a single line of text with a hanging indent was
duplicated in commands and help -- it's now moved to a new function
called wrap in util.

The function defaults to a line width is 78 chars, and this un-wraps
some command line flag descriptions, hence the test output changes.
2009-06-24 19:15:58 +02:00
Dirkjan Ochtman
1d29e68744 change wiki/bts URLs to point to new hostname 2009-06-24 15:32:37 +02:00
Dirkjan Ochtman
c8e6583765 extensions: change descriptions for hook-providing extensions
Thanks to timeless and Dave Townsend for advice!
2009-06-24 13:42:34 +02:00
Dirkjan Ochtman
1c6c4a9bc7 extensions: fix up description lines some more 2009-06-24 12:25:56 +02:00
Martin Geisler
4323e41d7e test-globalopts: broken by output change in 9635d54be8c2 2009-06-23 23:05:51 +02:00
Fred Wulff
affad77f81 Add (pre)outgoing hooks for local clones. 2009-04-17 16:34:43 -07:00
Steve Losh
7220dda224 Add a forget command for easily untracking files.
This command does exactly what 'hg remove -Af [FILES]' does.

The reason for creating a new command is that the options for 'hg remove'
are confusing (-A removes only deleted files, -f forces deletion, and using
both means *the exact opposite of both*).

[mpm: simplified help text, code, and updated tests]
2009-05-31 03:09:00 -04:00
Mads Kiilerich
677dbc5997 test merge-tools internal:dump and internal:prompt 2009-06-21 03:11:52 +02:00
Martin Geisler
422e30f7db test-grep: fixed comment 2009-06-23 14:41:16 +02:00
Cédric Duval
dbcec5595d extensions: improve the consistency of synopses
Trying as much as possible to consistently:
 - use a present tense predicate followed by a direct object
 - verb referring directly to the functionality provided
   (ie. not "add command that does this" but simple "do that")
 - keep simple and to the point, leaving details for the long help
   (width is tight, possibly even more so for translations)

Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom
Podlaski Christiansen and others for the helpful suggestions.
2009-06-22 15:48:08 +02:00
Patrick Mezard
64f9f43970 convert/svn: test svn tags encoding 2009-06-21 23:17:05 +02:00
Patrick Mezard
55cbeb1d9a convert/svn: stop returning unicode revision identifiers 2009-06-21 23:17:02 +02:00
Patrick Mezard
872c1fc1ec convert/svn: remove dead code from entry deletion code path
It was made obsolete when multi-branches commit were split into multiple
Mercurial commits.
2009-06-21 23:04:02 +02:00
Patrick Mezard
5943f46c36 convert/svn: remove useless encoding/decoding calls (issue1676) 2009-06-21 23:04:02 +02:00
Dirkjan Ochtman
9685cd7ac9 mq: fix error message for qpush inexistent-patch (issue1702) 2009-06-21 17:34:33 +02:00
Cédric Duval
06cac940ef help: adding a new help topic about extensions
Currently listing non-enabled extensions and a short introductory text.

Thanks to Dan Villiom Podlaski Christiansen for the preliminary
proof-of-concept code for listing available extensions.
2009-06-20 20:55:43 +02:00
Matt Mackall
689cdd2284 tags: silence warning about unknown tags
This is mostly a nuisance and can happen legitimately with pull -r, etc.
2009-06-20 10:53:47 -05:00
Matt Mackall
1ca56aef1e update: add --check option 2009-06-20 08:29:41 -05:00
FUJIWARA Katsunori
0c065c08fa compare grep result between target and its parent
I found that typical case is that grep target is added at (*) revision
in the tree shown below.

     +--- 1(*) --- 3
     0
     +--- 2 ------ 4

Now, I expect 'hg grep --all' to show only rev:1 which is first
appearance of target line.

But 'hg grep --all' will tell:

  target line dis-appeared at 3 => 4
  target line     appeared at 2 => 3
  target line dis-appeared at 1 => 2
  target line     appeared at 0 => 1

because current 'hg grep' implementation compares not between target
revision and its parent, but between neighbor revisions in walkthrough
order.

I checked performance of this patch by "hg grep --follow --all
walkchangerevs" on whole Mercurial repo, and patched version could
complete as fast as un-patched one.
2009-05-19 16:49:54 +09:00
Dirkjan Ochtman
73679ffc0d tests: fix test for convert detection of p4 repos 2009-06-19 14:00:41 +02:00
Dirkjan Ochtman
605b944edf kill trailing whitespace 2009-06-19 13:47:50 +02:00
Dirkjan Ochtman
7daf0cc9cd merge: rename -S/--show option to -P/--preview 2009-06-19 13:58:48 +02:00
Dirkjan Ochtman
12ed4dc982 mq: unify code for qdel -r and qfin 2009-06-19 13:58:22 +02:00
Dirkjan Ochtman
d6eb9e3f55 mq: warn about finalizing patches without cset message 2009-06-19 12:37:29 +02:00
Frank Kingswood
d0ec83933c convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Convert now handles errors from p4 during conversion more gracefully.
If keyword expansion is enabled in a P4 file then keywords will be
unexpanded in hg.
Added testcase for p4 filetypes and keyword (un)expansion.
This testcase ignores UTF and Apple files to avoid binary data.

Edited by pmezard: fixed collation issue on OSX
2009-06-18 10:39:04 +01:00
Martin Geisler
0dfb08009d patchbomb: update test output to match 51f46ab5ceb5 2009-06-18 15:04:20 +02:00
Christian Ebert
623f4a4a00 keyword: concise help title 2009-06-18 01:21:26 +01:00
Greg Ward
7ad75fed52 Fix test-convert-cvsnt-mergepoints so it works reliably.
Specifically, always run 'cvs commit' with -f option to force commit;
add one strategic sleep which seems to be necessary for post-merge
clobber-and-commit (-f doesn't force a commit there?).
2009-06-15 20:35:19 -04:00
Greg Ward
2b10164cb6 test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
2009-06-15 20:35:19 -04:00
Greg Ward
357a69bec3 test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong

This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails.  Failure is more frequent with faster hardware.
2009-06-15 20:35:19 -04:00