Commit Graph

13786 Commits

Author SHA1 Message Date
Adrian Buehlmann
b66c4be0ad subrepo: process merge substate in sorted order in submerge()
This ensures that subrepositories are pulled in a well defined
order when cloning the parent repository.

BEFORE:

  $ hg clone http://hg.gerg.ca/allextensions
  destination directory: allextensions
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 10 changesets with 20 changes to 6 files
  updating to branch default
  pulling subrepo caseguard from http://bitbucket.org/alexandru/caseguard
  real URL is https://bitbucket.org/alexandru/caseguard
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 81 changesets with 100 changes to 13 files
  pulling subrepo hg-prompt from http://bitbucket.org/sjl/hg-prompt
  real URL is https://bitbucket.org/sjl/hg-prompt
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 114 changesets with 176 changes to 35 files
  pulling subrepo hgpaste from http://bitbucket.org/birkenfeld/hgpaste
  real URL is https://bitbucket.org/birkenfeld/hgpaste
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 18 changesets with 18 changes to 2 files
  ...

AFTER:

  $ hg clone http://hg.gerg.ca/allextensions
  destination directory: allextensions
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 10 changesets with 20 changes to 6 files
  updating to branch default
  pulling subrepo Artemis from http://hg.mrzv.org/Artemis
  requesting all changes
  adding changesets
  adding manifests
  adding file changes
  added 55 changesets with 108 changes to 47 files
  ...
2011-04-03 01:57:17 +02:00
Stefano Tortarolo
85a97bc519 rebase: add --tool argument for specifying merge tool 2011-04-02 11:07:05 +02:00
Adrian Buehlmann
9db9ae7e0e revert: note that added files are left as is 2011-04-01 22:44:58 +02:00
Patrick Mezard
964b307b71 bugzilla: fix documentation typo 2011-04-01 20:40:27 +02:00
Matt Mackall
aed6c182f3 merge with stable 2011-04-01 13:25:44 -05:00
Matt Mackall
565ca3ae19 merge with i18n 2011-04-01 13:25:26 -05:00
Matt Mackall
02d5be3b33 Added signature for changeset e5c66e134318 2011-04-01 12:42:02 -05:00
Wagner Bruna
c4c41c0583 i18n-pt_BR: synchronized with fa1153023ab1 2011-04-01 14:35:04 -03:00
Matt Mackall
a4567ca2a9 merge with i18n 2011-04-01 11:45:07 -05:00
Wagner Bruna
0856cc0db2 i18n-pt_BR: synchronized with 9ea18810f8da 2011-04-01 07:53:15 -03:00
Martin Geisler
42b381babb help/hgweb: add pointer to hgrc(5) location 2011-04-01 12:18:37 +02:00
Martin Geisler
9e82c0f40f patchbomb, help/hgweb: do not refer to config files as hgrc files 2011-04-01 12:14:42 +02:00
Kevin Gessner
fd940915e4 hgweb: add base link to file log for paper and coal styles (issue2452) 2011-03-31 15:49:53 -04: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
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
Brodie Rao
5f24d65643 HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT
This makes it possible to gain the benefits of HGPLAIN for scripting
while preserving different behaviors like internationalization.
2011-01-05 00:18:36 +11:00
Brodie Rao
3bbcdd41bc url: be stricter about detecting schemes
While the URL parser is very forgiving about what characters are
allowed in each component, it's useful to be strict about the scheme
so we don't accidentally interpret local paths with colons as URLs.

This restricts schemes to containing alphanumeric characters, dashes,
pluses, and dots (as specified in RFC 2396).
2011-03-31 17:37:33 -07:00
Matt Mackall
d9a0b1cafd merge with stable 2011-04-01 11:45:29 -05:00
Martin Geisler
d8a6341a37 bugzilla: fix bad reST markup
The indented second line turned the first line into a description
header.
2011-04-01 12:30:40 +02:00
Martin Geisler
8cb176c788 bugzilla: markup literal text as such 2011-04-01 12:27:12 +02:00
Martin Geisler
7ec188ab1d merge with stable 2011-04-01 12:21:59 +02:00
Martin Geisler
0d1109205c bugzilla: refer to hgrc(5) man page with normal notation 2011-04-01 12:09:11 +02:00