Commit Graph

9074 Commits

Author SHA1 Message Date
Mads Kiilerich
9920fe3bc5 test-command-template: Don't diff files with same content
Solaris diff will report "No differences encountered" on stdout
2009-08-22 15:36:52 +02:00
Martin Geisler
b139d35cc0 hgrc.5: document %unset directive 2009-08-22 10:50:29 +02:00
Adrian Buehlmann
0a39b63526 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
This change narrows the race guard that was introduced by ffd022830d6d
("dirstate: ignore stat data for files that were updated too recently")
to not discard the _map entry's stat data if the mtime is in the future.

Without this change, status locks files having odd mtimes in the future
into the 'unset' state, causing needless file compares later (admittedly
harmless), but also inflicting highly irritating sticky effects on
tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).
2009-08-21 14:17:23 +02:00
Martin Geisler
96c88eb0e0 hgrc.5: document %include directive 2009-08-22 01:34:56 +02:00
Martin Geisler
01be01a4e5 help: show results of all date filters 2009-08-18 13:40:19 +02:00
Martin Geisler
482ea06365 help: document isodatesec and rfc3339 filters (issue1799) 2009-08-18 13:00:13 +02:00
Steve Borho
5d6c914525 iss: make mfc*.dll and msvc*.dll optional
mfc71.dll was only needed for Python2.4
msvc*.dll is similarly optional
Do not bail installer build if not found
2009-08-16 20:53:49 -05:00
Steve Borho
bef6f273c2 iss: take version from iscc command line or __version__.py
Requires InnoSetup Preprocessor to be installed.
2009-08-16 21:23:48 -05:00
Sebastien Binet
44975f5f1e osutil: fix compilation with -ansi 2009-08-14 11:18:23 +02:00
Matt Mackall
2900a327ba Merge with i18n-stable 2009-08-12 12:06:12 -05:00
Wagner Bruna
bac660e1e6 i18n-pt_BR: miscellaneous fixes 2009-08-05 10:56:20 -03:00
Wagner Bruna
eedb4a60d4 i18n-pt_BR: synchronized with bddc2736aa0b 2009-07-28 15:50:14 -03:00
Steve Borho
c96b2aca86 hook: fix full path imports on Windows (issue1779)
Bottom portion fixes full path imports on source installs on Windows.
The top portion further fixes full path imports on binary installs.

Initial patch by Roman V. Kiseliov
2009-08-05 21:45:54 -05:00
Dan Villiom Podlaski Christiansen
68ad384d38 dispatch: also pass level argument to __import__ for ignored modules
I wanted to check if mercurial.demandimport could speed up the loading of
PyObjC, and ran into this: the level argument for __import__, available in
Python 2.5 and later, is silently dropped when doing an 'import *'. I have no
idea what these arguments mean, but this minor change made it work.

(Oh, and because of that 'from ... import *', PyObjC still took about 2s...)
2009-08-05 17:19:37 +02:00
Dirkjan Ochtman
27d1598185 lsprof: make profile not die when imported modules changes (issue1774) 2009-08-05 14:58:30 +02:00
Christian Ebert
ba76e4ec6a notify: do not mime encode multipart templates
Mulitpart templates should take care of this themselves.
See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html

Also catch potential parsing errors gracefully.
2009-08-05 17:19:08 +02:00
Stuart W Marks
7e4c51534f help: improve "hg help revisions"
Add info about branch names, and other clarifications.
2009-08-02 19:21:47 -07:00
David Soria Parra
7af1039389 mq: Parse commit message after we find start of changeset patch
patch.extract extracts just the message below HG changeset patch. So to not
parse comments above the patch, we reset the message if we find a changeset
patch as we know the commit message comes after the changeset patch data.
This is similar to the behavior of patch.extract.

