Commit Graph

276 Commits

Author SHA1 Message Date
Patrick Mezard
cc0dbae2c2 Move and complete execute bit conversion tests into test_fetch_exec.py 2008-12-10 11:03:18 -06:00
Luke Opperman
beecf48b3b tag_repo: remove gentags command, extend repo.tags(), HgChangeEditor now takes either repo or repo_path 2008-12-04 13:10:40 -06:00
Augie Fackler
a071605551 Fix a bug in replay convert where replaced files that couldn't use replay
would sometimes end up having no content.
2008-12-03 22:51:03 -06:00
Patrick Mezard
a1dea77fe1 SubversionRepo: work around ra.get_files() not releasing input buffer 2008-12-02 20:13:13 -06:00
Augie Fackler
b66e1ea5f4 README: We now only require hg 1.1, rather than a prerelease version. 2008-12-02 20:10:11 -06:00
Patrick Mezard
f378fe3193 hg_delta_editor: do not assume branches are copied from trunk by default
Here is what happen in jquery repository:
- kelvin-dev branch is created in r1617 with an empty directory for the
  datePicker plugin
- commits are done
- datePicker plugin is merged in trunk

Before the fix, the converter assumed the initial empty commit had for parent
some other commit of trunk, therefore adding all its files, which was wrong.
And we ended with 'alignDemo.html' in converted trunk@5946 while it was not in
the source revision.
2008-11-29 11:25:01 -06:00
Patrick Mezard
a8d51edac3 hg_delta_editor: fix update of stray files in branches/
Ensure that self.current_file is a non-empty path in a branch.
2008-11-29 11:25:01 -06:00
Patrick Mezard
ede6bdfce9 fetch_command: ignore stray files in branches/ in non-diff mode 2008-11-29 11:25:01 -06:00
Patrick Mezard
05423736da Add a disabled test for unrelated branches
The fix is not obvious but preserving the test helps fixing other stuff.
2008-11-29 11:25:01 -06:00
Patrick Mezard
e7cc3df833 hg_delta_editor: merge _is_path_valid() and _path_and_branch_from_path() 2008-11-29 11:24:31 -06:00
Luke Opperman
022302b49e Clean up help text, document subcommands. 2008-11-20 22:03:30 -06:00
John Paulett
bd4c9c37dc Correct a typo in the README. 2008-11-27 21:24:06 -06:00
John Paulett
0fae755633 Better note on how to pull a repository. 2008-11-27 21:23:01 -06:00
Augie Fackler
4ec9620b80 Fix a regression in converting repositories with files copied in from outside
branches/tags/trunk where repo root != project root.
2008-11-25 16:21:57 -06:00
Augie Fackler
0b3d81a7d5 fetch_command: Fix mis-converted executable when svn:executable was set to the
empty string.
2008-11-25 09:45:38 -06:00
Patrick Mezard
86ee82c737 fetch_command: pass parent changectx instead of identifier 2008-11-25 09:18:30 -06:00
Patrick Mezard
34229c49c6 fetch_command: only raise BadPatchApply() from stupid_diff_branchrev() 2008-11-25 09:18:29 -06:00
Patrick Mezard
2b794d4357 fetch_command: extract diff code in a function 2008-11-25 09:18:29 -06:00
Patrick Mezard
5739062901 fetch_command: use the opener to read touched files 2008-11-25 09:18:28 -06:00
Patrick Mezard
25e5c47562 fetch_command: simplify deleted files enumeration, bypass filesystem 2008-11-25 09:18:28 -06:00
Patrick Mezard
3dbb1a3cec fetch_command: move diff file deletion code back with everything else 2008-11-25 09:18:27 -06:00
Patrick Mezard
940661ae1d fetch_command: remove useless delete_all_files case 2008-11-25 09:18:27 -06:00
Patrick Mezard
d7400e6d83 fetch_command: simplify diff code with opener objects 2008-11-25 09:18:26 -06:00
Patrick Mezard
edb6ae1ead fetch_command: remove dead code 2008-11-25 09:18:26 -06:00
Augie Fackler
e9d74f009c Cleanups based on pyflakes output. 2008-11-21 16:21:19 -06:00
Augie Fackler
adf788f9aa Add a diff command that behaves kind of like svn diff. 2008-11-21 16:15:23 -06:00
Augie Fackler
8c5f2ca7f0 Refactored outgoing_revisions into util where it really belongs. 2008-11-21 16:11:24 -06:00
Patrick Mezard
c86541b258 fetch_command: simplify replay_convert_rev() with svn.list_files() 2008-11-20 22:41:14 -06:00
Patrick Mezard
a46560a49e hg_delta_editor: fix symlink prefix confusion
- SubversionRepo.get_file() strips the symlink prefix
- Enforce that hg_delta_editor symlink data always contains the prefix. The
  alternative was seducing and more consistent with hg content but it makes the
  code more complicated since svn:special can be set before or after the content
  is set, and we need it in apply_textdelta()

