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
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
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
Matt Mackall
56cd5d40bb
Merge with crew-stable
2009-04-17 11:16:50 -05:00
Patrick Mezard
0d13db37f7
extdiff: preserve execute-bit across copies (issue1562)
...
Bug report and test by Mads Kiilerich <mads@kiilerich.com>
2009-04-09 14:32:44 +02:00
Patrick Mezard
b3f0d7b5b8
convert/p4: win32 fixes
...
* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
maintenance time and drop the trailing whitespaces tests.
2009-04-13 16:15:45 +02:00
Patrick Mezard
3ca6ee213a
test-issue1438: make executable
2009-04-13 21:18:53 +02:00
Patrick Mezard
0dbcb77e35
convert/mtn: record changes from directory renames (issue1587)
...
Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>
2009-04-11 23:12:42 +02:00
Augie Fackler
00f768d1f1
test-convert-svn-sink: rewrite output for svn compatibility
...
Addition by Patrick Mezard <pmezard@gmail.com>:
* drop 'kind=' lines from svn 1.6 output
2009-04-04 20:39:46 -05:00
Patrick Mezard
2ae17cf19b
convert/bzr: fix file rename replaced by a dir case (issue1583)
...
We were not checking entry types, and getting file content was working with
directories instead of raising IOError.
2009-04-11 20:18:51 +02:00
Patrick Mezard
1e07615a4a
test-convert-bzr: check renamed files are removed (issue1505)
2009-04-08 23:17:33 +02:00
Benoit Boissinot
e5ea532970
raise RevlogError when parser can't parse the revlog index
...
Initial patch and test thanks to Nicolas Dumazet.
2009-04-06 19:48:11 +02:00
Greg Ward
47d2411255
issue1577: fix broken test by assuming less about CVS output.
...
Specifically, output of "cvs ci" varies unpredictably across CVS versions,
so any test that includes the output of "cvs ci" is doomed to fail
some of the time. This fixes that by discarding the output of "cvs ci".
2009-03-28 12:24:53 -04:00
Vsevolod Solovyov
201e56ffbb
Fix issue1495, corner case of adding empty files via patching
2009-03-24 23:28:55 +00:00
madhu@madhu
d6166450e5
Returns lines changed for paths specified as arguments correctly.
...
This fixes issue 1569. hg churn <path> now returns only the number
of lines changed in the path, if the path is specified by filtering
files through a match filter at the changeset level. test-churn
has been updated to take care of this issue.
2009-03-25 01:49:03 +05:30
Matt Mackall
1fca17b321
Fix new CVS test output
2009-03-20 18:49:44 -05:00
Greg Ward
c9426abe07
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
2009-03-18 09:15:38 -04:00
Benjamin Pollack
022828a7a5
regression test for issue1552
...
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
2009-03-17 11:34:40 -04:00
Matt Mackall
7d51e0b1f6
bundlerepo: reintroduce dirstate
2009-03-17 13:43:11 -05:00
Matt Mackall
e31a8bb788
atom: fix URLs used in entry GUIDs
2009-03-16 17:21:06 -05:00
Matt Mackall
891ec3832e
resolve: keep .orig files
2009-03-16 16:58:41 -05:00
Matt Mackall
56a3a8557f
Merge with crew-stable
2009-03-09 11:41:38 -05:00
Benoit Boissinot
c34938cba1
verify: find correct first corrupted cset for missing/corrupted revlogs
2009-03-07 20:16:03 +01:00
Mads Kiilerich
240dc61d24
test-identify: require no-outer-repo
...
The test expects "There is no Mercurial repository here (.hg not found)"
2009-03-05 14:53:59 +01:00
Frank Kingswood
a2f1d401c2
convert: Perforce source for conversion to Mercurial
2009-03-03 21:32:23 +00:00
Matt Mackall
f91e781c87
remove tests for long-gone imerge extension
2009-03-04 18:42:24 -06:00
Augie Fackler
bf90b0cbb4
merge: better error messages to lead users to hg update --clean to abandon merges.
...
Fixes issue1533.
2009-03-04 13:06:16 -06:00
Matt Mackall
5871cdf2c8
audit: be even pickier (issue1450)
2009-03-04 17:02:16 -06:00
Alex Unden
eb753f04dc
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
2009-02-27 02:01:45 -08:00
David Soria Parra
f6ec2e9b01
bookmarks: Set current bookmark if we create a new one on the tip
...
If track.current is enabled we set the newly created bookmark as the
current tracked bookmark. We do not do this if a revision is specified.
2009-03-01 00:30:01 +01:00
Matt Mackall
6ed04dc163
convert: change hg.saverev default to False
...
This needlessly breaks changeset identifiers for the common case (cleaning
history), which is sad.
2009-03-02 19:19:12 -06:00
Matt Mackall
104cda5c20
tag: force load of tag cache
2009-03-02 19:19:09 -06:00
Mads Kiilerich
2694fdc1a4
run-tests.py: avoid using popen2.Popen4 - use subprocess instead
...
Use subprocess to emulate Popen4 if available - similar to how it is done in
util.py.
Using popen2 under python 2.6 gives
DeprecationWarning: The popen2 module is deprecated. Use the subprocess module.
2009-02-27 19:10:38 +01:00
Mads Kiilerich
9686279212
test-convert-cvs*: mute output from "cvs up"
...
Apparently some versions of cvs outputs more than other versions. That is
however not relevant for these tests.
2009-02-27 17:52:31 +01:00
timeless
26d95caa99
help: miscellaneous language fixes
2009-02-28 12:38:45 +01:00
Frank Wierzbicki
975c4301af
tests: use same popen strategy for jython as for nt
2009-02-18 13:19:30 +01:00
Matt Mackall
cb4d50ff04
Introduce HG_PREPEND to solve pretxn races
...
- add writepending to flush delayed writes to separate file
- add support in hooks for lazy evaluation of callable parameters
- add HG_PENDING to pretxn hooks
- call writepending if hook is used
- pass repo root to hook environment
- if HG_PENDING = repo root, we're in pretxn hook
- read pending data to make pending changesets visible
- filter HG_PENDING in tests/printenv.py
2009-02-16 19:35:07 -06:00
Stefano Tortarolo
ae208b3a98
rebase: pull --rebase updates if there is nothing to rebase
2009-01-18 19:59:51 +01:00
Mads Kiilerich
d6ab2f95b5
test-merge-tool: Make sure no hgmerge can be found in $PATH
...
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
2009-02-10 22:47:38 +01:00
Matt Mackall
2e1730294c
patch: teach selectfile about symlinks (issue1438)
2009-02-16 17:37:23 -06:00
Matt Mackall
1a2d87e4e1
mq: handle empty patches more gracefully (issue1501)
2009-02-16 17:37:23 -06:00
Simon Heimberg
23251d5bdf
test suite: saver check if bzr is installed
...
Test if bzrlib.__doc__ is not empty. Ignores an empty lib.
2009-02-08 13:46:04 +01:00
Augie Fackler
7131a2f8b7
fancyopts: Parse options that occur after arguments.
...
This changes the behavior of qguard in the case of setting negative guards, as -- will now always be required.
Fixes issue1402.
Doc fixes for mq by mpm.
2009-02-10 13:26:00 -06:00
Augie Fackler
0dd0e4f46d
tests: Add a test for the behavior of 'hg export -- -2'
2009-02-10 16:31:52 -06:00
Mads Kiilerich
9b111ad022
test-merge-tools: Don't use tac
...
"tac" was a bad tool - is not available on all platforms.
The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
2009-02-10 16:11:48 +01:00
Matt Mackall
d7c2a2e49b
merge: mark kept local files as readded on linear update (issue539)
2009-02-15 10:50:48 -06:00
Jim Correia
78e5b53d7d
add --git option to commands supporting --patch (log, incoming, history, tip)
...
No short -g form, since it would conflict with -g from the graphlog extension.
2009-02-14 22:40:39 +01:00