The drawback of this approach, after a qref -e the comment above HG changeset
patch is gone. Without this patch the message would become part of the commit
message in the HG changset patch part.
2009-07-28 15:36:28 +02:00
Mads Kiilerich
5d1bd11f15 test-repair-strip: Don't rely on cat error message 2009-07-29 22:14:46 +02:00
David Champion
1dff6a934c test-gpg: suppress secure memory warning
Some platforms (Solaris for one) does not support secure memory and
would give a warning.
2009-07-05 13:59:25 -05:00
David Soria Parra
7322d10ac4 email: Catch exceptions during send.
Catch SMTPlib exceptions to avoid mercurial showing a backtrace during
an e.g. authentication error.
2009-07-27 02:27:24 +02:00
Matt Mackall
56469b1da7 update: make a naked except more specific (issue1766) 2009-07-25 19:04:08 -05:00
Mads Kiilerich
ca42a59332 tests/hghave: bzr114 checks for bzr >= 1.14
Everything but the implementation indicated that bzr114 also should be true for
"or higher".
2009-07-25 02:20:27 +02:00
Bill Barry
5c4fb9e616 fix issue 1763: strip chars from end of line when parsing gitpatch lines 2009-07-24 15:53:40 -06:00
Bryan O'Sullivan
f190c5182d issue1251: bail if darcs version is too old 2009-07-25 10:08:20 -07:00
Cédric Duval
5f07139d53 gendoc: don't translate topic strings twice (issue1760) 2009-07-24 12:20:40 +02:00
Matt Mackall
ae15e810c2 Merge with i18n 2009-07-23 15:25:47 -05:00
Matt Mackall
81e821d1df Added signature for changeset 36d299931578 2009-07-23 12:58:15 -05:00
Christian Ebert
a94d439881 keyword: argument to "kwdemo --rcfile" must be string (bugfix) 2009-07-22 19:12:34 +01:00
Matt Mackall
4f34600114 heads: more clarity for --closed 2009-07-22 18:27:23 -05:00
Matt Mackall
cfbbab6abc Merge with crew-stable 2009-07-22 18:08:02 -05:00
Matt Mackall
de154bfa34 update: allow -c to jump branches if clean 2009-07-22 17:59:11 -05:00
Matt Mackall
60ca8ea58d subrepo: use '/' for joining non-local paths 2009-07-22 17:53:23 -05:00
Bryan O'Sullivan
9a780e99c8 Fix issue1679: path reconstruction in hgwebdir was mangling things badly 2009-07-22 15:26:27 -07:00
Martin Geisler
a17f0cee1b do not translate commit messages
It is not very helpful to have 'Added tag %s for changeset %s' and
similar messages translated into different languages when people work
together using different locales.

We now use English strings without support for translations. If
needed, the user can still supply a custom string for most commands.
2009-07-22 22:50:34 +02:00
Matt Mackall
35f4ca68f0 fetch: drop force arg for commit (issue1752)
This appears to be unneeded and forces fetch commits to examine clean files.
2009-07-22 00:28:37 -05:00
David Soria Parra
fac51771ef i18n-de: fix indention 2009-07-21 15:47:13 +02:00
Martin Geisler
b596922c24 hgignore.5: expanded description
- explain that .hgignore must be created manually
- hint that it is typically put under revision control
2009-07-21 12:06:32 +02:00
Matt Mackall
5d2bdd955b Merge with crew-stable 2009-07-20 19:15:44 -05:00
Martin Geisler
e5eb704799 i18n-da: switch back to "rettelse" for "patch" 2009-07-21 00:17:10 +02:00
Martin Geisler
7be3bdec8d i18n-da: updates in gpg, highlight, inotify, and mq 2009-07-20 23:55:55 +02:00
Martin Geisler
73e7217210 i18n-da: synchronized with 8abace467e5d 2009-07-20 23:24:12 +02:00
Benoit Boissinot
74c03ea972 graphlog: fix incoming with local repo (issue1731) 2009-07-19 18:59:19 +02:00
Patrick Mezard
ef63c1e5f9 Mention GnuWin32 gettext in win32 build instructions 2009-07-19 18:23:37 +02:00
Cédric Duval
43357b0ef8 i18n-fr: synchronized with 8abace467e5d 2009-07-18 22:49:49 +02:00
Cédric Duval
c18fb51cfe i18n-fr: translations for dispatch.py 2009-07-18 22:45:59 +02:00
Cédric Duval
f6a961679b i18n-fr: translation of various core messages 2009-07-18 22:45:31 +02:00
Cédric Duval
ba760605fd i18n-fr: translation for the archive command 2009-07-18 22:44:50 +02:00
Cédric Duval
ce4de9a7dc i18n-fr: translation of bisect 2009-07-18 22:43:34 +02:00
Matt Mackall
b707d43231 Merge with crew-stable 2009-07-17 11:52:53 -05:00