Commit Graph

6395 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
a8733ad91a make test-diff-copy-depth executable 2008-04-02 21:45:35 +02:00
Peter Arrenbrecht
898046c9b1 convert: fix test-convert-svn-* problems with mtime not changing
The `svn commit` command does not detect changed files unless
their mtime has changed. A quick succession of, for instance,
`svn co ...; echo x >> y; svn ci` can thus lead to the change to y
being ignored.

Edited by pmezard to write in binary mode.
2008-04-01 09:17:11 +02:00
Thomas Arendsen Hein
448785c6b4 merge with hg-stable 2008-04-01 08:33:17 +02:00
Thomas Arendsen Hein
330a183096 Fix test-convert-svn-tags on case sensitive filesystems 2008-03-30 23:58:02 +02:00
Benoit Boissinot
46509e2ba0 fix error spotted by pychecker 2008-03-30 20:21:46 +02:00
Patrick Mezard
2a688097e7 commands: fix shadowed repo module 2008-03-30 20:18:40 +02:00
Matt Mackall
52b4d9ec25 copies: refactor symmetricdifference as _findlimit
We only need to track the lowest revision seen, which makes things simpler.
2008-03-29 12:39:47 -05:00
Matt Mackall
95434837e1 copies: teach symmetric difference about working revisions
- use changelog.count() as a pseudo revision number
- abort early in copies if revs are the same
- eliminate working dir hacks in copies
- yield results as they're found
2008-03-29 12:39:47 -05:00
Matt Mackall
56e621f7bc symmetricdifference: move back to copies
It's too tightly dependent on known revlog ordering to fit well in ancestors
2008-03-29 12:39:47 -05:00
Matt Mackall
ab64062215 symmetricdifference: change colors to sides 2008-03-29 12:39:47 -05:00
Matt Mackall
469b176973 ancestors: simplify symmetric difference
- n_wanted/wanted -> interesting
- scan colors rather than managing ret
2008-03-29 12:39:47 -05:00
Matt Mackall
ba8f438e7a copies: don't double-detect items in the directory copy check 2008-03-29 12:39:47 -05:00
Matt Mackall
c9895536f8 copies: skip directory rename checks when not merging
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
2008-03-29 12:39:47 -05:00
Matt Mackall
1b20d834b6 copies: sort old names by depth 2008-03-29 12:39:47 -05:00
Matt Mackall
8a7d38f2e2 backout: reverse changeset belongs on current branch
Backing out a changeset that is before a named branch branchpoint was
making the reverse changeset the tip of the old branch, which is wrong
and very confusing. So instead, we put it on the current named branch.
2008-03-29 12:39:47 -05:00
Matt Mackall
fc40a37304 copies: fix silly precedence bug 2008-03-29 12:39:47 -05:00
Patrick Mezard
d556aa96d4 test-convert-svn-source: remove redundant tests 2008-03-29 17:16:39 +01:00
Patrick Mezard
664a12a36c convert: allow tags detection to be disabled
Tags calculation becomes more reliable but slower, measurable on frequent
synchronizations.
2008-03-29 17:16:18 +01:00
Patrick Mezard
686a0f8465 convert: follow svn tags history (issue953) 2008-03-29 17:15:45 +01:00
Patrick Mezard
05b7b4915e Add a test for svn tags conversion 2008-03-29 17:15:43 +01:00
Patrick Mezard
f6b95792a5 convert: avoid svn log retrieval process cleanup
With huge history (like kdelibs), the process termination suddenly consumes a
lot of memory (from 700M to 1.3G+). Since the job is done, clean termination is
not required, just exit.
2008-03-29 17:14:53 +01:00
Patrick Mezard
da284c98c8 test-convert-mtn: test directory deletion 2008-03-29 17:14:47 +01:00
Kirill Smelkov
b3208d45a6 churn: allow whitespaces as delimiter in aliases
it was exactly on space character before.
2008-03-28 11:17:10 +03:00
Matt Mackall
fca88d72ac Added signature for changeset 564441983cb9 2008-03-24 18:05:30 -05:00
Bryan O'Sullivan
c8e33b9c63 Tests for issue 1049 2008-03-24 15:50:58 -07:00
Bryan O'Sullivan
776bc63f5b commit: when committing the results of a merge, it's all or nothing
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do.  This fixes issue 1049.
2008-03-24 15:36:56 -07:00
Thomas Arendsen Hein
ae74a1c929 Skip older monotone versions for tests.
test-convert-mtn is known to work with 0.37 and 0.38, but fails with
0.31 (Debian etch). hghave now skips all versions up to 0.31.
2008-03-24 22:49:33 +01:00
Thomas Arendsen Hein
818fb02fb9 run-tests.py: Only one fail message when output changed and error code.
This fixes passing back fail messages mistaken for skip messages when
running with parallel jobs because run_children() only expects one message per
fail.
2008-03-24 22:09:01 +01:00
Alexis S. L. Carvalho
7b6fc87ed3 mq: use repo.changelog.tip() instead of the "tip" tag 2008-03-24 18:07:07 -03:00
Thomas Arendsen Hein
5690af9ff7 Fix missing space in one of the new update messages. 2008-03-24 20:28:13 +01:00
Alexis S. L. Carvalho
e3b08ba721 qclone: do not abort if remote hasn't enabled mq (issue1040) 2008-03-24 16:17:19 -03:00
Alexis S. L. Carvalho
506e114776 hgweb: add compatibility code for old templates
Up to changeset 6713db859c82, HTTP headers were expected to be embedded
in the "headers" template.  Since that changeset, the content-type is
supposed to be defined as the "mimetype" template in the map file.

