Commit Graph

8238 Commits

Author SHA1 Message Date
Matt Mackall
bc6c19544f config: allow including other config files 2009-04-26 16:50:43 -05:00
Matt Mackall
b7e5202883 showconfig: show source file and line with --debug 2009-04-26 16:50:43 -05:00
Matt Mackall
8a63c10958 util: kill configparser wrapper 2009-04-26 16:50:43 -05:00
Matt Mackall
8034ce6ca9 hgweb: use config.config 2009-04-26 16:50:43 -05:00
Matt Mackall
68db339c4b clone: config escaping no longer needed 2009-04-26 16:50:43 -05:00
Matt Mackall
7587b1ab33 Merge with stable 2009-04-26 16:50:09 -05:00
Brendan Cully
3777340d8f transplant: forbid transplant to nonempty repositories with no working directory.
Partially undoes a16d422297c0.
2009-04-26 14:20:41 -07:00
Benjamin Wohlwend
ef87785038 ui.isatty() accesses sys.stdin, causing mod_wsgi to throw IOError. 2009-04-26 13:36:08 -07:00
Martijn Pieters
4abe231925 hg: allow hg.parseurl(url, None)
In many places hg.parseurl is called with a url and "opts.get('rev')",
suggesting the second, optional argument can be None. Because opts['rev']
usually defaults to [] this never happens in practice.

However, extensions don't necessarily behave the same, but do copy this
pattern.

Also, include wider hg.parseurl tests, beyond a demonstration of the problem.
2009-04-24 18:17:42 +02:00
Jacob Lee
9dd517638d transplant: remove the restriction that the destination be nonempty.
Test fixed by Patrick Mezard <pmezard@gmail.com>
2009-04-24 17:00:18 -05:00
Francis Barber
54d390306a Fix subversion convert not detecting empty changesets.
Need to check for the empty as list as well as None.
2009-04-25 21:27:47 +08:00
Greg Ward
c5b50c8953 cvsps: fix crash when log message refers to non-existent branch (issue1615). 2009-04-19 13:12:20 -04:00
Greg Ward
a7ab6b3c51 cvsps: add test for merge detection (issue1615).
Currently only testing convert.cvsps.mergefrom; this script should also
probably test convert.cvsps.mergeto.
2009-04-19 12:20:39 -04:00
Patrick Mezard
71875461a3 convert/cvs: add an option to disable remote log caching
Useful for debugging or testing when using --tmpdir.
2009-04-26 16:30:37 +02:00
Martin Geisler
d850e0459d tests: removed redundant "-u test" from test scripts
The tests are executed with a .hgrc file which adds "-u test" by
default.
2009-04-26 14:49:49 +02:00
Martin Geisler
65537ad291 tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
2009-04-26 14:29:02 +02:00
Patrick Mezard
eb5b6f47f6 Merge with crew-stable 2009-04-26 11:49:17 +02:00
Martin Geisler
56c8ce33ee verify: combine sets instead of concatenating lists 2009-04-25 22:26:39 +02:00
Martin Geisler
7a5147b673 rebase, revlog: use set(x) instead of set(x.keys())
The latter is both unnecessary and slower.
2009-04-25 22:25:49 +02:00
Augie Fackler
c9dfeaae14 monoblue: Fix indentation and other styling in the annotation view. 2009-04-15 10:33:58 -05:00
Simon Heimberg
36693ceb6a run-tests: cosmetics 2009-04-22 15:49:33 +02:00
Henrik Stuart
54d1e80807 patchbomb: add user agent header to mails 2009-04-23 08:39:27 +02:00
Martin Geisler
bf3136d2eb help: document stripdir template filter 2009-04-24 19:39:27 +02:00
Aleix Conchillo Flaque
95a32f54b8 templatefilters: add new stripdir filter
Adds a new template filter for removing directory levels from a
string. Examples:

