Commit Graph

5540 Commits

Author SHA1 Message Date
Bryan O'Sullivan
314630c85c convert: some tidyups, doc improvements, and test fixes
The various back end options are now documented.
The hg source can now be configured not to hand out a revision ID.
2007-11-27 09:44:09 -08:00
Bryan O'Sullivan
a364fef5fb Merge with crew 2007-11-26 17:24:21 -08:00
Bryan O'Sullivan
eff109c7b0 convert: tell the source repository when a rev has been converted
This lets us roundtrip changes between svn and hg.
2007-11-26 17:23:20 -08:00
Bryan O'Sullivan
d991d10d66 convert: save hg revision during a convert
This breaks hg->hg hash roundtripping, but that was fragile, didn't work
reliably, and hence arguably of little value.
2007-11-26 14:01:31 -08:00
Bryan O'Sullivan
3367073b9e Merge with mpm. 2007-11-26 12:25:55 -08:00
Patrick Mezard
eeff34ef5f Merge with crew-stable 2007-11-25 12:42:06 +01:00
Patrick Mezard
f280a41d83 test-import: test fuzziness, ambiguous patch locations 2007-11-25 12:17:30 +01:00
Jim Hague
5ef18ea71f patch: fix sort() comparator argument
'hg import' fails under Python 2.3. The name of the compare function parameter in the call to list.sort() is 'cmpfunc' in Python 2.3 and
'cmp' in Python 2.4+. Passing the compare function as a named parameter is therefore problematic.
2007-11-25 11:49:34 +01:00
Patrick Mezard
cbf322b12c cmdutil: make "files" list all files, add "file_mods" for modified files 2007-11-24 20:16:59 +01:00
Matt Mackall
21ee8a4e42 Merge with crew 2007-11-24 12:35:02 -06:00
Matt Mackall
93267d50c5 revlog: make revlogv0 loading more robust against corruption 2007-11-24 12:13:32 -06:00
Patrick Mezard
8f3f01adea cmdutil: always expose "files_add", "files_del" and "manifest" templater properties 2007-11-24 17:56:15 +01:00
Matt Mackall
c1ac09f205 push/pull: abort if we try to visit a missing or empty revlog 2007-11-21 13:26:18 -06:00
Matt Mackall
ad28be7c23 i18n: fix complaints from pygettext 2007-11-20 15:54:25 -06:00
Matt Mackall
a93c9d4d89 verify: improve handling of empty or missing files
- explicitly notice empty or missing changeset, manifest or file
  revlogs
- shortcircuit warnings relating to missing changeset or manifest
  revlogs
- fix changeset/manifest crosscheck swapped variables
- properly sort crosscheck messages
2007-11-20 15:46:20 -06:00
Patrick Mezard
80735bf58c Merge with crew-stable 2007-11-20 14:41:47 +01:00
Patrick Mezard
8ae803be30 mq: avoid qnew committing everything on invalid paths (issue 803)
If paths are supplied but resolve to nothing, localrepo.commit() is called with an empty set and commits the whole dirstate. Avoid this by passing the match function to commit.
2007-11-20 14:31:58 +01:00
Patrick Mezard
a9e1f119ec convert: read CVS files in chunks (issue 800)
socket.makefile() fails on large read requests (more than 10MB) with MemoryError.
2007-11-18 17:25:28 +01:00
Patrick Mezard
808b254fe1 test-convert-svn-sink: test directory additions 2007-11-17 18:41:31 +01:00
Patrick Mezard
930b69add7 convert: add directories to subversion from root to leaves 2007-11-17 18:41:31 +01:00
Patrick Mezard
12b8219be3 convert: force svn:executable when execute-bit is not supported
The util.is_exec fallback would be to ask subversion for the current value of svn:executable. Setting it directly is just simpler.
2007-11-11 19:34:00 +01:00
Patrick Mezard
44e6544bec convert: fix svn file:// URL generation under Windows 2007-11-11 14:17:30 +01:00
Bryan O'Sullivan
e906d6af4e highlight: clean up coding style a little 2007-11-12 10:49:26 -08:00
Adam Hupp
8fafdc321a extension for synax highlighting in the hgweb file revision view
Depends on the pygments syntax highlighting library:
http://pygments.org/
2007-11-10 17:54:57 -05:00
Patrick Mezard
334286e6e7 Change standard streams mode to binary at hg startup
Standard streams are expected to operate in binary mode everywhere, especially with archive, cat, diff and export commands. Rewriting these to separate informational output from binary content is complicated to do and to maintain, nonwithstanding mode switching reliability. Changing all output mode to binary should not have much impact on Windows were stream processing tools are barely used and usually cope with unix style endings.

