Commit Graph

3558 Commits

Author SHA1 Message Date
Adrian Buehlmann
a3504b4a15 tests: unify test-default-push 2010-09-14 22:54:04 +02:00
Adrian Buehlmann
5c33744442 tests: unify test-clone-update-order 2010-09-14 18:43:24 +02:00
Adrian Buehlmann
fba2780eec tests: unify test-debugrename 2010-09-14 21:41:06 +02:00
Adrian Buehlmann
005b52c999 tests: unify test-confused-revert 2010-09-14 21:26:05 +02:00
Adrian Buehlmann
f7441a3667 tests: unify test-command-template 2010-09-14 19:31:00 +02:00
Sune Foldager
843894f4b3 tests: remove exec bit from .t files 2010-09-14 16:03:10 +02:00
Adrian Buehlmann
79059e20c1 combine tests 2010-09-14 12:20:51 +02:00
Martin Geisler
2fe1ef135d test-subrepo-recursion: test missing subrepo 2010-09-13 15:13:30 +02:00
Martin Geisler
d37ba034d5 incoming: recurse into subrepositories with --subrepos/-S flag
As with push and outgoing, the optional source path is ignored for the
subrepositories. Fixing this is Issue1852.
2010-09-13 13:09:31 +02:00
Martin Geisler
2346ea8e9e outgoing: recurse into subrepositories with --subrepos/-S flag
As with push, the optional destination path is ignored for the
subrepositories, i.e., they are always compared with their default
push path. Fixing this is Issue1852.
2010-09-13 13:09:26 +02:00
Martin Geisler
cb93a10b9b add: recurse into subrepositories with --subrepos/-S flag 2010-09-13 13:09:20 +02:00
Martin Geisler
28afb23368 merge with stable 2010-09-12 14:00:40 +02:00
Adrian Buehlmann
b48212d057 tests: unify test-merge-remove 2010-09-12 12:11:39 +02:00
Adrian Buehlmann
9e07266e5a tests: unify test-merge-prompt 2010-09-12 11:52:13 +02:00
Adrian Buehlmann
ee5b09a053 tests: unify test-merge-local 2010-09-11 21:19:12 +02:00
Adrian Buehlmann
6fa6d14d98 tests: unify test-merge-internal-tools-pattern 2010-09-11 20:04:35 +02:00
Adrian Buehlmann
010ea362c8 tests: unify test-merge-force 2010-09-11 17:58:37 +02:00
Adrian Buehlmann
278c3f123f tests: unify test-merge-default 2010-09-11 11:44:53 +02:00
Adrian Buehlmann
98a82d2c4e tests: unify test-merge-commit 2010-09-11 11:18:47 +02:00
Adrian Buehlmann
074eafe83e tests: unify test-manifest* 2010-09-10 23:13:59 +02:00
Dirkjan Ochtman
5ec1a29d90 tests: fix incompatibility with python-2.4 in test-hgweb
Thanks to lcantey for catching it.
2010-09-11 10:57:35 +02:00
Patrick Mezard
30bd1afde3 subrepos: handle diff nodeids in subrepos, not before
Subversion nodeids are integer revisions.
2010-09-10 22:52:00 +02:00
Adrian Buehlmann
84909492b7 tests: unify test-locate 2010-09-10 19:41:45 +02:00
Adrian Buehlmann
587c075c2b tests: unify test-journal-exists 2010-09-10 19:05:49 +02:00
Adrian Buehlmann
5e9c898892 tests: unify test-issue1438 and test-issue2137 2010-09-10 17:59:17 +02:00
Martin Geisler
964567ee35 convert: move -A option to --authormap 2010-09-10 20:11:42 +02:00
Brodie Rao
1833e73f70 convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.

This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.

This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.

