Nicolas Dumazet
6adbb3c99f
util: canonpath: simplify logic
...
if root == os.sep, then endswithsep(root) is True as well: one test is enough
2009-08-22 15:47:03 +02:00
Patrick Mezard
a1609c7698
Merge with crew-stable
2009-08-23 13:03:10 +02:00
Patrick Mezard
181cfe5ee6
test-parse-date: test 12-hours time formats (issue1804)
2009-08-23 11:32:44 +02:00
Martin Geisler
e2912b8950
Merge with crew-stable
2009-08-22 10:52:53 +02:00
Martin Geisler
b139d35cc0
hgrc.5: document %unset directive
2009-08-22 10:50:29 +02:00
Dirkjan Ochtman
64fb856abf
merge with crew-stable
2009-08-22 10:25:50 +02:00
Martin Geisler
73b766980d
Merge with crew-stable
2009-08-22 01:37:28 +02:00
Martin Geisler
96c88eb0e0
hgrc.5: document %include directive
2009-08-22 01:34:56 +02:00
Martin Geisler
476e39b88f
mq: don't mention qtop in module doc string
...
(qtop was removed in 5b1bcf3885fe)
2009-08-21 16:58:30 +02:00
Patrick Mezard
cb35e02c8f
color: no need for itertools, zip() is good enough
2009-08-21 14:29:54 +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
Carey Evans
28b2e6acc5
util: Fix date format for 12-hour time.
2009-08-21 21:52:57 +12:00
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
Dirkjan Ochtman
1677a2b0c1
log: fix traceback for log -k caused by 51e61d3c56bc (issue1805)
2009-08-21 09:33:27 +02:00
Dirkjan Ochtman
2f2b5e0e4f
templater: remove support for ## template variables
2009-08-20 10:41:56 +02:00
Dirkjan Ochtman
1eca14ba70
graphlog: simplify ascii drawing to process one cset at a time
2009-08-20 08:49:01 +02:00
Dirkjan Ochtman
9df20e1f95
graphlog: shorter variable names, fewer underscores, single state container
2009-08-20 08:36:20 +02:00
Dirkjan Ochtman
f7cb958259
graphlog: move common code into function again, change function types
2009-08-20 08:35:35 +02:00
Dirkjan Ochtman
c6e10d384b
graphlog: extract some setup code out of common functions
2009-08-20 08:35:03 +02:00
Dirkjan Ochtman
e00109f7e7
cmdutil: use context objects for walkchangerevs()
2009-08-20 08:34:22 +02:00
Greg Ward
4b5e9861a0
tags: don't crash if unable to write tag cache
...
This happens with hgweb in real life, if the httpd user is unable to
write in the repository directory. Another case is doing 'hg incoming'
on a repository in the filesystem owned by someone else.
2009-08-18 22:07:43 -04:00
Dirkjan Ochtman
4fc1177ba0
mq: get rid of qnext, qprev and qtop
2009-08-19 12:51:07 +02:00
Dirkjan Ochtman
d825977cb1
mq: add options to qapplied/qunapplied to act like qprev/qnext
2009-08-19 12:50:46 +02:00
Dirkjan Ochtman
d96058fd14
hgweb: add web.descend configuration variable
2009-08-19 12:47:04 +02:00
Martin Geisler
0f0f34a99a
help: align columns "hg help templates" output
2009-08-18 13:59:30 +02:00
Martin Geisler
531c6ddba3
Merge with crew-stable
2009-08-18 13:55:34 +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
ef214fdcd8
Merge with crew-stable
2009-08-17 20:20:34 -05: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
Nicolas Dumazet
2478119a2e
inotify: remove unused import
2009-08-16 11:09:21 +09:00
Martin Geisler
d85f3fd407
Merge with crew-stable
2009-08-14 22:20:47 +02: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
