Commit Graph

13747 Commits

Author SHA1 Message Date
Brodie Rao
7db4593199 url: special case bundle URL parsing to preserve backwards compatibility
This allows bundle://../foo to continue to refer to the relative path
../foo (bundle URLs do not take host names).
2011-03-30 20:00:24 -07:00
Brodie Rao
40c99bbacb url: add trailing slashes to URLs with hostnames that don't have one
This works around a potential issue in Python 2.4 where cloning a repo
with a URL like http://foo:8080 would cause urllib2 to query on
http://foo:8080?cmd=capabilities instead of
http://foo:8080/?cmd=capabilities.

In the past, this issue has been masked by the fact that
url.getauthinfo() added a trailing slash when it was missing.
2011-03-30 20:00:23 -07:00
Brodie Rao
193402d9df url: move drive letter checking into has_drive_letter() for extensions
This will let the schemes extension override drive letter detection to
allow single letter schemes.
2011-03-30 19:50:56 -07:00
Matt Mackall
d1e21c741d changegroup: unnest some lookup functions 2011-03-31 10:03:24 -05:00
Matt Mackall
70a486fc7f changegroup: minor ordering and renaming changes for similarity
This eliminates some needless differences between the two changegroup variants
2011-03-31 09:59:56 -05:00
Matt Mackall
2cd8ddf3e1 changegroup: remove nodeiter temporary 2011-03-31 09:56:27 -05:00
Matt Mackall
6cf532f349 changegroup: refactor prune as a filter 2011-03-30 17:50:34 -05:00
Matt Mackall
b62691ff5f changegroup: add first logic to send file header
This will allow us to later change how we filter needed file nodes
2011-03-30 17:50:27 -05:00
Matt Mackall
b92d665cf7 url: fix tests 2011-03-30 14:42:41 -05:00
Matt Mackall
712f3e23d9 url: deal with drive letters 2011-03-30 13:34:39 -05:00
David Soria Parra
c0e729f18b bookmarks: do not forward merged bookmark (issue1877) 2011-03-14 23:50:28 +01:00
Matt Mackall
1d9a1adcf9 merge with stable 2011-03-30 13:23:24 -05:00
Yuya Nishihara
95ce899cb1 hgweb: add bookmark labels to monoblue theme (based on 4d7cfa1867b5) 2011-03-30 02:22:15 +09:00
timeless@gmail.com
4f2e8b67dc mq: fix qselect help for qguard 2011-03-29 16:45:23 +03:00
Kevin Berridge
58214a3429 pull: new output message when there are multiple branches
Pull outputs a slightly new message when there are multiple branches and
the current branch has many heads:
(run 'hg heads .' to see heads, 'hg merge' to merge)

This message adds the "." in hg heads to encourage you to consider only the
current branch's heads.
2011-03-28 20:56:56 -04:00
Wagner Bruna
02c0e68aea i18n-pt_BR: synchronized with d816363d60ad 2011-03-23 13:58:33 -03:00
Wagner Bruna
ea42effc1d merge with i18n 2011-03-23 11:57:10 -03:00
Stefano Tortarolo
d1da6cf615 mq: fix typo in docstring 2011-03-15 14:55:16 +01:00
Matt Mackall
c989b5dd89 merge: avoid unlinking destination of merge when case changes (issue2715) 2011-03-22 12:00:38 -05:00
Matt Mackall
c6bc26dacb dirstate: introduce a public case normalizing method 2011-03-22 11:59:43 -05:00
Steve Borho
ebbe78951f wix: add new file templates/paper/bookmarks.tmpl
This file was snuck onto the stable branch with 77ea38e46cc8
2011-03-18 11:36:36 -05:00
Miloš Hadžić
b3d3d7aa76 push/outgoing: print remote target path even if there's an error (issue2561)
This is a simple patch to make hg push/hg outgoing print their remote target
path even if the operation fails. I'm not sure if the original behavior was by
design.

This patch also changes one test to reflect the changed behaviour.
2011-03-17 22:55:02 +01:00
Eric Eisner
3cc72a297f subrepo: recognize scp-style paths as git URLs 2011-03-17 16:29:09 -04:00
Martin Geisler
c18e2c0bc2 i18n-da: synchronize with 3bcc6424bb23 2011-03-16 17:42:42 +01:00
Martin Geisler
a0a2144b94 i18n: don't mark trivial string for translation 2011-03-16 17:38:25 +01:00
Martin Geisler
6f502a2558 i18n: merge with mpm 2011-03-16 17:34:13 +01:00
Martin Geisler
87e06b967c relink: mark abort message for translation 2011-03-16 15:34:45 +01:00
Martin Geisler
ba5898d620 relink: avoid trying to lock the same repo twice 2011-03-16 15:34:10 +01:00
David Soria Parra
8cd17f87d7 i18n-de: correct translation for some fuzzy strings 2011-03-15 10:39:19 +01:00
David Soria Parra
31bf9ec82f i18n-de: synchronize with 3fc1a48c5069 2011-03-15 10:20:55 +01:00
Stefano Tortarolo
add8e3d995 i18n-it: synchronized with 67066925f21d 2011-03-14 23:48:17 +01:00
Patrick Mezard
ec6a1a3ed2 convert/svn: fix _iterfiles() output in root dir case (issue2647)
When converting directory additions/replacement with project directory set to
root, _iterfiles() sometimes returned paths starting with a slash making
following svn calls to fail.