{foo|stripdir} -> 'foo'
{foo/bar|stripdir} -> 'foo'
{foo/bar/more|stripdir} -> 'foo/bar'
{foo/bar/more|stripdir|stripdir} -> 'foo'
2009-04-24 18:37:44 +02:00
Martin Geisler
3ce0ca846d context: use Python 2.4 decorator syntax 2009-04-24 18:47:15 +02:00
Martin Geisler
6a1b0a03df localrepo: use sets in findcommonincoming 2009-04-24 17:32:18 +02:00
Martin Geisler
9fc1be4b52 strutil: removed rsplit 2009-04-24 17:32:18 +02:00
Martin Geisler
91a80784c5 notify: turned a set-like dict into a real set 2009-04-24 17:32:18 +02:00
Martin Geisler
747c05d2eb revlog: let nodestotag be a set instead of a list 2009-04-22 20:51:20 +02:00
Martin Geisler
e2222d3c43 replace set-like dictionaries with real sets
Many of the dictionaries created by dict.fromkeys were emulating sets.
These can now be replaced with real sets.
2009-04-22 00:57:28 +02:00
Martin Geisler
44aa7e92d1 util: use built-in set instead of util.unique 2009-04-22 00:56:06 +02:00
Martin Geisler
1deb417a82 util: use built-in set and frozenset
This drops Python 2.3 compatibility.
2009-04-22 00:55:32 +02:00
Patrick Mezard
db8b25f86d Merge with crew-stable 2009-04-24 10:43:12 +02:00
Bryan O'Sullivan
39f59a8aee win32text: be more careful about rejecting violating changesets
We now try to walk changesets in reverse order from newest to oldest,
so that if we see a file multiple times, we treat the newest version
as canonical.

This should prevent us from rejecting a changegroup that contains an
unacceptable commit followed later by a commit that fixes the problem.
2009-04-24 00:06:01 -07:00
Matt Mackall
72994b59d3 keepalive: attempt to fix issue1003
This is a reimport of the relevant piece of the upstream urlgrabber,
which appears to be more correct.
2009-04-23 15:40:10 -05:00
Matt Mackall
3322f13534 test-archive: silence stupid messages from GNU tar
Recent versions of GNU tar have apparently decided they're old enough
that it's ok for them to prattle on senselessly about things no one
cares about without anyone objecting. We object; apply duct tape.
2009-04-23 15:40:10 -05:00
Matt Mackall
e8b3de6bf8 ui: introduce new config parser 2009-04-23 15:40:10 -05:00
Matt Mackall
b784fcf1a7 ui: simplify init, kill dupconfig 2009-04-23 15:40:10 -05:00
Matt Mackall
371257fd73 ui: fold readsections into readconfig
readconfig now reads only single files
readconfig takes an optional list of sections
readconfig trusts files we're looking for sections in
2009-04-23 15:40:10 -05:00
Matt Mackall
c85f431ef9 ui: cleanup _is_trusted a bit 2009-04-23 15:40:10 -05:00
Matt Mackall
e2ffc933dc ui: simplify parent overlay logic 2009-04-23 15:40:10 -05:00
Matt Mackall
87a779b162 ui: always have ucdata
simplify readconfig logic
2009-04-23 15:40:10 -05:00
Matt Mackall
97699b4b90 ui: fold verbosity_constraints into fixconfig, simplify 2009-04-23 15:40:10 -05:00
Matt Mackall
0174734c46 ui: kill updateopts
Move setconfig into dispatch._parseconfig
2009-04-23 15:40:10 -05:00
Matt Mackall
ebffe5ccb8 ui: refactor option setting
No more passing options as constructor keywords. Basic options are now
always stored in the overlay for simplicity and consistency.
2009-04-23 15:40:10 -05:00
Matt Mackall
cc041814d1 ui: kill redundant call to verbosity_constraints 2009-04-23 15:40:10 -05:00
Matt Mackall
f21df2587f ui: always have an overlay 2009-04-23 15:40:10 -05:00
Matt Mackall
3243d007af ui: kill check_trusted 2009-04-23 15:40:10 -05:00
Matt Mackall
db4f571c07 ui: move _isatty near user 2009-04-23 15:40:10 -05:00
Alexander Solovyov
e3fac599e8 zeroconf: don't fail on non-local names 2009-04-13 21:23:52 +03:00