Show More
@@ -670,11 +670,11 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: |
@@ -37,7 +37,7 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 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 |
@@ -12,13 +12,13 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 |
General Comments 0
You need to be logged in to leave comments.
Login now