Commit Graph

3108 Commits

Author SHA1 Message Date
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
Patrick Mezard
8c28124de1 convert: add progress support 2010-05-09 22:50:07 +02:00
Patrick Mezard
4eba02ab8f Merge with crew-stable 2010-05-09 19:25:35 +02:00
Patrick Mezard
3cefb24597 convert/svn: handle files/links replaced by dirs (issue2166) 2010-05-09 19:11:02 +02:00
Patrick Mezard
cb10fb5dd3 test-convert-svn-move: test moved dirs copy records 2010-05-09 19:11:02 +02:00
Elifarley Callado Coelho Cruz
33ea9b072c acl: update test output 2010-05-06 15:17:00 -03:00
Elifarley Callado Coelho Cruz
1b50176554 acl: support for group definitions in section [acl.groups], which take precedence over OS-level groups 2010-05-06 14:23:14 -03:00
Matt Mackall
3ce5a868cd subrepo: fix test output 2010-05-07 14:14:41 -05:00
Edouard Gomez
293b104156 subrepo: print paths relative to upper repo root for push/pull/commit
This makes more sense when using multiple levels of
nesting.

This happens to help a lot in a case where 3 projects
of mine all use the same makefile helper project as a
sub. A fourth project use these first three projects
and current output made it very hard to figure
which makefile helper was committed. it looked more
like the project was committed/pushed/pulled three times
in a row than dealing on three different repos.
2010-05-01 23:05:22 +02:00
Edouard Gomez
0a2d8e6eef subrepo: print pushing url 2010-05-01 23:05:22 +02:00
Edouard Gomez
079690a146 subrepo: dirtiness checks should iterate over subrepos 2010-05-01 23:05:21 +02:00
Edouard Gomez
46ea8095fd subrepo: normalize path part of URLs so that pulling subrepos from webdir works
For a "all projects at root" repo layout eg:
/main
/sub

Where subrepos are used such that a clone of main has this layout:
./main/
./main/.hgsub
./main/sub/

And the .hgsub content is:
sub = ../sub

This allows a pull from a hgweb where main and sub are exposed
at the root (or same directory level)

The current code doesn't normalize the path component of a pull
url. this results in trying to pull from
http://server.com/hg/main/../sub

Current hgweb implementation doesn't reduce the path component
so this results in a 404 error though everything is setup logically.

This patch adresses this 404 error on the puller side
normalizing the URLs used for pulling sub repos. For this
example, the URL would be reduced to http://server.com/hg/sub

Fix + test
2010-05-01 23:05:19 +02:00
Matt Mackall
ba577371b4 mq: fix test 2010-05-07 14:14:41 -05:00
Matt Mackall
7a237857b0 mq: add a line to hg summary 2010-05-05 20:53:45 -05:00
Elifarley Callado Coelho Cruz
573088891a acl: update test output for branch-based access control 2010-05-04 08:39:11 -03:00
Matt Mackall
1d338ff2d8 summary: add subrepo status 2010-05-03 17:05:23 -05:00
Thomas Arendsen Hein
1e2f836e91 Adjusted output of test-subrepo for issue1977 to 67db6aba9ae1 2010-05-02 09:15:17 +02:00
Matt Mackall
7f6aa6252c Merge with stable 2010-05-01 15:15:35 -05:00
Christian Ebert
0c56ea9b1c keyword: cleanup test and make it portable
- replace sed call with python command
- no need to back up hgrc before record
2010-05-01 20:49:40 +02:00
Faheem Mitha
5fe5a6e7b6 mq: rewrite strip docstrings
This patch is joint work with ilowe.
2010-05-01 23:04:49 +05:30
Mads Kiilerich
76f4bb870c test-issue2137: don't use $PWD; use pwd instead
This fixes test failure on Solaris, as described on
http://mercurial.selenic.com/wiki/WritingTests
2010-05-01 19:24:51 +02:00
Mads Kiilerich
7c7a8e770e test-mq-merge: quote ^
^ is magic on Solaris and must be quoted
2010-05-01 19:24:49 +02:00
Mads Kiilerich
5e49c62ca7 test-extension: changed environment variables must be exported again
This fixes failure on Solaris because HGRCPATH wasn't unset.
2010-05-01 19:24:46 +02:00
Wagner Bruna
707cfea20f subrepo: add test for issue1977 2010-04-30 19:50:37 -03:00
Wagner Bruna
e4cfca8a2e subrepo: update test output for issue1977 fix 2010-04-30 19:49:35 -03:00
Mads Kiilerich
ee95467b21 mq: qpush --move, reorder patch series and apply only the patch
This makes it less necessary to edit .hg/patches/series manually.
2010-04-30 15:05:51 +02:00
Nicolas Dumazet
09283d5a0c static-http: mimic more closely localrepo (issue2164: allow clone -r )
* httprangereader: name, __iter__ and close are needed to mimic file object
* static-http opener:
    - disallow write/append modes
    - add (unused) atomictemp parameter
* static-http repo:
    - root attribute is needed for localrepo.dirstate()
    - _branch* attributes are required for commitctx and branchmap calls
* tags: force repo.opener.__iter__ call earlier to force httprangereader
  to try to read the cache early, to avoid raising IOError later.
2010-04-26 20:13:14 +09:00
Nicolas Dumazet
22fdcb45f3 tag: warn users about tag/branch possible name conflicts
As reported recently, Mercurial users can easily find confusion when
using a common name for a tag and a branch. It seems reasonable to warn
them about this potential outcome, to avoid that "surprise".
* Explain briefly the issue in "hg help tag"
* Warn when tagging a revision
2010-04-19 17:41:12 +09:00
Patrick Mezard
8207527bd4 test-convert-git: be tolerant to git output variants 2010-04-26 14:40:34 +02:00
Patrick Mezard
438c49a871 convert/git: check status when reading output stream 2010-04-25 23:07:46 +02:00
Brett Cannon
8e100766b6 subrepo: fix repo root path handling in svn subrepo 2010-04-18 14:20:08 -07:00
Yuya Nishihara
539b379b8c log: add --stat for diffstat output
log --stat shows diffstat in place of patch output.
2010-04-01 00:35:12 +09:00
Martin Geisler
1693779bcc test-acl: grep for $HGTMP, not /tmp/ 2010-05-01 16:35:27 +02:00
Yuya Nishihara
a3e35890c8 mq: fix opts['unified'] = '0' to take effect when qdiff --stat
`opts['unified'] = '0'` tries to reduce the number of lines to be
processed by patch.diffstat, but here it does not affect diffopts,
thus it does not make sense.

Instead, we can change `diffopts.context` directly.

Added test case for qdiff --stat.
2010-04-07 00:10:54 +09:00
Mads Kiilerich
d0cbf08541 showconfig: show rc paths with --debug 2010-04-26 15:32:23 +02:00
Eric Eisner
dd5c303d3f tags: return tags in sorted order
This makes log and summary have less arbitrary tag ordering and also
groups similar tags together, such as the mq tags.
2010-04-26 15:58:36 -04:00
Christian Ebert
44beae283e keyword: test recording 2010-04-26 04:01:13 +02:00