Show More
@@ -670,11 +670,11 b' def debugstate(ui, repo):' | |||||
670 | for file_, ent in k: |
|
670 | for file_, ent in k: | |
671 | if ent[3] == -1: |
|
671 | if ent[3] == -1: | |
672 | # Pad or slice to locale representation |
|
672 | # Pad or slice to locale representation | |
673 |
locale_len = len(time.strftime("% |
|
673 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(0))) | |
674 | timestr = 'unset' |
|
674 | timestr = 'unset' | |
675 | timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr)) |
|
675 | timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr)) | |
676 | else: |
|
676 | else: | |
677 |
timestr = time.strftime("% |
|
677 | timestr = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ent[3])) | |
678 | if ent[1] & 020000: |
|
678 | if ent[1] & 020000: | |
679 | mode = 'lnk' |
|
679 | mode = 'lnk' | |
680 | else: |
|
680 | else: |
@@ -210,21 +210,23 b' def findcopies(repo, m1, m2, ma, limit):' | |||||
210 | for f in u2: |
|
210 | for f in u2: | |
211 | checkcopies(ctx(f, m2[f]), m1, ma) |
|
211 | checkcopies(ctx(f, m2[f]), m1, ma) | |
212 |
|
212 | |||
213 | d2 = {} |
|
213 | diverge2 = {} | |
214 | for of, fl in diverge.items(): |
|
214 | for of, fl in diverge.items(): | |
215 |
f |
|
215 | if len(fl) == 1: | |
216 | fo = list(fl) |
|
216 | del diverge[of] # not actually divergent | |
217 | fo.remove(f) |
|
217 | else: | |
218 | d2[f] = (of, fo) |
|
218 | diverge2.update(dict.fromkeys(fl)) # reverse map for below | |
219 |
|
219 | |||
220 | if fullcopy: |
|
220 | if fullcopy: | |
221 | repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n")) |
|
221 | repo.ui.debug(_(" all copies found (* = to merge, ! = divergent):\n")) | |
222 | for f in fullcopy: |
|
222 | for f in fullcopy: | |
223 | note = "" |
|
223 | note = "" | |
224 | if f in copy: note += "*" |
|
224 | if f in copy: note += "*" | |
225 | if f in diverge: note += "!" |
|
225 | if f in diverge2: note += "!" | |
226 | repo.ui.debug(_(" %s -> %s %s\n") % (f, fullcopy[f], note)) |
|
226 | repo.ui.debug(_(" %s -> %s %s\n") % (f, fullcopy[f], note)) | |
227 |
|
227 | |||
|
228 | del diverge2 | |||
|
229 | ||||
228 | if not fullcopy or not repo.ui.configbool("merge", "followdirs", True): |
|
230 | if not fullcopy or not repo.ui.configbool("merge", "followdirs", True): | |
229 | return copy, diverge |
|
231 | return copy, diverge | |
230 |
|
232 |
@@ -34,7 +34,7 b' no changes found' | |||||
34 | % dirstate should be empty: |
|
34 | % dirstate should be empty: | |
35 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
35 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 | % put something in the dirstate: |
|
36 | % put something in the dirstate: | |
37 | a 0 -1 unset baz |
|
37 | a 0 -1 unset baz | |
38 | copy: bar -> baz |
|
38 | copy: bar -> baz | |
39 | % add a new revision in the original repo |
|
39 | % add a new revision in the original repo | |
40 | scanning source... |
|
40 | scanning source... |
@@ -37,7 +37,7 b' echo 2b > baz' | |||||
37 | hg commit -m "branch b" -d "1000000 0" |
|
37 | hg commit -m "branch b" -d "1000000 0" | |
38 |
|
38 | |||
39 | echo "we shouldn't have anything but n state here" |
|
39 | echo "we shouldn't have anything but n state here" | |
40 |
hg debugstate | cut -b 1-16,3 |
|
40 | hg debugstate | cut -b 1-16,37- | |
41 |
|
41 | |||
42 | echo merging |
|
42 | echo merging | |
43 | hg pull ../a |
|
43 | hg pull ../a | |
@@ -48,7 +48,7 b' echo 2b > baz' | |||||
48 | echo new > quux |
|
48 | echo new > quux | |
49 |
|
49 | |||
50 | echo "we shouldn't have anything but foo in merge state here" |
|
50 | echo "we shouldn't have anything but foo in merge state here" | |
51 |
hg debugstate | cut -b 1-16,3 |
|
51 | hg debugstate | cut -b 1-16,37- | grep "^m" | |
52 |
|
52 | |||
53 | hg ci -m "merge" -d "1000000 0" |
|
53 | hg ci -m "merge" -d "1000000 0" | |
54 |
|
54 |
@@ -11,7 +11,7 b' resolving manifests' | |||||
11 | getting foo |
|
11 | getting foo | |
12 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13 | (branch merge, don't forget to commit) |
|
13 | (branch merge, don't forget to commit) | |
14 | n 0 -2 unset foo |
|
14 | n 0 -2 unset foo | |
15 | M foo |
|
15 | M foo | |
16 | c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo |
|
16 | c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo | |
17 | rev offset length base linkrev nodeid p1 p2 |
|
17 | rev offset length base linkrev nodeid p1 p2 |
@@ -79,6 +79,19 b' hg update' | |||||
79 | echo % cat |
|
79 | echo % cat | |
80 | cat sym a b |
|
80 | cat sym a b | |
81 |
|
81 | |||
|
82 | echo % check whether expansion is filewise | |||
|
83 | echo '$Id$' > c | |||
|
84 | echo 'tests for different changenodes' >> c | |||
|
85 | echo % commit c | |||
|
86 | hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' | |||
|
87 | echo % force expansion | |||
|
88 | hg -v kwexpand | |||
|
89 | echo % compare changenodes in a c | |||
|
90 | cat a c | |||
|
91 | echo % rollback and remove c | |||
|
92 | hg rollback | |||
|
93 | rm c | |||
|
94 | ||||
82 | echo % copy |
|
95 | echo % copy | |
83 | hg cp a c |
|
96 | hg cp a c | |
84 |
|
97 |
@@ -146,6 +146,20 b' expand $Id: a,v f782df5f9602 1970/01/01 ' | |||||
146 | do not process $Id: |
|
146 | do not process $Id: | |
147 | xxx $ |
|
147 | xxx $ | |
148 | ignore $Id$ |
|
148 | ignore $Id$ | |
|
149 | % check whether expansion is filewise | |||
|
150 | % commit c | |||
|
151 | adding c | |||
|
152 | % force expansion | |||
|
153 | overwriting a expanding keywords | |||
|
154 | overwriting c expanding keywords | |||
|
155 | % compare changenodes in a c | |||
|
156 | expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $ | |||
|
157 | do not process $Id: | |||
|
158 | xxx $ | |||
|
159 | $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $ | |||
|
160 | tests for different changenodes | |||
|
161 | % rollback and remove c | |||
|
162 | rolling back last transaction | |||
149 | % copy |
|
163 | % copy | |
150 | % kwfiles added |
|
164 | % kwfiles added | |
151 | a |
|
165 | a |
@@ -12,13 +12,13 b' hg add baz' | |||||
12 | hg rm bar |
|
12 | hg rm bar | |
13 |
|
13 | |||
14 | echo '% state dump' |
|
14 | echo '% state dump' | |
15 |
hg debugstate | cut -b 1-16,3 |
|
15 | hg debugstate | cut -b 1-16,37- | sort | |
16 | echo '% status' |
|
16 | echo '% status' | |
17 | hg st -A |
|
17 | hg st -A | |
18 |
|
18 | |||
19 | hg debugrebuildstate |
|
19 | hg debugrebuildstate | |
20 | echo '% state dump' |
|
20 | echo '% state dump' | |
21 |
hg debugstate | cut -b 1-16,3 |
|
21 | hg debugstate | cut -b 1-16,37- | sort | |
22 | echo '% status' |
|
22 | echo '% status' | |
23 | hg st -A |
|
23 | hg st -A | |
24 |
|
24 |
@@ -11,9 +11,9 b' resolving manifests' | |||||
11 | b |
|
11 | b | |
12 | b2 |
|
12 | b2 | |
13 | all copies found (* = to merge, ! = divergent): |
|
13 | all copies found (* = to merge, ! = divergent): | |
14 | c2 -> a2 |
|
14 | c2 -> a2 ! | |
15 | b -> a * |
|
15 | b -> a * | |
16 | b2 -> a2 |
|
16 | b2 -> a2 ! | |
17 | checking for directory renames |
|
17 | checking for directory renames | |
18 | a2: divergent renames -> dr |
|
18 | a2: divergent renames -> dr | |
19 | a: remote moved to b -> m |
|
19 | a: remote moved to b -> m |
@@ -228,8 +228,8 b' resolving manifests' | |||||
228 | unmatched files in other: |
|
228 | unmatched files in other: | |
229 | c |
|
229 | c | |
230 | all copies found (* = to merge, ! = divergent): |
|
230 | all copies found (* = to merge, ! = divergent): | |
231 | c -> a |
|
231 | c -> a ! | |
232 | b -> a |
|
232 | b -> a ! | |
233 | checking for directory renames |
|
233 | checking for directory renames | |
234 | a: divergent renames -> dr |
|
234 | a: divergent renames -> dr | |
235 | rev: versions differ -> m |
|
235 | rev: versions differ -> m |
General Comments 0
You need to be logged in to leave comments.
Login now