Commit Graph

11258 Commits

Author SHA1 Message Date
Matt Mackall
e11c3296a4 Merge with i18n 2010-05-11 17:12:10 -05:00
Matt Mackall
eb7971b34e Merge with stable 2010-05-11 17:03:44 -05:00
Matt Mackall
94c9deabbe static-http: disable lazy parsing
This only hits if you're crazy enough to use static-http on a
repository with revlogs larger than 1M. Don't do it.
2010-05-11 16:28:09 -05:00
Martin Geisler
e68e5f0825 i18n-da: merge with stable 2010-05-09 00:15:13 +02:00
Matt Mackall
f37d605b14 clean up remaining generic exceptions 2010-05-07 16:59:00 -05:00
Eric Eisner
21d3c16701 mq: make use of output labeling for summary 2010-05-07 16:51:45 -04:00
Martin Geisler
f93965f673 mq: mark error message for translation 2010-05-07 23:31:49 +02:00
Martin Geisler
0133c2f995 mq: mark string for translation 2010-05-07 23:28:07 +02:00
Stanimir Stamenkov
268f6af2e2 color: add some missing background colors for win32 console 2010-05-07 15:19:37 -05:00
Matt Mackall
8f1a07c9bd subrepo: fix 2.5ism in url parsing 2010-05-07 14:19:14 -05:00
Elifarley Callado Coelho Cruz
33ea9b072c acl: update test output 2010-05-06 15:17:00 -03:00
Elifarley Callado Coelho Cruz
6a180e3b5f acl: update docstring to describe section [acl.groups] 2010-05-06 15:14:40 -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
Greg Ward
89bd117131 push: document return values between various repo methods.
This starts at localrepository.push() and seeps down to
push_addchangegroup(), push_unbundle(), prepush(), addchangegroup(),
and leaks out to sshrepository.unbundle(), sshrepository.addchangegroup(),
and httprepository.unbundle().  Seems to cover everything you ever
wanted to know about pushing but were afraid to ask.
2010-05-02 21:56:25 -04: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
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
Steve Borho
f15661a778 changectx: change diff() to accept keyword opts 2010-05-07 14:07:30 -05:00
Steve Borho
68abae61b6 changectx: use repo.ui diffopts, allow argument override 2010-05-07 10:59:11 -05:00
Martin Geisler
a44b1e166b Merge with stable 2010-05-07 17:03:48 +02:00
Matt Mackall
ad8006c15f context: only scan unknowns when needed 2010-05-05 20:21:57 -05:00
Matt Mackall
cb35f80674 context: use asserts for ignored and clean exceptions 2010-05-04 15:52:42 -05:00
Steve Borho
c9196798ff workingctx: use member variables to store ignored and clean
If some code tries to query ignored or clean files without first
calling the explicit status() method to query them, it will raise
an exception (indicating a software bug).
2010-05-04 15:02:55 -05:00
Steve Borho
ab2c41068e workingctx: add explicit status method, add ignored and fix clean
workingctx.clean() and memctx.clean() have both been returning ignored files
since their creation.  This patch fixes clean() while introducing a method for
querying ignored files.  The new status() method can be used to explicitly
override the default (fast) arguments used by the _status property.
2010-05-04 14:52:25 -05:00
Steve Borho
d1f3ff6382 context: add a changectx.diff() convenience function
With this function, extracting diffs becomes trivial:

repo = hg.repository(ui.ui(), path=root)
ctx = repo['tip']
for out in ctx.diff():  print out
2010-05-04 20:12:58 -05:00
Christian Ebert
7ef7102e51 keyword: omit setting extra variable for record context
Since ab6bbeb1b787 the context is always retrieved in
kwtemplater.overwrite().
2010-05-05 14:02:45 +02:00
Martin Geisler
fa236c2f0a acl: more consistent docstring 2010-05-05 09:25:09 +02:00
Martin Geisler
648fca8526 acl: fix reST syntax 2010-05-05 09:18:05 +02:00
Elifarley Callado Coelho Cruz
573088891a acl: update test output for branch-based access control 2010-05-04 08:39:11 -03:00
Elifarley Callado Coelho Cruz
e8298826aa acl: add support for branch-based access control 2010-05-04 08:37:20 -03:00
Brendan Cully
9a40d342ae Merge with main 2010-05-03 15:28:04 -07:00
Brendan Cully
1efcfabe26 Merge with stable 2010-05-03 15:27:05 -07: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
Benoit Boissinot
38455dfaea fix coding style 2010-05-02 00:48:33 +02:00
Christian Ebert
9642b7288d keyword: simplify record switch in kwtemplater.overwrite
1) use kwtemplater.record attribute for clarity
2) drop optional context argument; consider the speed loss by
   duplicating the dictionary lookup repo['.'] as negligible
2010-05-01 23:59:39 +02:00
Steve Borho
146627c709 color: fix typo in w32effect for bold_background 2010-05-01 16:57:02 -05:00
Matt Mackall
43d8a6855b Merge with stable 2010-05-01 16:03:45 -05:00
Wagner Bruna
51046333e0 merge with i18n stable 2010-05-01 17:56:54 -03:00
Matt Mackall
7f6aa6252c Merge with stable 2010-05-01 15:15:35 -05:00
Matt Mackall
b169367bf4 Merge with i18n 2010-05-01 15:14:22 -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
Alexander Solovyov
558ccfdb04 slightly improve memctx api 2010-05-01 15:00:21 +03: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
David Champion
b8cccccefd merge: tool.check = prompt will force an interactive merge check
tool.check = prompt can be used when the exit status of a merge
tool is unreliable but an explicit user signoff on the merge result is
acceptable.
2010-05-10 11:04:56 -05:00