Commit Graph

3144 Commits

Author SHA1 Message Date
Matt Mackall
476998d3a8 error: fix up test-hgrc 2010-06-04 23:04:31 -05:00
Matt Mackall
0625b02fef error: update test-trusted.py 2010-06-04 23:00:22 -05:00
Matt Mackall
ae637a04b0 rebase: use usual util.abort rather than error.ParseError 2010-06-04 17:22:33 -05:00
Matt Mackall
db01b4c21d revset: fix up tests 2010-06-03 20:32:41 -05:00
Matt Mackall
a1c4034fda revset: add a debugrevspec command 2010-06-01 11:18:57 -05:00
Henrik Stuart
0efeb97219 mq: better qqueue test for troublesome names 2010-06-03 21:38:30 +02:00
Cédric Duval
06eedc4b82 mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
2010-06-03 20:40:23 +02:00
Henrik Stuart
ac61fc4db1 mq: fix naming issues for qqueue directories 2010-06-02 19:39:45 +02:00
Alexander Solovyov
a6931a2129 churn: add possibility to include/exclude paths 2010-05-27 22:50:23 +03:00
Alexander Solovyov
06239f590d churn: support spaces in aliases (issue2222) 2010-06-02 14:28:45 +02:00
Christian Ebert
a2b0bda630 keyword: force dirstate normal when all changes in a file are recorded
Before this bugfix a file whose changes were entirely recorded was still
considered modified by "hg status".

Note: the test must use hg record -l/--logfile, because this is not
reproducible with hg record -m/--message.
2010-06-01 01:05:45 +02:00
Martin Geisler
e68f4fb8bb Merge with stable 2010-05-31 21:43:03 +02:00
Martin Geisler
d9fb8f71e1 eol: extension for managing file EOLs 2010-05-31 21:37:01 +02:00
Martin Geisler
9050bae24d Merge with stable 2010-05-31 13:55:47 +02:00
Nicolas Dumazet
20bba72bdf record: check that we are not committing a merge before patch selection
It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.
2010-05-31 17:13:15 +09:00
Martin Geisler
4644ff1a96 mq: mention qqueue in module docstring 2010-05-30 23:24:10 +02:00
Henrik Stuart
9ec8c20547 mq: support multiple patch queues using qqueue 2010-05-29 20:32:39 +02:00
Chad Dombrova
8cc38b5dd4 ui.username(): expand environment variables in username configuration value.
note: expansion of config variables must be handled on a case-by-case basis
because they can contain arbitrary data that may not be desirable to expand.
2010-05-26 14:03:29 -07:00
Chad Dombrova
2d1fae5fc2 config: expand hgrc %include paths 2010-05-26 14:03:29 -07:00
Peter Arrenbrecht
10bda79606 rename: make --after work if source is already in R state
I routinely want to use `hg addrem` and then fix up missed renames
manually using `hg mv -A`. This patch allows me to record such
renames from a source in state R to a target in state A.
2010-05-26 16:16:47 +02:00
Patrick Mezard
094ca2873a convert/svn: remove useless try/catch
While the try/catch was reintroduced in 05a88417e1cb, it was made useless by
the tags/ existence check in getheads().
2010-05-19 22:04:41 +02:00
Sune Foldager
f9f5488566 push: add --new-branch option to allow intial push of new branches
Compare this to --force which allows anything to be pushed. With --new-branch,
only changesets to named branches not present on the and changesets not
introducing additional heads on existing branches are allowed.

Developed by
  Henrik Stuart <henrik.stuart@edlund.dk>
  Sune Foldager <cryo@cyanite.org>
