Mercurial > hg > pyhgsh
changeset 793:445970ccf57a
Merge with upstream
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 29 Jul 2005 06:43:21 +0100 |
| parents | 49ec802b4a16 (diff) f199e1887889 (current diff) |
| children | cdf61d3d3904 |
| files | mercurial/commands.py mercurial/hg.py mercurial/transaction.py mercurial/util.py templates/changelogentry-rss.tmpl templates/filelogentry-rss.tmpl tests/README tests/run-tests tests/test-bad-pull.out tests/test-basic.out tests/test-clone-failure.out tests/test-copy.out tests/test-diffdir tests/test-flags.out tests/test-hup.out tests/test-merge6.out tests/test-pull tests/test-pull.out tests/test-rawcommit1.out tests/test-simple-update.out tests/test-tag.out tests/test-undo.out tests/test-unrelated-pull.out tests/test-up-local-change tests/test-up-local-change.out |
| diffstat | 6 files changed, 221 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Jul 28 07:46:08 2005 -0800 +++ b/mercurial/commands.py Fri Jul 29 06:43:21 2005 +0100 @@ -527,7 +527,10 @@ keys = dc.keys() keys.sort() for file_ in keys: - ui.write("%c %s\n" % (dc[file_][0], file_)) + ui.write("%c %3o %10d %s %s\n" + % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2], + time.strftime("%x %X", + time.localtime(dc[file_][3])), file_)) def debugindex(ui, file_): """dump the contents of an index file"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-revert Fri Jul 29 06:43:21 2005 +0100 @@ -0,0 +1,45 @@ +#!/bin/sh -x + +mkdir t +cd t +hg init +echo "added file1" > file1 +echo "added file2" > file2 +hg add file1 file2 +hg commit -m "added file1 and file2" -d "0 0" -u user +echo "changed file1" >> file1 +hg commit -m "changed file1" -d "0 0" -u user +hg -q log +hg id +hg update -C 0 +hg id +echo "changed file1" >> file1 +hg id +hg revert +hg diff +hg status +hg id +hg update +hg diff +hg status +hg id +hg update -C 0 +echo "changed file1" >> file1 +HGMERGE=merge hg update +hg diff +hg status +hg id +hg revert +hg diff +hg status +hg id +hg revert -r tip +hg diff +hg status +hg id +hg update -C +hg diff +hg status +hg id +cd ..; /bin/rm -rf t +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-revert.out Fri Jul 29 06:43:21 2005 +0100 @@ -0,0 +1,56 @@ ++ mkdir t ++ cd t ++ hg init ++ echo 'added file1' ++ echo 'added file2' ++ hg add file1 file2 ++ hg commit -m 'added file1 and file2' -d '0 0' -u user ++ echo 'changed file1' ++ hg commit -m 'changed file1' -d '0 0' -u user ++ hg -q log +1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c +0:8633637036c18f021d771208e16ae3508ab81d28 ++ hg id +3aa14bbc23d9 tip ++ hg update -C 0 ++ hg id +8633637036c1 ++ echo 'changed file1' ++ hg id +8633637036c1+ ++ hg revert ++ hg diff ++ hg status ++ hg id +8633637036c1 ++ hg update ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg update -C 0 ++ echo 'changed file1' ++ HGMERGE=merge ++ hg update +merging file1 ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg revert ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg revert -r tip ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg update -C ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ cd .. ++ /bin/rm -rf t
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-revert2 Fri Jul 29 06:43:21 2005 +0100 @@ -0,0 +1,45 @@ +#!/bin/sh -x + +mkdir t +cd t +hg init +echo "added file1" > file1 +echo "added file2" > file2 +hg add file1 file2 +hg commit -m "added file1 and file2" -d "0 0" -u user +echo "changed file1" >> file1 +hg commit -m "changed file1" -d "0 0" -u user +hg -q log +hg id +hg update -C 0 +hg id +echo "changed file1" >> file1 +hg id +hg revert +hg diff +hg status +hg id +hg update +hg diff +hg status +hg id +hg update -C 0 +echo "changed file1 different" >> file1 +HGMERGE=merge hg update +hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg status +hg id +hg revert +hg diff +hg status +hg id +hg revert -r tip +hg diff +hg status +hg id +hg update -C +hg diff +hg status +hg id +cd ..; /bin/rm -rf t +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge-revert2.out Fri Jul 29 06:43:21 2005 +0100 @@ -0,0 +1,70 @@ ++ mkdir t ++ cd t ++ hg init ++ echo 'added file1' ++ echo 'added file2' ++ hg add file1 file2 ++ hg commit -m 'added file1 and file2' -d '0 0' -u user ++ echo 'changed file1' ++ hg commit -m 'changed file1' -d '0 0' -u user ++ hg -q log +1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c +0:8633637036c18f021d771208e16ae3508ab81d28 ++ hg id +3aa14bbc23d9 tip ++ hg update -C 0 ++ hg id +8633637036c1 ++ echo 'changed file1' ++ hg id +8633637036c1+ ++ hg revert ++ hg diff ++ hg status ++ hg id +8633637036c1 ++ hg update ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg update -C 0 ++ echo 'changed file1 different' ++ HGMERGE=merge ++ hg update +merge: warning: conflicts during merge +merging file1 +merging file1 failed! ++ hg diff ++ sed -e 's/\(\(---\|+++\).*\)\t.*/\1/' -e 's/\(<<<<<<<\|>>>>>>>\) .*/\1/' +diff -r 3aa14bbc23d9 file1 +--- a/file1 ++++ b/file1 +@@ -1,2 +1,6 @@ + added file1 ++<<<<<<< ++changed file1 different ++======= + changed file1 ++>>>>>>> ++ hg status +M file1 ++ hg id +3aa14bbc23d9+ tip ++ hg revert ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg revert -r tip ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ hg update -C ++ hg diff ++ hg status ++ hg id +3aa14bbc23d9 tip ++ cd .. ++ /bin/rm -rf t