##// END OF EJS Templates
copies: separate added/removed files by newline instead of null...
Martin von Zweigbergk -
r42620:027f1567 default
parent child Browse files
Show More
@@ -109,12 +109,12 b' def encodefileindices(files, subset):'
109 for i, f in enumerate(files):
109 for i, f in enumerate(files):
110 if f in subset:
110 if f in subset:
111 indices.append('%d' % i)
111 indices.append('%d' % i)
112 return '\0'.join(indices)
112 return '\n'.join(indices)
113
113
114 def decodefileindices(files, data):
114 def decodefileindices(files, data):
115 try:
115 try:
116 subset = []
116 subset = []
117 for strindex in data.split('\0'):
117 for strindex in data.split('\n'):
118 i = int(strindex)
118 i = int(strindex)
119 if i < 0 or i >= len(files):
119 if i < 0 or i >= len(files):
120 return None
120 return None
@@ -25,7 +25,9 b' Check that copies are recorded correctly'
25 $ hg ci -m 'copy a to b, c, and d'
25 $ hg ci -m 'copy a to b, c, and d'
26 $ hg changesetcopies
26 $ hg changesetcopies
27 files: b c d
27 files: b c d
28 filesadded: 0\x001\x002 (esc)
28 filesadded: 0
29 1
30 2
29
31
30 p1copies: 0\x00a (esc)
32 p1copies: 0\x00a (esc)
31 1\x00a (esc)
33 1\x00a (esc)
@@ -95,7 +97,9 b" File 'f' exists only in p1, so 'i' shoul"
95 $ hg ci -m 'merge'
97 $ hg ci -m 'merge'
96 $ hg changesetcopies
98 $ hg changesetcopies
97 files: g h i
99 files: g h i
98 filesadded: 0\x001\x002 (esc)
100 filesadded: 0
101 1
102 2
99
103
100 p1copies: 0\x00a (esc)
104 p1copies: 0\x00a (esc)
101 2\x00f (esc)
105 2\x00f (esc)
@@ -620,7 +620,7 b' merging csets is a descendant of the bas'
620
620
621 $ hg rebase -r . -d 2 -t :other
621 $ hg rebase -r . -d 2 -t :other
622 rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !)
622 rebasing 5:5018b1509e94 "added willconflict and d" (tip) (no-changeset !)
623 rebasing 5:619047c26bf8 "added willconflict and d" (tip) (changeset !)
623 rebasing 5:af8d273bf580 "added willconflict and d" (tip) (changeset !)
624
624
625 $ hg up 3 -q
625 $ hg up 3 -q
626 $ hg l --hidden
626 $ hg l --hidden
@@ -644,4 +644,4 b' neither of the merging csets will be a d'
644
644
645 $ hg graft -r 6 --base 4 --hidden -t :other
645 $ hg graft -r 6 --base 4 --hidden -t :other
646 grafting 6:99802e4f1e46 "added willconflict and d" (tip) (no-changeset !)
646 grafting 6:99802e4f1e46 "added willconflict and d" (tip) (no-changeset !)
647 grafting 6:9ddc6fb3b691 "added willconflict and d" (tip) (changeset !)
647 grafting 6:b19f0df72728 "added willconflict and d" (tip) (changeset !)
General Comments 0
You need to be logged in to leave comments. Login now