Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:43 -0500] rev 8183
config: allow including other config files
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:43 -0500] rev 8182
showconfig: show source file and line with --debug
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:43 -0500] rev 8181
util: kill configparser wrapper
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:43 -0500] rev 8180
hgweb: use config.config
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:43 -0500] rev 8179
clone: config escaping no longer needed
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:50:09 -0500] rev 8178
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 26 Apr 2009 16:49:47 -0500] rev 8177
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Sun, 26 Apr 2009 14:20:41 -0700] rev 8176
transplant: forbid transplant to nonempty repositories with no working directory.
Partially undoes
d3fb413667e5.
Benjamin Wohlwend <bw@piquadrat.ch> [Sun, 26 Apr 2009 13:36:08 -0700] rev 8175
ui.isatty() accesses sys.stdin, causing mod_wsgi to throw IOError.
Martijn Pieters <mj@zopatista.com> [Fri, 24 Apr 2009 18:17:42 +0200] rev 8174
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.
Jacob Lee <artdent@gmail.com> [Fri, 24 Apr 2009 17:00:18 -0500] rev 8173
transplant: remove the restriction that the destination be nonempty.
Test fixed by Patrick Mezard <pmezard@gmail.com>
Francis Barber <fedora@barber-family.id.au> [Sat, 25 Apr 2009 21:27:47 +0800] rev 8172
Fix subversion convert not detecting empty changesets.
Need to check for the empty as list as well as None.
Greg Ward <greg-hg@gerg.ca> [Sun, 19 Apr 2009 13:12:20 -0400] rev 8171
cvsps: fix crash when log message refers to non-existent branch (
issue1615).
Greg Ward <greg-hg@gerg.ca> [Sun, 19 Apr 2009 12:20:39 -0400] rev 8170
cvsps: add test for merge detection (
issue1615).
Currently only testing convert.cvsps.mergefrom; this script should also
probably test convert.cvsps.mergeto.
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Apr 2009 16:30:37 +0200] rev 8169
convert/cvs: add an option to disable remote log caching
Useful for debugging or testing when using --tmpdir.
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 14:49:49 +0200] rev 8168
tests: removed redundant "-u test" from test scripts
The tests are executed with a .hgrc file which adds "-u test" by
default.
Martin Geisler <mg@lazybytes.net> [Sun, 26 Apr 2009 14:29:02 +0200] rev 8167
tests: removed redundant "-d '0 0'" from test scripts
The tests are executed with a .hgrc file which adds "-d '0 0'" by
default.
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Apr 2009 11:49:17 +0200] rev 8166
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Apr 2009 11:35:53 +0200] rev 8165
convert/bzr: make it work with filemaps (
issue1631)
The bzr converter maintains a child -> parents mapping and drop entries
whenever a child is read. It does not work with filemaps, getchangedfiles() may
be called more than once when filtered files belong to merge revisions.
getchanges() still works that way but it is not clear whether a similar issue
can arise when interacting with merges.
Martin Geisler <mg@lazybytes.net> [Sat, 25 Apr 2009 22:26:39 +0200] rev 8164
verify: combine sets instead of concatenating lists
Martin Geisler <mg@lazybytes.net> [Sat, 25 Apr 2009 22:25:49 +0200] rev 8163
rebase, revlog: use set(x) instead of set(x.keys())
The latter is both unnecessary and slower.
Augie Fackler <durin42@gmail.com> [Wed, 15 Apr 2009 10:33:58 -0500] rev 8162
monoblue: Fix indentation and other styling in the annotation view.
Simon Heimberg <simohe@besonet.ch> [Wed, 22 Apr 2009 15:49:33 +0200] rev 8161
run-tests: cosmetics
Henrik Stuart <hg@hstuart.dk> [Thu, 23 Apr 2009 08:39:27 +0200] rev 8160
patchbomb: add user agent header to mails
Martin Geisler <mg@lazybytes.net> [Fri, 24 Apr 2009 19:39:27 +0200] rev 8159
help: document stripdir template filter
Aleix Conchillo Flaque <aleix@member.fsf.org> [Fri, 24 Apr 2009 18:37:44 +0200] rev 8158
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'
Martin Geisler <mg@lazybytes.net> [Fri, 24 Apr 2009 18:47:15 +0200] rev 8157
context: use Python 2.4 decorator syntax
Martin Geisler <mg@lazybytes.net> [Fri, 24 Apr 2009 17:32:18 +0200] rev 8156
localrepo: use sets in findcommonincoming
Martin Geisler <mg@lazybytes.net> [Fri, 24 Apr 2009 17:32:18 +0200] rev 8155
strutil: removed rsplit
Martin Geisler <mg@lazybytes.net> [Fri, 24 Apr 2009 17:32:18 +0200] rev 8154
notify: turned a set-like dict into a real set
Martin Geisler <mg@lazybytes.net> [Wed, 22 Apr 2009 20:51:20 +0200] rev 8153
revlog: let nodestotag be a set instead of a list
Martin Geisler <mg@lazybytes.net> [Wed, 22 Apr 2009 00:57:28 +0200] rev 8152
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.
Martin Geisler <mg@lazybytes.net> [Wed, 22 Apr 2009 00:56:06 +0200] rev 8151
util: use built-in set instead of util.unique
Martin Geisler <mg@lazybytes.net> [Wed, 22 Apr 2009 00:55:32 +0200] rev 8150
util: use built-in set and frozenset
This drops Python 2.3 compatibility.
Patrick Mezard <pmezard@gmail.com> [Fri, 24 Apr 2009 10:43:12 +0200] rev 8149
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 24 Apr 2009 10:34:11 +0200] rev 8148
convert/bzr: fix symlink handling (
issue1626)
Bryan O'Sullivan <bos@serpentine.com> [Fri, 24 Apr 2009 00:06:01 -0700] rev 8147
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.
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8146
keepalive: attempt to fix
issue1003
This is a reimport of the relevant piece of the upstream urlgrabber,
which appears to be more correct.
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8145
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.
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8144
ui: introduce new config parser
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8143
ui: simplify init, kill dupconfig
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8142
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
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8141
ui: cleanup _is_trusted a bit
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8140
ui: simplify parent overlay logic
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8139
ui: always have ucdata
simplify readconfig logic
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8138
ui: fold verbosity_constraints into fixconfig, simplify
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8137
ui: kill updateopts
Move setconfig into dispatch._parseconfig
Matt Mackall <mpm@selenic.com> [Thu, 23 Apr 2009 15:40:10 -0500] rev 8136
ui: refactor option setting
No more passing options as constructor keywords. Basic options are now
always stored in the overlay for simplicity and consistency.