Wagner Bruna
2a9331b2f1
i18n-pt_BR: synchronized with f49521594bc2
2010-09-10 21:05:51 -03:00
Martin Geisler
ab7285a5e1
merge with i18n-stable
2010-09-11 00:39:34 +02:00
Christian Ebert
55548a8056
keyword: explain file-wise expansion in help
2010-09-10 16:58:13 +02:00
Brodie Rao
1833e73f70
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
...
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
2010-09-10 09:30:50 -05:00
Martin Geisler
074f6b21a9
convert: help string cleanups
2010-09-10 00:36:01 +02:00
Martin Geisler
6765286f85
convert: better quoting in help text
2010-09-10 00:30:36 +02:00
Martin Geisler
e1be8b3f05
convert: show example splice, author, and branch map entries in help
...
Also document that
- empty lines are skipped and comment are supported in author map
- whitespace is not allowed in branch map entries since we split on it
when parsing the file
2010-09-10 00:22:46 +02:00
Wagner Bruna
5a1881d32f
i18n-pt_BR: fix a couple of typos
2010-09-07 18:37:59 -03:00
Wagner Bruna
2022904198
i18n-pt_BR: added messages from crew stable up to c93ef501f756
2010-09-07 18:13:36 -03:00
Peter Arrenbrecht
c3d38bfaec
merge: delay writing the mergestate during until commit is called
...
This speeds up merges of lots of files considerably.
2010-09-06 17:35:49 +02:00
Matt Mackall
dcc838ad18
tests: fix touch -t with RHEL
2010-09-22 15:33:08 -05:00
Dan Villiom Podlaski Christiansen
8e99053714
tests: compatibility fix.
...
'touch -d *' doesn't work on Mac OS X. In order to prevent this from
occuring again, a check for the case is added to 'check-code.py'.
2010-09-21 18:36:23 +02:00
Matt Mackall
5d9fc42983
tests: drop a bunch of sed calls from unified tests
2010-09-21 16:44:13 -05:00
Matt Mackall
ac660e9f65
tests: cleanup exit code handling in unified tests
2010-09-21 16:00:02 -05:00
Matt Mackall
0c59a109d6
check-code: add some basic support for unified tests
2010-09-21 12:41:24 -05:00
Patrick Mezard
b416e95b1a
test-subrepo-recursion: sort archive output for portability
2010-09-21 23:58:32 +02:00
Patrick Mezard
827fa9acf4
Merge with crew
2010-09-21 23:38:26 +02:00
Patrick Mezard
44b002a617
Merge with stable
2010-09-21 23:37:47 +02:00
Matt Mackall
add9355590
tests: fix hgweb template change
2010-09-20 17:01:12 -05:00
Matt Mackall
6b5c5e35ef
merge with stable
2010-09-20 16:56:57 -05:00
Matt Mackall
f764dbce14
merge with crew
2010-09-20 16:56:44 -05:00
Patrick Mezard
0f60de38ce
Merge with crew
2010-09-20 23:42:23 +02:00
Matt Mackall
fc9b3fe966
revsets: reduce cost of outgoing in the optimizer
2010-09-20 16:40:36 -05:00
Matt Mackall
89bcf054c9
tests: fixup tests using unzip -l
2010-09-20 15:50:36 -05:00
Patrick Mezard
9679c03c21
Restore lexists() changes lost in d8a989380f8b merge
2010-09-20 22:41:10 +02:00
Patrick Mezard
614db673f4
Merge with stable
2010-09-20 22:29:13 +02:00
Matt Mackall
82d0edffe9
tests: add hack to avoid problem with graphlog in unified tests
2010-09-20 14:36:36 -05:00
Matt Mackall
c2f36f74bb
bundle: encapsulate all bundle streams in unbundle class
2010-09-20 14:32:21 -05:00
Martin Geisler
34af0cf109
subrepo: add support for 'hg archive'
2010-09-20 15:46:17 +02:00
Martin Geisler
37b2820a98
subrepo: introduce files and filedata methods for subrepo classes
2010-09-20 15:44:30 +02:00
Martin Geisler
989dda555a
merge with stable
2010-09-20 15:42:58 +02:00
Matt Mackall
aa7fff48c0
bundle: move chunk parsing into unbundle class
2010-09-19 13:12:45 -05:00
Matt Mackall
4b4d939b00
bundle: get rid of chunkiter
2010-09-19 12:51:54 -05:00
Matt Mackall
1118760c78
bundle: refactor progress callback
...
This lets us eliminate the chunk iterator so we can have the bundle class
parse headers.
2010-09-19 12:38:44 -05:00
Matt Mackall
43940bec52
bundle: make getchunk() a method
2010-09-18 18:20:34 -05:00
Matt Mackall
10fc9a1867
bundlerepo: use bundle objects everywhere
2010-09-17 19:24:29 -05:00
Matt Mackall
40f75a026a
bundlerepo: drop unused close() method
2010-09-17 19:03:13 -05:00
Matt Mackall
02677f1fa3
bundle: make unbundle object seekable
...
This is only for uncompressed bundles used by bundlerepo.
2010-09-17 19:02:32 -05:00
Matt Mackall
44ccb450e4
bundle: push chunkbuffer down into decompress
...
We replace the fixup iterator with a file-like object so that
uncompressed file streams can be passed end to end through the stack.
2010-09-17 19:02:26 -05:00
Matt Mackall
200e89394d
tests: fix a bunch of pointless #s in unified tests
2010-09-17 17:03:08 -05:00
Matt Mackall
bf9417da11
tests: exit 0 no longer needed on unified tests
2010-09-17 17:03:04 -05:00
Matt Mackall
04833e5383
tests: update debugcomplete output
2010-09-20 15:33:12 -05:00
Matt Mackall
6f3e841677
merge with abuehl
2010-09-20 15:31:48 -05:00
Adrian Buehlmann
a8ea57a0d0
tests: unify some of test-mq*
2010-09-19 23:42:18 +02:00
Steve Borho
d990f5561b
Merge with stable
2010-09-17 12:45:13 -05:00
Matt Mackall
08439e0f2d
tests: add exit codes to unified tests
2010-09-16 17:51:32 -05:00
Matt Mackall
6e90a5484a
merge with stable
2010-09-16 16:12:26 -05:00
Brodie Rao
4be7b3bfc3
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
...
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
2010-09-12 18:05:53 -05:00
Peter Arrenbrecht
1aec67382d
transplant: maintain list of transplants in dict
2010-09-16 16:00:29 +02:00
Adrian Buehlmann
3cc83c1b44
tests: unify test-hgignore
2010-09-15 22:18:46 +02:00
