Commit Graph

14153 Commits

Author SHA1 Message Date
Adrian Buehlmann
0e6715fa28 rename util.set_binary to setbinary 2011-05-06 15:25:35 +02:00
Adrian Buehlmann
c415440828 rename util.set_flags to setflags 2011-05-06 15:22:31 +02:00
Adrian Buehlmann
eb8027ea31 rename util.parse_patch_output to parsepatchoutput 2011-05-06 15:19:48 +02:00
Adrian Buehlmann
554b565228 rename util.lookup_reg to lookupreg 2011-05-06 15:16:22 +02:00
Adrian Buehlmann
77a777c79b rename util.set_hgexecutable to _sethgexecutable 2011-05-06 15:13:46 +02:00
Adrian Buehlmann
90df715d75 rename util.main_is_frozen to mainfrozen 2011-05-06 15:10:29 +02:00
Adrian Buehlmann
c451efca8a scmutil: rename local function _add_dir_if_not_there 2011-05-06 15:02:53 +02:00
Adrian Buehlmann
9804b19041 rename scmutil.user_rcpath to userrcpath 2011-05-06 14:58:04 +02:00
Adrian Buehlmann
5b97603cc4 rename scmutil.system_rcpath to systemrcpath 2011-05-06 14:54:05 +02:00
Adrian Buehlmann
761f9b4904 rename scmutil.os_rcpath to osrcpath 2011-05-06 14:52:25 +02:00
Martin Geisler
917c323abc merge with stable
The change from ca7156175461 (parent 2) is not needed after switching
to the new url parser.
2011-05-06 14:29:53 +02:00
Adrian Buehlmann
e981d64ef2 rename path_auditor to pathauditor
The Mercurial 1.9 release is moving a lot of stuff around anyway and we are
already moving path_auditor from util.py to scmutil.py for that release.

So this seems like a good opportunity to do such a rename. It also strengthens
the current project policy to avoid underbars in names.
2011-05-06 09:54:06 +02:00
Martin Geisler
d04646b8d9 revlog: use real Booleans instead of 0/1 in nodesbetween 2011-05-06 12:09:20 +02:00
Martin Geisler
23e62c55ea patch: fix clash between local variable and exception instance
The local err variable would be bound to PatchError thrown and it
keeps this value even after the except block is executed.

The whole thing worked anyway since the rejected variable is set in
the except block and this makes the function return -1 when a
PatchError is thrown.
2011-05-06 11:31:40 +02:00
Martin Geisler
c4c68cacee patchfile: use real Booleans instead of 0/1 2011-05-06 11:12:55 +02:00
Martin Geisler
42c642ca22 annotate: use real Booleans instead of 0/1 2011-05-06 11:11:55 +02:00
Martin Geisler
4c02a87d5a hbisect: use real Booleans instead of 0/1 2011-05-06 10:02:46 +02:00
Sune Foldager
750dcd7b48 revlog: compute correct deltaparent in the deltaparent function
It now returns nullrev for chain base revisions, since they are conceptually
deltas against nullrev. The revdiff function was updated accordingly.
2011-05-05 18:05:24 +02:00
Zachary Gramana
6cc7816532 changelog: fixes leaked file handle 2011-05-05 11:33:02 -04:00
Steven Brown
411d547af4 setdiscovery: limit lines to 80 characters 2011-05-05 23:21:37 +08:00
Thomas Arendsen Hein
394d9f50d7 subrepo: use code from 1d866b621bf7 only if Python needs it (issue2795)
With Python >= 2.6 the original code already works correct, therefore the
fix for issue2556 on Python <= 2.5 broke relative subrepositories with
newer versions of Python.
2011-05-05 16:01:09 +02:00
Augie Fackler
71eea02c91 sslutil: extracted ssl methods from httpsconnection in url.py
This makes it easier to share ssl cert validation with other http
implementations.
2011-05-04 22:08:55 -05:00
Mads Kiilerich
938d75f22d check-code: fix checking for sh style in .t tests
Restore checks after they were disabled by a1f828662ac8.
2011-05-06 00:34:10 +02:00
Martin Geisler
4a2bc65e8a run-tests: add --shell command line flag
This makes it easy to test with, say, both /bin/bash and /bin/dash
instead of changing the system-wide /bin/sh.
2011-05-05 20:04:49 +02:00
Martin Geisler
027d8985b0 run-tests: use type of default to convert environment variable
Before, defaults could only be integers, they can now also be strings,
floats and what have you.
2011-05-05 20:03:43 +02:00
Martin Geisler
9f8b415ad1 test-treediscovery: fix escaping for both dash and bash
A '\n' on the command line is turned into a newline by dash, but kept
as-is by bash, which resulted in a syntax error in the config file.

