##// END OF EJS Templates
identify: add template support...
identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

File last commit:

r26066:89872688 default
r33051:15a79ac8 default
Show More
test-convert-bzr-directories.t
194 lines | 4.2 KiB | text/troff | Tads3Lexer
/ tests / test-convert-bzr-directories.t
#require bzr
$ . "$TESTDIR/bzr-definitions"
empty directory
$ mkdir test-empty
$ cd test-empty
$ bzr init -q source
$ cd source
$ echo content > a
$ bzr add -q a
$ bzr commit -q -m 'Initial add'
$ mkdir empty
$ bzr add -q empty
$ bzr commit -q -m 'Empty directory added'
$ echo content > empty/something
$ bzr add -q empty/something
$ bzr commit -q -m 'Added file into directory'
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
2 Initial add
1 Empty directory added
0 Added file into directory
$ manifest source-hg 1
% manifest of 1
644 a
$ manifest source-hg tip
% manifest of tip
644 a
644 empty/something
$ cd ..
directory renames
$ mkdir test-dir-rename
$ cd test-dir-rename
$ bzr init -q source
$ cd source
$ mkdir tpyo
$ echo content > tpyo/something
$ bzr add -q tpyo
$ bzr commit -q -m 'Added directory'
$ bzr mv tpyo typo
tpyo => typo
$ bzr commit -q -m 'Oops, typo'
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Added directory
0 Oops, typo
$ manifest source-hg 0
% manifest of 0
644 tpyo/something
$ manifest source-hg tip
% manifest of tip
644 typo/something
$ cd ..
nested directory renames
$ mkdir test-nested-dir-rename
$ cd test-nested-dir-rename
$ bzr init -q source
$ cd source
$ mkdir -p firstlevel/secondlevel/thirdlevel
$ echo content > firstlevel/secondlevel/file
$ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff
$ bzr add -q firstlevel
$ bzr commit -q -m 'Added nested directories'
$ bzr mv firstlevel/secondlevel secondlevel
firstlevel/secondlevel => secondlevel
$ bzr commit -q -m 'Moved secondlevel one level up'
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Added nested directories
0 Moved secondlevel one level up
$ manifest source-hg tip
% manifest of tip
644 secondlevel/file
644 secondlevel/thirdlevel/stuff
$ cd ..
directory remove
$ mkdir test-dir-remove
$ cd test-dir-remove
$ bzr init -q source
$ cd source
$ mkdir src
$ echo content > src/sourcecode
$ bzr add -q src
$ bzr commit -q -m 'Added directory'
$ bzr rm -q src
$ bzr commit -q -m 'Removed directory'
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Added directory
0 Removed directory
$ manifest source-hg 0
% manifest of 0
644 src/sourcecode
$ manifest source-hg tip
% manifest of tip
$ cd ..
directory replace
$ mkdir test-dir-replace
$ cd test-dir-replace
$ bzr init -q source
$ cd source
$ mkdir first second
$ echo content > first/file
$ echo morecontent > first/dummy
$ echo othercontent > second/something
$ bzr add -q first second
$ bzr commit -q -m 'Initial layout'
$ bzr mv first/file second/file
first/file => second/file
$ bzr mv first third
first => third
$ bzr commit -q -m 'Some conflicting moves'
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Initial layout
0 Some conflicting moves
$ manifest source-hg tip
% manifest of tip
644 second/file
644 second/something
644 third/dummy
$ cd ..
divergent nested renames (issue3089)
$ mkdir test-divergent-renames
$ cd test-divergent-renames
$ bzr init -q source
$ cd source
$ mkdir -p a/c
$ echo a > a/fa
$ echo c > a/c/fc
$ bzr add -q a
$ bzr commit -q -m 'Initial layout'
$ bzr mv a b
a => b
$ mkdir a
$ bzr add a
add(ed|ing) a (re)
$ bzr mv b/c a/c
b/c => a/c
$ bzr status
added:
a/
renamed:
a/? => b/? (re)
a/c/? => a/c/? (re)
$ bzr commit -q -m 'Divergent renames'
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Initial layout
0 Divergent renames
$ hg -R source-hg st -C --change 1
A b/fa
a/fa
R a/fa
$ hg -R source-hg manifest -r 1
a/c/fc
b/fa
$ cd ..