Matt Mackall
be7d59ab85
ui: kill most users of parentui name and arg, replace with .copy()
2009-04-26 16:50:43 -05:00
Matt Mackall
88b13fecec
ui: replace parentui mechanism with repo.baseui
2009-04-26 16:50:43 -05:00
Matt Mackall
6708d0e299
add cmdutil.remoteui
...
remoteui sorts out the issues of getting ssh config options from the
local repo into the remote one while not copying other options like hooks.
2009-04-26 16:50:43 -05:00
Matt Mackall
10af375ad9
ui: less links to parentui
2009-04-26 16:50:43 -05:00
Matt Mackall
1217ed8107
config: add some helper methods
2009-04-26 16:50:43 -05:00
Matt Mackall
9c7f505708
config: split source data out into separate map
2009-04-26 16:50:43 -05:00
Matt Mackall
a85b71443f
config: add %unset name support
2009-04-26 16:50:43 -05:00
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
Matt Mackall
ee9ffff851
Merge with crew-stable
2009-04-26 16:49:47 -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
Patrick Mezard
ccca7abe8e
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.
2009-04-26 11:35:53 +02: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
Patrick Mezard
62eea60737
convert/bzr: fix symlink handling (issue1626)
2009-04-24 10:34:11 +02:00
Matt Mackall
5c870ca09d
Merge with crew-stable
2009-04-23 15:25:27 -05:00
Patrick Mezard
75233223fe
convert/bzr: handle files replaced by directories (issue1623)
2009-04-23 15:07:05 +02:00
Paul Aurich
e41f434c50
convert/mtn: mtn does not record timezones, mark dates as UTC (issue1624)
2009-04-23 08:45:44 +02:00
Patrick Mezard
f7e8a4c038
convert/mtn: handle directory move into moved directory (issue1619/3)
2009-04-22 10:25:05 +02:00
Patrick Mezard
6bbead8918
convert/mtn: handle files moved in a moved directory (issue1619/2)
2009-04-21 22:31:16 +02:00
Matt Mackall
e612ed45dd
Merge with crew-stable
2009-04-21 12:53:06 -05:00
Paul Aurich
477feb0ff9
convert/mtn: handle subsecond commit dates (issue1616)
2009-04-21 15:57:15 +02:00
Patrick Mezard
551e0cf361
convert/mtn: handle new files in moved directories (issue1619)
...
Reported and investigated by Paul Aurich <paul@darkrain42.org>
2009-04-21 14:17:29 +02: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
Matt Mackall
56cd5d40bb
Merge with crew-stable
2009-04-17 11:16:50 -05: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