(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
2010-09-10 09:30:50 -05:00
Christian Ebert
57eed7cac3 patchbomb: add --confirm option to show series details and ask for confirmation
--confirm presents same prompt as --diffstat, but does not write
a diffstat to the messages' bodies.

A simple test simulating a negative response is included.
2010-09-10 15:32:22 +02:00
Christian Ebert
c4731e2be5 patchbomb: let diffstat prompt only once with complete summary
This changes the behaviour of --diffstat.
Before the user was asked for confirmation of each patch with its
description and diffstat, and a final summary.

Now there is only one prompt right before sending with a final
summary which does not include the patch descriptions, but the
message details and the diffstats:

  Final summary:

  From: sender
  To: recipient(s)
  Cc: (if present)
  Bcc: (if present)
  Reply-To: (if present)
  Subject: [patch 0 of x [flags]] intro (if present)
      a |  28 ++++++++++++++++++++++++++++
      b |  15 +++++++++++++++
  Subject: [patch 1 of x [flags]] subject
      a |  28 ++++++++++++++++++++++++++++
  [ ... ]

  are you sure you want to send (yn)?
2010-09-10 15:32:14 +02:00
Martin Geisler
0447137bce convert: deprecate --authors in preference for --authormap
This aligns the authormap option with the other three mapping options.
The old --authors option is still supported and 'hg help convert -v'
will still show it.
2010-09-10 01:34:14 +02:00
Martin Geisler
074f6b21a9 convert: help string cleanups 2010-09-10 00:36:01 +02:00
Martin Geisler
6765286f85 convert: better quoting in help text 2010-09-10 00:30:36 +02:00
Martin Geisler
e1be8b3f05 convert: show example splice, author, and branch map entries in help
Also document that

- empty lines are skipped and comment are supported in author map

- whitespace is not allowed in branch map entries since we split on it
  when parsing the file
2010-09-10 00:22:46 +02:00
Christian Ebert
c71ec4c740 patchbomb: show prompt and selection in non-interactive mode
Akin to 023d1310d8a4 for the custom patchbomb prompt.
2010-09-08 08:31:07 +02:00
Christian Ebert
c44df41dfd patchbomb: use ui.promptchoice for diffstat to allow localization of choices
The extra check for ui.interacive from patchbomb's prompt function is not
needed here.

Format boolean prompt as in filemerge.py.
2010-09-08 08:31:07 +02:00
Thomas Arendsen Hein
48cd219ead verify: fix "missing revlog!" errors for revlog format v0 and add test
With revlog format v0 the .d files are empty if the only revision stored is an
empty file. Since Mercurial can no longer create format v0 repositories, but
still use it, add a script which creates a repository with a single empty file.
This can be used in other tests if wanted.
2010-09-05 22:32:11 +02:00
Adrian Buehlmann
c7fe62171f tests: unify test-issue* 2010-09-03 23:34:37 +02:00
Adrian Buehlmann
f45079fc9b tests: unify test-globalopts 2010-09-03 22:10:08 +02:00
Adrian Buehlmann
0d0466ee3f tests: unify test-git-* 2010-09-03 14:29:28 +02:00
Adrian Buehlmann
d53524bb44 tests: unify test-filebranch 2010-09-03 11:47:24 +02:00
Adrian Buehlmann
58d4a9dd14 tests: unify test-extension 2010-09-03 11:19:50 +02:00
Adrian Buehlmann
c3854fec44 tests: unify test-execute-bit 2010-09-03 09:46:17 +02:00
Adrian Buehlmann
65803ce2e2 tests: unify test-empty-group 2010-09-03 09:12:36 +02:00
Martin Geisler
77e923da30 merge with stable 2010-09-10 01:04:32 +02:00
Martin Geisler
e783fa28e6 convert: better grouping of command line flags in help
We normally put related command line flags after one another.
2010-09-10 00:07:38 +02:00
Dirkjan Ochtman
fcd515c23a hgweb: support very simple caching model (issue1845) 2010-09-08 15:23:48 +02:00
Dirkjan Ochtman
ea62f97a35 tests: extend get-with-headers to support cache testing 2010-09-08 15:11:35 +02:00
Dirkjan Ochtman
e0920e95c8 tests: fix test output for test-hgweb-no* tests 2010-09-08 15:19:35 +02:00
Dirkjan Ochtman
88a33c641e tests: rename test for better grouping 2010-09-08 15:18:33 +02:00
Dirkjan Ochtman
7846080481 bisect: warn about ending on a merge with only one side marked 2010-09-08 13:48:25 +02:00