2010-05-21 15:22:29 +02:00
Yuya Nishihara
0ed2abe6d5 tests: fix bashism to load helpers.sh
`source` isn't available at POSIX sh.
2010-05-21 20:55:18 +09:00
Matt Mackall
dd998094a7 rebase: add error codes
Suggested by Dirk Hasselbalch
2010-05-20 15:58:16 -05:00
Matt Mackall
639d751bf4 rebase: improve --abort failure message 2010-05-20 15:20:25 -05:00
Matt Mackall
70ee1c01f7 rebase: only show "rebase completed" message with -v 2010-05-20 15:15:11 -05:00
Matt Mackall
46429c0cb8 strip: hide unbundle messages by default
Unbundling is an internal implementation detail for strip, only show
them with --verbose.
2010-05-20 13:27:28 -05:00
Matt Mackall
0f3c7b919c Fix up rebase's handling of strip backups 2010-05-20 12:21:35 -05:00
Matt Mackall
a386dc3529 strip: improve full backup message 2010-05-20 12:15:44 -05:00
Matt Mackall
1717a658d7 rebase: use helpers.sh in tests 2010-05-19 20:20:12 -05:00
Matt Mackall
0a1ca665ca strip: be quiet about temporary internal bundle 2010-05-19 19:46:39 -05:00
Patrick Mezard
b68b0fc427 Merge with crew-stable 2010-05-19 22:32:40 +02:00
Martin Geisler
efb4a38a04 Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
2010-05-18 16:31:10 +02:00
Martin Geisler
adcdd57662 rebase: stress that only local changesets should be rebased 2010-05-17 21:16:35 +02:00
Martin Geisler
3411550e7e Merge with stable 2010-05-17 21:30:00 +02:00
Steve Losh
6c5a8fed4b tag: add -e/--edit option for modifying the commit message 2010-05-15 23:33:22 -04:00
Matt Mackall
73231aa117 commit: fix complaint about branch merge creating new heads (issue2186) 2010-05-15 21:24:23 -05:00
Matt Mackall
a02b5a5fd1 commands: initial audit of exit codes
bisect: clarify None return
bundle: return 1 on no changes
clone: return result code
copy: limit errors to 0/1
commit: return 1 on no changes
forget: return 1 on errors
grep: return 1 if no match found
remove: return 1 on errors
resolve: return 1 if something fails to resolve
rollback: return 1 if no rollback data
2010-05-15 17:48:49 -05:00
Matt Mackall
3b762c8626 rollback: fix up tests 2010-05-14 10:01:09 -05:00
Matt Mackall
e3ad4f8b46 commit: note new branch heads rather than topological heads
Move to using contexts while we're at it.
2010-05-13 17:24:21 -05:00
Gilles Moris
899149fc0b commit: inform the commiter when resurrecting a closed changeset 2010-05-10 08:53:06 +02:00
Matt Mackall
eb7971b34e Merge with stable 2010-05-11 17:03:44 -05:00
Steve Losh
cbd3276a2b cmdutil: Warn when trying to copy/rename --after to a nonexistant file.
Currently running 'hg rename --after foo.txt bar.typo' is a silent no-op.  This patch adds a warning.  It also updates the copy and rename tests.

No actual functionality is changed.

fixes issue 1822
2010-05-01 18:39:40 -04:00
Cédric Duval
2207d76e14 patchbomb: Reply-To support
From RFC 5322:
  an optional reply-to field MAY also be included, which contains the field
  name "Reply-To" and a comma-separated list of one or more addresses.
  [...]
  When the "Reply-To:" field is present, it indicates the address(es) to which
  the author of the message suggests that replies be sent.  In the absence of
  the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es)
  specified in the "From:" field unless otherwise specified by the person
  composing the reply.

Reply-To addresses may be specified either via command line with --reply-to
or via the 'email' or 'patchbomb' sections of the config file.
2010-05-10 22:06:28 +02:00
Patrick Mezard
3dfbf9b937 test-subrepo-svn: fix strange svn behaviour on windows
I got a full path when pusing the external like:

  Sending        C:/foo/bar/test-subrepo-svn/sub/t/s/alpha

instead of the relative path
2010-05-10 22:52:28 +02:00
Patrick Mezard
d24db38ea7 tests: force color ansi mode on Windows 2010-05-10 22:46:16 +02:00
Patrick Mezard
82b9bdbce9 acl: improve undefined group error handling 2010-05-10 21:44:00 +02:00
Patrick Mezard
48800330b8 test-acl: avoid $HGTMP on windows
sed does not like colons and there are other path normalization issues.
2010-05-10 21:15:12 +02:00
Patrick Mezard
d289b10ad0 convert/svn: report path discovery progress
When converting non-local repositories, scanning changed paths before
retrieving data can be almost as slow as retrieving the data itself, thanks to
HTTP calls overhead.
2010-05-09 22:51:25 +02:00
Patrick Mezard
ba463ef89c convert: display files data retrieval progress 2010-05-09 22:50:42 +02:00