Patrick Mezard
7b07c85acf
test-transplant: fix missing file addition
2011-04-25 21:11:28 +02:00
Matt Mackall
0739231ee2
merge with i18n
2011-04-21 15:10:59 -05:00
Patrick Mezard
95e7147cd4
convert: make filemap prune useless branch closing revs (issue2774)
...
A branch closing revision only applies if one of its parents belongs to the
branch being closed. Otherwise the filemap can prune it too.
2011-04-20 23:15:18 +02:00
Kevin Bullock
4669edf97c
identify: further clarification of help
...
Following on to 9010cb9bd620, correct a minor grammar issue, re-wrap to
72 columns, and further clarify wording.
2011-04-19 13:33:43 -05:00
Wagner Bruna
2b383e0d00
i18n-pt_BR: synchronized with 9010cb9bd620
2011-04-19 12:00:22 -03:00
Martin Geisler
6cd55d2029
hgweb: detect change based on changelog size too
...
Before, there was a race between an access and a modification made
within the same second.
2011-04-19 15:15:56 +02:00
Martin Geisler
f225a4e198
rollback: lower-case warning issued when branch cannot be reset
...
Also improved the word order.
2011-04-19 13:25:19 +02:00
Martin Krüger
224af593e0
i18n-de: improve grammar
2011-04-19 09:30:42 +02:00
Idan Kamara
44990ce111
identify/help: say what the command does first, mention bookmarks
2011-04-19 00:41:47 +03:00
Martin Geisler
cb82832656
help config: explain that config files do not exist by default
...
Inspired by critique given on StackOverflow where a user writes:
I can have a good guess at what "%USERPROFILE%" might signify but
none of the files listed in the "hg help config" output exist after
running the installer. Previous experience would suggest that
missing files mean something somewhere has gone seriously wrong.
http://stackoverflow.com/questions/2329023/2351139#2351139
2011-04-18 13:57:22 +02:00
Matt Mackall
1cf3cf83b1
encoding: avoid localstr when a string can be encoded losslessly (issue2763)
...
localstr's hash method exists to prevent bogus matching on lossy local
encodings. For instance, we don't want 'caf?' to match 'café' in an
ASCII locale.
But when café can be losslessly encoded in the local charset, we can
simply use a normal string and avoid the hashing trick.
This avoids using localstr's hash method, which would prevent a match between
2011-04-15 23:45:41 -05:00
Idan Kamara
32b141c5c5
help/revset: fix grammar
2011-04-15 16:35:32 +03:00
Thomas Arendsen Hein
e97f821988
subrepo: prevent url normalization from removing // in ssh paths (issue2556)
2011-04-07 12:33:47 +02:00
Md. O. Shayan
43492ff710
hgweb: fix inconsistant display of graphlog (issue1706)
2011-04-07 13:23:07 +05:30
Martin Geisler
bcd0e81ccd
hgrc.5: drop 'hgext.' prefix when talking about extensions
...
The first paragraph apply to all extensions, not just those in hgext.
The second paragraph can just use the simpler form to load mq.
2011-04-07 11:17:55 +02:00
Matt Mackall
ada95b57d4
merge with crew
2011-04-06 15:13:49 -05:00
Matt Mackall
bfe6a35a69
url: use a regex to hide unsupported ssh passwords (issue2754)
2011-04-06 15:10:47 -05:00
Martin Geisler
f484933f96
help/dates: rephrase explanation of internal format
...
The old explanation referred to the two numbers as "unixtime" and
"offset" without really defining those terms.
2011-04-05 10:04:19 +02:00
Yuya Nishihara
8138520db0
hgweb: add missing bookmarks definition to coal/map
...
It shares most templates with paper style.
2011-04-03 23:47:17 +09:00
Yuya Nishihara
63284146ac
hgweb: add separate bookmarks listing to gitweb theme (based on 77ea38e46cc8)
2011-04-03 23:47:05 +09:00
Yuya Nishihara
ac9ff11417
hgweb: add bookmark labels to gitweb theme (based on 4d7cfa1867b5)
2011-04-03 23:44:28 +09:00
Yuya Nishihara
eac83f8ea6
hgweb: format page_nav of gitweb/error.tmpl and add missing links
2011-04-03 23:42:05 +09:00
Yuya Nishihara
d0f552f812
hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help
2011-04-03 22:53:20 +09:00
Yuya Nishihara
6da6d2fbdd
hgweb: add separate bookmarks listing to monoblue theme (based on 77ea38e46cc8)
2011-04-03 22:53:20 +09:00
Yuya Nishihara
0055d5983d
hgweb: fix typo in page-header of monoblue's help template
2011-04-03 22:53:19 +09:00
Yuya Nishihara
e94cb76b15
hgweb: add missing bookmarks templates to atom/rss styles
...
It's already referenced from paper style.
2011-04-03 22:53:19 +09: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
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
Stefano Tortarolo
e2565790ee
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
2011-03-27 13:34:20 +02: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
