/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to notes/mapping.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-04-11 16:06:53 UTC
  • mto: (4286.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4287.
  • Revision ID: v.ladeuil+lp@free.fr-20090411160653-eq1gfn41q3lzhmss
Cleanup test imports and use features to better track skipped tests.

* bzrlib/tests/workingtree_implementations/__init__.py: 
Fix imports. Delete obsolete comment.

* bzrlib/tests/tree_implementations/test_walkdirs.py:
(TestWalkdirs.get_all_subdirs_expected): Reduce duplication.

* bzrlib/tests/tree_implementations/test_test_trees.py: 
Fix import.

* bzrlib/tests/tree_implementations/test_path_content_summary.py: 
Fix imports.

(TestPathContentSummary.test_unicode_symlink_content_summary,
TestPathContentSummary.test_unicode_symlink_target_summary):Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/test_inv.py: 
Fix imports.
(TestInventoryWithSymlinks): Factor out test that requires
symlinks and use _test_needs_features.
(TestInventory.test_canonical_path,
TestInventory.test_canonical_path_dir,
TestInventory.test_canonical_path_root,
TestInventory.test_canonical_path_invalid_all,
TestInventory.test_canonical_invalid_child): Use assert(expected,
actual)

* bzrlib/tests/tree_implementations/test_get_symlink_target.py: 
Fix imports.
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/__init__.py: 
Fix imports.

(TestCaseWithTree.get_tree_with_subdirs_and_all_supported_content_types,
TestCaseWithTree._create_tree_with_utf8): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/test_workingtree_4.py:
Fix too long lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Mapping between Git and Bazaar is generally straightforward.
2
 
 
3
 
Mapping version 1
4
 
=================
5
 
 
6
 
All revision ids created in this mapping format are prefixed with "git-v1:". 
7
 
This mapping format does not support roundtripped revisions from Bazaar; 
8
 
pushing or pulling from Bazaar into Git is not possible. dpush is possible 
9
 
and more or less does the opposite of the mapping described in this section.
10
 
 
11
 
Commits
12
 
-------
13
 
 
14
 
Git commits are mapped to Bazaar revisions. 
15
 
 
16
 
Bazaar revision ids are created by prefixing the (hex format) of git commit 
17
 
sha with "git-v1:". 
18
 
 
19
 
Commit properties are as follows:
20
 
 
21
 
 * git committer string: mapped to the Bazaar committer string
22
 
 * git committer timestamp: mapped to the Bazaar commit timestamp
23
 
 * git author string: mapped to the Bazaar 'author' revision property, if it 
24
 
   is different from the committer string
25
 
 * git author timestamp: ignored
26
 
 * git commit message: mapped to Bazaar commit message
27
 
 
28
 
The git committer string, author string and commit message are assumed to 
29
 
be encoded in UTF-8. Any utf-8-invalid characters are ignored.
30
 
 
31
 
Trees and blobs
32
 
---------------
33
 
Git trees are generally converted to Bazaar directories, Git blobs are 
34
 
generally converted to Bazaar files and symlinks.
35
 
 
36
 
Since all git trees are mapped *including* the root tree, it is only possible 
37
 
to create mapped rich-root revisions.
38
 
 
39
 
File ids for all objects are simply created by taking their path and 
40
 
escaping invalid characters in them:
41
 
 
42
 
 * _ is mapped to __
43
 
 * spaces are mapped to _s