--- a/mercurial/commands.py Mon Jan 14 16:28:32 2008 -0600
+++ b/mercurial/commands.py Fri Jan 11 23:30:56 2008 +0200
@@ -670,11 +670,11 @@
for file_, ent in k:
if ent[3] == -1:
# Pad or slice to locale representation
- locale_len = len(time.strftime("%x %X", time.localtime(0)))
+ locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(0)))
timestr = 'unset'
timestr = timestr[:locale_len] + ' '*(locale_len - len(timestr))
else:
- timestr = time.strftime("%x %X", time.localtime(ent[3]))
+ timestr = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ent[3]))
if ent[1] & 020000:
mode = 'lnk'
else:
--- a/tests/test-convert-hg-sink.out Mon Jan 14 16:28:32 2008 -0600
+++ b/tests/test-convert-hg-sink.out Fri Jan 11 23:30:56 2008 +0200
@@ -34,7 +34,7 @@
% dirstate should be empty:
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% put something in the dirstate:
-a 0 -1 unset baz
+a 0 -1 unset baz
copy: bar -> baz
% add a new revision in the original repo
scanning source...
--- a/tests/test-filebranch Mon Jan 14 16:28:32 2008 -0600
+++ b/tests/test-filebranch Fri Jan 11 23:30:56 2008 +0200
@@ -37,7 +37,7 @@
hg commit -m "branch b" -d "1000000 0"
echo "we shouldn't have anything but n state here"
-hg debugstate | cut -b 1-16,35-
+hg debugstate | cut -b 1-16,37-
echo merging
hg pull ../a
@@ -48,7 +48,7 @@
echo new > quux
echo "we shouldn't have anything but foo in merge state here"
-hg debugstate | cut -b 1-16,35- | grep "^m"
+hg debugstate | cut -b 1-16,37- | grep "^m"
hg ci -m "merge" -d "1000000 0"
--- a/tests/test-issue522.out Mon Jan 14 16:28:32 2008 -0600
+++ b/tests/test-issue522.out Fri Jan 11 23:30:56 2008 +0200
@@ -11,7 +11,7 @@
getting foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-n 0 -2 unset foo
+n 0 -2 unset foo
M foo
c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
rev offset length base linkrev nodeid p1 p2
--- a/tests/test-rebuildstate Mon Jan 14 16:28:32 2008 -0600
+++ b/tests/test-rebuildstate Fri Jan 11 23:30:56 2008 +0200
@@ -12,13 +12,13 @@
hg rm bar
echo '% state dump'
-hg debugstate | cut -b 1-16,35- | sort
+hg debugstate | cut -b 1-16,37- | sort
echo '% status'
hg st -A
hg debugrebuildstate
echo '% state dump'
-hg debugstate | cut -b 1-16,35- | sort
+hg debugstate | cut -b 1-16,37- | sort
echo '% status'
hg st -A