Streams mode being process wide, the switch is performed in the startup script to avoid polluting existing API users who may have solved this issue already or ignored it at least for the mercurial part.
2007-11-10 21:30:59 +01:00
Patrick Mezard
c182383712 test-import: read email payload in binary mode 2007-11-10 21:30:43 +01:00
Patrick Mezard
d9ba22f633 convert: fix util.popen regression in darcs converter 2007-11-10 17:09:56 +01:00
Alexis S. L. Carvalho
2e160ca8ff merge with crew-stable 2007-11-09 21:24:25 -02:00
Alexis S. L. Carvalho
0086f97dc7 mq: really remove undo after a qpush (and after a strip)
For qpush, removeundo has to be called after the transaction has finished.

strip may use unbundle, which also leaves an undo file.

Fixes issue780.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
f8788ac266 httprepo: give self._url and the netloc to the password manager
This should hide some differences between different python versions.
2007-11-09 20:21:35 -02:00
Matt Mackall
d3de4f56b7 Merge with crew 2007-11-07 21:13:56 -06:00
Matt Mackall
62438e2d34 Add note to CONTRIBUTORS file 2007-11-07 21:10:30 -06:00
Bryan O'Sullivan
68c398d741 convert: add support for Subversion as a sink 2007-11-07 18:26:59 -08:00
Bryan O'Sullivan
4b5495f397 convert: abstract darcs's commandline handling 2007-11-07 17:40:39 -08:00
Bryan O'Sullivan
bb3b51ecf1 convert: iterate 2007-11-07 17:07:14 -08:00
Bryan O'Sullivan
857e67d5db convert: abstract map files into a class 2007-11-07 17:06:02 -08:00
Matt Mackall
10b354f4a5 Mark failing test as a known bug 2007-11-07 14:38:04 -06:00
Bryan O'Sullivan
33c2bc9eb9 Merge with -stable 2007-11-05 13:20:24 -08:00
Manuel Holtgrewe
4a33cb8d98 Do not display passwords with pull/push/incoming/outgoing
Passwords specified in the repository URL are now displayed as '***'
when accessing the remote repository.
2007-11-05 20:29:32 +01:00
Alexis S. L. Carvalho
9877d9e85e run-tests.py: add a default --date "0 0" argument to commit et al
Part of test-tags was modified just to be sure this works.

The change in test-archive-symlinks is necessary to avoid a "helpful"
warning from GNU tar ("implausibly old time stamp 1970-01-01 00:00:00").
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
cde5fb5024 tests/*: avoid losing the original settings from $HGRCPATH 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
8775f8f81c convert: make sure mercurial_source has a local hg repo 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
fe9d865e0d convert: display all errors if we couldn't open the source repo
This should give the user a better hint of what's going wrong.

Improve some error messages.  In particular, mention "CVS checkout" instead
of "CVS repo".

Fixes issue822 and issue826.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
959d3f5cd4 test-convert-darcs: skip if we can't find the elementtree module
This patch is a bit dirty to avoid having to repeat the dance required
to import elementtree.
2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
bb984a6137 test-permissions: add a chmod +w to allow the directory to be removed 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
8dd3103fe5 run-tests.py: don't print a dot for skipped tests 2007-11-09 20:21:35 -02:00
Alexis S. L. Carvalho
c4d02f3fdf purge: simplify safety net for case mangling filesystems
Relying on the exact return of statwalk would cause us to abort
when there was at least one tracked file inside an ignored directory.

This patch forces an extra walk of the whole working directory even
on sane filesystems, where it wouldn't be needed.

Fixes issue621.
2007-11-09 20:21:35 -02:00
Maxim Dounin
084e15f969 Fix dir-changed-to-file updates on clean workdir.
Workaround for dir-changed-to-file updates mentioned
in rev c3f3393b9096 doesn't actually work since tests
introduced in mentioned changeset prevented dirstate
updates even if working directory updates succeded.

Make tests more relaxed for dirstate operations
not directly accessible from cli. See also issue660.

While here, move _dirs existance check from _decpath()
to _changepath() for unification.
2007-11-07 22:57:28 +01:00
Peter Arrenbrecht
bfb3ae9d06 Support qgoto in contrib/bash_completion. 2007-11-05 08:41:22 +01:00
bdowning@lavos.net
95bc1b9c93 hgk: change config file from .gitk to .hgk
Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible.  Whenever I run one, the other gets reset to the default screen position.  This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.
2007-11-03 21:50:11 +01:00