Commit Graph

11258 Commits

Author SHA1 Message Date
Steve Borho
74a14c2364 mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
2010-06-08 11:58:09 -05:00
Martin Geisler
bd1de7cf0d mq: use hg reST role some more 2010-06-08 14:12:46 +02:00
Dirkjan Ochtman
64bb18f0dd cleanups: undefined variables 2010-06-08 09:30:45 +02:00
Dirkjan Ochtman
cb25b6f79d cleanups: unused variables 2010-06-08 09:30:33 +02:00
Dirkjan Ochtman
af6b696f0f move working dir/dirstate methods from localrepo to workingctx 2010-06-07 20:03:32 +02:00
Steve Borho
e91613380a color: labeled text should be passed to ui.write() as ui.labeled
Some implementations of ui.label() (HTML versions in particular) must escape
the provided text and then markup the text with their tags.  When this marked
up text is then passed to ui.write(), we must label the text as 'ui.labeled'
so the implementation knows not to escape it a second time (exposing the initial
markup).

This required the addition of a 'ui.plain' label for text that is purposefully
not marked up.

I was a little pedantic here, passing even ' ' strings to ui.label() when it
would be included with other labeled text in a ui.write() call.   But it seemed
appropriate to lean to the side of caution.
2010-06-03 23:18:18 -05:00
Dirkjan Ochtman
cf1de649bd move discovery methods from localrepo into new discovery module 2010-06-07 18:35:54 +02:00
Sune Foldager
e0cc1e8ad9 merge with stable 2010-06-07 16:29:06 +02:00
Sune Foldager
ebb213954d push/pull: fix bug in "--branch ." handling
The branch wasn't expanded, so only the tip was operated on.
2010-06-07 16:28:23 +02:00
Pradeepkumar Gayam
ade05bacc0 shrink-repo: wrong variable name 2010-06-06 22:39:32 +05:30
FUJIWARA Katsunori
9cce255bec replace Python standard textwrap by MBCS sensitive one for i18n text
Mercurial has problem around text wrapping/filling in MBCS encoding
environment, because standard 'textwrap' module of Python can not
treat it correctly. It splits byte sequence for one character into two
lines.

According to unicode specification, "east asian width" classifies
characters into:

   W(ide), N(arrow), F(ull-width), H(alf-width), A(mbiguous)


W/N/F/H can be always recognized as 2/1/2/1 bytes in byte sequence,
but 'A' can not. Size of 'A' depends on language in which it is used.

Unicode specification says:

   If the context(= language) cannot be established reliably they
   should be treated as narrow characters by default

but many of class 'A' characters are full-width, at least, in Japanese
environment.

So, this patch treats class 'A' characters as full-width always for
safety wrapping.

This patch focuses only on MBCS safe-ness, not on writing/printing
rule strict wrapping for each languages