This issue fixes jQuery repository conversion at r3674.
2008-11-20 22:41:15 -06:00
Patrick Mezard
551321fbc7 Add a test to check EOLs are correctly converted 2008-11-20 22:41:16 -06:00
Augie Fackler
e508c97000 utility_commands: fix outgoing against crew (required because of crew cset bb33a7b316be) 2008-11-19 10:23:48 -06:00
Augie Fackler
9b5a74a8e8 svncommand: Fix help to use ui.status() and be a bit smarter about displaying
help.
2008-11-19 10:16:50 -06:00
Augie Fackler
4d565525a9 svncommand: Check traceback length to stop masking real exceptions. 2008-11-19 10:16:24 -06:00
Augie Fackler
2df035818d svnwrap: Fix handling of auth providers so cached credentials can work.
Also fixed things so that svn 1.6 should enable platform-specific auth providers.
2008-11-19 09:41:09 -06:00
Augie Fackler
effb740fae tests: Mock the mercurial.ui.ui class like we really should to capture output.
Has the nice side effect that we can use nose 0.11's multiprocess plugin.
2008-11-14 16:52:30 -06:00
Patrick Mezard
b32298ea04 fetch_command: create branch temporary directory when we need it 2008-11-14 16:18:24 -06:00
Patrick Mezard
b9a4fe09c2 SubversionRepo: remember svn.diff3() does not work
Calling it repeatedly is expensive, files and directories are created,
svn transport layer is reset.
2008-11-14 16:18:24 -06:00
Patrick Mezard
074290e2b2 fetch_command: handle nullid parent in stupid non-diffy mode 2008-11-14 16:18:24 -06:00
Patrick Mezard
e45c792412 fetch_command: in stupid non-diffy mode, take changed paths in account
Former code was checkouting all branch files for every converted
revision when diffs were not available in stupid mode. Now, only
changed items are requested.
2008-11-14 16:18:24 -06:00
Patrick Mezard
bb6cd594bf push_cmd: add option to push in stupid mode
This is mostly useful for test coverage, to roundtrip in stupid mode.
2008-11-14 16:18:24 -06:00
Patrick Mezard
f9ee55239f push_cmd: consider only dirs with added/removed files for addition or deletion 2008-11-14 16:18:24 -06:00
Patrick Mezard
baa9d16b5c test_util: add commitchanges() to TestBase 2008-11-14 16:18:24 -06:00
Patrick Mezard
f1278f2869 push_cmd: delete empty svn directories, refactor directory creation 2008-11-14 16:18:24 -06:00
Patrick Mezard
87d62ad5a3 Extract PushTest common code into test_util.TestBase 2008-11-14 16:18:24 -06:00
Patrick Mezard
8a41385c59 SubversionRepo: close files before rmtree() in diff3
Open files cannot be removed if open (by default) under Windows.
2008-11-14 16:18:24 -06:00
Patrick Mezard
e8410f200d test_push_command: fix test_push_existing_file_newly_execute() under Windows 2008-11-14 16:18:24 -06:00
Patrick Mezard
cec1718fff fetch_command: handle failing svn.diff3() on Windows, fetch full revision 2008-11-09 18:08:35 -06:00
Patrick Mezard
56c1f22424 Fix basic issues with tests on Windows
- shutil.rmtree() fails if there are any read-only files (svn store)
- Fix files:// URLs
- os.spawnvp()/Popen4() do not exist under Windows, use subprocess
2008-11-09 18:08:35 -06:00
Patrick Mezard
e03678b306 fetch_command: bypass export3() and checkout manually
This method has several advantages:
- export3() does not work very well under Windows, while client.list() and
  ra.get_file() do
- File modes are retrieved from get_file() for free, instead of being read from
  the filesystem, which does not work under Windows, more generally the
  filesystem is bypassed completely.
- It can be made much smarter by checkouting changed files only, like convert
  extension does.
2008-11-09 18:08:35 -06:00
Patrick Mezard
5dee2cf35e SubversionRepo: make get_file() return the file mode
It is cheap to get it, and it will be useful to fetch revisions.
2008-11-09 18:08:35 -06:00