This changeset makes sure the old templates still work.
2008-03-24 13:45:01 -03:00
Matt Mackall
5c0b28f679 Merge with crew 2008-03-24 11:12:57 -05:00
Patrick Mezard
91f7424c6f test-convert-mtn: test directory move 2008-03-24 17:02:31 +01:00
Patrick Mezard
d098a6938d convert: record deleted files in monotone source 2008-03-24 17:02:08 +01:00
Dirkjan Ochtman
bddf3af283 hgweb: fix breakage in python < 2.5 introduced in 664786dcb24f 2008-03-24 16:20:15 +01:00
Matt Mackall
fb8b59de16 update: better logic and messages for updates
- complain about attempts to merge with ancestor
- when updating, differentiate between
  - crossing named branches with no local changes (jump)
  - crossing named branches with local changes (complain)
  - nonlinear update on the same named branch, no changes (complain some more)
  - nonlinear update on the same named branch, changes (different complaining)
2008-03-24 10:01:05 -05:00
Alexis S. L. Carvalho
317b2a0fec setup.py: hide compiler error messages while searching for inotify 2008-03-23 21:35:57 -03:00
Patrick Mezard
fe0eb5235b Add a test for monotone conversion 2008-03-23 23:18:20 +01:00
Alexis S. L. Carvalho
47f3b2b751 don't use hasattr in repo.invalidate
hasattr ends up calling __getattr__ which will instantiate the very
attributes we want to remove.
2008-03-23 21:03:24 -03:00
Alexis S. L. Carvalho
4251cf3194 localrepo.commit: grab locks before getting the list of files to commit
Somebody may change the dirstate after we've determined the parents of
the working dir and run repo.status, but before we called wlock().

This should also fix issue997, where backout would change a file without
changing its size and then call repo.commit without passing the list of
files. If this happened in less than one second, we wouldn't detect any
file changes - the in-memory dirstate still has the cached stat data for
that file. Grabbing the wlock early causes the dirstate to be
invalidated and we end up reading the dirstate file again, which has
that file marked for lookup (size == -1).

A better fix would be for backout to give repo.commit the exact list of
files, but that'll require some changes to the revert operation.

A significant user-visible change is that the precommit hook is always
run with both locks grabbed - previously, hg commit would run it before
grabbing any locks, but hg import would run it after grabbing locks.
2008-03-23 21:03:24 -03:00
Alexis S. L. Carvalho
6aca9c0de0 Avoid calling heads() twice on every hg commit.
In an extreme case (merging two revisions with very low revision numbers)
this could be slower than the previous code, but it should be much faster
in the usual cases (parents are near the tip).  It also avoids some races
in some uninteresting cases (e.g. two concurrent hg commits).
2008-03-23 21:03:24 -03:00
Dirkjan Ochtman
056bb10b17 hgweb: better error messages 2008-03-23 23:08:18 +01:00
Patrick Mezard
4c90cade29 Remove unexpected "Alternately" word from tip help. 2008-03-23 22:15:47 +01:00
Thomas Arendsen Hein
702b9172d1 run-tests.py: Allow environment variables to set jobs/timeout/port. 2008-03-23 21:48:38 +01:00
Patrick Mezard
8ad14a4450 convertrepo: make it work with refactored convert extension 2008-03-23 21:41:03 +01:00
Patrick Mezard
9b0e618364 Make tip help more helpful 2008-03-23 21:40:27 +01:00
Patrick Mezard
d458f6f4af test-imerge: test resolve subcommand 2008-03-23 20:37:04 +01:00
Patrick Mezard
e54f2a771f imerge: replace "merge" with "internal:merge" when non-interactive 2008-03-23 20:37:02 +01:00
Patrick Mezard
0c0a818562 hgk: display orphan revisions content (issue 1041) 2008-03-23 18:52:02 +01:00