MBCS sensitive textwrap class is originally implemented
by ITO Nobuaki <daydream.trippers@gmail.com>.
2010-06-06 17:20:10 +09:00
Christian Ebert
9f4630cb27 keyword: use context to detect uncommitted merge 2010-06-03 10:37:31 +01:00
Adrian Buehlmann
304c69c642 tests: use --debug on test-clone 2010-06-03 13:58:00 +02:00
Greg Ward
6e1d6aff0f shrink-revlog: use util.mktempcopy() to preserve mode of index file.
(There's still a chmod() call to manually preserve the mode of the
data file.)
2010-06-03 10:18:33 -04:00
Matt Mackall
420e7ec722 revset: delay import of hg to avoid start-up import loops 2010-06-05 09:58:02 -05:00
Matt Mackall
476998d3a8 error: fix up test-hgrc 2010-06-04 23:04:31 -05:00
Matt Mackall
0625b02fef error: update test-trusted.py 2010-06-04 23:00:22 -05:00
Matt Mackall
97e2d2bcdb revset: fix test failure with qfinish 2010-06-04 22:54:43 -05:00
Matt Mackall
a963622643 revset: raise ParseError exceptions 2010-06-04 20:57:52 -05:00
Matt Mackall
969c51b3cf error: add new ParseError for various parsing errors 2010-06-04 20:57:26 -05:00
Matt Mackall
13c76ff349 error: change ParseError to CommandError 2010-06-04 20:19:53 -05:00
Matt Mackall
3daed7cd59 hgrc: improve docs for the trusted section 2010-06-04 20:13:51 -05:00
Matt Mackall
ae637a04b0 rebase: use usual util.abort rather than error.ParseError 2010-06-04 17:22:33 -05:00
Matt Mackall
fd94af4829 revset: sort the predicate list 2010-06-04 10:27:23 -05:00
Matt Mackall
4fb1269ccb revset: fix - handling in the optimizer 2010-06-04 10:26:55 -05:00
Matt Mackall
db01b4c21d revset: fix up tests 2010-06-03 20:32:41 -05:00
Matt Mackall
5de34fa30a walkchangerevs: allow empty query sets 2010-06-03 18:00:15 -05:00
Matt Mackall
8b6cd36757 revset: add tagged predicate 2010-06-03 17:39:40 -05:00
Matt Mackall
485a62ae68 revset: optimize the parse tree directly
Rather than dynamically optimize in methods, we pre-optimize the parse tree
directly. This also lets us do some substitution on some of the
symbols like - and ::.
2010-06-03 17:39:34 -05:00
Matt Mackall
96ee2ad35a revset: add support for prefix and suffix versions of : and :: 2010-06-02 14:07:46 -05:00
Greg Ward
cb24398037 shrink-revlog: preserve mode of the shrunken index and data file.
Otherwise, the shrunken index file always has mode 0600 thanks to
mkstemp(). This is annoying on a server, where multiple users may need
to read/write the manifest. chmod()ing the data file is not strictly
necessary, but it's nice for consistency.
2010-06-01 18:29:52 -04:00
Matt Mackall
959774dfd8 revset: hook into revrange 2010-06-01 11:18:57 -05:00
Matt Mackall
a1c4034fda revset: add a debugrevspec command 2010-06-01 11:18:57 -05:00
Matt Mackall
c3f24aa62b revset: introduce revset core 2010-06-01 11:18:57 -05:00
Matt Mackall
f9905b5aeb revset: introduce basic parser 2010-06-01 11:18:57 -05:00
Matt Mackall
86ebd43d71 remoteui: move from cmdutil to hg 2010-06-01 11:18:57 -05:00
Henrik Stuart
0efeb97219 mq: better qqueue test for troublesome names 2010-06-03 21:38:30 +02:00
Cédric Duval
06eedc4b82 mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
2010-06-03 20:40:23 +02:00
Henrik Stuart
ac61fc4db1 mq: fix naming issues for qqueue directories 2010-06-02 19:39:45 +02:00
Martin Geisler
ae18c6a910 win32text: mark this extension as deprecated 2010-06-02 14:54:25 +02:00
Martin Geisler
e73685cb49 Merge with stable 2010-06-02 14:40:31 +02:00
Matt Mackall
873e87c4b7 Added signature for changeset b3ef44e63f53 2010-06-01 10:54:03 -05:00
Matt Mackall
1dae641881 Merge with i18n 2010-06-01 10:44:03 -05:00
Wagner Bruna
bfaec5421b i18n-pt_BR: synchronized with f679265e5b2b 2010-06-01 12:23:44 -03:00
Martin Geisler
d9fb8f71e1 eol: extension for managing file EOLs 2010-05-31 21:37:01 +02:00
Matt Mackall
e07de18aba Merge with i18n 2010-05-31 12:57:24 -05:00
Adrian Buehlmann
5f0d937313 clone: save hardlink state of util.copyfiles()
When trying to do hardlink-cloning, the os_link() call of the
first file tried already fails on Windows, if the source is on a
UNC path.

This change avoids calling os_link() for the rest of files, leaving
us with a *single* failed os_link() call per clone operation, if the
source can't do hardlinks.
2010-05-28 17:28:34 +02:00
Adrian Buehlmann
ea134ddf29 util.copyfiles: don't try os_link() again if it failed before
If the os_link() call on the first file in the directory fails [1],
we switch mode to using shutil.copy() for all remaining files.

[1] happens for example on Windows for every file when cloning from a UNC
path without specifying --pull.
2010-05-28 17:28:34 +02:00
Wagner Bruna
45e771ab4e i18n-pt_BR: added message from 98736083a916 2010-05-25 13:20:33 -03:00
Wagner Bruna
9346255b42 i18n-pt_BR: synchronized with 9ff3acbe1562 2010-05-22 11:22:36 -03:00