Luckily, dash wont turn '\n' into a newline when it is part of a
here-doc, so we can write the config file using that technique.
2011-05-05 19:29:02 +02:00
Peter Arrenbrecht
85a1440d12 treediscovery: fix regression when run against older repos (issue2793)
I ran the entire test suite with "known" and "getbundle" disabled in
localrepository. This generated failures because the old findoutgoing
had always queried remote's heads explicitly and thus always got them
back in the returned heads. treediscovery.findcommonincoming now
correctly returns remote's heads in all cases.

Also adds a dedicated test for running treediscovery against a
pre-getbundle HTTP server.
2011-05-05 12:53:33 +02:00
Martin Geisler
823fefa7a6 commands: use util.Abort's hint some more 2011-05-05 14:57:21 +02:00
Martin Geisler
686a64c49c commands: use double-quotes for strings with single-quotes
The globalopts table contain a couple of \' still, but it was
normalized like that in cd2bb3dda566.
2011-05-05 12:16:43 +02:00
Sune Foldager
bb96ed66fc revlog: remove support for punched/shallow
The feature was never finished, and there has been restructuring going on
since it was added.
2011-05-05 12:46:02 +02:00
Sune Foldager
d959ff1e97 revlog: remove support for parentdelta
We will introduce a more powerful and general delta concept instead,
called generaldelta.
2011-05-05 12:55:12 +02:00
Adrian Buehlmann
f6cb5815f6 store: break up reference cycle introduced in e11fd6385080
see also 5ec0a41ce2c5
2011-05-04 12:58:59 +02:00
Augie Fackler
e362108b3a test-https.t: clean up superfluous trailing whitespace 2011-05-04 10:32:08 -05:00
Augie Fackler
c62bb34caf run-tests.py: correctly handle list options with parallel tasks 2011-05-04 10:39:10 -05:00
Idan Kamara
64876670a4 mq: don't suggest to refresh when qpushing with no applied patches 2011-05-04 23:12:23 +03:00
Peter Arrenbrecht
cf46703488 bundlerepo: fix closing and docstring of getremotechanges
I did not in fact implement what I documented about closing of the
original repo. And there was a bit of leftover from an older version
of the API.
2011-05-04 20:14:30 +02:00
Kevin Bullock
c38d0cc58b bookmarks: allow deactivating current bookmark with -i 2011-05-04 10:43:47 -05:00
Kevin Bullock
a19d7654b7 mq: strip extra whitespace from node ids in header (issue2790)
This makes `hg qpush --exact` work with patches created by `hg export`.
2011-05-03 11:46:02 -05:00
Matt Mackall
851d81f156 Added signature for changeset b4c87295fc30 2011-05-01 05:58:04 -05:00
Matt Mackall
a7a9f14c5c merge with i18n 2011-05-01 05:53:28 -05:00
Nicolas Dumazet
892f3cacb5 zeroconf: notify the Zeroconf threads when hg exits
Zeroconf launches two threads in the background, and they wait on
Condition objects to exit. We need to call Zeroconf.close() to
release those conditions so that threads can gracefully exit.

This means that an interrupt on the hg process will now gracefully
propagate to the Zeroconf children, fixing that bug which did not
allow us to kill an `hg serve` process.
2011-04-30 19:36:59 +02:00
Wagner Bruna
dfcb81da54 i18n-pt_BR: synchronized with 4080476516da 2011-04-29 18:19:08 -03:00
Wagner Bruna
abec493a65 merge with i18n 2011-04-29 18:12:55 -03:00
Wagner Bruna
e91feb69e7 i18n-pt_BR: minor spacing fix 2011-04-29 18:11:54 -03:00
Idan Kamara
856702f469 mq: add '.' and '..' to list of forbidden patch names
When an empty string is being passed to normname
it would return '.' causing checkfile() to always
return that a patch with that name exists.
2011-04-29 22:21:13 +03:00
Martin Geisler
7564668184 commit: improve --date help text 2011-04-26 12:55:26 +02:00
Patrick Mezard
7b07c85acf test-transplant: fix missing file addition 2011-04-25 21:11:28 +02:00
Wagner Bruna
1d60fe8d48 i18n-pt_BR: synchronized with d119d32b8972 2011-04-25 14:18:19 -03:00
Matt Mackall
0739231ee2 merge with i18n 2011-04-21 15:10:59 -05:00
Patrick Mezard
95e7147cd4 convert: make filemap prune useless branch closing revs (issue2774)
A branch closing revision only applies if one of its parents belongs to the
branch being closed. Otherwise the filemap can prune it too.
2011-04-20 23:15:18 +02:00