Commit Graph

12941 Commits

Author SHA1 Message Date
Martin Geisler
e98a6b16fb test-rename: test with absolute paths 2010-11-01 16:22:41 +01:00
Martin Geisler
785c45e367 test-rename: fix \" -> " in comments 2010-11-01 16:19:06 +01:00
Steve Borho
6fc11bd3c7 rebase: improve resolve failure message 2010-10-30 16:58:15 -05:00
Martin Geisler
23e249a12e run-tests: use regex when searching for $HGPORT in test output
This prevents spurious errors when a changeset hash happens to match
the port number. Before, this invocation gave a test failure:

  $ ./run-tests.py test-log.t --port 24427
  ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed
  --- /home/mg/src/mercurial-crew/tests/test-log.t
  +++ /home/mg/src/mercurial-crew/tests/test-log.t.err
  @@ -626,12 +626,12 @@

     $ hg log -b default
     changeset:   2:c3a4f03cc9a7
  -  parent:      0:24427303d56f
  +  parent:      0:$HGPORT303d56f
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     commit on default

  ...
2010-11-01 10:24:07 +01:00
Matt Mackall
627b247624 demandimport: back out ccffe6051751 (issue2467) 2010-10-30 11:32:04 -05:00
Wagner Bruna
f451b0adbc i18n-pt_BR: synchronized with 082e68cf1166 2010-10-30 12:51:15 -02:00
Matt Mackall
dbab506672 debugindex: add --format flag to allow debugging parentdelta
-f 1 shows extra data from revlogv1 (aka revlogng) including flags and size

(based on a patch by Pradeepkumar Gayam <in3xes@gmail.com>)
2010-10-30 02:47:35 -05:00
Kevin Bullock
deaad9124d pager: make example of setting pager less silly 2010-10-29 00:57:34 -05:00
Mike Sperber
bb18159cb0 convert: Work around p4 instability (issue2465)
The p4 command-line client sometimes fails upon doing "p4 describe"
when trying to produce a patch. (I'm guessing it's a bug in p4.)
However, "hg convert" doesn't even make use of the patch, and it can
be elided by adding "-s" to the p4 command line here.
2010-10-30 02:47:34 -05:00
Matt Mackall
90141f6021 revlog: choose best delta for parentdelta (issue2466)
When parentdelta is enabled, we choose the delta that has the minimum
distance to its base. Otherwise, base may be sufficiently far away to
require a full version, resulting in greatly reduced compression.
2010-10-30 02:47:34 -05:00
Matt Mackall
d0eecfc8e5 revlog: precalculate p1 and p2 revisions 2010-10-30 02:47:34 -05:00
Matt Mackall
9e1ed89cc3 revlog: extract delta building to a subfunction 2010-10-30 02:47:34 -05:00
Matt Mackall
4d0c140fd2 revlog: simplify cachedelta handling 2010-10-30 02:47:34 -05:00
Matt Mackall
a758f18a0a revlog: fix buildtext local scope
buildtext stores its result in _addrevision scope to avoid repeated builds
cachedelta is already visible
2010-10-30 02:47:34 -05:00
Matt Mackall
2742ab2c20 merge with i18n 2010-10-30 02:47:24 -05:00
Martin Geisler
02c90a666d qnew: distinguish between existing file and directory (issue2464) 2010-10-29 14:06:06 +02:00
Martin Geisler
3bd0773df5 qnew: give better feedback when doing 'hg qnew foo/' (issue2464) 2010-10-29 15:25:21 +02:00
Martin Geisler
23c9a547e5 opener: do not create "foo" directory when writing to "foo/"
The directories were not cleaned up when the subsequent open failed
and this would confuse things like qnew.
2010-10-29 12:50:08 +02:00
Martin Geisler
94a99c16c9 pager: backout 211c3a983bd3 (issue2441) 2010-10-29 14:47:45 +02:00
Patrick Mezard
1ba47f6d3d mq: qrename should not touch the dirstate if src is untracked (issue2460) 2010-10-28 22:04:33 +02:00
Patrick Mezard
a3c9b27eda patch: fix copies when patching over uncommitted changed (issue2459) 2010-10-28 21:25:53 +02:00
FUJIWARA Katsunori
90d51d0fce i18n-ja: synchronized with e06973ee268b 2010-10-29 00:19:39 +09:00
Wagner Bruna
7ddfb283d1 i18n-pt_BR: synchronized with b35608cae0c0
Reviewed formatting fixes from 21b62176b517.
2010-10-28 09:52:05 -02:00
Martin Geisler
741a85548d i18n-da: translate help for bookmarks extension 2010-10-28 10:02:28 +02:00
Martin Geisler
4f03753252 i18n, bookmarks: add comments for translators 2010-10-28 09:48:01 +02:00
Martin Geisler
7654ca39c3 i18n-da: synchronize with aa68066a6781 2010-10-28 09:43:56 +02:00
Matt Mackall
9c4593f365 merge with i18n 2010-10-27 16:54:46 -05:00
Matt Mackall
fce98d3778 minirst: use colwidth to match title lengths (issue2455) 2010-10-27 15:35:23 -05:00
Matt Mackall
50b99d1a5a encoding: default ambiguous character to narrow
The current implementation of colwidth was treating 'A'mbiguous
characters as wide, which was incorrect in a non-East Asian context.
As per http://unicode.org/reports/tr11/#Recommendations, we should
instead default to 'narrow' if we don't know better. As character
width is dependent on the particular font used and we have no idea
what fonts are in use, this recommendation applies.