I could not reproduce the issue with hand-crafted repositories.

Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>
2011-03-14 21:35:31 +01:00
thron7
34b16e2601 i18n-de: added translations concerning hardlinks 2011-03-13 15:35:23 +01:00
thron7
5416cc51a9 i18n-de: added more translations concerning rebase 2011-03-13 15:18:17 +01:00
thron7
5c05d2e574 i18n-de: added translations concerning rebase 2011-03-13 14:16:15 +01:00
thron7
0310129901 i18n-de: added translations concerning email sending 2011-03-13 13:04:06 +01:00
thron7
31b288b849 i18n-de: added translations concerning patches 2011-03-13 12:52:22 +01:00
thron7
a04437946a i18n-de: added translations concerning win32text and .hgeol 2011-03-13 12:21:46 +01:00
thron7
b3e89f0a36 i18n-de: added translations for Perforce conversion options 2011-03-13 11:38:27 +01:00
thron7
a9d720c80a i18n-de: added translations for Subversion conversion options 2011-03-12 18:54:43 +01:00
thron7
d90a84c7d1 i18n-de: added translation for CVS conversion options 2011-03-12 18:32:02 +01:00
thron7
110cbece4c i18n-de: added translations for convert.hg.* options 2011-03-12 17:42:17 +01:00
thron7
811ef3fc23 i18n-de: translate some strings 2011-03-12 17:42:17 +01:00
Kevin Berridge
87ae31d662 pull: don't suggest running hg merge when new heads are on different branches
After a pull when new heads are added but no head is added on the current
branch, the "run 'hg merge'" message can be misleading.  This patch doesn't
output the merge message in that scenario.
2011-03-11 20:43:12 -05:00
Jim Hague
aee30b7a2e bugzilla: add modified XMLRPC mode that uses email to send bug comments.
If Bugzilla has its email interface configured, an email can be used
to update bugs. If the From: address in the email matches a valid user
email, Bugzillas make the update as that user. So comments attached to a
bug appear under the name of the user making the change, and the user
does not receive email about the change, exactly as if they had made
the change via the web interface.

So add a modified XMLRPC mode that uses email to modify bugs. The format
of the mails is documented in the Bugzilla email_in.pl specification.
Briefly, initial non-blank lines in the message body starting
'@<field> = <value> modify bug fields. A blank line signals the end of
the command lines, and the rest of the message is used as bug comment.

Invoke the same Mercurial user to Bugzilla user email mapping
currently used in the MySQL mode.

All other processing - checking the bug numbers, checking user ids, etc.
continues to be done via XMLRPC.
2011-03-30 09:49:45 +01:00
Jim Hague
50d39b606d bugzilla: add XMLRPC interface.
Add support for access to Bugzilla via the XMLRPC interface.

This requires a single username and password used to log in to Bugzilla,
plus the URL of the Bugzilla installation. Commit messages are added to
bugs as before, but security only permits them to be added as the
username used to log in.
2011-03-30 09:49:45 +01:00
Jim Hague
86c71c3e2f bugzilla: localise all MySQL direct access inside access class.
Prepare for the addition of other Bugzilla access methods by localising
direct MySQL database access inside an access class.

Provide a base access class largely to document the methods required for
a class implementing a particular access method.

Rename the 'bugzilla_<version>' classes to 'bzmysql_<version>' to
emphasise that they are doing access via direct manipulation of a
MySQL database.
2011-03-30 09:49:45 +01:00
Jim Hague
2813d6b869 bugzilla: keep bug IDs in set.
Bug IDs are collected into a set, and then silently converted in
filter_real_bug_ids() into a list. For consistency, keep them in
a set throughout and update the docstrings to say that.
2011-03-30 09:49:45 +01:00
Jim Hague
e369f66c45 bugzilla: rename filter_unknown_bug_ids to reflect its actual purpose.
The method really removes from the list of bugs any that already have
comment text referencing the changeset in question. Rename it to
filter_cset_known_bug_ids().
2011-03-30 09:49:45 +01:00
Adrian Buehlmann
b6b4efebd6 test-paths.t: 'file:' disables [paths] entries for clone dest 2011-03-29 19:20:28 +02:00