Martijn Pieters
be04752b60
Don't use sed -r; instead use old-style regexp
...
Rev 428419380b9f introduced some sed -r tests, but -r is only available on GNU
sed, while BSD sed uses -E. Better to use old-style regular expressions, that
way the tests work on all sed variants.
2009-04-28 17:17:54 +02:00
Martijn Pieters
03d5e1ec41
Fix typeerror when specifying both --rebase and --pull
2009-04-29 11:39:49 +02:00
Martin Geisler
eee44d410e
webcommands: move nonempty logic from JavaScript to Python
...
This avoids hard-coding the '(none)' string in the JavaScript for each
style and avoids the {nonexisting|nonempty} hack which only works
since the template system don't complain about undefined variables.
2009-04-28 17:28:00 +02:00
Rocco Rutte
0324c58f8b
hgweb: use "nonempty" filter in templates for the changelog message
...
At least subversion allows empty commit logs which, after conversion,
show up as empty fields in hgweb and don't allow selecting the
changeset. Using "nonempty" as filter, "(none)" is used to get
clickable links for empty commit messages.
2009-04-20 12:10:04 +02:00
Martin Geisler
750183bdad
updated license to be explicit about GPL version 2
2009-04-26 01:08:54 +02:00
Dirkjan Ochtman
80de6974e4
more whitespace cleanup and some other style nits
2009-04-27 12:37:19 +02:00
Dirkjan Ochtman
9acb549bd6
tests: add tests for styled hgwebdir pages
2009-04-27 11:35:18 +02:00
Patrick Mezard
a001fce5fc
hghave: handle Windows raising on popen() failure
2009-04-26 19:39:15 +02:00
Patrick Mezard
48f64be1f8
test-extdiff: replace shell script with python for portability
2009-04-26 19:26:22 +02:00
Patrick Mezard
caba144775
Declare bzr TERM=dumb to silence progress bars
...
In theory, one could set BZR_PROGRESS_BAR=none but it does not work in 1.14rc2
2009-04-26 18:36:36 +02:00
Matt Mackall
2f9b02c62d
replace util.sort with sorted built-in
...
This is marginally faster for small and moderately-sized lists
2009-04-26 16:50:44 -05:00
Matt Mackall
efc3ded95f
ui: report_untrusted fixes
...
- report_untrusted -> _reportuntrusted
- only report config shadows if enabled
- config shadows are debug messages
2009-04-26 16:50:44 -05:00
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
68db339c4b
clone: config escaping no longer needed
2009-04-26 16:50:43 -05: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
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
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
Patrick Mezard
62eea60737
convert/bzr: fix symlink handling (issue1626)
2009-04-24 10:34:11 +02:00
Patrick Mezard
75233223fe
convert/bzr: handle files replaced by directories (issue1623)
2009-04-23 15:07:05 +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
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
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
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
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
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
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
Patrick Mezard
6205446ef7
Merge with crew-stable
2009-04-23 16:52:25 +02:00
Martin Geisler
80dd126e92
remove unnecessary outer parenthesis in if-statements
2009-04-22 01:39:47 +02:00
Simon Heimberg
e9ecbcc326
run-tests: fix error when timeout occurs
2009-04-22 09:11:46 +02:00
Benoit Boissinot
3da3b1d1e0
run-tests: fix -jN broken by eb47f6866e97
2009-04-22 01:53:15 +02:00
Patrick Mezard
33d1383a9e
Merge with crew-stable
2009-04-21 14:25:36 +02:00
Martin Geisler
f3f344d0c5
run-tests: removed some underscores (coding style)
2009-04-21 11:19:10 +02:00
Martin Geisler
6f1fe4b8fc
run-tests: upper-case global PYTHON variable
2009-04-21 10:53:42 +02:00
Greg Ward
7b736bed65
run-tests: reduce global variables set by parse_args().
2009-04-20 21:50:11 -04:00
Greg Ward
e0391753e2
run-tests: factor out main(); reduce use of globals a bit.
2009-04-20 21:42:20 -04:00
Greg Ward
2f2a34c5e7
run-tests: move bits of main program so it's all at the bottom.
2009-04-20 21:10:39 -04:00
