Brodie Rao
9dbf7b06a9
ui: suppress aliases when HGPLAIN is set
2010-02-18 16:50:49 -05:00
Greg Ward
cb143d442a
merge: fix --preview to show all nodes that will be merged (issue2043).
...
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge. The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
2010-02-15 15:25:29 -05:00
Greg Ward
cc17369c25
test-merge-default: make content of test repo clearer.
...
Makes it easier to understand and modify the test.
(issue2043).
2010-02-15 15:07:21 -05:00
Adrian Buehlmann
3d25317a13
contrib/wix: MSVC CRT libraries are installed in WinSxS
...
not in %system32%
2010-02-18 20:47:12 +01:00
Steve Borho
58556829a8
Add WiX installer scripts to contrib/wix
2010-02-18 13:05:15 -06:00
Brendan Cully
de7c8ccdfb
import: if in doubt, consume stream until start of diff
...
This prevents a header-like line in the message body from causing a spurious split.
2010-02-18 10:46:01 -08:00
Alistair Bell
fbefff7aa5
bdiff: do not use recursion / avoid stackoverflow (issue1940)
2010-02-18 10:32:51 +01:00
Christian Ebert
abe6b27034
keyword: mark improved demo commit message for translation
...
s/config/configuration/
Inside the quoted command put the message in single quotes in case
the translation contains apostrophes.
2010-02-18 05:55:05 +01:00
Brendan Cully
4b383ed9c8
mq: iterate over a copy of the command table keys (fixes issue2045).
...
I hope.
2010-02-17 14:35:11 -08:00
Martin Geisler
e2e1279b27
progress: mark strings for translation
2010-02-17 23:07:50 +01:00
Christian Ebert
9ff7e51e84
keyword: do not postpone commit hooks
...
With cbda5ce5d115 in place, this hack is not needed any more.
2010-02-17 17:11:20 +01:00
Benoit Boissinot
060818ca9f
inotify/inserve: implement --timeout-idle option (issue885)
...
hg inserve was ignoring and miscomputing the --timeout-idle option (seconds
vs. minutes).
Thanks to Jesse Glick for the bugreport and the initial patch.
2010-02-17 20:44:49 +01:00
Benoit Boissinot
9399306905
regression: missing arg from 3067d5de9e6c dirstate.{walk,status} changes
2010-02-17 20:30:57 +01:00
Sune Foldager
2369132b4b
run commit and update hooks after command completion (issue1827)
...
Previously, the working dir state hadn't been written when these
hooks were invoked, so external commands couldn't see all changes.
2010-02-17 15:43:21 +01:00
Benoit Boissinot
bb6f91a4eb
http: len(x) fails if it doesn't fit into an int, use __len__() instead
...
len(x) raises OverflowError if it's bigger than 2**31-1, we need to call
__len__() ourself instead.
2010-02-17 11:00:48 +01:00
Ronny Pfannschmidt
d170b686d2
filelog: sort meta entries, ensure deterministic order
2010-02-16 21:04:04 +01:00
Martin Geisler
f6256e8f89
Merge with i18n
2010-02-16 23:28:46 +01:00
Jens Bäckman
0bb286f23c
i18n-sv: synchronized with 599ce90a76c1
2010-02-16 22:01:27 +01:00
Steve Losh
0c8f350f3b
util: use the built-in any() and all() methods if they are available
2010-02-16 09:31:35 -05:00
Steve Borho
a6d934b6af
mergetools: improve configuration for several merge tools
...
* meld - provide labels for the three panes
* diffmerge - add registry key for detection, improve arguments
* beyond compare - add linux version
* winmerge - improve arguments
* araxis - add configuration, including registry key for detection
* misc - provide default priorities for more tools
2010-02-15 21:18:16 -06:00
Steve Borho
aad9ecf6aa
hgrc.5: document use of environment variables on Windows
...
This feature was introduced in c7a5a2c7063a
2010-02-15 20:28:42 -06:00
Benoit Boissinot
a92c59721b
url: correctly quote '/' in user and password embedded in urls
2010-02-15 22:39:36 +01:00
Wagner Bruna
a72284ca9d
i18n-pt_BR: synchronized with 599ce90a76c1
2010-02-15 16:34:59 -02:00
Benoit Boissinot
0a475e9eff
url: fix python < 2.6 with ssl installed
...
_GLOBAL_DEFAULT_TIMEOUT isn't related to ssl, but to python < 2.6, move it to
the right hunk.
2010-02-15 18:12:50 +01:00
Dirkjan Ochtman
1a3040f895
bugzilla: revert unhelpful check-code changes, module is actually called MySQLdb
2010-02-15 09:57:11 +01:00
Brendan Cully
0a7c012eeb
mq: unify implementation of qinit and init -Q
2010-02-15 00:16:59 -08:00
Benoit Boissinot
213d94e037
bundle: exclude csets given in --base, unless they are in --rev (issue1910)
...
Thanks Jesse Glick for the first version of this patch.
2009-11-16 16:10:05 -05:00
Martin Geisler
eeedee37da
Merge with default
2010-02-15 00:14:16 +01:00
Martin Geisler
0d92b94dfa
mq: more instructive use of "--" in qguard help (issue2040)
2010-02-15 00:12:10 +01:00
Pascal Quantin
b4af915ca2
Add progress extension to win32 default config file
2010-02-14 23:17:28 +01:00
Brodie Rao
459206adee
color: don't crash on invalid status codes (issue2036)
...
If an unknown file with a newline appears in the status output, color
shouldn't raise a KeyError trying to parse second line in the filename.
2010-02-14 17:08:52 -05:00
Martin Geisler
5da26fd349
test-interhg: test the extension
2010-02-14 20:28:49 +01:00
Martin Geisler
e9fc1aa76c
Merge with i18n
2010-02-14 13:28:34 +01:00
Jens Bäckman
19f2f00888
i18n-sv: nine basic commands translated
...
Translated the following commands:
bundle, branch, branches, cat, copy, grep, heads, identify, incoming
Also did a sync with 5ebd52f09b78.
2010-02-14 00:08:26 +01:00
Matt Mackall
3b7a5c7ec1
progress: add progress calls to changeset discovery
2010-02-13 00:38:29 -06:00
Augie Fackler
a30e3bd4a9
Progress bar extension
2010-02-12 21:53:32 -06:00
Augie Fackler
458129e75a
verify: call ui.progress()
2010-02-10 18:46:19 -06:00
David Soria Parra
11f271739c
subrepo: make sure that the source path is stripped
...
Test by Patrick Mézard <pmezard@gmail.com>
2010-02-09 18:32:57 +01:00
Augie Fackler
123811715e
localrepo: provide indeterminate progress information while bundling
2010-02-09 10:02:01 -06:00
Augie Fackler
dfd90db0f0
update: make calls to ui.progress()
2010-02-07 17:44:30 -06:00
Augie Fackler
47c5689cb6
localrepo: show indeterminate progress for incoming data
...
This has some quirks, like showing progress bars for importing
bundles, including during rebase.
2010-02-07 12:00:40 -06:00
Patrick Mezard
288790327a
Merge with crew-stable
2010-02-13 02:06:13 +01:00
Patrick Mezard
cfd28a67b2
test-mq-qclone: test --mq option
2010-02-12 21:30:24 +01:00
Benoit Boissinot
5919c97831
merge with crew
2010-02-12 16:04:00 +01:00
Thomas Arendsen Hein
4ee8391b45
ui: look before you leap on sys.stderr.closed (and look nicer)
...
4262f8a58f24 introduced a fix if sys.stdout.closed does not exist.
This change uses a getattr with default instead of hasattr (which just calls
getattr) and accessing the attribute.
Additionally it applies the same fix for sys.stderr.closed as this is not
available in the bpython shell (reported by Roger Gammans).
2010-02-12 15:46:48 +01:00
Matt Mackall
dd8f91e931
Merge with stable
2010-02-11 17:44:01 -06:00
Matt Mackall
f4a529722f
hgrc: update docs for the server section
2010-02-11 17:13:22 -06:00
Augie Fackler
2b4b265287
localrepo: add optional validation (defaults to off) for incoming changes
...
This verifies that all manifests are present for incoming changes,
and all files for those manifests are also present. This is a simple
first-pass, and could be better, but seems like a valuable thing to
have, as I've seen pushes in the past that propagated revlog corruption.
2010-02-11 16:37:43 -06:00
Giorgos Keramidas
a74504962c
convert: differentiate between IOError and OSError on commitctx()
...
The IOError exception is overloaded to mean 'this file was deleted in
the current commit'. Separate the code that handles IOError and file
deletion from general OSError exceptions. The latter are real errors,
but IOError is not always a throwable error.
This solves the accidental marking of files as 'deleted' in commits that
try to write for example in .hg/store/data revlogs that the current user
has no permission to modify (a normal OSError that should abort the
current commit).
Changed by pmezard: use getattr() to be on the safe side.
2010-02-11 23:15:42 +02:00
Henrik Stuart
534ea9a0f8
doc: add missing documentation for http_proxy.always
2010-02-11 21:11:59 +01:00