This introduces HGENCODINGAMBIGUOUS to get the old behavior back.
2010-10-27 15:35:21 -05:00
Wagner Bruna
6fb65a2e9e i18n-pt_BR: synchronized with f56615ba390b 2010-10-26 21:31:35 -02:00
Wagner Bruna
7981c0583e i18n-pt_BR: msgmerge with f56615ba390b 2010-10-26 19:12:45 -02:00
Wagner Bruna
ba23bd475b merge with i18n 2010-10-26 18:47:45 -02:00
Dan Villiom Podlaski Christiansen
f385faac7a *: kill all unnecessary shebangs. 2010-10-26 12:18:39 +02:00
Dan Villiom Podlaski Christiansen
080231037c *: add executable bit to a few files that were missing it. 2010-10-26 12:18:37 +02:00
Martin Geisler
9af75a713e i18n-da: remove extra newline in translation 2010-10-26 10:54:32 +02:00
Martin Geisler
34e84d44a0 i18n-da: synchronize with c11e3a435c7f 2010-10-26 00:21:57 +02:00
Matt Mackall
3c3d5527ff merge with i18n 2010-10-25 13:07:27 -05:00
Matt Mackall
4d7b056fed traceback: point to BugTracker on the wiki 2010-10-25 13:06:37 -05:00
Steve Borho
85bbdcc648 wix: add subrepos help text 2010-10-25 10:07:54 -05:00
Matt Mackall
b6427b4a0a version: replace email address with url to reduce private mail 2010-10-24 16:02:10 -05:00
Patrick Mezard
4f21d24f6f Add subrepos help topic
Edited by:
Martin Geisler <mg@lazybytes.net>
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
2010-10-24 19:28:44 +02:00
Patrick Mezard
e03174184a hgrc: document [subpaths] section 2010-10-24 18:39:02 +02:00
Patrick Mezard
d96f85f343 merge-tools.txt: 6 comes after 5 2010-10-24 18:37:59 +02:00
Patrick Mezard
88ff8c9a1e Test applying context diffs 2010-10-24 12:56:38 +02:00
Patrick Mezard
90ed7bf6a1 merge-tools.txt: fix typos, simplify, renumber from 1. 2010-10-24 12:55:29 +02:00
Patrick Mezard
3fd83b5b68 hggettext: handle i18nfunctions declaration for docstrings translations 2010-10-24 12:52:37 +02:00
Patrick Mezard
bd120906a2 Fix and unify transplant and bookmarks revsets doc registration 2010-10-23 19:22:42 +02:00
Patrick Mezard
c832c42c0c revsets: generate predicate help dynamically 2010-10-23 19:21:51 +02:00
Patrick Mezard
88087f644b help: add topic rewriting hooks
They are useful when updating help topics dynamically from extensions.
2010-10-23 19:21:49 +02:00
Martin Geisler
98ed55bc01 minirst: ignore comments 2010-10-23 17:30:08 +02:00