##// END OF EJS Templates
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
Giorgos Keramidas -
r5858:e7ed5d07 default
parent child Browse files
Show More
@@ -670,11 +670,11 b' def debugstate(ui, repo):'
670 670 for file_, ent in k:
671 671 if ent[3] == -1:
672 672 # Pad or slice to locale representation
673 locale_len = len(time.strftime("%x %X", time.localtime(0)))
673 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(0)))
674 674 timestr = 'unset'
675 675 timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
676 676 else:
677 timestr = time.strftime("%x %X", time.localtime(ent[3]))
677 timestr = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ent[3]))
678 678 if ent[1] & 020000:
679 679 mode = 'lnk'
680 680 else:
@@ -34,7 +34,7 b' no changes found'
34 34 % dirstate should be empty:
35 35 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
36 36 % put something in the dirstate:
37 a 0 -1 unset baz
37 a 0 -1 unset baz
38 38 copy: bar -> baz
39 39 % add a new revision in the original repo
40 40 scanning source...
@@ -37,7 +37,7 b' echo 2b > baz'
37 37 hg commit -m "branch b" -d "1000000 0"
38 38
39 39 echo "we shouldn't have anything but n state here"
40 hg debugstate | cut -b 1-16,35-
40 hg debugstate | cut -b 1-16,37-
41 41
42 42 echo merging
43 43 hg pull ../a
@@ -48,7 +48,7 b' echo 2b > baz'
48 48 echo new > quux
49 49
50 50 echo "we shouldn't have anything but foo in merge state here"
51 hg debugstate | cut -b 1-16,35- | grep "^m"
51 hg debugstate | cut -b 1-16,37- | grep "^m"
52 52
53 53 hg ci -m "merge" -d "1000000 0"
54 54
@@ -11,7 +11,7 b' resolving manifests'
11 11 getting foo
12 12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 13 (branch merge, don't forget to commit)
14 n 0 -2 unset foo
14 n 0 -2 unset foo
15 15 M foo
16 16 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
17 17 rev offset length base linkrev nodeid p1 p2
@@ -12,13 +12,13 b' hg add baz'
12 12 hg rm bar
13 13
14 14 echo '% state dump'
15 hg debugstate | cut -b 1-16,35- | sort
15 hg debugstate | cut -b 1-16,37- | sort
16 16 echo '% status'
17 17 hg st -A
18 18
19 19 hg debugrebuildstate
20 20 echo '% state dump'
21 hg debugstate | cut -b 1-16,35- | sort
21 hg debugstate | cut -b 1-16,37- | sort
22 22 echo '% status'
23 23 hg st -A
24 24
General Comments 0
You need to be logged in to leave comments. Login now